Merge branch 'feature/NG-74' of ssh://16.162.42.175:8013/guanli/ngds-backend-ele into feature/NG-74

src/lang/en.js

@@ -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,7 +208,7 @@ export default {
     RMarketBalancePerformance: '二市场结余业绩',
     confirmAndReviseMemberPerformance: '确认修改会员业绩?',
     periodNo: '期数',
-    bonusMonth: '所在结算月',
+    bonusMonth: '结算月',
     timeframe: '时间范围',
     closingTime: '封期时间',
     timeOfGeneratingPerformanceSheet: '生成业绩单时间',
@@ -223,7 +223,7 @@ export default {
     initializeBasicData: '初始化基础数据',
     generationPeriodPerformance: '生成期业绩',
     pullPeriodPerformance: '拉取期业绩',
-    calculationOfBonus: '计算奖金',
+    calculationOfBonus: '计算',
     pullBonusData: '拉取奖金数据',
     bulkWithdrawal: '批量提现',
     periodNum: '期数',

src/views/bonus/period.vue

@@ -12,101 +12,36 @@
             <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')" width="110"><!-- 结算月 -->
           <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">&lt;!&ndash; 封期时间 &ndash;&gt;-->
-<!--          <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">&lt;!&ndash; 生成业绩单时间 &ndash;&gt;-->
-<!--          <template slot-scope="scope">-->
-<!--            &lt;!&ndash; 开始 &ndash;&gt;{{ $t('bonus.start') }}：{{getWatTime(scope.row.PERF_STARTED_AT)}}<br>-->
-<!--            &lt;!&ndash; 完成 &ndash;&gt;{{ $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"><!-- 结算时间 -->
           <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"><!-- 挂网时间 -->
           <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=""><!-- 操作 -->
           <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')}}&lt;!&ndash; 封期 &ndash;&gt;-->
-<!--            </el-button>-->
 
             <!-- 计算 -->
-            <el-button v-if="scope.row.IS_CAN_CALC" class="button" type="primary" @click.native="calcHandle(scope.row.PERIOD_NUM)">{{ $t('bonus.calculationOfBonus') }}</el-button>
+            <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="primary" class="button" v-if="scope.row.IS_CAN_SENT && permission.hasPermission(`bonus/send-period`)">
+            <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="primary" @click.native="getDialogData(scope.row.PERIOD_NUM);dialogLoading=true;" >{{$t('bonus.logRefresh')}}</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-button v-if="scope.row.IS_SHOW_LOG" class="button" type="info" size="small" @click.native="getDialogData(scope.row.PERIOD_NUM);dialogLoading=true;" >{{$t('bonus.logRefresh')}}</el-button>
 
 <!--                  <el-row><el-button class="button" type="primary" @click.native="autoPerfHandle(currentPeriod)" >计算和拉取期业绩</el-button></el-row>-->
 <!--                <div>-->
@@ -121,37 +56,6 @@
 <!--              </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>-->
           </template>
         </el-table-column>
       </el-table>
@@ -216,15 +120,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: {