添加国家

src/views/ecw/offer/all-routes-list.vue

@@ -16,7 +16,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('目的仓')" prop="destWarehouseIdArr">
-          <el-select multiple  v-model="queryParams.destWarehouseIdList" multiple
+          <el-select multiple v-model="queryParams.destWarehouseIdList" multiple
                      :placeholder="$t('请选择目的仓')" clearable>
             <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id"
                        :key="item.id"></el-option>
@@ -28,6 +28,12 @@
                        :key="item.channelId"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label-width="200" label="目的仓国家">
+          <el-select style="width: 100%" filterable clearable v-model="queryParams.destCountryId" :placeholder="$t('请选择国家')">
+            <el-option v-for="dict in countryList"
+                       :key="dict.id" :label="$l(dict,'title')" :value="parseInt(dict.id)"/>
+          </el-select>
+        </el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
       </el-form-item>
     </el-form>
@@ -49,6 +55,11 @@
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportType"></dict-tag>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('目的仓国家')" align="center">
+        <template slot-scope="{row}">
+          {{ row.channelIds ? $l(row, 'destCountryName') : '/' }}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('出货渠道')" align="center">
         <template slot-scope="{row}">
           {{ row.channelIds ? $l(row, 'channelNames') : '/' }}
@@ -61,6 +72,7 @@
           query:{
             startWarehouseTitle:$l(row,'startWarehouseTitle'),
             destWarehouseTitle: $l(row, 'destWarehouseTitle'),
+            destCountryName:$l(row,'destCountryName')
           }
           })">空运渠道包装清关费
           </el-button>
@@ -92,12 +104,14 @@ import {listServiceUser} from "@/api/system/user";
 import {getWarehouseList} from '@/api/ecw/warehouse'
 import {DICT_TYPE} from "@/utils/dict";
 import {warehouseLinePage} from "@/api/ecw/customerContacts";
+import {getTradeCountryList} from "@/api/ecw/region";
 
 export default {
   name: "EcwOfferAll-routes-list",
   components: {},
   data() {
     return {
+      countryList:[],
       // 遮罩层
       loading: true,
       // 总条数
@@ -135,6 +149,9 @@ export default {
     this.getList();
   },
   created() {
+    getTradeCountryList().then(r => {
+      this.countryList = r.data
+    })
     this.getChannelList();
     this.getList();
     listServiceUser().then(r => {

src/views/ecw/offer/channel-route.vue

@@ -244,6 +244,7 @@ export default {
 <template>
   <div style="padding: 20px">
     <div style="margin-bottom: 15px">
+      <span>目的国：{{ $route.query.destCountryName }}</span>
       <span>路线：{{ $route.query.startWarehouseTitle }}到{{ $route.query.destWarehouseTitle }}</span>
       <span style="margin-left: 30px;">运输方式：空运专线</span>
     </div>