Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/book/book-list.vue

@@ -224,6 +224,7 @@ export default {
           scopedSlots: { customRender: 'documentStateSlot' },
           width: 140,
            ellipsis: true,
+           fixed: 'right',
           className: 'replacecolor'
         },
         // { title: '收汇方式', dataIndex: 'exchangeEarningsValue', width: 120, className: 'replacecolor' },

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

@@ -445,13 +445,7 @@ export default {
 
        
 
-        {
-          title: '推送状态',
-          dataIndex: 'pushState',
-          width: 90,
-          scopedSlots: { customRender: 'pushState' },
-          className: 'replacecolor'
-        },
+       
 
         // {
         //   title: '单据状态',
@@ -468,14 +462,7 @@ export default {
         //   className: 'replacecolor'
         // },
 
-        {
-          title: '是否云工厂推送',
-          dataIndex: 'whetherCloudFactoryPush ',
-          width: 90,
-          scopedSlots: { customRender: 'whetherCloudFactoryPush' },
-          className: 'replacecolor'
-        },
-
+      
       
 
         {
@@ -485,12 +472,28 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
+        {
+          title: '推送状态',
+          dataIndex: 'pushState',
+          width: 90,
+          fixed: 'right',
+          scopedSlots: { customRender: 'pushState' },
+          className: 'replacecolor'
+        },
+        {
+          title: '是否云工厂推送',
+          dataIndex: 'whetherCloudFactoryPush ',
+          width: 90,
+          fixed: 'right',
+          scopedSlots: { customRender: 'whetherCloudFactoryPush' },
+          className: 'replacecolor'
+        },
 
         {
           title: '单据状态',
           dataIndex: 'status',
           width: 80,
-          // fixed: 'right'，
+          fixed: 'right',
           scopedSlots: { customRender: 'stateSlot' },
           className: 'replacecolor'
         },

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

@@ -267,12 +267,14 @@ export default {
           dataIndex: 'pushState',
           scopedSlots: { customRender: 'pushState' },
           width: 140,
+          fixed: 'right',
           className: 'replacecolor'
         },
         {
           title: '是否云工厂推送',
           dataIndex: 'whetherCloudFactoryPush ',
           width: 90,
+          fixed: 'right',
           scopedSlots: { customRender: 'whetherCloudFactoryPush' },
           className: 'replacecolor'
         },
@@ -281,6 +283,7 @@ export default {
           dataIndex: 'status',
           scopedSlots: { customRender: 'state' },
           width: 140,
+          fixed: 'right',
           className: 'replacecolor'
         },
         {
@@ -288,7 +291,7 @@ export default {
           dataIndex: 'operation',
           scopedSlots: { customRender: 'operationSlot' },
           width: 150,
-          // fixed: 'right',
+          fixed: 'right',
           className: 'replacecolor'
         }
       ],

src/views/pre-book/advancePackingListModal.vue

@@ -23,11 +23,22 @@
                   </j-search-select-tag>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="8">
+              <!-- <a-col :md="6" :sm="8">
               <a-form-item label="预发货日期">
                 <a-date-picker placeholder="请选择预发货日期" v-model="queryParam.preDeliveryDate" format="YYYY-MM-DD"
                 @change="deliveryDateChange"></a-date-picker>
               </a-form-item>
+            </a-col> -->
+            <a-col :md="6" :sm="8">
+              <a-form-item label="预发货日期">
+                <a-range-picker
+                  :placeholder="['开始时间', '结束时间']"
+                  format="YYYY-MM-DD"
+                  style="width: 100%"
+                  v-model="preDeliveryDate"
+                  @change="deliveryDateChange"
+                />
+              </a-form-item>
             </a-col>
             <a-col :md="6" :sm="8">
               <a-form-item label="小PO">
@@ -397,7 +408,9 @@ export default {
       this.selectedNumber = 0
     },
     deliveryDateChange(value, dateString) {
-      this.queryParam.preDeliveryDate = dateString
+     
+      this.queryParam.beginTime = dateString[0]
+      this.queryParam.endTime = dateString[1]
     },
 
   },

src/views/pre-book/preBookList.vue

@@ -248,7 +248,7 @@ export default {
           dataIndex: 'theDocumentsState',
           width: 90,
           scopedSlots: { customRender: 'documentStateSlot' },
-          // fixed: 'right',
+          fixed: 'right',
           className: 'replacecolor'
         },
         {

src/views/shipment-details/shipmentList.vue

@@ -691,7 +691,8 @@ export default {
         if(ccode =='19'){ //如果是成衣取规格型号,否则取物料名称
           this.$refs.itemNumEleModal.editItemNumber.materialComposition = record.specificationAndModel
         }else{
-          this.$refs.itemNumEleModal.editItemNumber.materialComposition = record.inventoryName
+          var split = record.inventoryName.split(" ");
+          this.$refs.itemNumEleModal.editItemNumber.materialComposition = split[0];
         }
       }
     },