Merge branch 'jd_dev' of...

Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master 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/bannerPop/index.vue

@@ -98,6 +98,9 @@
         <el-form-item label="标题(英文)" prop="titleEn">
           <el-input v-model="form.titleEn" :placeholder="$t('请输入英文标题')" />
         </el-form-item>
+        <el-form-item label="标题(法文)" prop="titleFr">
+          <el-input v-model="form.titleFr" :placeholder="$t('请输入英文标题')" />
+        </el-form-item>
         <el-form-item :label="$t('有效期')" prop="validateStart">
           <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="form.validateStart" @change="startChange">
           </el-date-picker>
@@ -113,12 +116,18 @@
         <el-form-item :label="$t('网页英文')" prop="htmlWebEn">
           <editor v-model="form.htmlWebEn" :min-height="150"/>
         </el-form-item>
+        <el-form-item :label="$t('网页法文')" prop="htmlWebFr">
+          <editor v-model="form.htmlWebFr" :min-height="150"/>
+        </el-form-item>
         <el-form-item label="APP中文" prop="htmlAppZh">
           <editor v-model="form.htmlAppZh" :min-height="150"/>
         </el-form-item>
         <el-form-item label="APP英文" prop="htmlAppEn">
            <editor v-model="form.htmlAppEn" :min-height="150"/>
         </el-form-item>
+        <el-form-item label="APP法文" prop="htmlAppFr">
+           <editor v-model="form.htmlAppFr" :min-height="150"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -164,11 +173,15 @@ export default {
         rows: 10,
         titleZh: null,
         titleEn: null,
+        titleFr: null,
         validateStart: null,
         validateEnd: null,
         htmlWebZh: null,
         htmlWebEn: null,
+        htmlWebFr: null,
         htmlAppZh: null,
+        htmlAppEn: null,
+        htmlAppFr: null,
         status: null,
       },
       // 表单参数
@@ -177,6 +190,7 @@ export default {
       rules: {
         titleZh: [{ required: true, message: this.$t("中文标题不能为空"), trigger: "blur" }],
         titleEn: [{ required: true, message: this.$t("英文标题不能为空"), trigger: "blur" }],
+        titleFr: [{ required: true, message: this.$t("法文标题不能为空"), trigger: "blur" }],
         validateStart: [{ required: true, message: this.$t("有效期开始时间不能为空"), trigger: "blur" }]
       },
       CommonStatusEnum: CommonStatusEnum,

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/exception/index.vue

@@ -899,8 +899,6 @@ export default {
       showSearch: true,
       // 遮罩层
       loading: true,
-      // 显示搜索条件
-      showSearch: false,
       // 总条数
       total: 0,
       // 订单异常列表
@@ -1209,7 +1207,7 @@ export default {
   right: 0;
 }
 ::v-deep .top-right-btn .el-row .el-button{
-  font-size: 28px;
+  font-size: 18px;
 }
 ::v-deep .top-right-btn .el-row{
   display: flex;