From 932380ab19711c3ed01034aeab410deffeb767f3 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 1 Sep 2020 18:34:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/result/record/lzresultrecordapp.vue  |  1 +
 src/views/modules/result/record/recorddetail.vue | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue
index a645c36..0952185 100644
--- a/src/views/modules/result/record/lzresultrecordapp.vue
+++ b/src/views/modules/result/record/lzresultrecordapp.vue
@@ -111,6 +111,7 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column prop="currentApprovalStaffName" header-align="center" align="center" label="审批人"></el-table-column>
         <el-table-column prop="lastScore" header-align="center" align="center" label="最后得分"></el-table-column>
         <el-table-column prop="allScore" header-align="center" align="center" label="总分"></el-table-column>
         <el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue
index cf72e00..7cbdb87 100644
--- a/src/views/modules/result/record/recorddetail.vue
+++ b/src/views/modules/result/record/recorddetail.vue
@@ -28,23 +28,23 @@
 
         <div class="titleBottom">
           <div class="bottom" v-show="this.auth.commit == 1" >
-            <p><span style="cursor: pointer" @click="commitApprovalYes('你确认要提交审批吗？')">提交审批</span></p>
+            <p> <el-button type="primary" @click="commitApprovalYes('你确认要提交审批吗？')">提交审批</el-button></p>
           </div>
 
           <div class="bottom" v-show="this.auth.approvel == 1">
             <p>
-              <span  @click="commitApprovalAddOrUpdate(1)">
-                <label :class="'label bg-order my_pointer'">审批</label>
-              </span>
+              <el-button type="primary"  @click="commitApprovalAddOrUpdate(1)">
+                <label >审批</label>
+              </el-button>
             </p>
           </div>
 
           <div class="bottom" v-show="this.auth.confirmCommit == 1">
-            <p><span style="" @click="commitApprovalYes('你要确认得分吗？')">确认得分</span></p>
+            <p><el-button type="primary" style="" @click="commitApprovalYes('你要确认得分吗？')">确认得分</el-button></p>
           </div>
 
           <div class="bottom" v-show="this.auth.reject === 1">
-            <p><span  @click="commitApprovalAddOrUpdate(5)" ><label :class="'label bg-danger my_pointer'">驳回</label></span></p>
+            <p><el-button type="warning"  @click="commitApprovalAddOrUpdate(5)" ><label >驳回</label></el-button></p>
           </div>
 
           <div class="bottom" v-show="this.auth.uploadFile === 1 ">
@@ -387,7 +387,7 @@ export default {
         } else if (columnIndex === 1) {
           return [1, 1]
         } else if (columnIndex === 2) {
-          return [1, 7]
+          return [1, 9]
         } else {
           return [0, 0]
         }
@@ -526,7 +526,7 @@ export default {
         font-weight:bold;
         font-size:14px;
         color:#7266ba;
-        height: 30px;
+        height: 50px;
 
         .bottom{
           float: right;