From a0f156919b8a469a3b2920f9fa3b1af5a64a4de0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 16 May 2023 10:52:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E5=BA=93=E7=94=B3?= =?UTF-8?q?=E8=AF=B7--=E9=80=89=E6=8B=A9=E4=BC=98=E6=83=A0=E5=A5=97?= =?UTF-8?q?=E9=A4=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chukubanli/chukushenqingAdd.vue | 19 ++++++++++++------- .../chukubanli/relation/selectpackage.vue | 4 +++- .../chukuguanliFlow/chukuguanli/chukuEdit.vue | 19 ++++++++++++------- .../chukuguanli/relation/selectpackage.vue | 4 +++- 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue index 551e6daa0c..727dd0f300 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue @@ -392,20 +392,25 @@ export default { }, backPackAge(val, vinSid) { this.viewState = 1 - for (var i = 0; i < val.length; i++) { + var value = JSON.parse(JSON.stringify(val)) + for (var i = 0; i < value.length; i++) { // 循环计算最外层的套餐数量 for (var k = 0; k < this.formobj.discountLeave.length; k++) { - if (val[i].discountSid === this.formobj.discountLeave[k].discountSid) { - this.formobj.discountLeave[k].discountLeaveNum = parseInt(this.formobj.discountLeave[k].discountLeaveNum) - parseInt(val[i].discountNum) + if (value[i].discountSid === this.formobj.discountLeave[k].discountSid) { + if (value[i].discountNum !== '0') { + this.formobj.discountLeave[k].discountLeaveNum = parseInt(this.formobj.discountLeave[k].discountLeaveNum) - parseInt(value[i].discountNum) + } else { + this.formobj.discountLeave[k].discountLeaveNum = value[i].discountLeaveNum + } } } // 循环计算每辆车的套餐数量 for (var n = 0; n < this.formobj.carList.length; n++) { if (this.formobj.carList[n].vinSid === vinSid) { for (var b = 0; b < this.formobj.carList[n].discountUse.length; b++) { - if (val[i].discountSid === this.formobj.carList[n].discountUse[b].discountSid) { - this.formobj.carList[n].discountUse[b].discountNum = val[i].discountNum - this.formobj.carList[n].discountUse[b].totalNum = parseInt(this.formobj.carList[n].discountUse[b].totalNum) - parseInt(val[i].discountNum) + if (value[i].discountSid === this.formobj.carList[n].discountUse[b].discountSid) { + this.formobj.carList[n].discountUse[b].discountNum = value[i].discountNum + this.formobj.carList[n].discountUse[b].totalNum = parseInt(this.formobj.carList[n].discountUse[b].totalNum) - parseInt(value[i].discountNum) } } } @@ -424,7 +429,7 @@ export default { remarks(row) { var aa = '' for (var i = 0; i < row.discountUse.length; i++) { - if (row.discountUse[i].discountNum !== 0) { + if (row.discountUse[i].discountNum !== 0 && row.discountUse[i].discountNum !== '0') { aa = aa + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ',' } } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue index 9586834710..db8b16743e 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue @@ -86,8 +86,10 @@ export default { break } }, - showData(discountUse, discountLeave, vinSid) { + showData(countUse, countLeave, vinSid) { const aa = [] + var discountUse = JSON.parse(JSON.stringify(countUse)) + var discountLeave = JSON.parse(JSON.stringify(countLeave)) for (var i = 0; i < discountLeave.length; i++) { for (var k = 0; k < discountUse.length; k++) { if (discountLeave[i].discountSid === discountUse[k].discountSid) { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue index bedba40b32..97ac0221ad 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue @@ -395,20 +395,25 @@ export default { }, backPackAge(val, vinSid) { this.viewState = 1 - for (var i = 0; i < val.length; i++) { + var value = JSON.parse(JSON.stringify(val)) + for (var i = 0; i < value.length; i++) { // 循环计算最外层的套餐数量 for (var k = 0; k < this.formobj.discountLeave.length; k++) { - if (val[i].discountSid === this.formobj.discountLeave[k].discountSid) { - this.formobj.discountLeave[k].discountLeaveNum = parseInt(this.formobj.discountLeave[k].discountLeaveNum) - parseInt(val[i].discountNum) + if (value[i].discountSid === this.formobj.discountLeave[k].discountSid) { + if (value[i].discountNum !== '0') { + this.formobj.discountLeave[k].discountLeaveNum = parseInt(this.formobj.discountLeave[k].discountLeaveNum) - parseInt(value[i].discountNum) + } else { + this.formobj.discountLeave[k].discountLeaveNum = value[i].discountLeaveNum + } } } // 循环计算每辆车的套餐数量 for (var n = 0; n < this.formobj.carList.length; n++) { if (this.formobj.carList[n].vinSid === vinSid) { for (var b = 0; b < this.formobj.carList[n].discountUse.length; b++) { - if (val[i].discountSid === this.formobj.carList[n].discountUse[b].discountSid) { - this.formobj.carList[n].discountUse[b].discountNum = val[i].discountNum - this.formobj.carList[n].discountUse[b].totalNum = parseInt(this.formobj.carList[n].discountUse[b].totalNum) - parseInt(val[i].discountNum) + if (value[i].discountSid === this.formobj.carList[n].discountUse[b].discountSid) { + this.formobj.carList[n].discountUse[b].discountNum = value[i].discountNum + this.formobj.carList[n].discountUse[b].totalNum = parseInt(this.formobj.carList[n].discountUse[b].totalNum) - parseInt(value[i].discountNum) } } } @@ -427,7 +432,7 @@ export default { remarks(row) { var aa = '' for (var i = 0; i < row.discountUse.length; i++) { - if (row.discountUse[i].discountNum !== 0) { + if (row.discountUse[i].discountNum !== 0 && row.discountUse[i].discountNum !== '0') { aa = aa + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ',' } } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue index 78b77c8a92..2b33b09bab 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue @@ -86,8 +86,10 @@ export default { break } }, - showData(discountUse, discountLeave, vinSid) { + showData(countUse, countLeave, vinSid) { const aa = [] + var discountUse = JSON.parse(JSON.stringify(countUse)) + var discountLeave = JSON.parse(JSON.stringify(countLeave)) for (var i = 0; i < discountLeave.length; i++) { for (var k = 0; k < discountUse.length; k++) { if (discountLeave[i].discountSid === discountUse[k].discountSid) {