diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue index 85b5157fa6..a864efb8e3 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue @@ -206,23 +206,21 @@ export default { this.viewTitle = '【编辑】回款返利核对审核申请' console.log('编辑回显', row.sid) req.fetchDetailsBySid(row.sid).then((resp) => { - this.formobj = resp.data - this.formobj.instanceId = resp.data.procInstId + if (resp.success) { + this.formobj = resp.data + this.formobj.instanceId = resp.data.procInstId + } }).catch((e) => { this.formobj = row }) }, changeBrand(value) { - let bb = null - this.brand_list.forEach((e) => { - if (e.brandName === value) { - bb = { - name: e.brandName, - sid: e.sid - } - } - }) - this.formobj.brandSid = bb.sid + const choose = this.brand_list.filter((item) => item.brandName === value) + if (choose !== null && choose.length > 0) { + this.formobj.brandSid = choose[0].sid + } else { + this.formobj.brandSid = '' + } }, // 明细表添加一行数据 handleSelect() { @@ -244,10 +242,10 @@ export default { let v = 0 for (var j in this.formobj.scmWhenCollectionrebateCheckapplydetailDetails) { if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionTypeValue === cval.collectionTypeValue) { - this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney) + parseInt(cval.collectionMoney) - this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate) + parseInt(cval.estimateRebate) - this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney) + parseInt(cval.uploadMoney) - this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney) + parseInt(cval.adjustmentMoney) + this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney) + parseFloat(cval.collectionMoney) + this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate) + parseFloat(cval.estimateRebate) + this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney) + parseFloat(cval.uploadMoney) + this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney) this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionRebateSids.push(cval.sid) v = 1 break @@ -279,10 +277,10 @@ export default { let v = 0 for (var l in this.formobj.scmLastCollectionrebateCheckapplydetailDetails) { if (this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].withholdingDate === bval.withholdingDate) { - this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney) + parseInt(bval.collectionMoney) - this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate) + parseInt(bval.estimateRebate) - this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney) + parseInt(bval.uploadMoney) - this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney) + parseInt(bval.adjustmentMoney) + this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney) + parseFloat(bval.collectionMoney) + this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate) + parseFloat(bval.estimateRebate) + this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney) + parseFloat(bval.uploadMoney) + this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney) + parseFloat(bval.adjustmentMoney) this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionRebateSids.push(bval.sid) v = 1 break @@ -317,10 +315,10 @@ export default { let v = 0 for (var j in aa) { if (aa[j].collectionTypeValue === cval.collectionTypeValue) { - aa[j].collectionMoney = parseInt(aa[j].collectionMoney) + parseInt(cval.collectionMoney) - aa[j].estimateRebate = parseInt(aa[j].estimateRebate) + parseInt(cval.estimateRebate) - aa[j].uploadMoney = parseInt(aa[j].uploadMoney) + parseInt(cval.uploadMoney) - aa[j].adjustmentMoney = parseInt(aa[j].adjustmentMoney) + parseInt(cval.adjustmentMoney) + aa[j].collectionMoney = parseFloat(aa[j].collectionMoney) + parseFloat(cval.collectionMoney) + aa[j].estimateRebate = parseFloat(aa[j].estimateRebate) + parseFloat(cval.estimateRebate) + aa[j].uploadMoney = parseFloat(aa[j].uploadMoney) + parseFloat(cval.uploadMoney) + aa[j].adjustmentMoney = parseFloat(aa[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney) aa[j].collectionRebateSids.push(cval.sid) v = 1 break @@ -375,11 +373,7 @@ export default { req.save(this.formobj).then((resp) => { this.submitdisabled = false if (resp.success) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg - }) + this.$message({ showClose: true, type: 'success', message: resp.msg }) this.handleReturn('true') } }).catch(() => { @@ -397,11 +391,7 @@ export default { req.submitVehicleApply(this.formobj).then((resp) => { this.submitdisabled = false if (resp.success) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg - }) + this.$message({ showClose: true, type: 'success', message: resp.msg }) this.handleReturn('true') } }).catch(() => { diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue index b022f45521..60b4717d7b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue @@ -139,7 +139,9 @@ export default { this.viewTitle = '回款返利核对审核申请详情' console.log('编辑回显', row.sid) req.fetchDetailsBySid(row.sid).then((resp) => { - this.formobj = resp.data + if (resp.success) { + this.formobj = resp.data + } }).catch((e) => { this.formobj = row }) diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue index 0c6c4c251c..69c360f812 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue @@ -188,7 +188,7 @@ export default { handleRebate() { if (this.formobj.scmCollectionRebateVehs.length !== 0) { for (var i = 0; i < this.formobj.scmCollectionRebateVehs.length; i++) { - this.formobj.scmCollectionRebateVehs[i].uploadMoney = parseFloat(this.formobj.scmCollectionRebateVehs[i].estimateRebate) / parseFloat(this.formobj.estimateRebate) * parseFloat(this.formobj.uploadMoney) + this.formobj.scmCollectionRebateVehs[i].uploadMoney = Math.round((parseFloat(this.formobj.scmCollectionRebateVehs[i].estimateRebate) / parseFloat(this.formobj.estimateRebate) * parseFloat(this.formobj.uploadMoney)) * 100) / 100 this.formobj.scmCollectionRebateVehs[i].adjustmentMoney = parseFloat(this.formobj.scmCollectionRebateVehs[i].uploadMoney) - parseFloat(this.formobj.scmCollectionRebateVehs[i].estimateRebate) } } diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue index a2d74acc0b..dbd03695b6 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue @@ -211,7 +211,9 @@ export default { this.viewTitle = '回款返利核对审核申请详情' console.log('编辑回显', sid) req.fetchDetailsBySid(sid).then((resp) => { - this.formobj = resp.data + if (resp.success) { + this.formobj = resp.data + } }).catch((e) => { this.formobj = {} }) diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue index 6cef83964a..0ead5eac12 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue @@ -201,23 +201,21 @@ export default { this.viewTitle = '【编辑】回款返利核对审核申请' console.log('编辑回显', sid) req.fetchDetailsBySid(sid).then((resp) => { - this.formobj = resp.data - this.formobj.instanceId = resp.data.procInstId + if (resp.success) { + this.formobj = resp.data + this.formobj.instanceId = resp.data.procInstId + } }).catch((e) => { this.formobj = {} }) }, changeBrand(value) { - let bb = null - this.brand_list.forEach((e) => { - if (e.brandName === value) { - bb = { - name: e.brandName, - sid: e.sid - } - } - }) - this.formobj.brandSid = bb.sid + const choose = this.brand_list.filter((item) => item.brandName === value) + if (choose !== null && choose.length > 0) { + this.formobj.brandSid = choose[0].sid + } else { + this.formobj.brandSid = '' + } }, // 明细表添加一行数据 handleSelect() { @@ -239,10 +237,10 @@ export default { let v = 0 for (var j in this.formobj.scmWhenCollectionrebateCheckapplydetailDetails) { if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionTypeValue === cval.collectionTypeValue) { - this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney) + parseInt(cval.collectionMoney) - this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate) + parseInt(cval.estimateRebate) - this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney) + parseInt(cval.uploadMoney) - this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney) + parseInt(cval.adjustmentMoney) + this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney) + parseFloat(cval.collectionMoney) + this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate) + parseFloat(cval.estimateRebate) + this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney) + parseFloat(cval.uploadMoney) + this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney) this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionRebateSids.push(cval.sid) v = 1 break @@ -274,10 +272,10 @@ export default { let v = 0 for (var l in this.formobj.scmLastCollectionrebateCheckapplydetailDetails) { if (this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].withholdingDate === bval.withholdingDate) { - this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney) + parseInt(bval.collectionMoney) - this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate) + parseInt(bval.estimateRebate) - this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney) + parseInt(bval.uploadMoney) - this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney) + parseInt(bval.adjustmentMoney) + this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney) + parseFloat(bval.collectionMoney) + this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate) + parseFloat(bval.estimateRebate) + this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney) + parseFloat(bval.uploadMoney) + this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney) + parseFloat(bval.adjustmentMoney) this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionRebateSids.push(bval.sid) v = 1 break @@ -312,10 +310,10 @@ export default { let v = 0 for (var j in aa) { if (aa[j].collectionTypeValue === cval.collectionTypeValue) { - aa[j].estimateRebate = parseInt(aa[j].estimateRebate) + parseInt(cval.estimateRebate) - aa[j].collectionMoney = parseInt(aa[j].collectionMoney) + parseInt(cval.collectionMoney) - aa[j].uploadMoney = parseInt(aa[j].uploadMoney) + parseInt(cval.uploadMoney) - aa[j].adjustmentMoney = parseInt(aa[j].adjustmentMoney) + parseInt(cval.adjustmentMoney) + aa[j].estimateRebate = parseFloat(aa[j].estimateRebate) + parseFloat(cval.estimateRebate) + aa[j].collectionMoney = parseFloat(aa[j].collectionMoney) + parseFloat(cval.collectionMoney) + aa[j].uploadMoney = parseFloat(aa[j].uploadMoney) + parseFloat(cval.uploadMoney) + aa[j].adjustmentMoney = parseFloat(aa[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney) aa[j].collectionRebateSids.push(cval.sid) v = 1 break diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue index 049deafd5e..c43ae200db 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue @@ -175,7 +175,9 @@ export default { this.viewTitle = '回款返利核对审核申请详情' console.log('编辑回显', sid) req.fetchDetailsBySid(sid).then((resp) => { - this.formobj = resp.data + if (resp.success) { + this.formobj = resp.data + } }).catch((e) => { this.formobj = {} })