Merge remote-tracking branch 'origin/dev' into dev

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/i18n/languages/en_US.json

@@ -4690,6 +4690,8 @@
   "财务资料": "Finance Information",
   "特殊设置": "Special setting",
   "已卸柜/已到仓时间": "Unloaded/arrived Time",
+  "动态": "Dynamics",
+  "增值服务": "Added services",
   "开启会员积分系统":"Enable member points system",
   "是否确认{val}会员积分系统":"Confirm whether to {val} the member points system"
 }

src/views/ecw/order/index.vue

@@ -5,7 +5,6 @@
       ref="queryForm"
       size="small"
       :inline="true"
-      v-show="showSearch"
     >
       <el-form-item :label="$t('编号')" prop="orderNo">
         <el-input
@@ -35,7 +34,7 @@
           :placeholder="$t('发货人')"
           clearable
           @keyup.enter.native="handleQuery"
-          onkeyup="this.value=this.value.replace(/\s+/g, '')"
+          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
         />
       </el-form-item>
       <el-form-item :label="$t('收货人')" prop="consigneeKey">
@@ -44,7 +43,7 @@
           :placeholder="$t('收货人')"
           clearable
           @keyup.enter.native="handleQuery"
-          onkeyup="this.value=this.value.replace(/\s+/g, '')"
+          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
         />
       </el-form-item>
       <el-form-item label="">
@@ -102,12 +101,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item :label="$t('目的城市')" prop="objectiveId">
           <el-select
             v-model="objectiveId"
             multiple
-            :placeholder="$t('请根据目的国选择目的城市')"
+            :placeholder="$t('请选择目的城市')"
             style="width: 200px"
             clearable
             @change="handleQuery"
@@ -120,12 +118,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
           <el-select
             v-model="destWarehouseId"
             multiple
-            :placeholder="$t('请根据目的城市选择目的仓')"
+            :placeholder="$t('请选择目的仓')"
             style="width: 200px"
             clearable
             @change="handleQuery"
@@ -153,10 +150,11 @@
         />
       </el-form-item>
 
-      <!-- <el-form-item :label="$t('商品分类')" prop="goodsType">
-        <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>
+      <!--
       <el-form-item :label="$t('品名')" prop="prodId">
         <product-selector v-model="queryParams.prodId" @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -165,7 +163,7 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
 
-      <el-form-item :label="$t('商品')" prop="tidanNo">
+      <el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch">
         <el-input
           v-model.trim="prodParam.value"
           :placeholder="$t('请输入商品类型、品名或品牌')"
@@ -184,7 +182,7 @@
         </el-input>
       </el-form-item>
 
-      <el-form-item :label="$t('控货')" prop="isCargoControl">
+      <el-form-item :label="$t('控货')" prop="isCargoControl" v-show="showSearch">
         <dict-selector
           v-model="queryParams.isCargoControl"
           :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
@@ -193,7 +191,7 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('入仓类型')" prop="warehouseType">
+      <el-form-item :label="$t('入仓类型')" prop="warehouseType" v-show="showSearch">
         <dict-selector
           :type="DICT_TYPE.ECW_WAREHOUSING_TYPE"
           v-model="queryParams.warehouseTypes"
@@ -205,13 +203,14 @@
       <el-form-item :label="$t('客户经理')">
         <user-selector
           manage
-          v-model="queryParams.salesmanId"
+          v-model="queryParams.salesmanIds"
+          multiple
           clearable
           @change="handleQuery"
           :prepend="{ id: 0, nickname: $t('未分配客户经理') }"
         />
       </el-form-item>
-      <el-form-item :label="$t('订单状态')" prop="statusList">
+      <el-form-item :label="$t('动态')" prop="statusList">
         <dict-selector
           :type="DICT_TYPE.ORDER_STATUS"
           multiple
@@ -222,7 +221,7 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('报关方式')" prop="customsTypes">
+      <el-form-item :label="$t('报关方式')" prop="customsTypes" v-show="showSearch">
         <dict-selector
           :type="DICT_TYPE.ECW_CUSTOMS_TYPE"
           multiple
@@ -231,7 +230,7 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('是否齐货')">
+      <el-form-item :label="$t('是否齐货')" v-show="showSearch">
         <!--//字段存疑-->
         <dict-selector
           v-model="queryParams.isNeat"
@@ -248,16 +247,16 @@
         <el-input style="width: 100px;" v-model="denominator" placeholder="" clearable @change="denominatorChange"
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
-      <el-form-item :label="$t('备案属性')" prop="productRecord">
+      <el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch">
         <dict-selector
           :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
           multiple
-          v-model="queryParams.productRecord"
+          v-model="queryParams.productRecords"
           clearable
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('快递单号')" prop="number">
+      <el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch">
         <el-input
           v-model="queryParams.number"
           :placeholder="$t('快递单号')"
@@ -266,7 +265,7 @@
           onkeyup="this.value=this.value.replace(/\s+/g, '')"
         />
       </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.isExternalWarehouse"
           multiple
@@ -279,7 +278,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('异常状态')" prop="abnormalStateList">
+      <el-form-item :label="$t('异常状态')" prop="abnormalStateList" v-show="showSearch">
         <dict-selector
           :type="DICT_TYPE.ORDER_ABNORMAL_STATE"
           multiple
@@ -289,7 +288,7 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('审核状态')" prop="auditTypeList">
+      <el-form-item :label="$t('审核状态')" prop="auditTypeList" v-show="showSearch">
         <dict-selector
           :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE"
           multiple
@@ -299,9 +298,9 @@
           @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.type"
+          v-model="queryParams.types"
           multiple
           :placeholder="$t('请选择')"
           clearable
@@ -315,7 +314,7 @@
       <!--空运多一个出货渠道筛选-->
       <el-form-item
         :label="$t('出货渠道')"
-        prop="channelId"
+        prop="channelIds"
         v-if="channelList.length"
       >
         <selector
@@ -323,10 +322,10 @@
           :options="channelList"
           :label-field="$l('name')"
           value-field="channelId"
-          v-model="queryParams.channelId"
+          v-model="queryParams.channelIds"
         ></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
@@ -1634,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;
       }
 
@@ -1678,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() {