diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue index 932de55a89..5261bee71d 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue @@ -41,10 +41,12 @@ - + @@ -52,6 +54,11 @@ {{ scope.row.vinNo }} + + + - + + + + @@ -145,16 +157,15 @@ export default { } }, methods: { - UpNumber(e) { - e.target.value = e.target.value.replace(/[^\d.-]/g, '') // 清除“数字”和“.”"-"以外的字符 - e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0 - e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的 - e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/\-{2,}/g, '-') // 只保留第一个- - e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数 + UpNumber(e, row) { + e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符 + e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0 if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') { // 以上已经过滤,此处控制的是如果没有小数点,首位不能为类似于 01、02的金额 + console.log(e.target.value) e.target.value = parseFloat(e.target.value) } + row.disabledRefundMoney = e.target.value }, showEdit(row) { this.$nextTick(() => { @@ -238,6 +249,10 @@ export default { }) }, confirm(row) { + if (row.disabledRefundMoney !== row.costPrice && row.manDeduRemarks === '') { + this.$message({ showClose: true, type: 'error', message: '因厂家结算价与退款金额不一致,请填写厂家扣款说明' }) + return + } req.confirm(row).then((res) => { if (res.success) { this.$message({ diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuInfo.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuInfo.vue index 06a43e0bcf..2d4dd31a71 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuInfo.vue @@ -45,16 +45,26 @@ {{ scope.row.vinNo }} + + + - + + + +