From ddc3b70ddf5afef265fbf0079f23d26a8be832d2 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 6 Jul 2024 15:46:22 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=BB=E6=AC=A1=E8=B4=A6=E5=8F=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA,=20=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/detail.vue                     |  1 +
 src/views/workflow/common/OperationRender.vue | 26 ++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue
index fb95612..6aaeb41 100644
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -37,6 +37,7 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
+          <el-table-column prop="departmentName" label="承办部门" align="center"/>
           <el-table-column prop="investmentType" label="出资类型" align="center">
             <template #default="scope">
               <div v-if="scope.row.investmentType !== null">
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index 78c987c..7611fb9 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -12,11 +12,18 @@
             当前节点: {{ operation.operationName }}
           </div>
           <div class="card">
-            <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name" :style="{'flex-direction': isColumn?'column':'row'}">
+            <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name"
+                 :style="{'flex-direction': isColumn?'column':'row'}">
               <div class="avatar-block" :style="{'margin-bottom': isColumn?'10px':'0'}">
                 <name-circle :user="user"/>
                 <div class="name">
-                  <span>{{ user.name }}</span>
+                  <div style="display: flex;align-items: center">
+                    <el-icon :color="user.accountType==='0'?'#95d475':user.accountType==null?'#95d475':'#409eff'"
+                             style="margin-right: 5px;">
+                      <UserFilled/>
+                    </el-icon>
+                    <span class="name-style">{{ user.name }}</span>
+                  </div>
                   <span>{{ user.jobActivityDesc }}</span>
                 </div>
               </div>
@@ -67,7 +74,7 @@ const props = defineProps({
   },
   isColumn: {
     type: Boolean,
-    default:false
+    default: false
   }
 })
 
@@ -295,20 +302,21 @@ init()
       border-bottom: none;
     }
 
-   .avatar-block {
+    .avatar-block {
       display: flex;
 
-     .name {
-        width:130px;
+      .name {
+        width: 130px;
         display: flex;
         flex-direction: column;
         margin-left: 10px;
-       margin-right: 20px;
+        margin-right: 20px;
 
-        > span:first-child {
+        .name-style{
           color: #2a99ff;
         }
-        >span:last-child{
+
+        > span:last-child {
           margin-top: 5px;
           color: #909399;
         }