奖金管理多语言翻译

package.json

@@ -39,6 +39,8 @@
     "script-loader": "0.7.2",
     "sortablejs": "1.8.4",
     "squire-rte": "^2.0.2",
+    "tinymce": "^6.4.1",
+    "tinymce-vue": "^1.0.0",
     "to-mark": "^1.1.9",
     "tui-code-snippet": "^2.3.3",
     "vue": "^2.6.10",

src/components/Tinymce/components/EditorImage.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="upload-container">
     <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
-      upload
+      {{$t('article.upload')}}
     </el-button>
     <el-dialog :visible.sync="dialogVisible">
       <el-upload
@@ -18,14 +18,14 @@
         :headers="uploaderHeaders"
       >
         <el-button size="small" type="primary">
-          Click upload
+          {{$t('article.clickUpload')}}
         </el-button>
       </el-upload>
       <el-button @click="dialogVisible = false">
-        Cancel
+        {{$t('article.cancel')}}
       </el-button>
       <el-button type="primary" @click="handleSubmit">
-        Confirm
+        {{$t('article.confirm')}}
       </el-button>
     </el-dialog>
   </div>

src/components/Tinymce/index.vue

@@ -19,6 +19,8 @@ import load from './dynamicLoadScript'
 
 // why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
 const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'
+//const tinymceCDN = 'http://lib.baomitu.com/tinymce/4.9.3/tinymce.min.js'
+
 
 export default {
   name: 'Tinymce',
@@ -117,7 +119,6 @@ export default {
   },
   methods: {
     init() {
-      console.log(this.uploaderRequestUrl)
       // dynamic load tinymce from cdn
       load(tinymceCDN, (err) => {
         if (err) {

src/lang/en.js

@@ -103,6 +103,24 @@ export default {
     hide: 'Hide',
     unhide: 'Unhide'
   },
+  article: {
+    clickUpload: 'Click Upload',
+    confirm: 'Confirm',
+    cancel: 'Cancel',
+    upload: 'Upload',
+    id: 'ID',
+    title: 'Title',
+    category: 'Category',
+    sort: 'Sort',
+    creationTime: 'Creation Time',
+    status: 'Status',
+    action: 'Action',
+    newArticle: 'New article',
+    content: 'Content',
+    order: 'Order',
+    show: 'Show',
+    categoryName: 'Category Name'
+  },
   file: {
     exportName: 'Export Name',
     route: 'Route',
@@ -114,7 +132,18 @@ export default {
     createTime: 'Create time',
     exportStartTime: 'Export Start Time',
     exportEndTime: 'Export End Time',
-    creationTime: 'Creation Time'
+    creationTime: 'Creation Time',
+    all: 'All'
+  },
+  bonus: {
+    welcomePackOrder: 'Welcome Pack Order',
+    memberCode: 'Member Code',
+    balancePerformance: 'Balance Performance',
+    entryBalancePerformance:'Entry Balance Performance',
+    reconditioningBalancePerformance: 'Reconditioning Balance Performance',
+    LMarketBalancePerformance: 'L. Market Balance Performance',
+    RMarketBalancePerformance: 'R. Market Balance Performance',
+    confirmAndReviseMemberPerformance: 'Confirm and revise member performance?'
   },
   documentation: {
     documentation: 'Documentation',
@@ -249,7 +278,16 @@ export default {
     reset: '重置',
     exportExcel:'Export Excel',
     desc: '描述',
-    upload: 'Upload'
+    upload: 'Upload',
+    hide: 'Hide',
+    unhide: 'Unhide',
+    selectData: 'Select Data',
+    deleteSelectedData: 'Are you sure to delete the selected data？',
+    notice: 'Notice',
+    hideSelectedData: 'Are you sure to hide the selected data？',
+    unHideSelectedData: 'Are you sure to un-hide the selected data？',
+    exportCurrentData: 'Are you sure you want to export the current data？',
+    all: 'All'
   },
 
   filter: {

src/lang/zh.js

@@ -103,6 +103,24 @@ export default {
     hide: '展示',
     unhide: '不展示'
   },
+  article: {
+    clickUpload: '点击上传',
+    confirm: '确定',
+    cancel: '取消',
+    upload: '上传',
+    id: '序号',
+    title: '标题',
+    category: '分类',
+    sort: '排序',
+    creationTime: '创建时间',
+    status: '状态',
+    action: '操作',
+    newArticle: '新增文章',
+    content: '内容',
+    order: '排序',
+    show: '展示',
+    categoryName: '分类名称'
+  },
   file: {
     exportName: '导出名称',
     route: '路径',
@@ -114,7 +132,18 @@ export default {
     createTime: '创建时间',
     exportStartTime: '导出开始时间',
     exportEndTime: '导出结束时间',
-    creationTime: '创建时间'
+    creationTime: '创建时间',
+    all: '全部'
+  },
+  bonus: {
+    welcomePackOrder: '首购单',
+    memberCode:'会员编号',
+    balancePerformance: '综合结余业绩',
+    entryBalancePerformance: '首单结余业绩',
+    reconditioningBalancePerformance: '复消结余业绩',
+    LMarketBalancePerformance: '一市场结余业绩',
+    RMarketBalancePerformance: '二市场结余业绩',
+    confirmAndReviseMemberPerformance: '确认修改会员业绩?'
   },
   documentation: {
     documentation: '文档',
@@ -250,7 +279,16 @@ export default {
     reset: '重置',
     desc: '描述',
     exportExcel:'导出Excel',
-    upload: '上传'
+    upload: '上传',
+    hide: '展示',
+    unhide: '不展示',
+    selectData: '所选数据',
+    deleteSelectedData: '您确定要删除所选数据吗？',
+    notice: '提示',
+    hideSelectedData: '您确定要隐藏所选数据吗？',
+    unHideSelectedData: '您确定要展示所选数据吗？',
+    exportCurrentData: '您确定要导出当前数据吗？',
+    all: '全部'
   },
 
   filter: {

src/views/ad/edit.vue

@@ -57,6 +57,7 @@
 import { fetchDetail, fetchEdit, fetchAdd } from '@/api/ad'
 import tool from '@/utils/tool'
 import Upload from '@/components/Upload'
+import ElementUI from 'element-ui'
 export default {
   name: 'RoleAdd',
   components: { Upload },
@@ -107,8 +108,8 @@ export default {
           this.article = response.data.oneData.CONTENT
         }
         this.loading = false
-      }).catch(err => {
-        console.log('err---------' + err)
+      }).catch((error) => {
+          ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
       })
     } else {
       fetchDetail(this.$route.params.ID).then(response => {
@@ -116,8 +117,8 @@ export default {
         this.allArticle = response.data.allArticle
 
         this.loading = false
-      }).catch(err => {
-        console.log('err---------' + err)
+      }).catch((error) => {
+          ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
       })
     }
   },
@@ -134,9 +135,9 @@ export default {
             type: "$t('common.successfully')"
           })
           this.$router.go(-1)
-        }).catch(err => {
-          console.log('err---------' + err)
-        })
+       }).catch((error) => {
+           ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
+       })
       } else {
         console.log(this.form)
         fetchAdd(this.form).then(response => {
@@ -147,8 +148,8 @@ export default {
             type: 'success'
           })
           this.$router.go(-1)
-        }).catch(err => {
-          console.log('err---------' + err)
+        }).catch((error) => {
+            ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
         })
       }
     },

src/views/ad/list.vue

@@ -127,6 +127,7 @@ import { parseTime } from '@/utils'
 import tool from '@/utils/tool'
 import permission from '@/utils/permission'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
+import ElementUI from 'element-ui'
 
 const calendarTypeOptions = [
   { key: 'CN', display_name: 'China' },
@@ -303,9 +304,9 @@ export default {
     },
     handleDelete(id = null) {
       const obj = this
-      obj.$confirm('Are you sure to delete the selected data？', 'Notice', { // 确定删除选定的数据？
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      obj.$confirm(this.$t('common.deleteSelectedData'), this.$t('common.notice'), { // 确定删除选定的数据？
+       confirmButtonText: this.$t('common.confirm'), // 确定
+       cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
         const selectedIds = []
@@ -322,14 +323,14 @@ export default {
             type: 'success'
           })
           obj.getList(obj.currentPage, obj.pageSize)
-        }).catch(response => {
-
+        }).catch((error) => {
+            ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
         })
       })
     },
     handleHide(id = null) {
       const obj = this
-      obj.$confirm('Are you sure to hide the selected data？', 'Notice', { // 确定删除选定的数据？
+     obj.$confirm(this.$t('common.hideSelectedData'), this.$t('common.notice'), {  // 确定删除选定的数据？
         confirmButtonText: 'confirm', // 确定
         cancelButtonText: 'cancel', // 取消
         type: 'warning'
@@ -348,8 +349,8 @@ export default {
             type: 'success'
           })
           obj.getList(obj.currentPage, obj.pageSize)
-        }).catch(response => {
-
+        }).catch((error) => {
+            ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
         })
       })
     },
@@ -358,7 +359,7 @@ export default {
     },
     handleUnhide(id = null) {
       const obj = this
-      obj.$confirm('Are you sure to hide the selected data？', 'Notice', { // 确定删除选定的数据？
+     obj.$confirm(this.$t('common.unHideSelectedData'), this.$t('common.notice'), { // 确定删除选定的数据？
         confirmButtonText: 'confirm', // 确定
         cancelButtonText: 'cancel', // 取消
         type: 'warning'
@@ -377,9 +378,9 @@ export default {
             type: 'success'
           })
           obj.getList(obj.currentPage, obj.pageSize)
-        }).catch(response => {
-
-        })
+       }).catch((error) => {
+           ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
+       })
       })
     }
   }

src/views/article/category.vue

@@ -3,8 +3,8 @@
     <div class="white-box">
       <el-table :data="tableData" stripe style="width: 100%;" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
-        <el-table-column label="Category Name" prop="CATE_NAME" /><!--分类名称-->
-        <el-table-column label="Order" width="100"><!--排序-->
+        <el-table-column :label="$t('article.categoryName')" prop="CATE_NAME" /><!--分类名称-->
+        <el-table-column :label="$t('article.order')" width="100"><!--排序-->
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.SORT"
@@ -14,7 +14,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="Creation Time"><!--创建时间-->
+        <el-table-column :label="$t('article.creationTime')"><!--创建时间-->
           <template slot-scope="scope">
             {{ tool.formatDate(scope.row.CREATED_AT) }}
           </template>

src/views/article/edit.vue

@@ -2,18 +2,18 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-form ref="form" :model="form" label-width="100px">
-        <el-form-item label="Title" style="width: 500px;"><!--标题-->
+        <el-form-item :label="$t('article.title')" style="width: 500px;"><!--标题-->
           <el-input v-model="form.title" />
         </el-form-item>
-        <el-form-item label="Category"><!--分类-->
+        <el-form-item :label="$t('article.category')"><!--分类-->
           <el-select v-model="form.cid" placeholder="please select category"><!--请选择分类-->
             <el-option v-for="item in allCategory" :key="item.ID" :label="item.CATE_NAME" :value="item.ID" />
           </el-select>
         </el-form-item>
-        <el-form-item label="Order" style="width: 500px;"><!--排序值-->
+        <el-form-item :label="$t('article.order')" style="width: 500px;"><!--排序值-->
           <el-input v-model="form.sort" />
         </el-form-item>
-        <el-form-item label="Content"><!--内容-->
+        <el-form-item :label="$t('article.content')"><!--内容-->
           <div class="components-container" style="margin:0">
             <!-- <aside>
               {{ $t('components.tinymceTips') }}
@@ -26,7 +26,7 @@
           </div>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">Confirm<!-- 提交 --></el-button>
+          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">{{$t('article.confirm')}}<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -36,6 +36,8 @@
 <script>
 import Tinymce from '@/components/Tinymce'
 import { fetchArticleDetail, fetchArticleAdd, fetchArticleAddList, fetchArticleEdit } from '@/api/article'
+import tool from '@/utils/tool'
+import ElementUI from 'element-ui'
 
 export default {
   name: 'ArticleEdit',
@@ -50,7 +52,7 @@ export default {
       },
       content: '',
       allCategory: null,
-      loading: false,
+      loading: true,
       submitButtonStat: false,
       isEdit: false
     }
@@ -85,8 +87,8 @@ export default {
             type: 'success'
           })
           this.$router.go(-1)
-        }).catch(() => {
-          this.submitButtonStat = false
+          }).catch((error) => {
+            ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
         })
       } else {
         fetchArticleAdd(this.form).then(response => {
@@ -96,8 +98,8 @@ export default {
             type: 'success'
           })
           this.$router.go(-1)
-        }).catch(() => {
-          this.submitButtonStat = false
+        }).catch((error) => {
+          ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
         })
       }
     }

src/views/article/index.vue

@@ -3,53 +3,53 @@
     <div class="white-box">
       <el-table :data="tableData" stripe style="width: 100%;" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
-        <el-table-column label="ID" prop="ID">
+        <el-table-column :label="$t('article.id')" prop="ID">
           <template slot-scope="scope">
             <router-link :to="`/article/detail/${scope.row.ID}`" target="_blank" class="islide">
               <span>{{ scope.row.ID }}</span>
             </router-link>
           </template>
         </el-table-column>
-        <el-table-column label="Title" prop="TITLE">
+        <el-table-column :label="$t('article.title')" prop="TITLE">
           <template slot-scope="scope">
             <router-link :to="`/article/detail/${scope.row.ID}`" target="_blank" class="islide">
               <span>{{ scope.row.TITLE }}</span>
             </router-link>
           </template>
         </el-table-column><!--标题-->
-        <el-table-column label="Category"><!--分类-->
+        <el-table-column :label="$t('article.category')"><!--分类-->
           <template slot-scope="scope">
             {{ allData.allCategory[scope.row.CID].CATE_NAME }}
           </template>
         </el-table-column>
-        <el-table-column label="Sort" width="100"> <!-- 排序 -->
+        <el-table-column :label="$t('article.sort')" width="100"> <!-- 排序 -->
           <template slot-scope="scope">
             <el-input v-model="scope.row.SORT" min="0" max="99" @change="handleChangeSort(scope.row, scope.row.SORT)" />
           </template>
         </el-table-column>
-        <el-table-column label="Creation Time"><!--创建时间-->
+        <el-table-column :label="$t('article.creationTime')"><!--创建时间-->
           <template slot-scope="scope">
             {{ tool.formatDate(scope.row.CREATED_AT) }}
           </template>
         </el-table-column>
-        <el-table-column label="Status"> <!-- 状态 -->
+        <el-table-column :label="$t('article.status')"> <!-- 状态 -->
           <template slot-scope="scope">
-            <div v-if="scope.row.STATUS === '1'">Show</div>
-            <div v-else>Hide</div>
+            <div v-if="scope.row.STATUS === '1'">{{$t('article.show')}}</div>
+            <div v-else>{{$t('common.hide')}}</div>
           </template>
         </el-table-column>
 
-        <el-table-column fixed="right" label="Action" width="180"><!--操作-->
+        <el-table-column fixed="right" :label="$t('article.action')" width="180"><!--操作-->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                Action<i class="el-icon-arrow-down el-icon--right" />
+                {{$t('article.action')}}<i class="el-icon-arrow-down el-icon--right" />
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)">Edit</el-dropdown-item>
-                <el-dropdown-item command="delete" @click.native="handleDelete(scope.row)">Delete</el-dropdown-item>
-                <el-dropdown-item command="hide" @click.native="handleHide(scope.row)">Hide</el-dropdown-item>
-                <el-dropdown-item command="un-hide" @click.native="handleUnHide(scope.row)">Unhide</el-dropdown-item>
+                <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)">{{$t('common.edit')}}</el-dropdown-item>
+                <el-dropdown-item command="delete" @click.native="handleDelete(scope.row)">{{$t('common.delete')}}</el-dropdown-item>
+                <el-dropdown-item command="hide" @click.native="handleHide(scope.row)">{{$t('common.hide')}}</el-dropdown-item>
+                <el-dropdown-item command="un-hide" @click.native="handleUnHide(scope.row)">{{$t('common.unhide')}}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -58,15 +58,15 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click">
           <el-button type="primary" size="small">
-            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right" />
+            {{$t('common.selectData')}}<!--所选数据--><i class="el-icon-arrow-down el-icon--right" />
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="delete" @click.native="handleMuliDel()">Delete</el-dropdown-item>
-            <el-dropdown-item command="hide" @click.native="handleMultiHide()">Hide</el-dropdown-item>
-            <el-dropdown-item command="un-hide" @click.native="handleMultiUnHide()">Unhide</el-dropdown-item>
+            <el-dropdown-item command="delete" @click.native="handleMuliDel()">{{$t('common.delete')}}</el-dropdown-item>
+            <el-dropdown-item command="hide" @click.native="handleMultiHide()">{{$t('common.hide')}}</el-dropdown-item>
+            <el-dropdown-item command="un-hide" @click.native="handleMultiUnHide()">{{$t('common.unhide')}}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-button type="primary" size="small" @click="handleAdd">New article</el-button><!--添加文章-->
+        <el-button type="primary" size="small" @click="handleAdd">{{$t('article.newArticle')}}</el-button><!--添加文章-->
         <el-pagination
           :current-page="currentPage"
           :page-sizes="[20, 50, 100, 200]"
@@ -84,6 +84,7 @@
 <script>
 import { fetchArticleIndex, fetchChangeArticleSort, fetchArticleHide, fetchArticleUnhide, fetchArticleDel } from '@/api/article'
 import tool from '@/utils/tool'
+import ElementUI from 'element-ui'
 
 export default {
   name: 'ArticleIndex',
@@ -158,9 +159,9 @@ export default {
     },
     delData(id = null) {
       const obj = this
-      obj.$confirm('Are you sure to delete the selected data？', 'Hint', { // 确定删除选定的数据
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      obj.$confirm(this.$t('common.deleteSelectedData'), this.$t('common.notice'), { // 确定删除选定的数据
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
         const selectedIds = []
@@ -177,16 +178,16 @@ export default {
             type: 'success'
           })
           obj.getData(obj.currentPage, obj.pageSize)
-        }).catch(response => {
-
+        }).catch((error) => {
+            ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
         })
       })
     },
     hideData(id = null) {
       const obj = this
-      obj.$confirm('Are you sure to hide the selected data？', 'Notice', { // 确定删除选定的数据？
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      obj.$confirm(this.$t('common.hideSelectedData'), this.$t('common.notice'), { // 确定删除选定的数据？
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
         const selectedIds = []
@@ -203,16 +204,16 @@ export default {
             type: 'success'
           })
           obj.getData(obj.currentPage, obj.pageSize)
-        }).catch(response => {
-
+        }).catch((error) => {
+            ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
         })
       })
     },
     unHideData(id = null) {
       const obj = this
-      obj.$confirm('Are you sure to un-hide the selected data？', 'Notice', { // 确定删除选定的数据？
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      obj.$confirm(this.$t('common.unHideSelectedData'), this.$t('common.notice'), { // 确定删除选定的数据？
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
         const selectedIds = []
@@ -229,9 +230,9 @@ export default {
             type: 'success'
           })
           obj.getData(obj.currentPage, obj.pageSize)
-        }).catch(response => {
-
-        })
+       }).catch((error) => {
+           ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
+       })
       })
     }
   }

src/views/bonus/balance-list.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <div class="white-box">
       <div class="filter-box">
-        <filter-user :filter-types="filterTypes" @select-value="handleFilterUser" />
+        <filter-user :filter-types="filterTypes"  :filter-btn-name="$t('common.screen')" @select-value="handleFilterUser" />
       </div>
       <el-table
         ref="multipleTable"
@@ -32,7 +32,7 @@
         <!--<el-button type="primary" size="small" @click="handleSendShow" icon="el-icon-plus"-->
         <!--v-show="permission.hasPermission(`bonus/cf-lx-apply`)">年度奖申请发放-->
         <!--</el-button>-->
-        <el-button v-show="permission.hasPermission(`bonus/balance-export`)" type="success" size="small" @click="handleExport"><!-- 导出Excel -->Export Excel</el-button>
+        <el-button v-show="permission.hasPermission(`bonus/balance-export`)" type="success" size="small" @click="handleExport"><!-- 导出Excel -->{{$t('common.exportExcel')}}</el-button>
         <pagination
           :total="totalCount"
           :page_size="pageSize"
@@ -79,6 +79,7 @@ import FilterUser from '@/components/FilterUser'
 import permission from '@/utils/permission'
 import Pagination from '@/components/Pagination'
 import filterHelper from '@/utils/filterHelper'
+import ElementUI from 'element-ui'
 
 export default {
   name: 'BonusBalanceList',
@@ -235,9 +236,9 @@ export default {
       return sums
     },
     handleExport() {
-      this.$confirm(`Are you sure you want to export the current data？`, 'Hint', { // `确定要导出当前数据吗？`, '提示',
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+     this.$confirm(this.$t('common.exportCurrentData'), this.$t('common.notice'), {  // `确定要导出当前数据吗？`, '提示',
+     confirmButtonText: this.$t('common.confirm'), // 确定
+     cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchBalanceExport(this.filterModel)
@@ -246,9 +247,11 @@ export default {
           message: response.data,
           type: 'success'
         })
-      }).catch(response => {
-
-      })
+     }).catch((error) => {
+         if(error !== 'cancel'){
+             ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
+         }
+     })
     }
   }
 }

src/views/bonus/flow-bonus.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <div class="white-box">
       <div class="filter-box">
-        <filter-user :filter-types="filterTypes" @select-value="handleFilterUser" />
+        <filter-user :filter-types="filterTypes" :filter-btn-name="$t('common.screen')" @select-value="handleFilterUser" />
       </div>
       <el-table ref="multipleTable" class="table-box" :data="tableData" stripe style="width: 100%;" :height="tool.getTableHeight()">
         <el-table-column v-for="(tableHeader, key) in tableHeaders" :key="key" :label="tableHeader.header" :width="tableHeader.other.width ? tableHeader.other.width : ''" :prop="tableHeader.other.prop ? tableHeader.other.prop : null">
@@ -17,7 +17,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button v-show="permission.hasPermission(`bonus/flow-bonus-export`)" type="success" size="small" @click="handleExport">Export Excel<!-- 导出Excel --></el-button>
+        <el-button v-show="permission.hasPermission(`bonus/flow-bonus-export`)" type="success" size="small" @click="handleExport">{{$t('common.exportExcel')}}<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
     </div>
@@ -32,6 +32,7 @@ import FilterUser from '../../components/FilterUser'
 import permission from '@/utils/permission'
 import Pagination from '@/components/Pagination'
 import filterHelper from '@/utils/filterHelper'
+import ElementUI from 'element-ui'
 
 export default {
   name: 'BonusFlowBonus',
@@ -87,10 +88,9 @@ export default {
       })
     },
     handleExport() {
-      this.$confirm(`Are you sure you want to export the current data？`, 'Hint', { // `确定要导出当前数据吗？`, '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
-        type: 'warning'
+    this.$confirm(this.$t('common.exportCurrentData'), this.$t('common.notice'), {  // `确定要导出当前数据吗？`, '提示',
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('common.cancel'), // 取消
       }).then(() => {
         return fetchFlowBonusExport(this.filterModel)
       }).then(response => {
@@ -98,9 +98,11 @@ export default {
           message: response.data,
           type: 'success'
         })
-      }).catch(response => {
-
-      })
+     }).catch((error) => {
+         if(error !== 'cancel'){
+             ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
+         }
+     })
     }
   }
 }

src/views/bonus/other-period-bonus.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <div class="white-box">
       <div class="filter-box">
-        <filter-user :filter-types.sync="filterTypes" @select-value="handleFilterUser" />
+        <filter-user :filter-types.sync="filterTypes" :filter-btn-name="$t('common.screen')" @select-value="handleFilterUser" />
       </div>
       <el-table ref="multipleTable" class="table-box" :data="tableData" stripe style="width: 100%;" :height="tool.getTableHeight()">
         <el-table-column v-for="(tableHeader, key) in tableHeaders" :key="key" :label="tableHeader.header" :width="tableHeader.other.width ? tableHeader.other.width : ''" :prop="tableHeader.other.prop ? tableHeader.other.prop : null">
@@ -17,7 +17,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button v-show="permission.hasPermission(`bonus/new-period-bonus-export`)" type="success" size="small" @click="handleExport">Export Excel<!-- 导出Excel --></el-button>
+        <el-button v-show="permission.hasPermission(`bonus/new-period-bonus-export`)" type="success" size="small" @click="handleExport">{{$t('common.exportExcel')}}<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
     </div>
@@ -32,6 +32,7 @@ import permission from '@/utils/permission'
 import baseInfo from '@/utils/baseInfo'
 import Pagination from '@/components/Pagination'
 import filterHelper from '../../utils/filterHelper'
+import ElementUI from 'element-ui'
 
 export default {
   name: 'BonusOtherPeriodBonus',
@@ -142,10 +143,9 @@ export default {
       return sums
     },
     handleExport() {
-      this.$confirm(`Are you sure you want to export the current data？`, 'Hint', { // `确定要导出当前数据吗？`, '提示',
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
-        type: 'warning'
+    this.$confirm(this.$t('common.exportCurrentData'), this.$t('common.notice'), {  // `确定要导出当前数据吗？`, '提示',
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('common.cancel'), // 取消
       }).then(() => {
         return fetchOtherPeriodBonusExport(this.filterModel)
       }).then(response => {
@@ -153,9 +153,11 @@ export default {
           message: response.data,
           type: 'success'
         })
-      }).catch(response => {
-
-      })
+    }).catch((error) => {
+        if(error !== 'cancel'){
+            ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
+        }
+    })
     }
   }
 }

src/views/bonus/perf-adjustment.vue

@@ -3,9 +3,9 @@
     <div class="white-box">
       <div class="filter-user" @keyup.enter="getData()">
         <el-input v-model="memberCode" size="small" style="width:400px;">
-          <template slot="prepend">Member Code</template>
+          <template slot="prepend">{{$t('bonus.memberCode')}}</template>
         </el-input>
-        <el-button type="primary" icon="el-icon-search" size="small" @click="getData()">Confirm<!-- 确定 --></el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" @click="getData()">{{$t('common.confirm')}}<!-- 确定 --></el-button>
       </div>
 
       <div v-show="show" style="margin-top: 25px;">
@@ -19,36 +19,36 @@
                     <el-input v-model="perfForm.USER_NAME" type="text" size="small" />
                   </el-form-item>
 
-                  <el-divider><span style="font-weight: bold;">L. Market Balance Performance</span></el-divider>
-                  <el-form-item label="Member Code" prop="SURPLUS_1L_USER_NAME"><!--会员编号-->
+                  <el-divider><span style="font-weight: bold;">{{$t('bonus.LMarketBalancePerformance')}}</span></el-divider>
+                  <el-form-item :label="$t('bonus.memberCode')" prop="SURPLUS_1L_USER_NAME"><!--会员编号-->
                     <el-input v-model="perfForm.SURPLUS_1L_USER_NAME" type="text" size="small" autocomplete="off" readonly />
                   </el-form-item>
-                  <el-form-item label="Balance Performance" prop="SURPLUS_1L"><!--综合结余业绩-->
+                  <el-form-item :label="$t('bonus.balancePerformance')" prop="SURPLUS_1L"><!--综合结余业绩-->
                     <el-input v-model="perfForm.SURPLUS_1L" type="text" size="small" autocomplete="off" />
                   </el-form-item>
-                  <el-form-item label="Entry Balance Performance" prop="SURPLUS_1L_ZC"><!--首单结余业绩-->
+                  <el-form-item :label="$t('bonus.entryBalancePerformance')" prop="SURPLUS_1L_ZC"><!--首单结余业绩-->
                     <el-input v-model="perfForm.SURPLUS_1L_ZC" type="text" size="small" autocomplete="off" />
                   </el-form-item>
-                  <el-form-item label="Reconditioning Balance Performance" prop="SURPLUS_1L_FX"><!--复消结余业绩-->
+                  <el-form-item :label="$t('bonus.reconditioningBalancePerformance')" prop="SURPLUS_1L_FX"><!--复消结余业绩-->
                     <el-input v-model="perfForm.SURPLUS_1L_FX" type="text" size="small" autocomplete="off" />
                   </el-form-item>
 
-                  <el-divider><span style="font-weight: bold;">R. Market Balance Performance</span></el-divider>
-                  <el-form-item label="Member Code" prop="SURPLUS_2L_USER_NAME"><!--会员编号-->
+                  <el-divider><span style="font-weight: bold;">{{$t('bonus.RMarketBalancePerformance')}}</span></el-divider>
+                  <el-form-item :label="$t('bonus.memberCode')" prop="SURPLUS_2L_USER_NAME"><!--会员编号-->
                     <el-input v-model="perfForm.SURPLUS_2L_USER_NAME" type="text" size="small" autocomplete="off" readonly />
                   </el-form-item>
-                  <el-form-item label="Balance Performance" prop="SURPLUS_2L"><!--综合结余业绩-->
+                  <el-form-item :label="$t('bonus.balancePerformance')" prop="SURPLUS_2L"><!--综合结余业绩-->
                     <el-input v-model="perfForm.SURPLUS_2L" type="text" size="small" autocomplete="off" />
                   </el-form-item>
-                  <el-form-item label="Entry Balance Performance" prop="SURPLUS_2L_ZC">
+                  <el-form-item :label="$t('bonus.entryBalancePerformance')" prop="SURPLUS_2L_ZC">
                     <el-input v-model="perfForm.SURPLUS_2L_ZC" type="text" size="small" autocomplete="off" />
                   </el-form-item>
-                  <el-form-item label="Reconditioning Balance Performance" prop="SURPLUS_2L_FX"><!--复消结余业绩-->
+                  <el-form-item :label="$t('bonus.reconditioningBalancePerformance')" prop="SURPLUS_2L_FX"><!--复消结余业绩-->
                     <el-input v-model="perfForm.SURPLUS_2L_FX" type="text" size="small" autocomplete="off" />
                   </el-form-item>
 
                   <el-form-item>
-                    <el-button type="primary" size="small" @click="handlePerfAdjustment('perfForm')">Save</el-button>
+                    <el-button type="primary" size="small" @click="handlePerfAdjustment('perfForm')">{{$t('common.save')}}</el-button>
                   </el-form-item>
                 </el-form>
               </el-card>
@@ -116,9 +116,9 @@ export default {
     },
     // 修改会员业绩
     handlePerfAdjustment(formName) {
-      this.$confirm('Confirm and revise member performance?', 'Hits', { // 确认修改会员业绩
-        confirmButtonText: 'Confirm',
-        cancelButtonText: 'Cancel',
+      this.$confirm(this.$t('bonus.confirmAndReviseMemberPerformance'), this.$t('common.hint'), { // 确认修改会员业绩
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
         this.loading = true

src/views/bonus/perf-month.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <div class="white-box">
       <div class="filter-box">
-        <filter-user ref="filterUser" :filter-types="filterTypes" @select-value="handleFilterUser" />
+        <filter-user ref="filterUser" :filter-btn-name="$t('common.screen')" :filter-types="filterTypes" @select-value="handleFilterUser" />
       </div>
       <el-table
         :data="tableData"
@@ -24,7 +24,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button v-show="permission.hasPermission(`bonus/perf-month-export`)" type="success" size="small" @click="handleExport">Export Excel<!-- 导出Excel --></el-button>
+        <el-button v-show="permission.hasPermission(`bonus/perf-month-export`)" type="success" size="small" @click="handleExport">{{$t('common.exportExcel')}}<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
     </div>
@@ -39,6 +39,7 @@ import FilterUser from '@/components/FilterUser'
 import permission from '@/utils/permission'
 import Pagination from '@/components/Pagination'
 import filterHelper from '@/utils/filterHelper'
+import ElementUI from 'element-ui'
 
 export default {
   name: 'LeoPerfMonthTable',
@@ -107,9 +108,9 @@ export default {
       if (window.location.href.indexOf('filter') === -1) {
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
-      this.$confirm('Are you sure you want to export the data in the current table？', 'Hint', { // '确定要导出当前表格中的数据吗？', '提示',
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+     this.$confirm(this.$t('common.exportCurrentData'), this.$t('common.notice'), { // '确定要导出当前表格中的数据吗？', '提示',
+       confirmButtonText: this.$t('common.confirm'), // 确定
+       cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchPerfMonthExport(this.filterModel)
@@ -118,8 +119,11 @@ export default {
           message: response.data,
           type: 'success'
         })
-      }).catch(response => {
-      })
+    }).catch((error) => {
+        if(error !== 'cancel'){
+            ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
+        }
+    })
     }
   }
 }

src/views/bonus/perf-order.vue

@@ -2,11 +2,11 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="filterStatus" @tab-click="handleFilterStatusClick">
-        <el-tab-pane label="All" name="ALL" :lazy="true" /><!-- 全部 -->
-        <el-tab-pane label="Welcome Pack Order" name="ZC" :lazy="true" /><!-- 首购单 -->
+        <el-tab-pane :label="$t('common.all')" name="ALL" :lazy="true" /><!-- 全部 -->
+        <el-tab-pane :label="$t('bonus.welcomePackOrder')" name="ZC" :lazy="true" /><!-- 首购单 -->
       </el-tabs>
       <div class="filter-box">
-        <filter-user ref="filterUser" :filter-types="filterTypes" @select-value="handleFilterUser" />
+        <filter-user ref="filterUser" :filter-btn-name="$t('common.screen')" :filter-types="filterTypes" @select-value="handleFilterUser" />
       </div>
       <el-table
         :data="tableData"
@@ -28,7 +28,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button v-show="permission.hasPermission(`bonus/perf-order-export`)" type="success" size="small" @click="handleExport">Export Excel<!-- 导出Excel --></el-button>
+        <el-button v-show="permission.hasPermission(`bonus/perf-order-export`)" type="success" size="small" @click="handleExport">{{$t('common.exportExcel')}}<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
     </div>
@@ -43,6 +43,7 @@ import FilterUser from '@/components/FilterUser'
 import permission from '@/utils/permission'
 import Pagination from '@/components/Pagination'
 import filterHelper from '@/utils/filterHelper'
+import ElementUI from 'element-ui'
 
 export default {
   name: 'LeoPerfOrderTable',
@@ -114,9 +115,9 @@ export default {
       if (window.location.href.indexOf('filter') === -1) {
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
-      this.$confirm('Are you sure you want to export the data in the current table?', 'Hint', { // '确定要导出当前表格中的数据吗？', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('common.exportCurrentData'), this.$t('common.notice'), { // '确定要导出当前表格中的数据吗？', '提示'
+      confirmButtonText: this.$t('common.confirm'), // 确定
+      cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchPerfOrderExport(this.filterModel)
@@ -125,8 +126,11 @@ export default {
           message: response.data,
           type: 'success'
         })
-      }).catch(response => {
-      })
+     }).catch((error) => {
+         if(error !== 'cancel'){
+             ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
+         }
+     })
     }
   }
 }

src/views/bonus/perf-period-list.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <div class="white-box">
       <div class="filter-box">
-        <filter-user ref="filterUser" :filter-types="filterTypes" @select-value="handleFilterUser" />
+        <filter-user ref="filterUser" :filter-btn-name="$t('common.screen')" :filter-types="filterTypes" @select-value="handleFilterUser" />
       </div>
       <el-table
         :data="tableData"
@@ -24,7 +24,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button v-show="permission.hasPermission(`bonus/perf-period-list-export`)" type="success" size="small" @click="handleExport">Export Excel<!-- 导出Excel --></el-button>
+        <el-button v-show="permission.hasPermission(`bonus/perf-period-list-export`)" type="success" size="small" @click="handleExport">{{$t('common.exportExcel')}}<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
     </div>
@@ -39,6 +39,7 @@ import FilterUser from '@/components/FilterUser'
 import permission from '@/utils/permission'
 import Pagination from '@/components/Pagination'
 import filterHelper from '@/utils/filterHelper'
+import ElementUI from 'element-ui'
 
 export default {
   name: 'LeoPerfPeriodListTable',
@@ -107,9 +108,9 @@ export default {
       if (window.location.href.indexOf('filter') === -1) {
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
-      this.$confirm('Are you sure you want to export the data in the current table？', 'Hint', { // '确定要导出当前表格中的数据吗？', '提示',
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+       this.$confirm(this.$t('common.exportCurrentData'), this.$t('common.notice'),  { // '确定要导出当前表格中的数据吗？', '提示',
+       confirmButtonText: this.$t('common.confirm'), // 确定
+       cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchPerfPeriodListExport(this.filterModel)
@@ -118,8 +119,11 @@ export default {
           message: response.data,
           type: 'success'
         })
-      }).catch(response => {
-      })
+     }).catch((error) => {
+         if(error !== 'cancel'){
+             ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
+         }
+     })
     }
   }
 }

src/views/bonus/user-perf.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <div class="white-box">
       <div class="filter-box">
-        <filter-user ref="filterUser" :filter-types="filterTypes" @select-value="handleFilterUser" />
+        <filter-user ref="filterUser" :filter-btn-name="$t('common.screen')" :filter-types="filterTypes" @select-value="handleFilterUser" />
       </div>
       <el-table
         :data="tableData"
@@ -23,7 +23,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button v-show="permission.hasPermission(`bonus/user-perf-export`)" type="success" size="small" @click="handleExport">Export Excel<!-- 导出Excel --></el-button>
+        <el-button v-show="permission.hasPermission(`bonus/user-perf-export`)" type="success" size="small" @click="handleExport">{{$t('common.exportExcel')}}<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
     </div>
@@ -38,6 +38,7 @@ import FilterUser from '@/components/FilterUser'
 import permission from '@/utils/permission'
 import Pagination from '@/components/Pagination'
 import filterHelper from '@/utils/filterHelper'
+import ElementUI from 'element-ui'
 
 export default {
   name: 'LeoUserPerfTable',
@@ -105,9 +106,9 @@ export default {
       if (window.location.href.indexOf('filter') === -1) {
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
-      this.$confirm('Are you sure you want to export the data in the current table?', 'Hint', { // '确定要导出当前表格中的数据吗？', '提示',
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('common.exportCurrentData'), this.$t('common.notice'), { // '确定要导出当前表格中的数据吗？', '提示',
+       confirmButtonText: this.$t('common.confirm'), // 确定
+       cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchUserPerfExport(this.filterModel)
@@ -116,8 +117,11 @@ export default {
           message: response.data,
           type: 'success'
         })
-      }).catch(response => {
-      })
+     }).catch((error) => {
+         if(error !== 'cancel'){
+             ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
+         }
+     })
     }
   }
 }

src/views/file/export.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="moduleName" @tab-click="handleFilterStatusClick">
-        <el-tab-pane label="All" name="all" :lazy="true" /><!-- 全部 -->
+        <el-tab-pane :label="$t('file.all')" name="all" :lazy="true" /><!-- 全部 -->
         <el-tab-pane
           v-for="(item,key) in allModuleName"
           :key="key"

src/views/log/user-login.vue

@@ -20,7 +20,7 @@
       </el-table-column>
     </el-table>
     <div class="white-box-footer">
-      <el-button v-show="permission.hasPermission(`v1/log/user-login-export`)" type="success" size="small" @click="handleExport">Export Excel<!-- 导出Excel --></el-button>
+      <el-button v-show="permission.hasPermission(`v1/log/user-login-export`)" type="success" size="small" @click="handleExport">{{$t('common.exportExcel')}}<!-- 导出Excel --></el-button>
       <pagination
         :total="totalCount"
         :page_size="pageSize"
@@ -38,6 +38,7 @@ import { fetchUserLoginList, fetchUserLoginExport } from '@/api/log'
 import filterHelper from '@/utils/filterHelper'
 import FilterUser from '@/components/FilterUser'
 import Pagination from '@/components/Pagination'
+import ElementUI from 'element-ui'
 
 export default {
   name: 'LogAdminLogin',
@@ -95,9 +96,9 @@ export default {
       this.getData()
     },
     handleExport() {
-      this.$confirm(`Are you sure you want to export the current data？`, 'Hint', { // `确定要导出当前数据吗？`, '提示',
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+       this.$confirm(this.$t('common.exportCurrentData'), this.$t('common.notice'), {  // `确定要导出当前数据吗？`, '提示',
+      confirmButtonText: this.$t('common.confirm'), // 确定
+      cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchUserLoginExport(this.filterModel)
@@ -106,8 +107,8 @@ export default {
           message: response.data,
           type: 'success'
         })
-      }).catch(response => {
-
+      }).catch((error) => {
+          ElementUI.Message({type: 'error', message: error.message, showClose: true, duration: 0})
       })
     }
   }