Просмотр исходного кода

feat: NG-74: 调整奖金计算页面.

kevin 1 год назад
Родитель
Сommit
066192826b
1 измененных файлов с 16 добавлено и 22 удалено
  1. 16 22
      src/views/bonus/period.vue

+ 16 - 22
src/views/bonus/period.vue

@@ -7,31 +7,31 @@
       </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_MONTH }}
             </el-tag>
           </template>
         </el-table-column>
 
-        <el-table-column :label="$t('bonus.settlementDate')" width="230"><!-- 结算时间 -->
+        <el-table-column :label="$t('bonus.settlementDate')"><!-- 结算时间 -->
           <template slot-scope="scope">
             {{ getWatTime(scope.row.CALCULATED_AT) }}
           </template>
         </el-table-column>
 
-        <el-table-column :label="$t('bonus.networkConnectionTime')" width="230"><!-- 挂网时间 -->
+        <el-table-column :label="$t('bonus.networkConnectionTime')"><!-- 挂网时间 -->
           <template slot-scope="scope">
             {{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">
 
             <!-- 计算 -->
@@ -41,21 +41,7 @@
               {{ $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);dialogLoading=true;" >{{$t('bonus.logRefresh')}}</el-button>
-
-<!--                  <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-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>
@@ -66,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>
 
@@ -131,7 +125,7 @@ export default {
       dialogData: null,
       currentDialogPage: 1,
       dialogPageSize: 100,
-      dialogLoading: true,
+      dialogLoading: false,
       form: {
         name: '',
         region: '',
@@ -327,7 +321,7 @@ export default {
       }
       fetchRecordList(period, paramsData).then(response => {
         this.dialogData = response.data.list
-        this.dialogLoading = false;
+        this.dialogLoading = true
       })
     },