主分支代码合并

src/HManagement/marketing2/agent/details/modules/saleclass/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <add-sale-class  class="normal-margin inline-16" :data="data" @addSuccess="getClassList" v-if="tool.checkAuth($route.name,'classAdd') && data.saleclassauth"/>
-    <el-button type="primary" size="mini" v-if="tool.checkAuth($route.name,'classAdd') && data.saleclassauth" :disabled="!selectRows.length" @click="deleteRow(selectRows,true)">删 除</el-button>
+    <el-button type="primary" size="mini" v-if="tool.checkAuth($route.name,'classAdd') && data.saleclassauth" :disabled="!selectRows.length" @click="deleteRow(selectRows,true)">{{$t(`删 除`)}}</el-button>
     <el-table
         :data="saleClassList"
         @select="selectRow"
@@ -16,15 +16,15 @@
         </el-table-column>
         <el-table-column
           prop="itemclassfullname"
-          label="营销类别">
+          :label="$t(`营销类别`)">
         </el-table-column>
         <el-table-column
           prop="brandname"
-          label="品牌"
+          :label="$t(`品牌`)"
           width="100">
         </el-table-column>
         <el-table-column
-          label="操作">
+          :label="$t(`操作`)">
           <template slot-scope="scope">
             <Del v-if="tool.checkAuth($route.name,'classDel') && data.saleclassauth" :id="scope.row.sys_enterprise_saleclassid" @onSuccess="getClassList"/>
           </template>
@@ -76,9 +76,9 @@ export default {
       this.selectRows = data.map(item=>item.sys_enterprise_saleclassid)
     },
     deleteRow (idArr) {
-      this.$confirm('确定删除当前选中数据吗?','提示',{
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
+      this.$confirm(this.$t('确定删除当前选中数据吗')+'?','提示',{
+        confirmButtonText:this.$t('确定'),
+        cancelButtonText:this.$t('取消'),
         type:'warning'
       }).then(() => {
         this.$api.requested({

src/HManagement/marketing2/agent/details/modules/salescope/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="inline-16">
-    <el-button size="small" type="text" @click="query_arealist(dialogVisible = true)">编 辑</el-button>
-    <el-dialog title="编辑管辖区域" append-to-body :visible.sync="dialogVisible" width="400px">
+    <el-button size="small" type="text" @click="query_arealist(dialogVisible = true)">{{$t(`编 辑`)}}</el-button>
+    <el-dialog :title="$t(`编辑管辖区域`)" append-to-body :visible.sync="dialogVisible" width="400px">
       <el-cascader
         style="width:100%"
         class="width-240"
@@ -12,8 +12,8 @@
         @change="cascaderChange">
       </el-cascader>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit()">确 定</el-button>
+        <el-button size="small" @click="dialogVisible = false">{{$t(`取 消`)}}</el-button>
+        <el-button size="small" type="primary" @click="submit()">{{$t(`确 定`)}}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -46,7 +46,7 @@ export default {
     },
     async submit () {
       if(this.value.length === 0) return this.$message({
-        message:'请选择省份',
+        message:this.$t('请选择省份'),
         type:'warning'
       })
       const res = await this.$api.requested({

src/HManagement/siteManage/tagManage/index.vue

@@ -14,7 +14,7 @@
       hidePagination=" ">
       <div slot="custom">
         <div style="disply:flex">
-          <span style="font-size:14px;color:#666666">业务对象: </span>
+          <span style="font-size:14px;color:#666666">{{$t(`业务对象`)}}: </span>
             <el-select v-model="selectTarget" style="margin-right:10px" placeholder="请选择" size="small" @change="change">
             <el-option
               v-for="item in objectList"
@@ -27,13 +27,13 @@
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'tag'">
-          <span style="margin-right:10px">{{scope.data.column.data[scope.data.column.columnname]}}</span>
-          <el-tag v-if="scope.data.column.data['issystem']" size="mini">系统</el-tag>
+          <span style="margin-right:10px">{{$t(scope.data.column.data[scope.data.column.columnname])}}</span>
+          <el-tag v-if="scope.data.column.data['issystem']" size="mini">{{$t(`系统`)}}</el-tag>
         </div>
         <div v-else-if="scope.data.column.columnname == 'mutextags'">
           <span v-if="scope.data.column.data[scope.data.column.columnname].length > 0">
             <el-tag style="margin-right:10px" size="mini" v-for="(item,index) in scope.data.column.data[scope.data.column.columnname]" :key="index">
-              {{item.tag}}
+              {{$t(item.tag)}}
             </el-tag>
           </span>
           <span v-else>--</span>
@@ -42,7 +42,7 @@
       </template>
       <template v-slot:tbOpreation="scope">
         <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :allData="allData.filter(item=>item.tag!=scope.data.data.tag)" @onSuccess="$refs.basicLayout.listData()" :data="scope.data.data"/>
-        <el-button  size="mini" type="text" v-if="tool.checkAuth($route.name,'delete') && scope.data.data.issystem == 0" @click="deleteRow(scope.data.data)">删 除</el-button>
+        <el-button  size="mini" type="text" v-if="tool.checkAuth($route.name,'delete') && scope.data.data.issystem == 0" @click="deleteRow(scope.data.data)">{{$t(`删 除`)}}</el-button>
       </template>
     </basicLayout>
   </div>
@@ -74,9 +74,9 @@ export default {
   },
   methods:{
      deleteRow (data) {
-      this.$confirm('确定删除当前数据吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(this.$t('确定删除当前数据吗')+'?', '提示', {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
         type: 'warning'
       }).then(async() => {
         let res = await this.$api.requested({
@@ -91,7 +91,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '已取消删除'
+          message: this.$t('已取消删除')
         });
       });
     },

src/SManagement/setenterpriseInfo/index.vue

@@ -6,31 +6,31 @@
         <el-descriptions class="normal-margin" :labelStyle="{width:'120px'}" title="" :column="2" size="medium" border>
           <el-descriptions-item>
             <template slot="label">
-              企业名称
+              {{$t(`企业名称`)}}
             </template>
             {{enterpriseInfo.enterprisename ? enterpriseInfo.enterprisename : '--'}}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
-              企业简称
+              {{$t(`企业简称`)}}
             </template>
             {{enterpriseInfo.abbreviation ? enterpriseInfo.abbreviation : '--'}}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
-              联系人
+              {{$t(`联系人`)}}
             </template>
             {{enterpriseInfo.contact ? enterpriseInfo.contact : '--'}}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
-              联系电话
+              {{$t(`联系电话`)}}
             </template>
             {{enterpriseInfo.phonenumber ? enterpriseInfo.phonenumber : '--'}}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
-              地址
+              {{$t(`地址`)}}
             </template>
             {{enterpriseInfo.province}}{{enterpriseInfo.city}}{{enterpriseInfo.county}}{{enterpriseInfo.address}}
           </el-descriptions-item>

src/components/financialInfo/index.vue

@@ -4,7 +4,7 @@
     <add class="inline-16" :data="mainData" @onSuccess="queryfinancialinfo"></add>
     <el-input
         style="width:300px"
-        placeholder="请输入内容"
+        :placeholder="$t(`请输入内容`)"
         v-model="search"
         clearable
         @clear="clearData()"
@@ -24,7 +24,7 @@
       </template>
       <template v-slot:opreation="scope">
         <edit class="inline-16" :data="scope.data" @onSuccess="queryfinancialinfo"></edit>
-        <el-button type="text" size="mini" @click="deleteRow(scope.data)">删 除</el-button>
+        <el-button type="text" size="mini" @click="deleteRow(scope.data)">{{$t(`删 除`)}}</el-button>
       </template>
     </tableNewLayout>
     <div class="container normal-panel" style="text-align:right">