From 1752dc60cced88ff7fc1b1e652769161ac54fa3c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 11 九月 2025 11:04:16 +0800
Subject: [PATCH] 修复替换流程bug
---
src/views/wel/shemi.vue | 5 ++---
src/views/flow/donelist.vue | 2 +-
src/views/flow/components/TodolistLeft.vue | 10 +++++++++-
src/views/flow/todolist.vue | 6 +++++-
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/views/flow/components/TodolistLeft.vue b/src/views/flow/components/TodolistLeft.vue
index 4df7fae..5fe03fe 100644
--- a/src/views/flow/components/TodolistLeft.vue
+++ b/src/views/flow/components/TodolistLeft.vue
@@ -31,9 +31,17 @@
<div style="display: flex;align-items: center;">
<span style="margin-right: 8px;">{{ row.name }}</span>
<el-icon v-if="row.fileType === 'other'">
+ <el-tooltip class="box-item" effect="light" content="鍏朵粬鏂囦欢" placement="right">
<FolderOpened />
+ </el-tooltip>
</el-icon>
- <img v-else src="./app.jpg" alt="" width="16" height="16">
+ <el-icon v-if="row.fileType === 'program'">
+ <el-tooltip class="box-item" effect="light" content="绋嬪簭鏂囦欢" placement="right">
+ <Tickets/>
+ </el-tooltip>
+ </el-icon>
+
+ <!--<img v-else src="./app.jpg" alt="" width="16" height="16">-->
</div>
</template>
</el-table-column>
diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index 2cd3bb5..f1c7fe1 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -211,7 +211,7 @@
{
label: '鐘舵��',
prop: 'status',
- //cleerable:true,
+ hide: true,
search: true,
type: 'select',
dicData: [
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 8c2579a..358189e 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -522,7 +522,11 @@
if (["approveTask", 'seniorApproveTask','replaceApprove','appendApproveTask'].includes(row.taskDefinitionKey)) {
//瀹℃壒鑺傜偣锛屼笉閫氳繃缁欑紪鍒讹細缂栧埗鏄矗浠讳汉锛岀粰瀹為檯缂栫▼鍛�
- this.formApprove.assignee = row.variables.actProgrammer;//缁欏疄闄呯紪绋嬪憳
+ if(row.variables.actProgrammer){
+ this.formApprove.assignee = row.variables.actProgrammer;//缁欏疄闄呯紪绋嬪憳
+ }else{
+ this.formApprove.assignee = row.variables.programmer;//鏃犵紪绋嬪憳缁欎富绠″伐鑹�
+ }
}else if(['unlockApproveTask'].includes(row.taskDefinitionKey)){
//瑙ｉ攣楂樺笀瀹℃壒鑺傜偣,涓婁竴姝ユ槸缂栫▼
this.formApprove.assignee = row.variables.programmer;//缁欎富绠″伐鑹�
diff --git a/src/views/wel/shemi.vue b/src/views/wel/shemi.vue
index b214f69..724e174 100644
--- a/src/views/wel/shemi.vue
+++ b/src/views/wel/shemi.vue
@@ -43,8 +43,7 @@
<template #name="{ row }">
<span>{{ row.name }}</span>
- <!-- 鏇挎崲 v-if="permission.auto_dispatch" icon="el-icon-unlock"-->
- <el-button class="treebtn" :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
+ <el-button class="treebtn" :size="size" text v-if="permission.replace_button && row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
icon="el-icon-switch" type="primary" @click="replacement(row)" placeholder="鏇挎崲" title="鏇挎崲"></el-button>
<!---->
<el-button icon="el-icon-unlock" class="treebtn" v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked != 1"text type="primary" @click="showLockDlg(row)" placeholder="閿佸畾" title="閿佸畾"></el-button>
@@ -102,7 +101,7 @@
<span>{{ row.name }}</span>
<!-- 鏇挎崲 v-if="permission.auto_dispatch"-->
- <el-button class="treebtn" :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
+ <el-button class="treebtn" :size="size" text v-if="permission.replace_button && row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
icon="el-icon-switch" type="primary" @click="replacement(row)" placeholder="鏇挎崲" title="鏇挎崲"></el-button>
<el-button class="treebtn" :size="size" text
v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked != 1"
--
Gitblit v1.9.3