From a62913ee6cb41763b5669de43ae318e19b046803 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 25 Oct 2022 16:06:36 +0800
Subject: [PATCH] bug

---
 .../app/AppRatingTask/components/Detail.vue   |  2 +-
 .../AppRatingTask/components/FormDetail.vue   | 35 ++++++++++++++++---
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/project/hlj/app/AppRatingTask/components/Detail.vue b/project/hlj/app/AppRatingTask/components/Detail.vue
index f1ec3152..49a28139 100644
--- a/project/hlj/app/AppRatingTask/components/Detail.vue
+++ b/project/hlj/app/AppRatingTask/components/Detail.vue
@@ -144,7 +144,7 @@
             label: '开始结束时间',
             render: (h, {row}) => {
               return h('span', {
-              }, `${row.beginTime.split(' ')[0]} - ${row.endTime.split(' ')[0]}`)
+              }, `${row.beginTime} - ${row.endTime}`)
             }
           },
           {
diff --git a/project/hlj/app/AppRatingTask/components/FormDetail.vue b/project/hlj/app/AppRatingTask/components/FormDetail.vue
index 4de59ec5..938e6ac2 100644
--- a/project/hlj/app/AppRatingTask/components/FormDetail.vue
+++ b/project/hlj/app/AppRatingTask/components/FormDetail.vue
@@ -67,11 +67,19 @@
                 :current.sync="search1.current"
                 :size.sync="search1.size"
                 @getList="getList1">
-                <el-table-column slot="user" label="成员" align="left">
+                <el-table-column slot="evaluators" label="参评人" align="left">
                   <template slot-scope="{ row }">
                     <div class="userinfo">
-                      <span>{{ row.groupOwnerName }}</span>
-                      <span style="color: #999">{{ row.mainDepartmentName }}</span>
+                      <img :src="row.evaluatorsAvatar" />
+                      <span>{{ row.evaluatorsName }}</span>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column slot="score" label="评分人" align="center">
+                  <template slot-scope="{ row }">
+                    <div class="userinfo" style="padding-left: 80px">
+                      <img :src="row.scorerAvatar" />
+                      <span>{{ row.scorerName }}</span>
                     </div>
                   </template>
                 </el-table-column>
@@ -152,8 +160,8 @@
         info: {},
         currIndex: 0,
         colConfigs1: [
-          { prop: 'evaluatorsName', label: '参评人', align: 'center' },
-          { prop: 'scorerName', label: '评分人', align: 'center' },
+          { slot: 'evaluators', label: '参评人', align: 'center' },
+          { slot: 'score', label: '评分人', align: 'center' },
           { prop: 'commitTime', label: '提交时间', align: 'center' },
           { prop: 'totalScore', label: '总分', align: 'center' }
         ],
@@ -233,6 +241,23 @@
 
 <style scoped lang="scss">
 .AppAnnounceDetail {
+  .userinfo {
+    display: flex;
+    align-items: center;
+    line-height: 1;
+
+    img {
+      width: 40px;
+      height: 40px;
+      margin-right: 10px;
+    }
+
+    span {
+      color: #333;
+      font-size: 14px;
+    }
+  }
+
   ::v-deep .AppAnnounceDetail-title {
     display: flex;
     align-items: center;