Merge remote-tracking branch 'origin/release2.2' into release2.2

src/views/ecw/pickupLoc/index.vue

@@ -3,7 +3,7 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-      
+
       <el-form-item :label="$t('提货点名称')" prop="titleZh">
         <el-input v-model="queryParams.titleZh" :placeholder="$t('请输入名称')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
@@ -17,7 +17,7 @@
       <!-- <el-form-item :label="$t('地区')" prop="countryId">
         <el-input v-model="queryParams.countryId" :placeholder="$t('请输入国家')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      
+
       <el-form-item :label="$t('状态')" prop="status">
         <el-select v-model="queryParams.status" :placeholder="$t('请选择状态')" clearable>
           <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
@@ -46,8 +46,12 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list" @sort-change="sortChange">
       <el-table-column :label="$t('序号')" type="index" width="50" />
-   
-      <el-table-column :label="$t('提货点名称')" align="center" :prop="$l('title')" />
+
+      <el-table-column :label="$t('提货点名称')" align="center"  >
+        <template v-slot="{row}">
+          {{$l(row,'title')}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('排序')" sortable="custom" align="center" prop="sort" />
 
       <el-table-column :label="$t('地区')" align="center" prop="countryId">
@@ -55,13 +59,13 @@
               <span>{{ getCountryName(scope.row.countryId) }}</span>
           </template>
       </el-table-column>
-     
+
       <el-table-column prop="status" :label="$t('状态')" width="100">
         <template slot-scope="scope">
           <el-switch v-model="scope.row.status" :active-value="CommonStatusEnum.ENABLE" :inactive-value="CommonStatusEnum.DISABLE" @change="handleStatusChange(scope.row)" />
         </template>
       </el-table-column>
-      
+
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -85,7 +89,7 @@
               <el-radio v-for="item in countryList" :key="item.id" :label="item.id">{{ $l(item, 'title') }}</el-radio>
             </el-radio-group>
         </el-form-item>
-        
+
 
         <el-form-item :label="$t('名称')" prop="titleZh">
           <el-input v-model="form.titleZh" :placeholder="$t('请输入名称')" />
@@ -132,10 +136,12 @@ import { createPickupLoc, updatePickupLoc, deletePickupLoc, getPickupLoc, getPic
 import {CommonStatusEnum} from '@/utils/constants'
 import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 import { getListTree } from "@/api/ecw/region";
+import Template from "@/views/cms/template/index.vue";
 
 export default {
   name: "PickupLoc",
   components: {
+    Template
   },
   data() {
     return {
@@ -149,7 +155,7 @@ export default {
       total: 0,
 
       //国家信息列表
-      countryList: [],  
+      countryList: [],
 
       // 自提点列表
       list: [],
@@ -229,7 +235,7 @@ export default {
     getCountryName(countryId) {
       for(let index in this.countryList) {
         let country = this.countryList[index];
-        if(country.id == countryId) return $l(country, 'title');
+        if(country.id == countryId) return this.$l(country, 'title');
       }
     },