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

src/views/ecw/customerCommission/index.vue

@@ -3,12 +3,12 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="客户名称" prop="customerId" >
+      <el-form-item :label="$t('客户名称')" prop="customerId" >
         <el-select
           clearable
           filterable
           v-model="queryParams.customerId"
-          placeholder="请输入关键词">
+          :placeholder="$t('请输入关键词')">
           <el-option
             v-for="(item, index) in customeList"
             :key="index"
@@ -18,41 +18,41 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="联系电话" prop="type">
-        <el-input v-model="queryParams.defaultContactPhone" placeholder="请输入电话" clearable size="small">
+      <el-form-item :label="$t('联系电话')" prop="type">
+        <el-input v-model="queryParams.defaultContactPhone" :placeholder="$t('请输入电话')" clearable size="small">
         </el-input>
       </el-form-item>
-      <el-form-item label="佣金类型" prop="transportId">
+      <el-form-item :label="$t('佣金类型')" prop="transportId">
         <el-select v-model="queryParams.type"  clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_TYPE)"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="运输方式" prop="departureId">
+      <el-form-item :label="$t('运输方式')" prop="departureId">
         <el-select v-model="queryParams.departureId"  clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="始发地" prop="objectiveId">
+      <el-form-item :label="$t('始发地')" prop="objectiveId">
         <el-select v-model="queryParams.objectiveId"  clearable size="small">
           <el-option v-for="dict in exportCityList"
                      :key="dict.id" :label="dict.titleZh" :value="dict.id"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="目的地" prop="customsType">
+      <el-form-item :label="$t('目的地')" prop="customsType">
         <el-select v-model="queryParams.customsType"  clearable size="small">
           <el-option v-for="dict in importCityList"
                      :key="dict.id" :label="dict.titleZh" :value="dict.id"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="报关方式" prop="approval">
+      <el-form-item :label="$t('报关方式')" prop="approval">
         <el-select v-model="queryParams.approval" clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SHIPPING_DECLARATION_TYPE)"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="备案" prop="darkReturnType">
+      <el-form-item :label="$t('备案')" prop="darkReturnType">
         <el-select v-model="queryParams.darkReturnType"  clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_PRODUCT_APPROVAL)"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -60,11 +60,11 @@
       </el-form-item>
         <div style="width:100%;display: flex;justify-content: space-between;margin-bottom: 50px;">
           <div style="flex: 1">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button></div>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button></div>
           <div style="flex: 1; text-align: right;">
             <router-link :to="'/customerCommissionInfo/'+ 0 ">
-              <el-button type="primary">佣金设置</el-button>
+              <el-button type="primary">{{$t('佣金设置')}}</el-button>
             </router-link>
           </div>
         </div>
@@ -83,48 +83,48 @@
         type="selection"
         width="55">
       </el-table-column>
-      <el-table-column label="佣金编码" align="center" prop="customerId" />
-      <el-table-column label="客户名称" align="center" prop="customerName" show-overflow-tooltip >
+      <el-table-column :label="$t('佣金编码')" align="center" prop="customerId" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" show-overflow-tooltip >
       </el-table-column>
-      <el-table-column label="联系电话" align="center" prop="transportId" show-overflow-tooltip >
+      <el-table-column :label="$t('联系电话')" align="center" prop="transportId" show-overflow-tooltip >
         <template slot-scope="scope">
          <div>{{scope.row.defaultContactPhone}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="佣金类型" type="" align="center" prop="type">
+      <el-table-column :label="$t('佣金类型')" type="" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.COMMISSION_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="暗佣返佣类型" align="center" prop="darkReturnType">
+      <el-table-column :label="$t('暗佣返佣类型')" align="center" prop="darkReturnType">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.COMMISSION_DARK_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="运输方式" align="center" prop="transportId">
+      <el-table-column :label="$t('运输方式')" align="center" prop="transportId">
         <template slot-scope="scope">
           <dict-tag v-if="scope.row.transportId" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId" />
-          <div v-else>全部</div>
+          <div v-else>{{$t('全部')}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="始发地/目的地 " align="center" prop="departureId" show-overflow-tooltip :formatter="originDestination">
+      <el-table-column :label="$t('始发地/目的地')" align="center" prop="departureId" show-overflow-tooltip :formatter="originDestination">
       </el-table-column>
-      <el-table-column label="报关方式" align="center" prop="customsType" show-overflow-tooltip>
+      <el-table-column :label="$t('报关方式')" align="center" prop="customsType" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag v-if="scope.row.customsType" :type="DICT_TYPE.SHIPPING_DECLARATION_TYPE" :value="scope.row.customsType" />
-          <div v-else>全部</div>
+          <div v-else>{{$t('全部')}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="备案" align="center" prop="approval">
+      <el-table-column :label="$t('备案')" align="center" prop="approval">
         <template slot-scope="scope">
           <dict-tag v-if="scope.row.approval" :type="DICT_TYPE.COMMISSION_PRODUCT_APPROVAL" :value="scope.row.approval" />
-          <div v-else>全部</div>
+          <div v-else>{{$t('全部')}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200px">
         <template slot-scope="scope">
 <!--          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>-->
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">{{$t('删除')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -182,9 +182,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        customerId: [{ required: true, message: "客户id不能为空", trigger: "change" }],
-        type: [{ required: true, message: "佣金类型不能为空", trigger: "change" }],
-        darkReturnType: [{ required: true, message: "暗佣类型 1产品2达标不能为空", trigger: "change" }],
+        customerId: [{ required: true, message: this.$t('客户id不能为空'), trigger: "change" }],
+        type: [{ required: true, message: this.$t('佣金类型不能为空'), trigger: "change" }],
+        darkReturnType: [{ required: true, message: this.$t('暗佣类型 1产品2达标不能为空'), trigger: "change" }],
       },
       customeList:[],
     };
@@ -245,7 +245,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除客户佣金类型编号为"' + id + '"的数据项?').then(function() {
+      this.$modal.confirm(this.$t('是否确认删除客户佣金类型编号为"') + id + this.$t('"的数据项?')).then(function() {
           return deleteCustomerCommission(id);
         }).then(() => {
           this.getList();
@@ -256,7 +256,7 @@ export default {
 
       let index1 = this.exportCityList.findIndex(item =>item.id == row.departureId);
       let index2 = this.importCityList.findIndex(item => item.id == row.objectiveId);
-      let flag = `${index1 === -1 ? '全部' : this.exportCityList[index1].titleZh}/${index2 === -1 ? '全部' : this.importCityList[index2].titleZh}`;
+      let flag = `${index1 === -1 ? this.$t('全部') : this.exportCityList[index1].titleZh}/${index2 === -1 ? this.$t('全部') : this.importCityList[index2].titleZh}`;
        return flag
     },
   }

src/views/ecw/customerCommissionInfo/customSelectorsDictionary.vue

 <template>
-  <el-select v-if="options" v-model="selectVal" placeholder="请选择">
-    <el-option v-if="allShow"  label="全部" :value='0'></el-option>
+  <el-select v-if="options" v-model="selectVal" :placeholder="$t('请选择')">
+    <el-option v-if="allShow"  :label="$t('全部')" :value='0'></el-option>
     <el-option
       v-for="item in options"
       :key="item[valueKey]"