From aaedb362b51db4001015a380d8166417a3be006b Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sun, 12 May 2024 15:14:39 +0800
Subject: [PATCH] =?UTF-8?q?build=20:=20=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectdemand/demandcollection/detail.vue |  2 +-
 .../projectdemand/demandcollection/index.vue  | 27 ++++++++++++++-----
 src/views/workflow/process/nodes/Node.vue     |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index eb0781f..1c0047e 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -68,7 +68,7 @@
       <!--        </el-col>-->
       <!--      </el-row>-->
     </el-form>
-    <div class="oper-page-btn" v-if="processInstanceData.taskId">
+    <div class="oper-page-btn" v-if="processInstanceData.state === '1' && processInstanceData.taskId">
       <el-button @click="handleReject">驳回</el-button>
       <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
     </div>
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
index a4bfb44..aa63a86 100644
--- a/src/views/projectdemand/demandcollection/index.vue
+++ b/src/views/projectdemand/demandcollection/index.vue
@@ -71,7 +71,7 @@ const tableConfig = reactive({
       prop: 'state',
       label: '状态',
       align: 'center',
-      width:200,
+      width: 200,
       showOverflowTooltip: false,
       currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
     },
@@ -81,12 +81,27 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
+        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
+        if (row.state === '3' || row.state === '2') {
+          btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '删除', func: () => handleDel(row), type: 'danger'})
+        }else if (row.state === '4'){
+          btn.push({label: '上报', func: () => handleReport(row), type: 'primary'})
+        }
         return (
-            <div>
-              <el-button type="primary" link onClick={() => handleDetail(row)}>详情
-              </el-button>
-              <el-button type="primary" link onClick={() => handleEdit(row)}>编辑</el-button>
-              <el-button type="primary" link onClick={() => handleReport(row)}>上报</el-button>
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        // v-perm={item.auth}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
             </div>
         )
       }
diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue
index 36acd65..ef615b6 100644
--- a/src/views/workflow/process/nodes/Node.vue
+++ b/src/views/workflow/process/nodes/Node.vue
@@ -24,7 +24,7 @@
         <template v-else-if="showAvatar">
           <span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
 
-          <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :mode="mode" :user-info="userInfo"/>
+          <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo"/>
 
 
 <!--          <div v-else v-for="item in userInfo" class="circle-user">-->