Merge branch 'dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into dev

src/views/ecw/order/index.vue

@@ -34,14 +34,14 @@
       <div>
 
       <el-form-item :label="$t('始发仓')" prop="startWarehouseId">
-        <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发仓')" clearable @change="handleQuery">
+        <el-select v-model="queryParams.startWarehouseId" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery">
           <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
     
       <el-form-item :label="$t('目的国')"   prop="destCountryId">
-      <el-select v-model="destCountryId" :label="destCountryId"  :placeholder="$t('请选择目的国')" clearable @change="handleQuery">
+      <el-select v-model="destCountryId" multiple :label="destCountryId"  :placeholder="$t('请选择目的国')" clearable @change="handleQuery">
         <el-option
           v-for="item in AddressProvince"	 :key="item.shi"  :label="item.guojiaName"	 :value="item.guojia"		
         ></el-option>
@@ -49,7 +49,7 @@
     </el-form-item>
 
     <el-form-item :label="$t('目的城市')"  prop="objectiveId">
-      <el-select v-model="objectiveId"  :placeholder="$t('请根据目的国选择目的城市')" style="width: 200px" clearable @change="handleQuery">
+      <el-select v-model="objectiveId" multiple  :placeholder="$t('请根据目的国选择目的城市')" style="width: 200px" clearable @change="handleQuery">
         <el-option
           v-for="item in AddressCity"  :key="item.shi"    :label="item.shiName"  :value="item.shi"
         ></el-option>
@@ -57,7 +57,7 @@
     </el-form-item>
 
     <el-form-item :label="$t('目的仓')"  prop="destWarehouseId">
-      <el-select v-model="destWarehouseId" :placeholder="$t('请根据目的城市选择目的仓')" style="width: 200px" clearable @change="handleQuery">
+      <el-select v-model="destWarehouseId" multiple :placeholder="$t('请根据目的城市选择目的仓')" style="width: 200px" clearable @change="handleQuery">
         <el-option
           v-for="item in AddressTown"  :key="item.id" :label="item.titleZh" :value="item.id"
         ></el-option>
@@ -92,10 +92,10 @@
       </el-form-item>
 
       <el-form-item :label="$t('控货')" prop="isCargoControl">
-        <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable />
+        <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('入仓类型')" prop="warehouseType">
-        <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType"  clearable/>
+        <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType" multiple  clearable @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" >
         <user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery"
@@ -106,7 +106,7 @@
           @keyup.enter.native="handleQuery" :filter="statusDictFilter" clearable />
       </el-form-item>
       <el-form-item :label="$t('报关方式')" prop="customsType">
-        <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable @change="handleQuery" />
+        <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsType" clearable @change="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('是否齐货')" >
         <!--// 字段存疑-->
@@ -120,13 +120,13 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
       <el-form-item :label="$t('备案属性')" prop="productRecord">
-        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" clearable @change="handleQuery" />
+        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecord" clearable @change="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('快递单号')" prop="number">
         <el-input v-model="queryParams.number" :placeholder="$t('快递单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"/>
       </el-form-item>
       <el-form-item :label="$t('外部仓')" prop="number">
-        <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery">
+        <el-select v-model="queryParams.isExternalWarehouse" multiple :placeholder="$t('请选择')" clearable @change="handleQuery">
           <el-option :label="$t('外部仓')" :value="1"></el-option>
           <el-option :label="$t('自有仓')" :value="0"></el-option>
         </el-select>
@@ -134,14 +134,14 @@
 
       <el-form-item :label="$t('异常状态')" prop="status">
         <dict-selector :type="DICT_TYPE.ORDER_ABNORMAL_STATE"  v-model="queryParams.abnormalState"
-          @keyup.enter.native="handleQuery" clearable />
+          @keyup.enter.native="handleQuery" clearable @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('审核状态')" prop="status">
         <dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE"  v-model="queryParams.auditType"
-          @keyup.enter.native="handleQuery" clearable />
+          @keyup.enter.native="handleQuery" clearable @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('订单类型')" prop="number">
-        <el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable >
+        <el-select v-model="queryParams.type" multiple  :placeholder="$t('请选择')" clearable @change="handleQuery">
           <el-option :label="$t('普通订单')" :value="0"></el-option>
           <el-option :label="$t('集运服务')" :value="1"></el-option>
           <el-option :label="$t('海外仓')" :value="2"></el-option>
@@ -637,10 +637,10 @@ export default {
       AddressCity: [],
       AddressProvince: [],
       AddressTown: [],
-      destCountryId: '',
+      destCountryId: [],
       countryId:'',
       //destCountryId:'',
-      objectiveId: '',
+      objectiveId: [],
       destWarehouseId: '',
 
       // 选中数组
@@ -699,10 +699,12 @@ export default {
       multipleSelection:[],
 
       transportId: null, // 指定运输方式
+      transportList:[],
       orderNo:'',
       params: {
         page: 1,
         rows: 20,
+        
       },
       currencyList:[],
       statistics: null ,// 统计数据
@@ -804,11 +806,21 @@ export default {
           queryParams[this.prodParam.key] = this.prodParam.value
         }
         //目的国
+        if(this.destCountryId !=null && this.destCountryId !=''){
           queryParams.destCountryId = this.destCountryId
+        }
+        
+        if(this.objectiveId !=null && this.objectiveId !=''){
         //目的城市
         queryParams.objectiveId = this.objectiveId
+        }
+        if(this.destWarehouseId !=null && this.destWarehouseId !=''){
         //目的仓
         queryParams.destWarehouseId = this.destWarehouseId
+        }
+       
+        
+      
      
         return queryParams
     },

src/views/ecw/product/copyPrice.vue

@@ -712,11 +712,13 @@
       //复制价格
       copyPrice(){
        
+       
+        console.log(this.product)
         if(this.ids.length==0){
-          console.log(this.ids)
+         
          return this.$message(this.$t('请至少选中一项复制价格'))
         }
-          this.$confirm(this.$t('请再次确认是否将勾选的线路价格复制到手机充电器'), '提示', {
+          this.$confirm(this.$t('请再次确认是否将勾选的线路价格复制到'+this.$route.query.titleZh), '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       }).then(() => {
@@ -724,9 +726,11 @@
        let  productPriceIds  =  this.ids.join(',') 
        
        let productId = this.$route.query.id
-       let data = {productPriceIds:productPriceIds,productId:productId}
+       let lineChannelList =[{lineId:1,shippingChannelId:2}]
+       let data = {productPriceIds:productPriceIds,productId:productId,lineChannelList:lineChannelList}
          copyPriceByProductIds(data).then(res => {
           this.$modal.msgSuccess(this.$t("复制价格成功"));
+          this.getList()
         })