lxf 1 year ago
parent
commit
6b5d88e371

+ 2 - 2
src/views/customer/file/index.vue

@@ -137,7 +137,7 @@
                   filterable
                   @change="(val) => getCityData(val, '20', true)"
                   :no-match-text="'无数据,请联系管理员添加'">
-                  <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id"> </el-option>
+                  <el-option v-for="item in countryData" :key="item.id" :label="item.chineseName + '(' + item.name + ')'" :value="item.id"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -348,7 +348,7 @@
                   clearable
                   filterable
                   @change="(val) => getCitySearchData(val, '20', true)">
-                  <el-option v-for="item in countrySearchData" :label="item.chineseName" :value="item.id"> </el-option>
+                  <el-option v-for="item in countryData" :key="item.id" :label="item.chineseName + '(' + item.name + ')'" :value="item.id"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>

+ 4 - 3
src/views/customer/highseas/index.vue

@@ -138,7 +138,7 @@
                   filterable
                   @change="(val) => getCityData(val, '20', true)"
                   :no-match-text="'无数据,请联系管理员添加'">
-                  <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id"> </el-option>
+                  <el-option v-for="item in countryData" :key="item.id" :label="item.chineseName + '(' + item.name + ')'" :value="item.id"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -340,8 +340,9 @@
                   placeholder="国家"
                   clearable
                   filterable
-                  @change="(val) => getCitySearchData(val, '20', true)">
-                  <el-option v-for="item in countrySearchData" :label="item.chineseName" :value="item.id"> </el-option>
+                  @change="(val) => getCitySearchData(val, '20', true)"
+                  :no-match-text="'无数据,请联系管理员添加'">
+                  <el-option v-for="item in countryData" :key="item.id" :label="item.chineseName + '(' + item.name + ')'" :value="item.id"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>

+ 9 - 3
src/views/customer/privatesea/index.vue

@@ -132,8 +132,13 @@
           <el-row style="width: 100%">
             <el-col :span="8">
               <el-form-item prop="countryId">
-                <el-select v-model="formData.data.countryId" placeholder="国家" filterable @change="(val) => getCityData(val, '20', true)">
-                  <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id"> </el-option>
+                <el-select
+                  v-model="formData.data.countryId"
+                  placeholder="国家"
+                  filterable
+                  @change="(val) => getCityData(val, '20', true)"
+                  :no-match-text="'无数据,请联系管理员添加'">
+                  <el-option v-for="item in countryData" :key="item.id" :label="item.chineseName + '(' + item.name + ')'" :value="item.id"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -333,10 +338,11 @@
                 <el-select
                   v-model="sourceList.pagination.countryId"
                   placeholder="国家"
+                  clearable
                   filterable
                   @change="(val) => getCitySearchData(val, '20', true)"
                   :no-match-text="'无数据,请联系管理员添加'">
-                  <el-option v-for="item in countrySearchData" :label="item.chineseName" :value="item.id"> </el-option>
+                  <el-option v-for="item in countryData" :key="item.id" :label="item.chineseName + '(' + item.name + ')'" :value="item.id"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>