Merge branch 'feature/NG-74' of guanli/ngds-backend-ele into master

src/api/bonus.js

@@ -230,7 +230,7 @@ export function fetchClosePeriod(query) {
 
 export function fetchCalcPeriod(query) {
   return request({
-    url: '/v1/calc/calc-period/' + query,
+    url: '/v1/bonus/calc-period/' + query,
     method: 'get'
   })
 }

src/components/TreeChart/index.vue

@@ -183,8 +183,6 @@ export default {
               "</span>" +
               '<span style="color: #000000;">' +
               params.data.EMP_LV_NAME +
-              "，" +
-              params.data.CROWN_LV_NAME +
               "</span>" +
               "</div>" +
               "<div>" +

src/lang/en.js

@@ -216,7 +216,7 @@ export default {
     settlementDate: 'Settlement Date',
     networkConnectionTime: 'Network connection time',
     closurePeriod: 'Closure period',
-    logRefresh: 'Log refresh',
+    logRefresh: 'Bonus Log',
     actionTime: 'Operating time(WAT)',
     logContent: 'Log content',
     autoCalculation: 'Automatic calculation',
@@ -224,7 +224,7 @@ export default {
     initializeBasicData: 'Initialize basic data',
     generationPeriodPerformance: 'Generation period performance',
     pullPeriodPerformance: 'Pull period performance',
-    calculationOfBonus: 'Calculate bonus',
+    calculationOfBonus: 'Calculate',
     pullBonusData: 'Pull Bonus Data',
     bulkWithdrawal: 'Batch withdrawal',
     periodNum: 'Number of periods',

src/lang/zh.js

@@ -208,14 +208,14 @@ export default {
     RMarketBalancePerformance: '二市场结余业绩',
     confirmAndReviseMemberPerformance: '确认修改会员业绩?',
     periodNo: '期数',
-    bonusMonth: '所在结算月',
+    bonusMonth: '结算月',
     timeframe: '时间范围',
     closingTime: '封期时间',
     timeOfGeneratingPerformanceSheet: '生成业绩单时间',
     settlementDate: '结算时间',
     networkConnectionTime: '挂网时间',
     closurePeriod: '封期',
-    logRefresh: '日志刷新',
+    logRefresh: '日志',
     actionTime: '操作时间(WAT)',
     logContent: '日志内容',
     autoCalculation: '自动计算',
@@ -223,7 +223,7 @@ export default {
     initializeBasicData: '初始化基础数据',
     generationPeriodPerformance: '生成期业绩',
     pullPeriodPerformance: '拉取期业绩',
-    calculationOfBonus: '计算奖金',
+    calculationOfBonus: '计算',
     pullBonusData: '拉取奖金数据',
     bulkWithdrawal: '批量提现',
     periodNum: '期数',

src/views/atlas/relation-opt.vue

@@ -26,8 +26,7 @@
                         <el-tag><!-- 会员编号 -->{{ $t('atlas.memberCode') }}：{{ node.label }}</el-tag>
                         <el-tag type="success">{{ $t('atlas.name') }}<!-- 姓名 -->：{{data.REAL_NAME}}</el-tag>
                         <el-tag type="warning">{{ $t('atlas.level') }}<!-- 级别 -->：{{data.DEC_LV_NAME}}</el-tag>
-                        <el-tag type="warning">{{ $t('atlas.highest') }}：<!-- 聘级 -->{{data.EMP_LV_NAME}}, {{data.CROWN_LV_NAME}}</el-tag>
-  <!--                      <el-tag type="warning">Star：&lt;!&ndash; 星级 &ndash;&gt;{{data.CROWN_LV_NAME}}</el-tag>-->
+                        <el-tag type="warning">{{ $t('atlas.highest') }}：<!-- 聘级 -->{{data.EMP_LV_NAME}}</el-tag>
                       </span>
                   </span>
             </el-tree>
@@ -45,7 +44,7 @@
               </el-input>
               <el-button type="primary" size="small" @click="handleFilter">{{ $t('common.confirm') }}<!-- 确定 --></el-button>
             </div>
-  
+
             <el-table :data="tableData" stripe style="width: 100%;" :height="tool.getTableHeight(true)">
               <!--<el-table-column type="selection" width="55" v-if="tableHeaders"></el-table-column>-->
               <el-table-column v-for="(tableHeader, key) in tableHeaders" :key="key" :label="tableHeader.header" :width="tableHeader.other.width ? tableHeader.other.width : ''">
@@ -84,7 +83,7 @@
       </div>
     </div>
   </template>
-  
+
   <script>
     import tool from '@/utils/tool'
     import store from '@/utils/vuexStore'
@@ -92,7 +91,7 @@
     import Pagination from '@/components/Pagination'
     import baseInfo from '@/utils/baseInfo'
     import { mainUserInfo, getRelation, relationList, relationListExport } from '@/api/atlas'
-  
+
     export default {
       name: 'atlas_relation-opt',
       components: {Pagination},
@@ -286,7 +285,7 @@
       }
     }
   </script>
-  
+
   <style>
     .filter-user{font-size: 14px;margin-bottom: 20px;}
     .filter-user:after{content: '';display: table;
@@ -297,23 +296,23 @@
       font-size: 14px;
       overflow-x: auto;
     }
-  
+
     .el-tree .el-tag {
       height: 20px;
       line-height: 18px;vertical-align: middle;
     }
     .el-tree-node{position: relative;}
-  
+
     .el-tree-node__content {
       height: 30px;
       line-height: 30px;
     }
-  
+
     .el-tree-node__children {
       position: relative;
       padding: 0 0 0 16px;
     }
-  
+
     .el-tree-node:before {
       position: absolute;
       content: '';
@@ -323,16 +322,16 @@
       border-left: 1px solid #ccc;
     }
     .el-tree-node:last-child:before{height: 15px;}
-  
+
     .custom-tree-node {
       position: relative;
       padding-left: 5px;
     }
-  
+
     .first-node:before {
       display: none;
     }
-  
+
     .custom-tree-node:before {
       position: absolute;
       width: 8px;
@@ -341,9 +340,8 @@
       left: -4px;
       border-bottom: 1px solid #ccc;
     }
-  
+
     .el-tree-node__expand-icon {
       display: none !important;
     }
   </style>
-  

src/views/bonus/period.vue

@@ -7,146 +7,41 @@
       </div>
       <el-table :data="tableData" stripe style="width: 100%;" @selection-change="handleSelectionChange"
                 :height="tool.getTableHeight()">
-        <el-table-column prop="PERIOD_NUM" :label="$t('bonus.periodNo')" width="100"><!-- 期数 -->
+        <el-table-column prop="PERIOD_NUM" :label="$t('bonus.periodNo')"><!-- 期数 -->
           <template slot-scope="scope">
             <el-tag type="" size="small" class="no-border">{{scope.row.PERIOD_NUM}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('bonus.bonusMonth')" width="110"><!-- 所在结算月 -->
+
+        <el-table-column :label="$t('bonus.bonusMonth')"><!-- 结算月 -->
           <template slot-scope="scope">
-            <el-tag type="warning" size="small" class="no-border">{{scope.row.CALC_YEAR}}-{{scope.row.CALC_MONTH}}
+            <el-tag type="warning" size="small" class="no-border">{{ scope.row.CALC_YEAR_MONTH }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('bonus.timeframe')" width="260"><!-- 时间范围 -->
-          <template slot-scope="scope">
-            <!-- 应开始于 -->{{ $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"><!-- 封期时间 -->
-          <template slot-scope="scope">
-            {{getWatTime(scope.row.CLOSED_AT)}}
-          </template>
-        </el-table-column>
-<!--        <el-table-column label="Performance sheet progress" width="90">&lt;!&ndash; 业绩单进度 &ndash;&gt;-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-progress type="circle" :percentage="Number.parseInt(percentList['PERF_PERCENT'][scope.row.ID])"-->
-<!--                         :width="50" :stroke-width="3"></el-progress>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-        <el-table-column :label="$t('bonus.timeOfGeneratingPerformanceSheet')" width="230"><!-- 生成业绩单时间 -->
-          <template slot-scope="scope">
-            <!-- 开始 -->{{ $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;-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-progress type="circle" :percentage="Number.parseInt(percentList['CALC_PERCENT'][scope.row.ID])"-->
-<!--                         :width="50" :stroke-width="3"></el-progress>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-        <el-table-column :label="$t('bonus.settlementDate')" width="230"><!-- 结算时间 -->
+
+        <el-table-column :label="$t('bonus.settlementDate')"><!-- 结算时间 -->
           <template slot-scope="scope">
-            <!-- 开始 -->{{ $t('bonus.start') }}：{{getWatTime(scope.row.CALCULATE_STARTED_AT)}}<br>
-            <!-- 完成 -->{{ $t('bonus.complete') }}：{{getWatTime(scope.row.CALCULATED_AT)}}
+            {{ getWatTime(scope.row.CALCULATED_AT) }}
           </template>
         </el-table-column>
-<!--        <el-table-column label="Network connection progress" width="80">&lt;!&ndash; 挂网进度 &ndash;&gt;-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-progress type="circle" :percentage="Number.parseInt(percentList['SENT_PERCENT'][scope.row.ID])"-->
-<!--                         :width="50" :stroke-width="3"></el-progress>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-        <el-table-column :label="$t('bonus.networkConnectionTime')" width="230"><!-- 挂网时间 -->
+
+        <el-table-column :label="$t('bonus.networkConnectionTime')"><!-- 挂网时间 -->
           <template slot-scope="scope">
-            <!-- 开始 -->{{ $t('bonus.start') }}：{{getWatTime(scope.row.SEND_STARTED_AT)}}<br/>
-            <!-- 完成 -->{{ $t('bonus.complete') }}：{{getWatTime(scope.row.SENT_AT)}}
+            {{getWatTime(scope.row.SENT_AT)}}
           </template>
         </el-table-column>
-        <el-table-column :fixed="fixed" :label="$t('common.action')" width=""><!-- 操作 -->
+        <el-table-column :fixed="fixed" :label="$t('common.action')"><!-- 操作 -->
           <template slot-scope="scope">
-<!--            <el-button v-if="scope.row.IS_CAN_CLOSE && permission.hasPermission(`bonus/close-period`)" class="button" type="primary"-->
-<!--                       @click.native="trialCalcHandle(scope.row.PERIOD_NUM)" >-->
-<!--              计算-->
-<!--            </el-button>-->
-            <el-button v-if="(scope.row.IS_CAN_CLOSE || scope.row.IS_CAN_PERF) && permission.hasPermission(`bonus/close-period`)" type="primary" class="button"
-                       @click="dialogTableVisible = true;currentPeriod = scope.row.PERIOD_NUM;getDialogData();">
-              {{$t('common.action')}}</el-button>
-            <el-button style="margin: 0 0 !important;" v-if="scope.row.IS_CAN_CLOSE && permission.hasPermission(`bonus/close-period`)" type="primary" class="button"
-                       @click.native="closeHandle(scope.row)">
-              {{$t('bonus.closurePeriod')}}<!-- 封期 -->
-            </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`)">
-              <!-- 挂网 -->{{ $t('bonus.spreadNet') }}
-            </el-button>
-
-						<el-button  class="button customstyle" style="margin-left:10px;" type="success" @click.native="autoCalcHandle(scope.row.PERIOD_NUM)" v-if="(scope.row.IS_CAN_CLOSE || scope.row.IS_CAN_PERF) && permission.hasPermission(`bonus/auto-calc`) && !permission.hasPermission(`bonus/close-period`)">{{$t('bonus.autoCalculation')}}</el-button>
-
-            <el-dialog :title="$t('bonus.logTitle', { currentPeriod: currentPeriod })" :visible.sync="dialogTableVisible" append-to-body :width="screenWidth">
-              <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" v-if="permission.hasPermission(`bonus/auto-calc`)" style="margin-left:10px;" type="success" @click.native="autoCalcHandle(currentPeriod)">{{$t('bonus.autoCalculation')}}</el-button>
-                <el-button  class="button customstyle" type="primary" @click.native="perfOrderHandle(currentPeriod)" >{{$t('bonus.createPerformanceSheet')}}</el-button>
-                <el-button  class="button customstyle" type="primary" @click.native="initDataHandle(currentPeriod)" >{{$t('bonus.initializeBasicData')}}</el-button>
-                <el-button  class="button customstyle" type="primary" @click.native="perfPeriodHandle(currentPeriod)" >{{$t('bonus.generationPeriodPerformance')}}</el-button>
-                <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-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%">
-                    <el-table-column prop="CREATED_AT" :label="$t('bonus.actionTime')" width="180">
-                      <template slot-scope="scope">
-                        {{getWatTime(scope.row.CREATED_AT)}}
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="TEXT" :label="$t('bonus.logContent')" width="650"></el-table-column>
-                  </el-table>
-              </div>
-            </el-dialog>
-
-<!--            <el-dropdown size="small" trigger="click" v-if=false>-->
-<!--            <el-dropdown size="small" trigger="click" v-if="scope.row.BUTTON_IS_CAN">-->
-<!--              <el-button type="primary" size="small" @click.stop="">-->
-<!--                &lt;!&ndash; 操作该数据 &ndash;&gt;Action<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
-<!--              </el-button>-->
-<!--              <el-dropdown-menu slot="dropdown">-->
-<!--                <el-dropdown-item @click.native="closeHandle(scope.row)"-->
-<!--                                  v-if="scope.row.IS_CAN_CLOSE && permission.hasPermission(`bonus/close-period`)">Closure period&lt;!&ndash; 封期 &ndash;&gt;-->
-<!--                </el-dropdown-item>-->
-<!--                <el-dropdown-item @click.native="perfHandle(scope.row)"-->
-<!--                                  v-if="scope.row.IS_PERFING === '0' && scope.row.IS_CAN_PERF && permission.hasPermission(`bonus/perf-period`)">-->
-<!--                  &lt;!&ndash; 生成业绩单 &ndash;&gt;Generate performance sheet-->
-<!--                </el-dropdown-item>-->
-<!--                <el-dropdown-item @click.native="perfHandle(scope.row)"-->
-<!--                                  v-if="scope.row.IS_PERFING === '1' && scope.row.IS_CAN_PERF && permission.hasPermission(`bonus/perf-period`)">-->
-<!--                  &lt;!&ndash; 强制生成业绩单 &ndash;&gt;Forced generation of performance sheet-->
-<!--                </el-dropdown-item>-->
-<!--                <el-dropdown-item @click.native="calcHandle(scope.row)"-->
-<!--                                  v-if="scope.row.IS_CALCING === '0' && scope.row.IS_CAN_CALC && permission.hasPermission(`bonus/calc-period`)">-->
-<!--                  &lt;!&ndash; 结算 &ndash;&gt;settlement-->
-<!--                </el-dropdown-item>-->
-<!--                <el-dropdown-item @click.native="calcHandle(scope.row)"-->
-<!--                                  v-if="scope.row.IS_CALCING === '1' && scope.row.IS_CAN_CALC && permission.hasPermission(`bonus/calc-period`)">-->
-<!--                  &lt;!&ndash; 强制结算 &ndash;&gt;Forced settlement-->
-<!--                </el-dropdown-item>-->
-<!--                <el-dropdown-item @click.native="sentHandle(scope.row)"-->
-<!--                                  v-if="scope.row.IS_CAN_SENT && permission.hasPermission(`bonus/send-period`)">-->
-<!--                  &lt;!&ndash; 挂网 &ndash;&gt;spread a net-->
-<!--                </el-dropdown-item>-->
-<!--              </el-dropdown-menu>-->
-<!--            </el-dropdown>-->
+            <!-- 计算 -->
+            <el-button v-if="scope.row.IS_CAN_CALC" class="button" type="primary" size="small" @click.native="calcHandle(scope.row.PERIOD_NUM)">{{ $t('bonus.calculationOfBonus') }}</el-button>
+            <!-- 挂网 -->
+            <el-button @click.native="sentHandle(scope.row)" type="danger" class="button" size="small" v-if="scope.row.IS_CAN_SENT && permission.hasPermission(`bonus/send-period`)">
+              {{ $t('bonus.spreadNet') }}
+            </el-button>
+            <!-- 日志 -->
+            <el-button v-if="scope.row.IS_SHOW_LOG" class="button" type="info" size="small" @click.native="getDialogData(scope.row.PERIOD_NUM)" >{{$t('bonus.logRefresh')}}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -157,6 +52,14 @@
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
+
+    <el-dialog title="dialog" :visible.sync="dialogLoading" top="0">
+      <el-table :data="dialogData" stripe size="small">
+        <el-table-column property="CREATE_TIME" label="日期"></el-table-column>
+        <el-table-column property="TEXT" label="内容"></el-table-column>
+      </el-table>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -211,15 +114,6 @@ export default {
         'periodNum': {isUserTable: false, name: this.$t('bonus.periodNum')}, // 期数
         'year': {isUserTable: false, name: this.$t('bonus.year')}, // 所在结算年
         'month': {isUserTable: false, name: this.$t('bonus.month')}, // 所在结算月
-        'startTime': {isUserTable: false, name: this.$t('bonus.startTime'), other: 'date'}, // 期数开始时间
-        'endTime': {isUserTable: false, name: this.$t('bonus.endTime'), other: 'date'}, // 期数结束时间
-        'closedAt': {isUserTable: false, name: this.$t('bonus.closedAt'), other: 'date'}, // 封期时间
-        'perfStartedAt': {isUserTable: false, name: this.$t('bonus.perfStartedAt'), other: 'date'}, // 生成业绩单开始时间
-        'perfedAt': {isUserTable: false, name: this.$t('bonus.perfedAt'), other: 'date'}, // 生成业绩单结束时间
-        'calStartedAt': {isUserTable: false, name: this.$t('bonus.calStartedAt'), other: 'date'}, // 结算开始时间
-        'calculatedAt': {isUserTable: false, name: this.$t('bonus.calculatedAt'), other: 'date'}, // 结算结束时间
-        'sendStartedAt': {isUserTable: false, name: this.$t('bonus.sendStartedAt'), other: 'date'}, // 挂网开始时间
-        'sentAt': {isUserTable: false, name: this.$t('bonus.sentAt'), other: 'date'} // 挂网结束时间
       },
       filterModel: {},
       percentList: {
@@ -231,7 +125,7 @@ export default {
       dialogData: null,
       currentDialogPage: 1,
       dialogPageSize: 100,
-      dialogLoading: true,
+      dialogLoading: false,
       form: {
         name: '',
         region: '',
@@ -420,15 +314,14 @@ export default {
     //   })
     // },
 
-    getDialogData () {
-      let vueObj = this
+    getDialogData (period) {
       let paramsData = {
         page: this.currentDialogPage,
         pageSize: this.dialogPageSize,
       }
-      fetchRecordList(this.currentPeriod,paramsData).then(response => {
+      fetchRecordList(period, paramsData).then(response => {
         this.dialogData = response.data.list
-        this.dialogLoading = false;
+        this.dialogLoading = true
       })
     },
 
@@ -451,13 +344,13 @@ export default {
           }
       })
     },
-    calcHandle (row) {
+    calcHandle (period) {
       this.$confirm(this.$t('bonus.performSettlementOperationHint'), this.$t('common.hint'), { // '确定对当前期进行结算操作？', '提示'
         confirmButtonText: this.$t('common.confirm'), // 确定
         cancelButtonText: this.$t('common.cancel'), // 取消
         type: 'warning'
       }).then(() => {
-        return fetchCalcPeriod(row.PERIOD_NUM)
+        return fetchCalcPeriod(period)
       }).then(response => {
         this.$message({
           message: response.data,

src/views/config/bonus-config.vue

@@ -4,7 +4,7 @@
       <div class="panel-heading">{{ $t('config.baseConfig') }}</div>
       <div class="panel-wrapper">
         <div class="panel-body">
-          <el-form ref="form" :model="form" label-width="250px" :label-position="labelPosition">
+          <el-form ref="form" :model="form" label-width="265px" :label-position="labelPosition">
             <template v-for="item in configData">
               <div v-if="item.SORT==='101'" class="hr-tip"><span>{{ $t('config.repeatAbout') }}</span></div>
               <el-form-item :key="item.CONFIG_NAME" :label="item.TITLE">
@@ -67,7 +67,7 @@
       </div>
     </div>
 
-    <div v-if="permission.hasPermission(`config/bonus-dec-level`)" class="panel">
+    <div v-if="false" class="panel">
       <div class="panel-heading">{{ $t('config.teamBonusConfig') }}</div>
       <div class="panel-wrapper">
         <div class="panel-body">
@@ -95,7 +95,7 @@
       </div>
     </div>
 
-    <div v-if="permission.hasPermission(`config/bonus-emp-level`)" class="panel">
+    <div v-if="false" class="panel">
       <div class="panel-heading">{{ $t('config.manageStarConfig') }}</div>
       <div class="panel-wrapper">
         <div class="panel-body">
@@ -145,7 +145,7 @@
       </div>
     </div>
 
-    <div v-if="permission.hasPermission(`config/bonus-star-level`)" class="panel">
+    <div v-if="false" class="panel">
       <div class="panel-heading">{{ $t('config.crownStarConfig') }}</div>
       <div class="panel-wrapper">
         <div class="panel-body">
@@ -243,9 +243,9 @@ export default {
       this.loading = true
       fetchBonusConfig().then(response => {
         this.configData = response.data.config
-        this.decLevelTableData = Object.values(response.data.decLevel)
-        this.empLevelTableData = Object.values(response.data.empLevel)
-        this.crownLevelTableData = Object.values(response.data.crownLevel)
+        // this.decLevelTableData = Object.values(response.data.decLevel)
+        // this.empLevelTableData = Object.values(response.data.empLevel)
+        // this.crownLevelTableData = Object.values(response.data.crownLevel)
 
         setTimeout(() => {
           this.loading = false