全部订单多选查询

src/components/RoutersSelector/index.vue

@@ -15,13 +15,13 @@
                 <el-option v-for="item in countryList" :key="item.id" :label="$l(item, 'title')" :value="item.id" />
             </el-select>
 
-            {{$t('目的地')}}：
+            {{$t('目的城市')}}：
             <!--
             <el-select :placeholder="$t('请选择目的地')" v-model="importCity" clearable>
                 <el-option v-for="item in importCityList" :key="item.id" :label="item.titleZh" :value="item.id" />
             </el-select>
             -->
-            <el-select :placeholder="$t('请选择目的地')" v-model="destCityId" clearable>
+            <el-select :placeholder="$t('请选择目的城市')" v-model="destCityId" clearable>
                 <el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi" />
             </el-select>
             {{$t('目的仓')}}：

src/utils/request.js

@@ -19,7 +19,7 @@ const service = axios.create({
     (localStorage.VUE_APP_BASE_API || process.env.VUE_APP_BASE_API) +
     "/admin-api/", // 此处的 /admin-api/ 地址，原因是后端的基础路径为 /admin-api/
   // 超时
-  timeout: 1000 * 30,
+  timeout: 1000 * 60,
 });
 
 // 如果是生产环境则打印提示

src/views/ecw/order/index.vue

@@ -13,6 +13,7 @@
           :placeholder="$t('请输入订单号、唛头、提单号')"
           clearable
           @keyup.enter.native="handleQuery"
+          onkeyup="this.value=this.value.replace(/\s+/g, '')"
         >
           <template slot="prepend">
             <dict-selector
@@ -34,7 +35,7 @@
           :placeholder="$t('发货人')"
           clearable
           @keyup.enter.native="handleQuery"
-          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
+          onkeyup="this.value=this.value.replace(/\s+/g, '')"
         />
       </el-form-item>
       <el-form-item :label="$t('收货人')" prop="consigneeKey">
@@ -43,7 +44,7 @@
           :placeholder="$t('收货人')"
           clearable
           @keyup.enter.native="handleQuery"
-          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
+          onkeyup="this.value=this.value.replace(/\s+/g, '')"
         />
       </el-form-item>
       <el-form-item label="">
@@ -213,7 +214,8 @@
       <el-form-item :label="$t('订单状态')" prop="status">
         <dict-selector
           :type="DICT_TYPE.ORDER_STATUS"
-          v-model="queryParams.status"
+          multiple
+          v-model="queryParams.statusList"
           @keyup.enter.native="handleQuery"
           :filter="statusDictFilter"
           clearable
@@ -261,7 +263,7 @@
           :placeholder="$t('快递单号')"
           clearable
           @keyup.enter.native="handleQuery"
-          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
+          onkeyup="this.value=this.value.replace(/\s+/g, '')"
         />
       </el-form-item>
       <el-form-item :label="$t('外部仓')" prop="number">
@@ -281,7 +283,7 @@
         <dict-selector
           :type="DICT_TYPE.ORDER_ABNORMAL_STATE"
           multiple
-          v-model="queryParams.abnormalState"
+          v-model="queryParams.abnormalStateList"
           @keyup.enter.native="handleQuery"
           clearable
           @change="handleQuery"
@@ -291,7 +293,7 @@
         <dict-selector
           :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE"
           multiple
-          v-model="queryParams.auditType"
+          v-model="queryParams.auditTypeList"
           @keyup.enter.native="handleQuery"
           clearable
           @change="handleQuery"
@@ -1675,16 +1677,16 @@ export default {
       }
       //目的国
       if (this.destCountryId != null && this.destCountryId != "") {
-        queryParams.destCountryId = this.destCountryId;
+        queryParams.destCountryIds = this.destCountryId;
       }
 
       if (this.objectiveId != null && this.objectiveId != "") {
         //目的城市
-        queryParams.objectiveId = this.objectiveId;
+        queryParams.objectiveIds = this.objectiveId;
       }
       if (this.destWarehouseId != null && this.destWarehouseId != "") {
         //目的仓
-        queryParams.destWarehouseId = this.destWarehouseId;
+        queryParams.destWarehouseIds = this.destWarehouseId;
       }
 
       return queryParams;