Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/track/cabinet/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>
@@ -254,7 +254,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"
@@ -455,6 +455,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         corpId: null,
+        carStatus: null,
         billType: null,
         transType: null,
         transProp: null,
@@ -1033,7 +1034,9 @@ export default {
     /** 搜索按钮操作 */
     handleQuery(Status) {
       this.queryParams.pageNum = 1;
-      this.queryParams.carStatus = Status;
+      if (Status) {
+        this.queryParams.carStatus = Status;
+      }
       this.getList();
     },
     /** 重置按钮操作 */

src/views/track/singleCost/index.vue

@@ -709,8 +709,8 @@ export default {
     getList() {
       this.loading = true;
       listFtmsorderbillsplans(this.queryParams).then((response) => {
-        this.ftmsorderbillsList = response.rows;
-        this.total = response.total;
+        this.ftmsorderbillsList = response.dataTable.rows;
+        this.total = response.dataTable.total;
         this.loading = false;
       });
     },