瀏覽代碼

预托书参照预装箱单 预付货日期应为范围设置,所有单据状态固定

zengtx 2 年之前
父節點
當前提交
d016544e79

+ 1 - 0
src/views/book/book-list.vue

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

+ 19 - 16
src/views/packing-list/clothes-list.vue

@@ -444,13 +444,7 @@ export default {
 
        
 
-        {
-          title: '推送状态',
-          dataIndex: 'pushState',
-          width: 90,
-          scopedSlots: { customRender: 'pushState' },
-          className: 'replacecolor'
-        },
+       
 
         // {
         //   title: '单据状态',
@@ -467,14 +461,7 @@ export default {
         //   className: 'replacecolor'
         // },
 
-        {
-          title: '是否云工厂推送',
-          dataIndex: 'whetherCloudFactoryPush ',
-          width: 90,
-          scopedSlots: { customRender: 'whetherCloudFactoryPush' },
-          className: 'replacecolor'
-        },
-
+      
       
 
         {
@@ -484,12 +471,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'
         },

+ 4 - 1
src/views/packing-list/fabric-list.vue

@@ -266,12 +266,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'
         },
@@ -280,6 +282,7 @@ export default {
           dataIndex: 'status',
           scopedSlots: { customRender: 'state' },
           width: 140,
+          fixed: 'right',
           className: 'replacecolor'
         },
         {
@@ -287,7 +290,7 @@ export default {
           dataIndex: 'operation',
           scopedSlots: { customRender: 'operationSlot' },
           width: 150,
-          // fixed: 'right',
+          fixed: 'right',
           className: 'replacecolor'
         }
       ],

+ 15 - 2
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]
     },
 
   },

+ 1 - 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'
         },
         {