订单列表商品和编号支持多匹配方式

src/utils/dict.js

@@ -183,6 +183,8 @@ export const DICT_TYPE = {
   ORDER_COD_EXCEPTION_RESULT:'order_cod_exception_result',//代收货款异常处理结果
   ORDER_OTHER_EXCEPTION_RESULT:'order_other_exception_result',//其它异常处理结果
   ORDER_BULKY_CARGO_EXCEPTION_RESULT:'order_bulky_cargo_exception_result',//泡货异常处理结果
+  ORDER_QUERY_PROD_FIELD: 'order_query_prod_field',//订单查询产品字段
+  ORDER_QUERY_NO_FIELD: 'order_query_no_field',//订单查询非产品字段
   NEED_KNOW_TYPE:'need_know_type',//需知类型
   NEED_KNOW_STATUS:'need_know_status',//需知状态
   MANUAL_EXCEPTION_TYPE:'manual_exception_type',
@@ -223,6 +225,7 @@ export const DICT_TYPE = {
   BOX_SHIPPING_ERROR_TYPE: "shipping_error_type",// 起运异常状态
   BOX_ARRIVAL_ERROR_TYPE: "arrival_error_type",// 到港异常状态
 
+
   APP_TYPE:"app_type",   //系统类型
   AIR_SHIPMENT_PROCESS:'air_shipment_process'
 }

src/views/ecw/order/index.vue

@@ -4,7 +4,11 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item :label="$t('编号')" prop="orderNo">
-        <el-input v-model="queryParams.numberKey" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="noParam.value" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery">
+          <template slot="prepend">
+            <dict-selector :type="DICT_TYPE.ORDER_QUERY_NO_FIELD" defaultable v-model="noParam.key" class="w-50" />
+          </template>
+        </el-input>
       </el-form-item>
       <!-- <el-form-item :label="$t('唛头')" prop="marks">
         <el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
@@ -54,7 +58,11 @@
       </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="prodParam.value" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery">
+          <template slot="prepend">
+            <dict-selector :type="DICT_TYPE.ORDER_QUERY_PROD_FIELD" defaultable v-model="prodParam.key" class="w-50" />
+          </template>
+        </el-input>
       </el-form-item>
 
       <el-form-item :label="$t('控货')" prop="isCargoControl">
@@ -544,9 +552,11 @@ import {getWarehouseList} from '@/api/ecw/warehouse'
 import { getCurrencyPage } from "@/api/ecw/currency";
 import SplitRevoke from "@/views/ecw/order/components/SplitRevoke";
 import {getChannelList} from "@/api/ecw/channel";
+import Template from "@/views/cms/template/index.vue";
 export default {
   name: "EcwOrderIndex",
   components: {
+    Template,
     UserSelector,
     FeeApplication,
     BatchSingleApplication,
@@ -620,7 +630,11 @@ export default {
 
       splitRevokeOrderId: null, // 撤销拆单的订单ID
       // 渠道列表，空运需要渠道筛选
-      channelList:[]
+      channelList:[],
+      // 编号搜索条件
+      noParam: {},
+      // 商品搜索条件
+      prodParam: {}
     };
   },
   watch:{
@@ -667,6 +681,12 @@ export default {
         if(this.transportId){
           queryParams.transportId = this.transportId
         }
+        if(this.noParam.value){
+          queryParams[this.noParam.key] = this.noParam.value
+        }
+        if(this.prodParam.value){
+          queryParams[this.prodParam.key] = this.prodParam.value
+        }
         return queryParams
     },
     /*batchWarehouseAdjustment(){