完善出库申请--选择优惠套餐

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) {
+          if (value[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].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) {
+              if (value[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].discountNum = value[i].discountNum
-                this.formobj.carList[n].discountUse[b].totalNum = parseInt(this.formobj.carList[n].discountUse[b].totalNum) - parseInt(val[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 + ','
         }
       }

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) {

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) {
+          if (value[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].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) {
+              if (value[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].discountNum = value[i].discountNum
-                this.formobj.carList[n].discountUse[b].totalNum = parseInt(this.formobj.carList[n].discountUse[b].totalNum) - parseInt(val[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 + ','
         }
       }

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) {