预装箱单字段调整

src/views/advance-packingList/adPaList-clothes.vue

@@ -314,7 +314,7 @@ export default {
         },
         {
           title: '颜色',
-          dataIndex: 'color',
+          dataIndex: 'colour',
           width: 180,
           className: 'replacecolor'
         },

src/views/advance-packingList/addAdpackingDrawer.vue

@@ -702,7 +702,6 @@ export default {
       //   }
       // })
     },
-
     // 设置表头信息
     setHeadData(referData, mData){
       var itemData = {};
@@ -711,12 +710,13 @@ export default {
       }
       // 设置件数小数位数
       this.dotConfig = getDotConfig(itemData.masterMetering);
-      this.addAdpacking.syDeclarationElementsId = mData.syDeclarationElementsId;      
+      this.addAdpacking.syDeclarationElementsId = mData.syDeclarationElementsId;    
+      this.addAdpacking.elementsId = mData.elementsId
       this.addAdpacking.itemNumber = referData.itemNumber;
       // this.addAdpacking.productName = referData.chineseName;
       this.addAdpacking.productName = mData.productName;
       this.addAdpacking.englishProductName = mData.englishProductName;
-      this.addAdpacking.u8Remarks = mData.memo;
+      this.addAdpacking.u8Remarks = mData.u8Remarks;
       this.addAdpacking.sizeRange = "";
       if (mData.sizeTables != null){
         if (mData.sizeTables.length == 1){
@@ -743,7 +743,7 @@ export default {
         syDeclarationElementsId:itemData.syDeclarationElementsId,
         syDeclarationElementsItemId:itemData.syDeclarationElementsItemId,
         acSetNo: itemData.acSetNo,
-        garmentFactory: mData.garmentFactory,
+        garmentFactory: itemData.garmentFactory,
         hod: itemData.hod,
         styleNo:itemData.styleNo,
         poNo:itemData.poNo,

src/views/advance-packingList/detailsAdpackingDrawer.vue

@@ -32,11 +32,11 @@
                 </a-form-model-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
+              <!-- <a-col :md="6" :sm="8">
                 <a-form-model-item label="预发货日期" prop="u8Remarks">
                   {{addAdpacking.preDeliveryDate}}
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="u8备注" prop="u8Remarks">
                   {{addAdpacking.u8Remarks}}
@@ -49,8 +49,14 @@
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="品名" prop="productName">
-                  {{addAdpacking.productName}}
+                <a-form-model-item label="中文品名" prop="productName">
+                 {{addAdpacking.productName}}
+                </a-form-model-item>
+              </a-col>
+
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="英文品名" prop="productName">
+                  {{addAdpacking.englishProductName}}
                 </a-form-model-item>
               </a-col>
 
@@ -99,6 +105,11 @@
                   {{addAdpacking.totalPrice}}
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="总件数" prop="totalNumber">
+                  {{addAdpacking.total}}
+                </a-form-model-item>
+              </a-col>
             </a-row>
           </a-form-model>
         </div>
@@ -262,6 +273,18 @@ export default {
           key: 'withCode',
           width: 240,
           type: JVXETypes.normal ,
+        },
+          {
+          title: '计划尺码数量',
+          key: 'planSize',
+          width: 240,
+          type: JVXETypes.normal ,
+        },
+        {
+          title: '计划装箱数量',
+          key: 'planQuantity',
+          width: 240,
+          type: JVXETypes.normal ,
         },
         {
           title: '件数/箱',