kevin_zhangl преди 2 години
родител
ревизия
cb5953c229
променени са 3 файла, в които са добавени 90 реда и са изтрити 67 реда
  1. 18 6
      src/lang/en.js
  2. 17 6
      src/lang/zh.js
  3. 55 55
      src/views/bonus/period.vue

+ 18 - 6
src/lang/en.js

@@ -5,7 +5,6 @@ export default {
     guide: 'Guide',
     permission: 'Permission',
     pagePermission: 'Page Permission',
-    rolePermission: 'Role Permission',
     directivePermission: 'Directive Permission',
     icons: 'Icons',
     components: 'Components',
@@ -235,7 +234,23 @@ export default {
     calStartedAt: 'Settlement start time',
     calculatedAt: 'Settlement end time',
     sendStartedAt: 'Network connection start time',
-    sentAt: 'End time of network connection'
+    sentAt: 'End time of network connection',
+    start: 'start',
+    complete: 'complete',
+    shouldStartOn: 'Should start on',
+    shouldEndOn: 'Should end on',
+    spreadNet: 'spread a net',
+    logTitle: '第{currentPeriod}期计算任务日志',
+    autoSettlementHint: 'Confirm to perform settlement operation for the auto current period?',
+    generatePerformanceOrderHint: 'Confirm to generate performance order for the current period?',
+    generatePerformanceSheetHint: 'Confirm to generate performance sheet for the current period?',
+    pullPerformanceSheetHint: 'Confirm to pull performance sheet for the current period?',
+    calculateBonusDataHint: 'Confirm to calculate bonus data for the current period?',
+    syncCalculateBonusRecordHint: 'Confirm to sync calculate bonus record for the current period?',
+    manuallySealHint: 'Confirm to manually seal the current period?',
+    performSettlementOperationHint: 'Confirm to perform settlement operation for the current period',
+    spreadNetHint: 'Are you sure to connect the current period? Performance sheet and settlement cannot be generated after network connection',
+    allWithdrawalHint: '全部提现?',
   },
   documentation: {
     documentation: 'Documentation',
@@ -343,7 +358,6 @@ export default {
     no: 'NO',
     view: 'View',
     select: 'Select',
-    reset: 'Reset',
     startDate: 'Start Date',
     endDate: 'End Date',
     deleteTips: 'Are you sure you want to delete the selected data?',
@@ -364,7 +378,7 @@ export default {
     updatedAdmin: 'Updater',
     actionThisData: 'Manipulate the data',
     selectType: 'Filter type',
-    selectFunction: 'Filter method', 
+    selectFunction: 'Filter method',
     selectDate: 'Select date',
     selectMonth: 'Select month',
     pleaseInputContent: 'Please enter content',
@@ -725,7 +739,6 @@ export default {
     rechargeStatusState: 'State',
     reviewWithdrawalInfoNotice: 'Review withdrawal info',
     datePayment: 'Date of payment',
-    selectRecordOperateNotice: 'Select the record to operate on',
     surePassReviewNoteNotice: 'Be sure to pass the review ? Note: ',
     sureUnpaidReviewNotice: 'Be sure to unpaid the review ? Note: ',
     surePaymentFailureReview: 'Be sure to payment failure the review ? Note: ',
@@ -820,7 +833,6 @@ export default {
     loginTimes: 'Logins',
     lastLoginIp: 'Last login IP',
     lastLoginAt: 'last login time',
-    selectData: 'Selected data',
     addAdmin: 'Add administrator',
     delNotice: 'Determine to delete the selected data'
   },

+ 17 - 6
src/lang/zh.js

@@ -69,7 +69,6 @@ export default {
     adminRoleList:'管理员角色列表',
     addRole:'添加角色',
     editRole:'编辑角色',
-    rolePermission:'角色权限',
     resetPwd:'重置密码',
     adminList:'管理员列表',
     addAdmin:'添加管理员',
@@ -234,8 +233,23 @@ export default {
     calStartedAt: '结算开始时间',
     calculatedAt: '结算结束时间',
     sendStartedAt: '挂网开始时间',
-    sentAt: '挂网结束时间'
-
+    sentAt: '挂网结束时间',
+    start: '开始',
+    complete: '完成',
+    shouldStartOn: '应开始于',
+    shouldEndOn: '应结束于',
+    spreadNet: '挂网',
+    logTitle: '第{currentPeriod}期计算任务日志',
+    autoSettlementHint: '确定对当前期进行结算操作?',
+    generatePerformanceOrderHint: '确定对当前期进行生成业绩单操作?',
+    generatePerformanceSheetHint: '确定对当前期进行生成业绩单操作?',
+    pullPerformanceSheetHint: '确定对当前期进行生成业绩单操作?',
+    calculateBonusDataHint: '确定对当前期进行生成业绩单操作?',
+    syncCalculateBonusRecordHint: '确定对当前期进行生成业绩单操作?',
+    manuallySealHint: '确定对当前期进行手动封期操作?',
+    performSettlementOperationHint: '确定对当前期进行结算操作?',
+    spreadNetHint: '确定对当前期进行挂网操作?挂网后无法生成业绩单和结算',
+    allWithdrawalHint: '全部提现?',
   },
   documentation: {
     documentation: '文档',
@@ -375,7 +389,6 @@ export default {
     exportPDF: '导出PDF',
     upload: '上传',
     modifyData: '正在修改数据',
-    upload: '上传',
     hide: '不展示',
     unhide: '展示',
     selectData: '所选数据',
@@ -701,7 +714,6 @@ export default {
     transactionType: '交易类型',
     pleaseSelectTranserType: '请选择交易类型',
     forgeDisplayRemark: '备注前台显示',
-    selectRecordOperateNotice: '请选择要操作的记录',
     modifyData: '正在修改数据',
     balanceInsufficientSubmitNotice: '会员账户余额不足,是否继续提交',
     passingAudit: '正在通过审核',
@@ -815,7 +827,6 @@ export default {
     loginTimes: '登录次数',
     lastLoginIp: '最后登录IP',
     lastLoginAt: '最后登录时间',
-    selectData: '所选数据',
     addAdmin: '添加管理员',
     delNotice: '确定删除选定的数据?'
   },

+ 55 - 55
src/views/bonus/period.vue

@@ -20,8 +20,8 @@
         </el-table-column>
         <el-table-column :label="$t('bonus.timeframe')" width="260"><!-- 时间范围 -->
           <template slot-scope="scope">
-            <!-- 应开始于 -->Should start on:{{getWatTime(scope.row.START_TIME)}}<br/>
-            <!-- 应结束于 -->Should end on:{{getWatTime(scope.row.END_TIME)}}
+            <!-- 应开始于 -->{{ $t('bonus.shouldStartOn') }}:{{getWatTime(scope.row.START_TIME)}}<br/>
+            <!-- 应结束于 -->{{ $t('bonus.shouldEndOn') }}:{{getWatTime(scope.row.END_TIME)}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('bonus.closingTime')" width="180"><!-- 封期时间 -->
@@ -37,8 +37,8 @@
 <!--        </el-table-column>-->
         <el-table-column :label="$t('bonus.timeOfGeneratingPerformanceSheet')" width="230"><!-- 生成业绩单时间 -->
           <template slot-scope="scope">
-            <!-- 开始 -->start:{{getWatTime(scope.row.PERF_STARTED_AT)}}<br>
-            <!-- 完成 -->complete:{{getWatTime(scope.row.PERFED_AT)}}
+            <!-- 开始 -->{{ $t('bonus.start') }}:{{getWatTime(scope.row.PERF_STARTED_AT)}}<br>
+            <!-- 完成 -->{{ $t('bonus.complete') }}:{{getWatTime(scope.row.PERFED_AT)}}
           </template>
         </el-table-column>
 <!--        <el-table-column label="Settlement progress" width="80">&lt;!&ndash; 结算进度 &ndash;&gt;-->
@@ -49,8 +49,8 @@
 <!--        </el-table-column>-->
         <el-table-column :label="$t('bonus.settlementDate')" width="230"><!-- 结算时间 -->
           <template slot-scope="scope">
-            <!-- 开始 -->start:{{getWatTime(scope.row.CALCULATE_STARTED_AT)}}<br>
-            <!-- 完成 -->complete:{{getWatTime(scope.row.CALCULATED_AT)}}
+            <!-- 开始 -->{{ $t('bonus.start') }}:{{getWatTime(scope.row.CALCULATE_STARTED_AT)}}<br>
+            <!-- 完成 -->{{ $t('bonus.complete') }}:{{getWatTime(scope.row.CALCULATED_AT)}}
           </template>
         </el-table-column>
 <!--        <el-table-column label="Network connection progress" width="80">&lt;!&ndash; 挂网进度 &ndash;&gt;-->
@@ -61,8 +61,8 @@
 <!--        </el-table-column>-->
         <el-table-column :label="$t('bonus.networkConnectionTime')" width="230"><!-- 挂网时间 -->
           <template slot-scope="scope">
-            <!-- 开始 -->start:{{getWatTime(scope.row.SEND_STARTED_AT)}}<br/>
-            <!-- 完成 -->complete:{{getWatTime(scope.row.SENT_AT)}}
+            <!-- 开始 -->{{ $t('bonus.start') }}:{{getWatTime(scope.row.SEND_STARTED_AT)}}<br/>
+            <!-- 完成 -->{{ $t('bonus.complete') }}:{{getWatTime(scope.row.SENT_AT)}}
           </template>
         </el-table-column>
         <el-table-column fixed="right" :label="$t('common.action')" width=""><!-- 操作 -->
@@ -80,17 +80,17 @@
             </el-button>
             <el-button style="margin: 0 0 !important;" @click.native="sentHandle(scope.row)" type="primary" class="button"
                               v-if="scope.row.IS_CAN_SENT && permission.hasPermission(`bonus/send-period`)">
-              <!-- 挂网 -->spread a net
+              <!-- 挂网 -->{{ $t('bonus.spreadNet') }}
             </el-button>
 
-            <el-dialog :title="`第${currentPeriod}期计算任务日志`" :visible.sync="dialogTableVisible" append-to-body width="60%">
+            <el-dialog :title="$t('bonus.logTitle', { currentPeriod: currentPeriod })" :visible.sync="dialogTableVisible" append-to-body width="60%">
               <el-row>
                 <el-button style="margin-left:10px;" class="button" type="primary" @click.native="getDialogData();dialogLoading=true;" >
                   {{$t('bonus.logRefresh')}}
                 </el-button>
               </el-row>
               <el-divider></el-divider>
-              
+
               <el-row>
                 <el-button  class="button customstyle" style="margin-left:10px;" type="success" @click.native="autoCalcHandle(currentPeriod)"
                   v-if="permission.hasPermission(`bonus/calc-period`)"
@@ -101,8 +101,8 @@
                 <el-button  class="button customstyle" type="primary" @click.native="pullPerfPeriodHandle(currentPeriod)" >{{$t('bonus.pullPeriodPerformance')}}</el-button>
                 <el-button  class="button customstyle" type="primary" @click.native="calcBonusHandle(currentPeriod)" >{{$t('bonus.calculationOfBonus')}}</el-button>
                 <el-button  class="button customstyle" type="primary" @click.native="pullBonusHandle(currentPeriod)" >{{$t('bonus.pullBonusData')}}</el-button>
-              </el-row>    
-                        
+              </el-row>
+
 <!--                  <el-row><el-button class="button" type="primary" @click.native="autoPerfHandle(currentPeriod)" >计算和拉取期业绩</el-button></el-row>-->
                 <div>
                   <el-table :data="dialogData" height="550" v-loading="dialogLoading" style="width: 100%">
@@ -247,9 +247,9 @@ export default {
   },
   methods: {
     autoCalcHandle(currentPeriod) {
-      this.$confirm('Confirm to perform settlement operation for the auto current period?', 'Hint', { // '确定对当前期进行结算操作?', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.autoSettlementHint'), this.$t('common.hint'), { // '确定对当前期进行结算操作?', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
         // return network.getData(`calc/auto-calc/${currentPeriod}`)
@@ -267,9 +267,9 @@ export default {
       })
     },
     perfOrderHandle(currentPeriod) {
-      this.$confirm('Confirm to generate performance order for the current period?', 'Hint', { // '确定对当前期进行生成业绩单操作?', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.generatePerformanceOrderHint'), this.$t('common.hint'), { // '确定对当前期进行生成业绩单操作?', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
          return fetchPerfOrderList(currentPeriod)
@@ -286,9 +286,9 @@ export default {
      })
     },
     initDataHandle(currentPeriod) {
-      this.$confirm('Confirm to generate performance sheet for the current period?', 'Hint', { // '确定对当前期进行生成业绩单操作?', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.generatePerformanceSheetHint'), this.$t('common.hint'), { // '确定对当前期进行生成业绩单操作?', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchInitData(currentPeriod)
@@ -305,9 +305,9 @@ export default {
      })
     },
     perfPeriodHandle(currentPeriod) {
-      this.$confirm('Confirm to generate performance sheet for the current period?', 'Hint', { // '确定对当前期进行生成业绩单操作?', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.generatePerformanceSheetHint'), this.$t('common.hint'), { // '确定对当前期进行生成业绩单操作?', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchCalcPerfPeriod(currentPeriod)
@@ -324,9 +324,9 @@ export default {
       })
     },
     pullPerfPeriodHandle(currentPeriod) {
-      this.$confirm('Confirm to pull performance sheet for the current period?', 'Hint', { // '确定对当前期进行生成业绩单操作?', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.pullPerformanceSheetHint'), this.$t('common.hint'), { // '确定对当前期进行生成业绩单操作?', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchPullPerfPeriod(currentPeriod)
@@ -343,9 +343,9 @@ export default {
       })
     },
     calcBonusHandle(currentPeriod) {
-      this.$confirm('Confirm to calculate bonus data for the current period?', 'Hint', { // '确定对当前期进行生成业绩单操作?', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.calculateBonusDataHint'), this.$t('common.hint'), { // '确定对当前期进行生成业绩单操作?', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchCalcBonus(currentPeriod)
@@ -362,9 +362,9 @@ export default {
      })
     },
     calcBonusRecordHandle(currentPeriod) {
-      this.$confirm('Confirm to sync calculate bonus record for the current period?', 'Hint', { // '确定对当前期进行生成业绩单操作?', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.syncCalculateBonusRecordHint'), this.$t('common.hint'), { // '确定对当前期进行生成业绩单操作?', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
          return fetchSyncCalcRecord(currentPeriod)
@@ -381,9 +381,9 @@ export default {
       })
     },
     pullBonusHandle(currentPeriod) {
-      this.$confirm('Confirm to calculate bonus data for the current period?', 'Hint', { // '确定对当前期进行生成业绩单操作?', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.calculateBonusDataHint'), this.$t('common.hint'), { // '确定对当前期进行生成业绩单操作?', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchPullBonus(currentPeriod)
@@ -400,9 +400,9 @@ export default {
       })
     },
     // trialCalcHandle (currentPeriod) {
-    //   this.$confirm('Confirm to calculate bonus data for the current period?', 'Hint', { // '确定对当前期进行生成业绩单操作?', '提示'
-    //     confirmButtonText: 'confirm', // 确定
-    //     cancelButtonText: 'cancel', // 取消
+    //   this.$confirm('Confirm to calculate bonus data for the current period?', this.$t('common.hint'), { // '确定对当前期进行生成业绩单操作?', '提示'
+    //     confirmButtonText: this.$t('common.confirm'), // 确定
+    //     cancelButtonText: this.$t('cancel'), // 取消
     //     type: 'warning'
     //   }).then(() => {
     //     return network.getData(`calc/trial-calc/${currentPeriod}`)
@@ -429,9 +429,9 @@ export default {
     },
 
     closeHandle (row) {
-      this.$confirm('Confirm to manually seal the current period?', 'Hint', { // '确定对当前期进行手动封期操作?', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.manuallySealHint'), this.$t('common.hint'), { // '确定对当前期进行手动封期操作?', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
          return fetchClosePeriod(row.PERIOD_NUM)
@@ -448,9 +448,9 @@ export default {
       })
     },
     calcHandle (row) {
-      this.$confirm('Confirm to perform settlement operation for the current period?', 'Hint', { // '确定对当前期进行结算操作?', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.performSettlementOperationHint'), this.$t('common.hint'), { // '确定对当前期进行结算操作?', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchCalcPeriod(row.PERIOD_NUM)
@@ -467,9 +467,9 @@ export default {
      })
     },
     perfHandle (row) {
-      this.$confirm('Confirm to generate performance sheet for the current period?', 'Hint', { // '确定对当前期进行生成业绩单操作?', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.generatePerformanceSheetHint'), this.$t('common.hint'), { // '确定对当前期进行生成业绩单操作?', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchPerfPeriod(row.PERIOD_NUM)
@@ -486,9 +486,9 @@ export default {
      })
     },
     sentHandle (row) {
-      this.$confirm('Are you sure to connect the current period? Performance sheet and settlement cannot be generated after network connection', 'Hint', { // '确定对当前期进行挂网操作?挂网后无法生成业绩单和结算', '提示'
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.spreadNetHint'), this.$t('common.hint'), { // '确定对当前期进行挂网操作?挂网后无法生成业绩单和结算', '提示'
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
         return fetchSendPeriod(row.PERIOD_NUM)
@@ -505,9 +505,9 @@ export default {
       })
     },
     doAutoWithdraw () {
-      this.$confirm('全部提现?', 'Hint', {
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+      this.$confirm(this.$t('bonus.allWithdrawalHint'), this.$t('common.hint'), {
+        confirmButtonText: this.$t('common.confirm'), // 确定
+        cancelButtonText: this.$t('cancel'), // 取消
         type: 'warning'
       }).then(() => {
         //return network.getData(`bonus/auto-withdraw`)