调整车队派车列表查询条件，调整入库字段

src/views/Warehousing/inStock/index.vue

@@ -673,6 +673,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "20",
+          label: "fStorekeeper",
+          name: "仓管员",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList: [],
       getRowList: [],

src/views/fleet/fleetStatistics/index.vue

@@ -303,11 +303,10 @@ export default {
         accchkDateList: null,
         acceptDateList: null,
       },
-      tableDate: [
-        {
+      tableDate: [{
           surface: "1",
-          label: "mdLoadDate",
-          name: "装卸日期",
+          label: "acceptDate",
+          name: "接单日期",
           checked: 0,
           width: 100,
         },
@@ -445,13 +444,6 @@ export default {
           width: 100,
         },
         {
-          surface: "22",
-          label: "acceptDate",
-          name: "接单日期",
-          checked: 0,
-          width: 100,
-        },
-        {
           surface: "23",
           label: "loadDate",
           name: "提箱日期",
@@ -621,7 +613,7 @@ export default {
   created() {
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
-    this.getList();
+    // this.getList();
     this.getRow();
     listCorps().then((response) => {
       this.corpsOptions = response.rows;
@@ -704,15 +696,11 @@ export default {
     },
     /** 查询订单主列表 */
     getList() {
-      this.loading = true;
-      /*if (this.queryParams.acceptDateList) {
-        this.queryParams.acceptDateList[0] = this.queryParams.acceptDateList + ' 00:00:00'
-        this.queryParams.acceptDateList[1] = this.queryParams.acceptDateList + ' 23:59:59'
+      if (!this.queryParams.acceptDateList) {
+        this.$message.error("请选择接单时间");
+        return false
       }
-      if (this.queryParams.accchkDateList) {
-        this.queryParams.accchkDateList[0] = this.queryParams.accchkDateList + ' 00:00:00'
-        this.queryParams.accchkDateList[1] = this.queryParams.accchkDateList + ' 23:59:59'
-      }*/
+      this.loading = true;
       queryLedgerList(this.queryParams).then((response) => {
         this.tabularData = response.rows;
         this.total = response.total;

src/views/fleet/sendcar/index.vue

@@ -78,6 +78,27 @@
             <el-col :span="6">
               <el-form-item
                 label-width="100px"
+                label="状态"
+                prop="planBillStatus"
+              >
+                <el-select
+                  v-model="queryParams.planBillStatus"
+                  placeholder="请选择状态"
+                  clearable
+                  size="small"
+                >
+                  <el-option
+                    v-for="(dict, index) in planStatusOption"
+                    :key="index.id"
+                    :label="dict.name"
+                    :value="dict.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item
+                label-width="100px"
                 label="运输性质"
                 prop="transProp"
               >
@@ -445,6 +466,7 @@ export default {
         loadAddr: null,
         mdLoadAddr: null,
         unLoadAddr: null,
+        planBillStatus: null,
       },
       billTypeList: [],
       transTypeList: [],
@@ -585,6 +607,16 @@ export default {
       vehicleList: [],
       show: false,
       collapses: [],
+      planStatusOption: [{
+        id: 6,
+        name: '待派车'
+      }, {
+        id: 20,
+        name: '派车中'
+      }, {
+        id: 60,
+        name: '派车完成'
+      }]
     };
   },
   // 使用子组件

src/views/track/cabinet/AddOrUpdate.vue

@@ -477,7 +477,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled||form.billStatus == 7"
+                :disabled="disabled||form.billStatus == 7 || form.billKind == 'MH'"
               />
             </el-form-item>
           </el-col>
@@ -489,7 +489,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled||form.billStatus == 7"
+                :disabled="disabled||form.billStatus == 7 || form.billKind == 'MH'"
               />
             </el-form-item>
           </el-col>

src/views/track/cabinet/index.vue

@@ -521,41 +521,48 @@ export default {
       tableDate: [
         {
           surface: "1",
+          label: "billKind",
+          name: "单据类型",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "2",
           label: "mdLoadDate",
           name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
+          surface: "3",
           label: "billType",
           name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
+          surface: "4",
           label: "transType",
           name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
+          surface: "5",
           label: "corpId",
           name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
+          surface: "6",
           label: "ysl",
           name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
+          surface: "7",
           label: "voy",
           name: "航次",
           checked: 0,
@@ -771,13 +778,6 @@ export default {
           checked: 0,
           width: 100,
         },
-        {
-          surface: "38",
-          label: "billKind",
-          name: "单据类型",
-          checked: 0,
-          width: 100,
-        },
       ],
       allCheck: false,
       title: "",