装箱单成衣字段调整

src/views/packing-list/clothes-list.vue

@@ -149,7 +149,7 @@
         </span>
 
         <!-- 推送状态 -->
-        <span slot="pushState" slot-scope="text, record">
+        <span slot="pushState" slot-scope="text, record" :title ="record.cause">
           <!-- v-if="record.isRelease == '0'" -->
           <a-tag color="#f50" :title="record.cause">保存</a-tag>
           <!-- <a-tag color="#87d068" v-else>已提交</a-tag> -->
@@ -427,7 +427,7 @@ export default {
         },
 
         {
-          title: '状态',
+          title: '单据状态',
           dataIndex: 'status',
           width: 80,
           fixed: 'right',
@@ -571,7 +571,7 @@ export default {
                 totalNetWeight:editData.totalNetWeight,
                 totalVolume:editData.totalVolume,
                 totalPrice:editData.totalPrice,
-                depositaryReceiptNo:data.depositaryReceiptNo,
+                depositaryReceiptNo:editData.depositaryReceiptNo,
                 total:editData.total,
             };
             this.$refs.detailsClothesDrawer.clothesAddData = editData.syPackingListTailoringItemList
@@ -598,6 +598,7 @@ export default {
                 orderNum:editData.orderNumber,
                 styleNum:editData.itemNumber,
                 name:editData.productName,
+                englishProductName:editData.englishProductName,
                 sizeRange:editData.sizeRange,
                 customer:editData.customer,
                 containerCode:editData.containerCode,
@@ -612,6 +613,7 @@ export default {
                 totalNetWeight:editData.totalNetWeight,
                 totalVolume:editData.totalVolume,
                 totalPrice:editData.totalPrice,
+                depositaryReceiptNo:editData.depositaryReceiptNo,
                 total:editData.total
             };
             this.$refs.clothesAddDrawer.clothesAddData = editData.syPackingListTailoringItemList

src/views/packing-list/packinglist-clothes/clothesAddDrawer.vue

@@ -89,7 +89,8 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="外销发票号" prop="exportInvoiceNo">
-                  <a-input placeholder="请输入外销发票号" v-model="clothesAdd.exportInvoiceNo"></a-input>
+                  {{clothesAdd.exportInvoiceNo}}
+                  <!-- <a-input placeholder="请输入外销发票号" v-model="clothesAdd.exportInvoiceNo"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
@@ -271,6 +272,12 @@ export default {
           key: 'itemCode',
           width: 340,
           type: JVXETypes.normal,
+        },
+         {
+          title: 'PREPACK SKU',
+          key: 'prepackSku',
+          width: 200,
+          type: JVXETypes.input,
         },
         {
           title: '分销点/DC/LABEL',
@@ -884,6 +891,12 @@ export default {
           key: 'itemCode',
           width: 340,
           type: JVXETypes.normal,
+        },
+          {
+          title: 'PREPACK SKU',
+          key: 'prepackSku',
+          width: 200,
+          type: JVXETypes.input,
         },
         {
           title: '分销点/DC/LABEL',
@@ -1007,7 +1020,7 @@ export default {
           key: 'remarks',
           width: 140,
           customRender: t => ellipsis(t),
-          fixed: 'right',
+          // fixed: 'right',
           type: JVXETypes.normal,
         },
         {

src/views/packing-list/packinglist-clothes/detailsClothesDrawer.vue

@@ -11,7 +11,7 @@
       <!-- 主表信息 填写-->
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
-          <a-form-model layout="inline" ref="formModel" :model="clothesAdd" :rules="validatorRules">
+          <a-form-model layout="inline" ref="formModel" :model="clothesAdd">
             <a-row :gutter="24">
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="订单号" prop="orderNum">
@@ -25,9 +25,17 @@
                 </a-form-model-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="品名" prop="name">
+             <a-col :md="6" :sm="8">
+                <a-form-model-item label="中文品名" prop="name">
                   {{clothesAdd.name}}
+                  <!-- <a-input placeholder="请输入中文品名" v-model="clothesAdd.name"></a-input> -->
+                </a-form-model-item>
+              </a-col>
+
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="英文品名" prop="englishProductName">
+                  {{clothesAdd.englishProductName}}
+                  <!-- <a-input placeholder="请输入英文品名" v-model="clothesAdd.englishProductName"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
@@ -39,7 +47,7 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="客户" prop="customer">
-                  {{clothesAdd.customer}}
+                  {{clothesAdd.customer | ellipsis}}
                 </a-form-model-item>
               </a-col>
 
@@ -61,15 +69,15 @@
                 </a-form-model-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
+              <!-- <a-col :md="6" :sm="8">
                 <a-form-model-item label="成衣工厂" prop="clothesFactory">
                   {{clothesAdd.clothesFactory}}
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="外销发票号" prop="exportInvoiceNo">
-                  {{clothesAdd.exportInvoiceN}}
+                  {{clothesAdd.exportInvoiceNo}}
                 </a-form-model-item>
               </a-col>
 
@@ -98,11 +106,11 @@
                   {{clothesAdd.totalVolume}}
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="8">
+              <!-- <a-col :md="6" :sm="8">
                 <a-form-model-item label="总价" prop="totalPrice">
                   {{clothesAdd.totalPrice}}
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="总件数" prop="total">
                   {{clothesAdd.total}}
@@ -157,18 +165,18 @@ export default {
         },
       // 表头
       clothesAddColumns: [
-        {
+       {
           title: '账套',
           key: 'acSetNo',
           width: 160,
-          fixed: 'left',
+          // fixed: 'left',
            type: JVXETypes.normal,
         },
         {
           title: '成衣工厂',
           key: 'garmentFactory',
           width: 120,
-          fixed: 'left',
+          // fixed: 'left',
            type: JVXETypes.normal,
         },
         {
@@ -197,50 +205,18 @@ export default {
           type: JVXETypes.normal,
         },
         {
+          title: 'PREPACK SKU',
+          key: 'prepackSku',
+          width: 200,
+          type: JVXETypes.normal,
+        },
+         {
           title: '分销点/DC/LABEL',
           key: 'distributionPoint',
           width: 200,
           type: JVXETypes.normal,
           insertAfter:true,
         },
-        // {
-        //   title: 'S',
-        //   key: 's',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-        // {
-        //   title: 'M',
-        //   key: 'm',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-        // {
-        //   title: 'L',
-        //   key: 'l',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-        // {
-        //   title: 'XL',
-        //   key: 'xl',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-        // {
-        //   title: 'XXL',
-        //   key: 'xxl',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-
-        // {
-        //   title: '3XL',
-        //   key: 'xxxl',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-
         {
           title: '启始箱号',
           key: 'startingBoxNumber',
@@ -351,24 +327,12 @@ export default {
           width: 120,
           type: JVXETypes.normal,
         },
-        {
-          title: '单价',
-          key: 'unitPrice',
-          width: 120,
-          type: JVXETypes.normal,
-        },
-        {
-          title: '总价',
-          key: 'totalPrice',
-          width: 120,
-          type: JVXETypes.normal,
-        },
         {
           title: '备注',
           key: 'remarks',
           width: 140,
           customRender: t => ellipsis(t),
-          fixed: 'right',
+          // fixed: 'right',
           type: JVXETypes.normal,
         },
       ],
@@ -384,12 +348,12 @@ export default {
       visible: false,
       sizeFields:[], // 尺码字段
       confirmLoading: false,
-      validatorRules: {
-        orderNum: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
-        styleNum: [{ required: true, message: '款号不能为空', trigger: 'blur' }],
-        name: [{ required: true, message: '品名不能为空', trigger: 'blur' }]
-        // 待确定还有哪些必填信息
-      }
+      // validatorRules: {
+      //   orderNum: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
+      //   styleNum: [{ required: true, message: '款号不能为空', trigger: 'blur' }],
+      //   name: [{ required: true, message: '品名不能为空', trigger: 'blur' }]
+      //   // 待确定还有哪些必填信息
+      // }
       // dateFormat: 'YYYY-MM-DD'
     }
   },
@@ -449,18 +413,18 @@ export default {
     //初始化表头
     initializationColumns(){
      this.clothesAddColumns= [
-        {
+         {
           title: '账套',
           key: 'acSetNo',
           width: 160,
-          fixed: 'left',
+          // fixed: 'left',
            type: JVXETypes.normal,
         },
         {
           title: '成衣工厂',
           key: 'garmentFactory',
           width: 120,
-          fixed: 'left',
+          // fixed: 'left',
            type: JVXETypes.normal,
         },
         {
@@ -488,6 +452,12 @@ export default {
           width: 340,
           type: JVXETypes.normal,
         },
+        {
+          title: 'PREPACK SKU',
+          key: 'prepackSku',
+          width: 200,
+          type: JVXETypes.input,
+        },
         {
           title: '分销点/DC/LABEL',
           key: 'distributionPoint',
@@ -498,7 +468,7 @@ export default {
         {
           title: '启始箱号',
           key: 'startingBoxNumber',
-          type: JVXETypes.inputNumber ,
+          type: JVXETypes.normal ,
           width: 120,
         },
 
@@ -506,14 +476,14 @@ export default {
           title: '结束箱号',
           key: 'endCaseNumber',
           width: 120,
-          type: JVXETypes.inputNumber 
+          type: JVXETypes.normal 
         },
 
         {
           title: '颜色（中英文）',
           key: 'colour',
           width: 140,
-         type: JVXETypes.input,
+         type: JVXETypes.normal,
         },
         {
           title: '配码',
@@ -533,7 +503,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: '总件数',
           key: 'total',
@@ -544,7 +525,7 @@ export default {
           title: '净重/箱',
           key: 'netWeight',
           width: 120,
-          type: JVXETypes.inputNumber 
+          type: JVXETypes.normal 
         },
         {
           title: '总净重',
@@ -556,7 +537,7 @@ export default {
           title: '毛重/箱',
           key: 'grossWeight',
           width: 120,
-          type: JVXETypes.inputNumber 
+          type: JVXETypes.normal 
         },
         {
           title: '总毛重',
@@ -568,19 +549,19 @@ export default {
           title: '外箱长度',
           key: 'outerBoxLength',
           width: 120,
-         type: JVXETypes.inputNumber 
+         type: JVXETypes.normal 
         },
         {
           title: '外箱宽度',
           key: 'outerBoxWidth',
           width: 120,
-          type: JVXETypes.inputNumber 
+          type: JVXETypes.normal 
         },
         {
           title: '外箱高度',
           key: 'outerBoxHeight',
           width: 120,
-          type: JVXETypes.inputNumber 
+          type: JVXETypes.normal 
         },
         {
           title: '总体积',
@@ -594,18 +575,6 @@ export default {
           width: 120,
           type: JVXETypes.normal,
         },
-        {
-          title: '单价',
-          key: 'unitPrice',
-          width: 120,
-          type: JVXETypes.normal,
-        },
-        {
-          title: '总价',
-          key: 'totalPrice',
-          width: 120,
-          type: JVXETypes.normal,
-        },
         {
           title: '备注',
           key: 'remarks',
@@ -614,15 +583,6 @@ export default {
           fixed: 'right',
           type: JVXETypes.normal,
         },
-        {
-          title: '操作',
-          key: 'operation',
-          type: JVXETypes.slot,
-          width: 160,
-          fixed: 'right',
-          align: 'center',
-            slotName: 'action',
-        }
       ]
     },
     // - father------------------------------------