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

src/components/CustomerContactsSelector/index.vue

@@ -85,7 +85,7 @@ export default {
             if(!this.value || !this.value.length){
                 return
             }
-            getCustomerContactsSelect({ids: this.value.join(',')})
+            getCustomerContactsSelect({ids: this.value.join(','),...this.queryParams})
                 .then(res => {
                     this.$set(this, 'choosedList', res.data.list)
                 })
@@ -124,4 +124,4 @@ export default {
     overflow-x: hidden;
     padding: 0 10px;
 }
-</style>
\ No newline at end of file
+</style>

src/components/RoutersSelector/index.vue

@@ -422,6 +422,7 @@ export default {
     },
   },
   async created() {
+
     this.tradeCityList = (await getTradeCityList()).data
     // 路线需要过滤失效的进出口城市，所以在程序加载后再加载路线
     await this.getOpenedRouterList()
@@ -434,6 +435,7 @@ export default {
     // this.getAddressCity()
     // this.getAddressTown()
     this.getChannelList()
+
     if (this.value && this.value.length) {
       this.selectedRoutes = this.value
     }
@@ -442,9 +444,11 @@ export default {
     if (this.showAttr) {
       this.getAttrList()
     }
-
     await this.$nextTick()
-    this.inited = true
+
+    setTimeout(() => {
+      this.inited = true
+    }, 1000);
   },
   methods: {
     getChannelList() {
@@ -486,6 +490,7 @@ export default {
       this.exportCity = +this.option.exportCity || null
       this.transportType = this.option.transportId || null
       this.channelId = +this.option.channelId || null
+      this.channelIds = this.option.channelIds || []
     },
     // 全选、全不选 某个运输方式所有线路
     toggleGroupChecker(index, selected) {

src/views/ecw/coupon/edit.vue

@@ -198,7 +198,7 @@
 			>
 				<!---第一个不是全部，所以不能使用defaultable-->
                 <dict-selector :type="DICT_TYPE.ECW_SUITABLE_LINE_TYPE" v-model="form.suitableLineType" formatter="number" defaultable />
-                <routers-selector  v-if="showRouterSelector" v-model="form.lineIds" :lineIds="form.lineIds" style="margin-top:5px" />
+                <routers-selector  v-if="showRouterSelector" v-model="form.lineIds" :lineIds="form.lineIds" style="margin-top:5px" :option="option" />
 			</el-form-item>
 			<el-form-item
 				:label="$t('适用商品')"
@@ -277,6 +277,7 @@ import Selector from '@/components/Selector/index'
 import {parseTime} from '@/utils/ruoyi'
 import {str2arr} from '@/utils/index'
 import item from '@/layout/components/Sidebar/Item.vue'
+import { getChannelList } from "@/api/ecw/channel"
 
 
 export default {
@@ -322,6 +323,7 @@ export default {
 			errTips: {}, // 跟fee对应的错误提示
 			isAllProduct: false, // 是否全部商品
 			initing: false, // 初始化中，编辑或者查看的时候，初始化中修改type不改默认值
+      option: {channelIds: null, transportId: 1}
 		};
 	},
     computed:{
@@ -470,6 +472,14 @@ export default {
 					})
 				}
         console.log('lineIds', this.form.lineIds)
+        if (this.form.lineIds!=null) {
+          if(this.form.lineIds[0].channelId==0) {
+            this.option.transportId = 1
+          } else {
+            this.option.transportId = 3
+          }
+        }
+
 				if(this.form.discountDetailedVOs){
 					/* this[['clearanceFeeList', 'freightFeeList', 'discountList'][]] */
 					// this.fee[this.form.costType] = this.form.discountDetailedVOs.filter(item => item.type ==  this.form.costType)
@@ -520,6 +530,13 @@ export default {
 			}
 		}
     this.reset()
+    getChannelList().then(res => {
+      var list = []
+      for(var i in res.data) {
+        list.push(res.data[i].channelId)
+      }
+      this.option.channelIds = list
+    })
 	},
 	methods: {
 		// 满减清关费修改满的货币后需要同步减的货币

src/views/ecw/order/edit.vue

@@ -894,7 +894,8 @@ export default {
       destCityList: [],
       selectedRouter: null,
       // 发货人默认付款
-      defaultPay: false
+      defaultPay: false,
+      showDestCityList: []
     };
   },
   computed: {
@@ -1069,10 +1070,6 @@ export default {
     showDestCountryList() {
       return this.destCountryList
     },
-    showDestCityList() {
-      if (!this.form.destCountryId) return this.destCityList
-      return this.destCityList.filter(item => item.guojia === this.form.destCountryId) || []
-    },
     // 是否已起运（已起运不让修改报关方式）
     isShipment() {
       return [326, 328, 329, 330, 332, 391, 392, 426, 428, 432].indexOf(this.form.shipmentState) > -1
@@ -1314,6 +1311,7 @@ export default {
     await getGuojiaAndShiAndWarehouseList({tradeType: 1}).then(({data}) => {
       this.destCountryList = data.guojiaList
       this.destCityList = data.shiList
+      this.showDestCityList = data.shiList
     })
     this.productAttrList = (await getProductAttrList()).data
     await this.getChannelList()
@@ -2099,7 +2097,13 @@ export default {
     // 切换目的国
     handleChangeDestCountry(val) {
       console.log("handleChangeDestCountry", val)
+      // 目的城市赋值
       this.form.destCountryId = val
+      if (!val) {
+        this.showDestCityList = JSON.parse(JSON.stringify(this.destCityList))
+      } else {
+        this.showDestCityList = JSON.parse(JSON.stringify(this.destCityList.filter(item => item.guojia === val)))
+      }
       if (this.form.destCountryId) {
         this.form.objectiveId = null
         this.form.lineId = null