订单下拉多选搜索

src/views/ecw/customer/query.vue

@@ -179,8 +179,8 @@
                       :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
                       class="item"
                       :style="{
-            color: row.orderType ==  2 ? 'red' : null
-          }"
+                        color: row.orderType ==  2 ? 'red' : null
+                      }"
                       effect="dark"
                       :content="(row.wvolume||0)+'m³'"
                       placement="bottom">
@@ -253,7 +253,7 @@
                     <el-select
                       v-model="objectiveId"
                       multiple
-                      :placeholder="$t('请根据目的国选择目的城市')"
+                      :placeholder="$t('请选择目的城市')"
                       style="width: 200px"
                       clearable
                       @change="handleQuery"
@@ -270,7 +270,7 @@
                     <el-select
                       v-model="destWarehouseId"
                       multiple
-                      :placeholder="$t('请根据目的城市选择目的仓')"
+                      :placeholder="$t('请选择目的仓')"
                       style="width: 200px"
                       clearable
                       @change="handleQuery"

src/views/ecw/order/index.vue

@@ -68,9 +68,9 @@
       </el-form-item>
 
       <div>
-        <el-form-item :label="$t('始发仓')" prop="startWarehouseId">
+        <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
           <el-select
-            v-model="queryParams.startWarehouseId"
+            v-model="queryParams.startWarehouseIds"
             multiple
             :placeholder="$t('请选择始发仓')"
             clearable
@@ -196,7 +196,7 @@
       <el-form-item :label="$t('入仓类型')" prop="warehouseType">
         <dict-selector
           :type="DICT_TYPE.ECW_WAREHOUSING_TYPE"
-          v-model="queryParams.warehouseType"
+          v-model="queryParams.warehouseTypes"
           multiple
           clearable
           @change="handleQuery"
@@ -211,7 +211,7 @@
           :prepend="{ id: 0, nickname: $t('未分配客户经理') }"
         />
       </el-form-item>
-      <el-form-item :label="$t('订单状态')" prop="status">
+      <el-form-item :label="$t('订单状态')" prop="statusList">
         <dict-selector
           :type="DICT_TYPE.ORDER_STATUS"
           multiple
@@ -222,11 +222,11 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('报关方式')" prop="customsType">
+      <el-form-item :label="$t('报关方式')" prop="customsTypes">
         <dict-selector
           :type="DICT_TYPE.ECW_CUSTOMS_TYPE"
           multiple
-          v-model="queryParams.customsType"
+          v-model="queryParams.customsTypes"
           clearable
           @change="handleQuery"
         />
@@ -279,7 +279,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('异常状态')" prop="status">
+      <el-form-item :label="$t('异常状态')" prop="abnormalStateList">
         <dict-selector
           :type="DICT_TYPE.ORDER_ABNORMAL_STATE"
           multiple
@@ -289,7 +289,7 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('审核状态')" prop="status">
+      <el-form-item :label="$t('审核状态')" prop="auditTypeList">
         <dict-selector
           :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE"
           multiple
@@ -1345,11 +1345,9 @@ export default {
       AddressCity: [],
       AddressProvince: [],
       AddressTown: [],
-      destCountryId: [],
-      countryId: "",
-      //destCountryId:'',
-      objectiveId: [],
-      destWarehouseId: "",
+      destCountryId: null,
+      objectiveId: null,
+      destWarehouseId: null,
       // 选中数组
       ids: [],
       //目的国

src/views/ecw/order/penddingList.vue

@@ -4,14 +4,14 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item :label="$t('编号')" prop="orderNo">
-        <el-input v-model="queryParams.numberKey" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.numberKey" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
       </el-form-item>
 
       <el-form-item :label="$t('发货人')" prop="consignorKey">
-        <el-input v-model="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
       </el-form-item>
       <el-form-item :label="$t('收货人')" prop="consigneeKey">
-        <el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
       </el-form-item>
       <el-form-item label="">
         <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" />
@@ -39,7 +39,7 @@
       </el-form-item>-->
 
       <el-form-item :label="$t('商品')" prop="tidanNo">
-        <el-input v-model="queryParams.prodKey" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.prodKey" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
       </el-form-item>
       <!--根据需求文档 lanbm 2024-06-23 隐藏
       <el-form-item :label="$t('控货')" prop="isCargoControl">