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

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

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue

@@ -26,7 +26,7 @@
           </el-table-column>
           <el-table-column label="本次赠送数量" align="center" width="200">
             <template slot-scope="scope">
-              <el-input :disabled="scope.row.discountLeaveNum == '0'" @change="changeByDiscountNum($event, scope.row)" v-model="scope.row.discountNum" placeholder=""/>
+              <el-input :disabled="scope.row.discountLeaveNum == '0'" @input="changeByDiscountNum($event, scope.row)" v-model="scope.row.discountNum" placeholder=""/>
             </template>
           </el-table-column>
         </el-table>
@@ -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) {

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

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue

@@ -26,7 +26,7 @@
           </el-table-column>
           <el-table-column label="本次赠送数量" align="center" width="200">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.discountNum" @change="changeByDiscountNum($event, scope.row)" placeholder=""/>
+              <el-input v-model="scope.row.discountNum" @input="changeByDiscountNum($event, scope.row)" placeholder=""/>
             </template>
           </el-table-column>
         </el-table>
@@ -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) {