Parcourir la source

解决预装箱单尺码更改不保存的问题、英文品名中文品名备注的取值

jbb il y a 2 ans
Parent
commit
28414478fb

+ 0 - 4
src/views/advance-packingList/adPaList-clothes.vue

@@ -440,7 +440,6 @@ export default {
     // 分页查询 预装箱单-成衣
     getadPaListClothes() {
       console.log(this.queryParam)
-      debugger
       this.$nextTick(() => {
         getadPaList(this.queryParam).then(res => {
           if (res.success) {
@@ -485,7 +484,6 @@ export default {
           res.result.totalGrossWeight = totalGrossWeight;
           res.result.totalVolume = totalVolume;
           res.result.totalPrice = totalPrice;
-          
         }else{
           this.$message.error(res.message);
         }
@@ -636,14 +634,12 @@ export default {
     
     rangeSelectChange(value) {
       this.range = value
-            debugger
         if (value.length == 0){
         this.queryParam.stratDate = "";
         this.queryParam.endDate = "";
       }else{
         this.queryParam.stratDate = value[0].format('YYYY-MM-DD');
         this.queryParam.endDate  = value[1].format('YYYY-MM-DD');
-        debugger
       }
     }
   },

+ 15 - 5
src/views/advance-packingList/addAdpackingDrawer.vue

@@ -462,9 +462,7 @@ export default {
           if (res.success) {
             // 放在前面,有小数位数设置
             this.setHeadData(val[0], res.result);
-
             this.loadSizeTables(res.result.sizeTables);          
-            
             var changedData = this.changeData(val[0], res.result);
             this.addAdpacking.syPreAssembledPackingListItemList.push(changedData);
 
@@ -623,13 +621,19 @@ export default {
           this.$message.error('第'+(i+1)+'行净净重未填,无法保存');
           return;
         }
+        tableRow.sort = ++sort;
+      }
+
+      //尺码赋值
+      for(var i =0;i<newObj.syPreAssembledPackingListItemList.length;i++){
+        var dataTable = newObj.syPreAssembledPackingListItemList[i]
         for (var j=0; j<tableRow.sizeTables.length; j++){
           var sizeTable = tableRow.sizeTables[j];
           var field = 'size-'+sizeTable.size;
-          tableRow.sizeTables[j].proportion = tableRow[field];
+         dataTable.sizeTables[j].proportion =  dataTable[field];
         }
-        tableRow.sort = ++sort;
       }
+
       // 日期格式转换
       if (newObj.preDeliveryDate != "" && newObj.preDeliveryDate != undefined){
         newObj.preDeliveryDate = newObj.preDeliveryDate+" 00:00:00";
@@ -651,6 +655,7 @@ export default {
             // this.msgFormSon = {}  清空子表信息
           }else{
              this.$message.error(res.message)
+              this.btnLoading = false
           }
          })
       }else {
@@ -666,6 +671,7 @@ export default {
           // this.msgFormSon = {}  清空子表信息
         }else{
           this.$message.error(res.message)
+           this.btnLoading = false
         }
       })
       }
@@ -691,7 +697,10 @@ export default {
       this.dotConfig = getDotConfig(itemData.masterMetering);
       this.addAdpacking.syDeclarationElementsId = mData.syDeclarationElementsId;      
       this.addAdpacking.itemNumber = referData.itemNumber;
-      this.addAdpacking.productName = referData.chineseName;
+      // this.addAdpacking.productName = referData.chineseName;
+      this.addAdpacking.productName = mData.productName;
+      this.addAdpacking.englishProductName = mData.englishProductName;
+      this.addAdpacking.u8Remarks = mData.memo;
       this.addAdpacking.sizeRange = "";
       if (mData.sizeTables != null){
         if (mData.sizeTables.length == 1){
@@ -771,6 +780,7 @@ export default {
     close() {
       this.$emit('close')
       this.visible = false;
+      this.btnLoading = false
       this.editDecide = 'add'
       this.addAdpacking = {syPreAssembledPackingListItemList:[]};
     },