订单专线空运/空运待出 查询加商品类型

src/views/ecw/order/cargoControl.vue

@@ -389,7 +389,6 @@ export default {
         key: "numberKey",
         value: "",
       },
-      productAttrList: [],
       channelList: [],
       AddressProvince: [],
       AddressCity: [],
@@ -519,7 +518,6 @@ export default {
     // getTradeCityList().then(res => this.tradeCityList = res.data)
     getWarehouseList().then(res => this.warehouseList = res.data)
     getChannelList().then(res => this.channelList = res.data)
-    getProductAttrList().then((res) => (this.productAttrList = res.data));
     this.getAddressProvince()
     this.getAddressCity()
     this.getAddressTown()

src/views/ecw/order/penddingList.vue

@@ -86,8 +86,13 @@
         <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery"/>
       </el-form-item>-->
 
+      <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>
+
       <el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch">
-        <el-input v-model="queryParams.prodKey" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
+        <el-input v-model.trim="queryParams.prodKey" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <!--根据需求文档 lanbm 2024-06-23-->
       <el-form-item :label="$t('控货')" prop="isCargoControl" v-show="showSearch">
@@ -115,7 +120,7 @@
       </el-form-item>
 
       <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" />
+        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" />
       </el-form-item>
       <!--lanbm 2024-06-23 根据需求文档隐藏-->
       <el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch">

src/views/ecw/order/stockingList.vue

@@ -112,13 +112,17 @@
         <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery"/>
       </el-form-item>-->
 
+      <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>
+
       <el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch">
         <el-input
-          v-model="queryParams.prodKey"
+          v-model.trim="queryParams.prodKey"
           :placeholder="$t('请输入商品类型、品名或品牌')"
           clearable
           @keyup.enter.native="handleQuery"
-          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
         />
       </el-form-item>