Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -2066,7 +2066,7 @@ export default {
         delete this.query[row.prop];
       }
       this.pageOrder.currentPage = 1;
-      this.onLoadOrder(this.pageOrder, this.pageOrder);
+      this.onLoadOrder(this.pageOrder, this.query);
     },
     inputsc(index, row) {
       this.query[row.prop] = index;

src/views/warehouse/parcelList/distributionParcelList.vue

@@ -331,28 +331,28 @@ export default {
         //   sortable: true,
         //   head: false,
         // },
-        {
-          prop: 'scanTime',
-          label: '装车时间',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
+        // {
+        //   prop: 'scanTime',
+        //   label: '装车时间',
+        //   type: 2,
+        //   values: '',
+        //   width: '140',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
 
-        {
-          prop: 'carNumber',
-          label: '客户车次号',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'carNumber',
+        //   label: '客户车次号',
+        //   type: 2,
+        //   values: '',
+        //   width: '140',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
 
         {
           prop: 'warehouseEntryTimeEnd',