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

src/views/ecw/channel/index.vue

@@ -24,8 +24,12 @@
       <!-- <el-form-item :label="$t('排序')" prop="sort">
         <el-input v-model="queryParams.sort" :placeholder="$t('请输入排序')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item :label="$t('快递ID')" prop="expressId">
-        <el-input v-model="queryParams.expressId" :placeholder="$t('请输入快递ID')" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item :label="$t('所属国家')" prop="countryId">
+        <el-select filterable clearable v-model="queryParams.countryId" :placeholder="$t('请选择国家')">
+          <el-option v-for="dict in countryList"
+                     :key="dict.id" :label="$l(dict,'title')" :value="parseInt(dict.id)" />
+        </el-select>
+<!--        <el-input v-model="queryParams.countryId" :placeholder="$t('请输入所属国家')" clearable @keyup.enter.native="handleQuery"/>-->
       </el-form-item>
       <el-form-item :label="$t('预计时间')">
           <el-input v-model="queryParams.etaTime" :placeholder="$t('预计到达天数')" clearable @keyup.enter.native="handleQuery"/>
@@ -97,7 +101,11 @@
       <el-table-column :label="$t('排序')" align="center" prop="sort" />
       <el-table-column :label="$t('快递公司')" align="center" prop="companyName" />
       <el-table-column :label="$t('预计时间(天)')" align="center" prop="etaTime" />
-      <el-table-column :label="$t('渠道代理')" align="center" prop="channelAgent" />
+       <el-table-column :label="$t('所属国家')">
+                <template slot-scope="{row}">
+                   {{$l(row,'countryTitle')}}
+                </template>
+       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarksZh" />
       <!-- <el-table-column label="备注-英文" align="center" prop="remarksEn" /> -->
       <!-- <el-table-column :label="$t('状态')" align="center" prop="status" /> -->
@@ -124,6 +132,8 @@
 
 <script>
 import { createChannel, updateChannel, deleteChannel, getChannel, getChannelPage, exportChannelExcel } from "@/api/ecw/channel";
+import {getCountryListAll} from "@/api/ecw/country";
+import {getTradeCountryList} from "@/api/ecw/region";
 
 export default {
   name: "EcwChannelIndex",
@@ -157,16 +167,21 @@ export default {
       // 表单校验
       rules: {
 
-      }
+      },
+      countryList:[],
     };
   },
   created() {
+    getTradeCountryList().then(r => {
+      this.countryList = r.data
+    })
     this.getList();
   },
   activated() {
     this.getList();
   },
   methods: {
+
     /** 查询列表 */
     getList() {
       this.loading = true;