修改bug

src/views/shipment-details/addShipDetDrawer.vue

@@ -623,18 +623,17 @@ export default {
 
   methods: {
     getSon(val) {
-      console.log('勾选订单数据', val)
-  
-      this.addShipDet.customer = val[0].customerName;
-      for (var i in val) {
-        val[i]['orderQuantity'] = val[i].quantity
-        val[i]['orderRemainingQuantity'] = val[i].surplusNum
-        val[i]['salesUnitPrice'] = val[i].unitPriceIncludingTax
-        val[i]['customerOrder'] = val[i].customerOrderNumber
-        val[i]['shipmentQuantity'] = val[i].surplusNum // 订单剩余数量 赋值给发货数量
+      var copyValList = JSON.parse(JSON.stringify(val));
+      this.addShipDet.customer = copyValList[0].customerName;
+      for (var i in copyValList) {
+        copyValList[i]['orderQuantity'] = copyValList[i].quantity
+        copyValList[i]['orderRemainingQuantity'] = copyValList[i].surplusNum
+        copyValList[i]['salesUnitPrice'] = copyValList[i].unitPriceIncludingTax
+        copyValList[i]['customerOrder'] = copyValList[i].customerOrderNumber
+        copyValList[i]['shipmentQuantity'] = copyValList[i].surplusNum // 订单剩余数量 赋值给发货数量
       }
-      this.msgFormSon = val;
-      this.syShippingDetailsItemList = this.msgFormSon;
+      this.syShippingDetailsItemList = this.syShippingDetailsItemList.concat(copyValList);
+      this.msgFormSon = this.syShippingDetailsItemList;
     },
     // 参照订单数据
     referOrderDataOpen() {
@@ -667,12 +666,12 @@ export default {
         } else {
           addShipmentList(newObj).then(res => {
             if (res.success) {
-              this.$message.success('新增成功')
-              this.close()
+              this.$message.success('新增成功');
+              this.close();
               // 清空信息
-              newObj = {}
-              newObj.syShippingDetailsItemList = []
-              this.fatherList() // 调用父组件 查询方法
+              this.addShipDet = {};
+              this.addShipDet.syShippingDetailsItemList = [];
+              this.fatherList(); // 调用父组件 查询方法
               // this.msgFormSon = {}  清空子表信息
             }else{
               this.$message.error(res.message);
@@ -748,10 +747,10 @@ export default {
     },
 
     close() {
-      this.$emit('close')
-      this.visible = false
-      this.addShipDet = {}
-      this.syShippingDetailsItemList = []
+      this.$emit('close');
+      this.visible = false;
+      this.addShipDet = {};
+      this.syShippingDetailsItemList = [];
     },
 
     // 参照订单数据弹框 ok-------------------------------------
@@ -760,6 +759,9 @@ export default {
       this.$refs.referOrderDataModal.referOrderDataModVis = false;
       this.$refs.referOrderDataModal.queryParam.orderNumber="";
       this.$refs.referOrderDataModal.queryParam.account="";
+      this.$refs.referOrderDataModal.queryParam.salesman="";
+      this.$refs.referOrderDataModal.queryParam.customerName="";
+      this.$refs.referOrderDataModal.queryParam.dateRange=[];
     }
   }
 }

src/views/shipment-details/editShipDetDrawer.vue

@@ -612,19 +612,27 @@ export default {
 
   methods: {
     getSon(val) {
-      console.log('val', val)
-      this.msgFormSon = val
-      this.syShippingDetailsItemList = this.msgFormSon
-      console.log('编辑页 子表信息', this.syShippingDetailsItemList)
+      var copyValList = JSON.parse(JSON.stringify(val));
+      for (var i in copyValList) {
+        copyValList[i]['orderQuantity'] = copyValList[i].quantity
+        copyValList[i]['orderRemainingQuantity'] = copyValList[i].surplusNum
+        copyValList[i]['salesUnitPrice'] = copyValList[i].unitPriceIncludingTax
+        copyValList[i]['customerOrder'] = copyValList[i].customerOrderNumber
+        copyValList[i]['shipmentQuantity'] = copyValList[i].surplusNum // 订单剩余数量 赋值给发货数量
+      }
+      this.syShippingDetailsItemList = this.syShippingDetailsItemList.concat(copyValList);
+      this.msgFormSon = this.syShippingDetailsItemList;
     },
     // 编辑 保存
     editSave() {
       // console.log('提交编辑、刷新发运明细列表')
       editById(this.editShipDet).then(res => {
         if (res.success) {
-          this.$message.success('编辑成功')
-          this.close()
-          this.fatherList() // 调用父组件的查询方法
+          this.$message.success('编辑成功');
+          this.addShipDet = {};
+          this.addShipDet.syShippingDetailsItemList = [];
+          this.close();
+          this.fatherList(); // 调用父组件的查询方法
         }
       })
     },
@@ -690,9 +698,11 @@ export default {
     },
 
     close() {
-      this.$emit('close')
-      this.visible = false
-      this.$refs.form.resetFields()
+      this.$emit('close');
+      this.visible = false;
+      this.addShipDet = {};
+      this.syShippingDetailsItemList = [];
+      this.$refs.form.resetFields();
     },
     // --------------------------------------
     // 分页、排序、筛选变化时触发
@@ -704,7 +714,12 @@ export default {
     // 参照订单数据弹框 ok-------------------------------------
     referOrderDataOk() {
       console.log('参照订单数据弹框确定')
-      this.$refs.referOrderDataModal.referOrderDataModVis = false
+      this.$refs.referOrderDataModal.referOrderDataModVis = false;
+      this.$refs.referOrderDataModal.queryParam.orderNumber="";
+      this.$refs.referOrderDataModal.queryParam.account="";
+      this.$refs.referOrderDataModal.queryParam.salesman="";
+      this.$refs.referOrderDataModal.queryParam.customerName="";
+      this.$refs.referOrderDataModal.queryParam.dateRange=[];
     },
     // father
     aa() {}

src/views/shipment-details/referOrderDataModal.vue

@@ -445,6 +445,7 @@ export default {
 
     // 弹框确定
     onSubmit() {
+      this.confimList = [];
       if (this.selectedRowKeys.length == 0) {
         this.$message.error('请勾选订单数据')
       } else {
@@ -480,11 +481,11 @@ export default {
       this.queryParam.orderNumber = '';
       this.queryParam.account = '';
       this.getOrderList();
+      this.selectedRowKeys = [];
+      this.selectedRows = [];
     },
     // 选中行
     onSelectChange(keys, rows) {
-      console.log(keys);
-      console.log(rows);
       this.selectedRowKeys = keys;
       this.selectedRows = rows;
     },

src/views/shipment-details/shipmentList.vue

@@ -530,6 +530,7 @@ export default {
 
     // 新增
     addShipDet() {
+      this.$refs.addShipDetDrawer.syShippingDetailsItemList = [];
       this.$refs.addShipDetDrawer.visible = true
     },