订单兼容多状态查询

src/components/Selector/index.vue

@@ -12,7 +12,7 @@ export default {
     },
     props:{
         options: Array,
-        value: [String, Number, Boolean, Object],
+        value: [String, Number, Array, Boolean, Object],
         labelField: {
             type: [String, Function],
             default: 'label'

src/views/ecw/order/index.vue

@@ -28,7 +28,7 @@
         <el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
 
-      <el-form-item :label="$t('发货人')" prop="consignorKey" v-show="showSearch">
+      <el-form-item :label="$t('发货人')" prop="consignorKey">
         <el-input
           v-model="queryParams.consignorKey"
           :placeholder="$t('发货人')"
@@ -37,7 +37,7 @@
           onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
         />
       </el-form-item>
-      <el-form-item :label="$t('收货人')" prop="consigneeKey" v-show="showSearch">
+      <el-form-item :label="$t('收货人')" prop="consigneeKey">
         <el-input
           v-model="queryParams.consigneeKey"
           :placeholder="$t('收货人')"
@@ -150,8 +150,8 @@
         />
       </el-form-item>
 
-      <el-form-item :label="$t('商品类型')" prop="goodsType" v-show="showSearch">
-        <selector v-model="queryParams.goodsType" :options="productAttrList" label-field="attrName" value-field="id">
+      <el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch">
+        <selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id">
         </selector>
       </el-form-item>
       <!--
@@ -298,7 +298,7 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('增值服务')" prop="number">
+      <el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch">
         <el-select
           v-model="queryParams.types"
           multiple
@@ -1633,13 +1633,12 @@ export default {
       if (this.destCountryId != null && this.destCountryId != "") {
         queryParams.destCountryIds = this.destCountryId;
       }
-
+      //目的城市
       if (this.objectiveId != null && this.objectiveId != "") {
-        //目的城市
         queryParams.objectiveIds = this.objectiveId;
       }
+      //目的仓
       if (this.destWarehouseId != null && this.destWarehouseId != "") {
-        //目的仓
         queryParams.destWarehouseIds = this.destWarehouseId;
       }
 
@@ -1677,9 +1676,9 @@ export default {
       (res) => (this.currencyList = res.data.list)
     );
     // 如果是空运(专线空运和海空联运)则获取渠道
-    if (this.transportId == 3 || this.transportId == 4) {
+    //if (this.transportId == 3 || this.transportId == 4) {
       getChannelList().then((res) => (this.channelList = res.data));
-    }
+    //}
   },
   methods: {
     init() {

src/views/ecw/order/penddingList.vue

@@ -102,8 +102,8 @@
                        :prepend="{ id: 0, nickname: $t('未分配客户经理')}"/>
       </el-form-item>
       <!--根据需求文档 lanbm 2024-06-23 隐藏-->
-      <el-form-item :label="$t('订单状态')" prop="status">
-        <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.statusList"
+      <el-form-item :label="$t('订单状态')" prop="status" v-show="showSearch">
+        <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"
           @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
       <el-form-item :label="$t('报关方式')" prop="customsType" v-show="showSearch">
@@ -114,12 +114,12 @@
         <dict-selector v-model="queryParams.isNeat" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool"  clearable @change="handleQuery"/>
       </el-form-item>
 
-      <el-form-item :label="$t('备案属性')" prop="productRecord" v-show="showSearch">
-        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" multiple clearable @change="handleQuery" />
+      <el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch">
+        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" multiple clearable @change="handleQuery" />
       </el-form-item>
       <!--lanbm 2024-06-23 根据需求文档隐藏-->
       <el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch">
-        <el-input v-model="queryParams.number" :placeholder="$t('快递单号')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.number" :placeholder="$t('快递单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
       </el-form-item>
       <el-form-item :label="$t('外部仓')" prop="number" v-show="showSearch">
         <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery">
@@ -136,7 +136,7 @@
         <dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" v-model="queryParams.auditType"
           @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
-      <el-form-item :label="$t('增值服务')" prop="number">
+      <el-form-item :label="$t('增值服务')" prop="number" v-show="showSearch">
         <el-select v-model="queryParams.types" :placeholder="$t('请选择')" multiple clearable>
           <el-option :label="$t('普通订单')" :value="0"></el-option>
           <el-option :label="$t('集运服务')" :value="1"></el-option>
@@ -146,7 +146,7 @@
       <el-form-item :label="$t('出货渠道')" prop="number">
         <selector clearable :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple></selector>
       </el-form-item>
-      <el-form-item :label="$t('特需')" prop="packageType">
+      <el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch">
         <el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable >
           <template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
             <el-option :label="$l(item, 'label')" :value="item.value"></el-option>
@@ -167,6 +167,10 @@
         <el-button :disabled="!multipleSelection.length" type="primary" :loading="exporting" plain size="mini" @click="exportXls(ids)" v-hasPermi="['ecw:order:peddingList:export_selected']">{{$t('导出所选')}}</el-button>
         <el-button type="primary" :loading="exporting" plain size="mini" @click="exportXls(queryParams)" v-hasPermi="['ecw:order:peddingList:export_search']">{{$t('导出搜索')}}</el-button>
       </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
@@ -218,7 +222,7 @@
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" /> / {{row.dstWarehouseName}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('控货')" align="center" prop="isCargoControl">
+      <el-table-column :label="$t('控货')" align="center" prop="isCargoControl" v-show="showSearch">
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="row.isCargoControl" />
         </template>
@@ -428,7 +432,6 @@ export default {
           this.destWarehouseId == ""
         ) {
           //获取当前城市值id，获取该城市下区域
-          
         } else if (
           this.destCountryId == "" &&
           this.objectiveId == "" &&