Преглед изворни кода

预装箱单、装箱单增加计划尺码数量、计划装箱数量字段

jbb пре 2 година
родитељ
комит
06df2af752

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

@@ -469,6 +469,7 @@ export default {
           var totalGrossWeight = 0;
           var totalVolume = 0;
           var totalPrice = 0;
+          var totalNumber = 0;
           for (var i=0; i<res.result.syPreAssembledPackingListItemList.length;i++){
             var row = res.result.syPreAssembledPackingListItemList[i];
             var sizeTables = row.sizeTables;
@@ -479,11 +480,13 @@ export default {
             totalGrossWeight += row.totalGrossWeight*1;
             totalVolume += row.totalVolume*1;
             totalPrice += row.totalPrice*1;
+            totalNumber += row.total*1
           }
           res.result.totalNetWeight = totalNetWeight;
           res.result.totalGrossWeight = totalGrossWeight;
           res.result.totalVolume = totalVolume;
           res.result.totalPrice = totalPrice;
+          res.result.totalNumber = totalNumber;
         }else{
           this.$message.error(res.message);
         }

+ 22 - 1
src/views/advance-packingList/addAdpackingDrawer.vue

@@ -104,6 +104,11 @@
                   <a-input placeholder="自动生成" v-model="addAdpacking.totalPrice" readOnly></a-input>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="总件数" prop="totalNumber">
+                  <a-input placeholder="自动生成" v-model="addAdpacking.totalNumber" readOnly></a-input>
+                </a-form-model-item>
+              </a-col>
             </a-row>
           </a-form-model>
         </div>
@@ -298,6 +303,18 @@ export default {
           width: 240,
           type: JVXETypes.input ,
         },
+        {
+          title: '计划尺码数量',
+          key: 'planSize',
+          width: 240,
+          type: JVXETypes.normal ,
+        },
+        {
+          title: '计划装箱数量',
+          key: 'planQuantity',
+          width: 240,
+          type: JVXETypes.normal ,
+        },
         {
           title: '件数/箱',
           key: 'piecesBox',
@@ -465,7 +482,6 @@ export default {
             this.loadSizeTables(res.result.sizeTables);          
             var changedData = this.changeData(val[0], res.result);
             this.addAdpacking.syPreAssembledPackingListItemList.push(changedData);
-
           }else{
             this.$message.error("获取发运明细详情失败");
           }
@@ -832,6 +848,7 @@ export default {
       var totalGrossWeight = 0;
       var totalVolume = 0;
       var totalPrice = 0;
+      var total = 0;
 
       for (var i=0; i<headData.syPreAssembledPackingListItemList.length; i++){
         var rowData = headData.syPreAssembledPackingListItemList[i];
@@ -848,12 +865,16 @@ export default {
         if (rowData.totalPrice != undefined && rowData.totalPrice != ""){
           totalPrice += rowData.totalPrice*1;
         }
+        if (rowData.total != undefined && rowData.total != ""){
+          total += rowData.total*1;
+        }
       }
       headData.totalBoxes = totalBoxes;
       headData.totalNetWeight = totalNetWeight;
       headData.totalGrossWeight = totalGrossWeight;
       headData.totalVolume = totalVolume;
       headData.totalPrice = totalPrice.toFixed(2); 
+      headData.totalNumber = total
       this.addAdpacking = headData;
     },
   },

+ 0 - 3
src/views/advance-packingList/referShipmentDetailsModal.vue

@@ -329,9 +329,6 @@ export default {
         // console.log('需要传给父组件的数据', this.selectedRows)
         // bao父组件指定的传数据绑定的函数 || this.selectedRows子组件给父组件传递的数据
         var msg = "选中记录后,会清除编辑的内容。";
-        if (this.selectedRowKeys.length>1){
-          msg = '当前勾选了多行,只有第一行会被选中。'+msg;
-        }
         this.$message.info(msg);
         this.$emit('bao', this.selectedRows)
         this.referShipDetModVis = false

+ 12 - 0
src/views/packing-list/packinglist-clothes/clothesAddDrawer.vue

@@ -353,6 +353,18 @@ export default {
           width: 120,
           type: JVXETypes.normal 
         },
+         {
+          title: '计划尺码数量',
+          key: 'planSize',
+          width: 240,
+          type: JVXETypes.normal ,
+        },
+        {
+          title: '计划装箱数量',
+          key: 'planQuantity',
+          width: 240,
+          type: JVXETypes.normal ,
+        },
 
         {
           title: '总件数',