发运明细调整

src/views/shipment-details/addShipDetDrawer.vue

@@ -39,7 +39,7 @@
                 </a-form-model-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
+              <!-- <a-col :md="6" :sm="8">
                 <a-form-model-item label="预发货日期" prop="preDeliveryDate">
                   <a-date-picker
                     placeholder="请选择预发货时间"
@@ -48,9 +48,9 @@
                     v-model="addShipDet.preDeliveryDate"
                   />
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
 
-              <a-col :md="6" :sm="8">
+              <!-- <a-col :md="6" :sm="8">
                 <a-form-model-item label="预完工日期" prop="preCompletionDate">
                   <a-date-picker
                     placeholder="请选择预完工日期"
@@ -59,7 +59,7 @@
                     v-model="addShipDet.preCompletionDate"
                   />
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="订单类型" prop="orderType">
@@ -67,11 +67,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="garmentFactory">
                   <a-input placeholder="请输入成衣工厂" v-model="addShipDet.garmentFactory"></a-input>
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
 <!-- 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="整单合计" prop="wholeOrderTotal">
@@ -269,10 +269,10 @@ export default {
       id: '',
       validatorRules:{
           documentDate:[{required: true, message: '请输入单据日期!'}],
-          customer:[{required: true, message: '请选择客户!'}],
-          preDeliveryDate:[{required: true, message: '请选择预发货时间!'}],
-          preCompletionDate:[{required: true, message: '请选择预完工日期!'}],
-          orderType:[{required: true, message: '请输入订单类型!'}],
+         // customer:[{required: true, message: '请选择客户!'}],
+         // preDeliveryDate:[{required: true, message: '请选择预发货时间!'}],
+         // preCompletionDate:[{required: true, message: '请选择预完工日期!'}],
+         // orderType:[{required: true, message: '请输入订单类型!'}],
         },
       // 表头
       columns: [
@@ -307,6 +307,27 @@ export default {
             return moment(text).format('YYYY-MM-DD')
           }
         },
+        
+         {
+          title: '预发货日期',
+          dataIndex: 'preDeliveryDate',
+          width: 100,
+          className: 'replacecolor',
+        
+        },
+         {
+          title: '预完工日期',
+          dataIndex: 'preCompletionDate',
+          width: 100,
+          className: 'replacecolor',
+         
+        },
+         {
+          title: '成衣工厂',
+          dataIndex: 'garmentFactory',
+          width: 100,
+          className: 'replacecolor'
+        },
         {
           title: '业务类型',
           dataIndex: 'businessTypeText',
@@ -605,6 +626,8 @@ 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
@@ -631,8 +654,8 @@ export default {
         newObj.documentNo = this.addShipDet.documentNo
         newObj.documentDate = this.addShipDet.documentDate.format('YYYY-MM-DD')
         newObj.customer = this.addShipDet.customer
-        newObj.preDeliveryDate = this.addShipDet.preDeliveryDate.format('YYYY-MM-DD') // 预发货日期
-        newObj.preCompletionDate = this.addShipDet.preCompletionDate.format('YYYY-MM-DD') // 预完工日期
+        //newObj.preDeliveryDate = this.addShipDet.preDeliveryDate.format('YYYY-MM-DD') // 预发货日期
+        //newObj.preCompletionDate = this.addShipDet.preCompletionDate.format('YYYY-MM-DD') // 预完工日期
         newObj.orderType = this.addShipDet.orderType
 
         newObj.garmentFactory = this.addShipDet.garmentFactory

src/views/shipment-details/referOrderDataModal.vue

@@ -117,8 +117,14 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '订单日期',
-          dataIndex: 'orderDate',
+          title: '预发货日期',
+          dataIndex: 'preDeliveryDate',
+          width: 120,
+          className: 'replacecolor'
+        },
+         {
+          title: '预完工日期',
+          dataIndex: 'preCompletionDate',
           width: 120,
           className: 'replacecolor'
         },
@@ -155,12 +161,12 @@ export default {
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
-        {
-          title: '尺码',
-          dataIndex: 'size',
-          width: 100,
-          className: 'replacecolor'
-        },
+        // {
+        //   title: '尺码',
+        //   dataIndex: 'size',
+        //   width: 100,
+        //   className: 'replacecolor'
+        // },
         {
           title: '配码规格',
           dataIndex: 'codingRules',