添加车队 计划下达、业务调度、车队派车 未完成、全部状态检索条件

src/views/fleet/plans/index.vue

@@ -15,7 +15,7 @@
               placeholder="请输入提单号"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="handleQuery()"
               style="max-width: 187px"
             />
           </el-form-item>
@@ -125,7 +125,7 @@
                   placeholder="请输入提箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 />
               </el-form-item>
@@ -141,7 +141,7 @@
                   placeholder="请输入装卸货地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -158,7 +158,7 @@
                   placeholder="请输入卸箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -168,6 +168,12 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(2)">全 部</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(1)">未完成</el-button>
+      </el-col>
+      <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -224,7 +230,7 @@
             type="cyan"
             icon="el-icon-search"
             size="mini"
-            @click="handleQuery"
+            @click="handleQuery()"
             >搜索</el-button
           >
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -452,15 +458,16 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        mblno: null,
         corpId: null,
+        goodsId: null,
+        loadAddr: null,
         billType: null,
         transType: null,
         transProp: null,
-        goodsId: null,
-        mblno: null,
-        loadAddr: null,
         mdLoadAddr: null,
         unLoadAddr: null,
+        incompleteStatus: 1,
       },
       billTypeList: [],
       transTypeList: [],
@@ -959,8 +966,11 @@ export default {
       return jsonData.map((v) => filterVal.map((j) => v[j]));
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery(val) {
       this.queryParams.pageNum = 1;
+      if (val) {
+        this.queryParams.incompleteStatus = val;
+      }
       this.getList();
     },
     /** 重置按钮操作 */

src/views/fleet/scheduling/index.vue

@@ -15,7 +15,7 @@
               placeholder="请输入提单号"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="handleQuery()"
               style="max-width: 187px"
             />
           </el-form-item>
@@ -126,7 +126,7 @@
                   placeholder="请输入提箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 />
               </el-form-item>
@@ -142,7 +142,7 @@
                   placeholder="请输入装卸货地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -159,7 +159,7 @@
                   placeholder="请输入卸箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -168,16 +168,12 @@
       </el-collapse-transition>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['fleet:ftmsorderbillsplans:add']"
-          >新增</el-button
-        >
-      </el-col> -->
+      <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(2)">全 部</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(1)">未完成</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -205,7 +201,7 @@
             type="cyan"
             icon="el-icon-search"
             size="mini"
-            @click="handleQuery"
+            @click="handleQuery()"
             >搜索</el-button
           >
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -428,6 +424,7 @@ export default {
         loadAddr: null,
         mdLoadAddr: null,
         unLoadAddr: null,
+        dispatchStatus: 1,
       },
       billTypeList: [],
       transTypeList: [],
@@ -661,6 +658,7 @@ export default {
     getList() {
       this.loading = true;
       // this.queryParams["billStatus"]="40"
+      console.log(JSON.stringify(this.queryParams))
       listFtmsorderbillscntrs(this.queryParams).then((response) => {
         response.rows.map((e) => {
           if (e.createTime) {
@@ -876,8 +874,11 @@ export default {
         });
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery(val) {
       this.queryParams.pageNum = 1;
+      if (val) {
+        this.queryParams.dispatchStatus = val;
+      }
       this.getList();
     },
     /** 重置按钮操作 */

src/views/fleet/sendcar/index.vue

@@ -15,7 +15,7 @@
               placeholder="请输入提单号"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="handleQuery()"
               style="max-width: 187px"
             />
           </el-form-item>
@@ -78,27 +78,6 @@
             <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"
               >
@@ -146,7 +125,7 @@
                   placeholder="请输入提箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 />
               </el-form-item>
@@ -162,7 +141,7 @@
                   placeholder="请输入装卸货地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -179,7 +158,7 @@
                   placeholder="请输入卸箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -188,16 +167,12 @@
       </el-collapse-transition>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['fleet:plans:add']"
-          >新增</el-button
-        >
-      </el-col> -->
+      <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(2)">全 部</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(1)">未完成</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -236,7 +211,7 @@
             type="cyan"
             icon="el-icon-search"
             size="mini"
-            @click="handleQuery"
+            @click="handleQuery()"
             >搜索</el-button
           >
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -466,7 +441,7 @@ export default {
         loadAddr: null,
         mdLoadAddr: null,
         unLoadAddr: null,
-        planBillStatus: null,
+        planBillStatus: 1,
       },
       billTypeList: [],
       transTypeList: [],
@@ -607,16 +582,6 @@ export default {
       vehicleList: [],
       show: false,
       collapses: [],
-      planStatusOption: [{
-        id: 6,
-        name: '待派车'
-      }, {
-        id: 20,
-        name: '派车中'
-      }, {
-        id: 60,
-        name: '派车完成'
-      }]
     };
   },
   // 使用子组件
@@ -926,8 +891,11 @@ export default {
         });
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery(val) {
       this.queryParams.pageNum = 1;
+      if (val) {
+        this.queryParams.planBillStatus = val;
+      }
       this.getList();
     },
     /** 重置按钮操作 */