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 727dd0f300..249669a65a 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 @@ -390,17 +390,17 @@ export default { this.viewState = 7 this.$refs['divSelectPackAge'].showData(row.discountUse, this.formobj.discountLeave, row.vinSid) }, - backPackAge(val, vinSid) { + backPackAge(value, vinSid) { this.viewState = 1 - var value = JSON.parse(JSON.stringify(val)) + // 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 (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 { + if (value[i].discountSid === this.formobj.discountLeave[k].discountSid && this.formobj.discountLeave[k].discountLeaveNum !== '0' && this.formobj.discountLeave[k].discountLeaveNum !== 0) { + if (value[i].discountNum == '0') { this.formobj.discountLeave[k].discountLeaveNum = value[i].discountLeaveNum + } else { + this.formobj.discountLeave[k].discountLeaveNum = parseInt(this.formobj.discountLeave[k].discountLeaveNum) - parseInt(value[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 db8b16743e..69a66cb4a9 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 @@ -26,7 +26,7 @@ @@ -86,10 +86,10 @@ export default { break } }, - showData(countUse, countLeave, vinSid) { + showData(discountUse, discountLeave, vinSid) { const aa = [] - var discountUse = JSON.parse(JSON.stringify(countUse)) - var discountLeave = JSON.parse(JSON.stringify(countLeave)) + // 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 97ac0221ad..5e0e4de3f9 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 @@ -393,17 +393,17 @@ export default { this.viewState = 7 this.$refs['divSelectPackAge'].showData(row.discountUse, this.formobj.discountLeave, row.vinSid) }, - backPackAge(val, vinSid) { + backPackAge(value, vinSid) { this.viewState = 1 - var value = JSON.parse(JSON.stringify(val)) + // 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 (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 { + if (value[i].discountSid === this.formobj.discountLeave[k].discountSid && this.formobj.discountLeave[k].discountLeaveNum !== '0' && this.formobj.discountLeave[k].discountLeaveNum !== 0) { + if (value[i].discountNum == '0') { this.formobj.discountLeave[k].discountLeaveNum = value[i].discountLeaveNum + } else { + this.formobj.discountLeave[k].discountLeaveNum = parseInt(this.formobj.discountLeave[k].discountLeaveNum) - parseInt(value[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 2b33b09bab..ee09ff8bc9 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 @@ -26,7 +26,7 @@ @@ -86,10 +86,10 @@ export default { break } }, - showData(countUse, countLeave, vinSid) { + showData(discountUse, discountLeave, vinSid) { const aa = [] - var discountUse = JSON.parse(JSON.stringify(countUse)) - var discountLeave = JSON.parse(JSON.stringify(countLeave)) + // 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) {