From 2781142ab67deba83925da706ca26b7f8ea1a759 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 04 九月 2025 15:42:24 +0800
Subject: [PATCH] 审批用户列表改为树形
---
src/views/flow/components/TodolistLeft.vue | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/views/flow/components/TodolistLeft.vue b/src/views/flow/components/TodolistLeft.vue
index 31df16b..6016d67 100644
--- a/src/views/flow/components/TodolistLeft.vue
+++ b/src/views/flow/components/TodolistLeft.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2025-07-01 20:45:15
* @LastEditors: gaoshp
- * @LastEditTime: 2025-08-27 20:40:57
+ * @LastEditTime: 2025-08-27 20:48:41
* @FilePath: /mdmweb/src/views/flow/components/TodolistLeft.vue
-->
<template>
@@ -11,8 +11,10 @@
<el-button type="primary" plain @click="addApp">娣诲姞鏂囦欢
</el-button>
</div>
- <el-text type="danger" v-if="row.variables.curedLocked === 'Y'">鍥哄寲绋嬪簭宸插姞閿侊紝璇疯皑鎱庝娇鐢�</el-text>
- <el-table :data="tableData" border @row-click="showContent" max-height="200" highlight-current-row>
+ <el-text type="danger" v-if="row.variables.curedLocked === 'Y'">鍥哄寲绋嬪簭宸查攣瀹氾紝璇疯皑鎱庝娇鐢ㄣ�傞攣瀹氬師鍥狅細{{ remark }}</el-text>
+ <el-text type="danger" v-if="row.processDefinitionKey === 'program-unlock'">绋嬪簭宸查攣瀹氾紝閿佸畾鍘熷洜锛歿{ remark }}</el-text>
+ <el-text type="danger" v-if="row.variables.hasCuredProgram==='Y' && row.variables.isProcessEditionSame=='N' && row.variables.cureProgramUseable==undefined">宸插浐鍖栫▼搴忓伐搴忕増娆′笉涓�鑷达紝娲惧伐鐗堟:{{row.variables.processEdition}},宸插浐鍖栫増娆★細{{row.variables.curedProcessEdition}}</el-text>
+ <el-table :data="tableData" border @row-click="showContent" :row-style="{height:'20px'}" :cell-style="{padding:'0px'}" max-height="240" highlight-current-row>
<!-- <el-table-column prop="machineCode" label="鍔犲伐鏈哄簥">
</el-table-column> -->
@@ -42,9 +44,9 @@
</template>
</el-table-column>
</el-table>
- <h4>闆剁粍浠跺彿: {{row.variables.drawingNo}} 宸ュ簭鍙�: {{row.variables.processNo }} 宸ュ簭鐗堟: {{ row.variables.processEdition }}</h4>
+ <!--
<el-collapse>
- <el-collapse-item title="鏂囦欢" name="1">
+ <el-collapse-item :title="`鍥哄寲鏃х増鏈�: 闆剁粍浠跺彿: ${row.variables.drawingNo} 宸ュ簭鍙�: ${row.variables.processNo } 宸ュ簭鐗堟: ${ row.variables.processEdition }`" name="1">
<el-table :data="fileData" border @row-click="showContent" max-height="200" highlight-current-row>
<el-table-column type="index" label="#" width="40" align="center" />
<el-table-column prop="name" label="鏂囦欢鍚�">
@@ -63,7 +65,7 @@
</el-table>
</el-collapse-item>
</el-collapse>
-
+ -->
<h4>绋嬪簭鍐呭</h4>
<div v-html="appContent" class="app-content">
</div>
@@ -82,7 +84,7 @@
</template>
<script>
-import { getAppList,getFileData, getSelectedAppList, getContent, removeAtt } from '@/api/flow/todolist';
+import { getAppList,getFileData, getSelectedAppList, getContent, removeAtt,queryLockRemark } from '@/api/flow/todolist';
import { exportBlob } from '@/api/common';
import { getToken } from '@/utils/auth';
import NProgress from 'nprogress';
@@ -107,7 +109,7 @@
content1: '',
content2: '',
codeDiffFileName1: '鍥炰紶鐗堟湰',
- codeDiffFileName2: '璇曞垏鐗堟湰',
+ codeDiffFileName2: '涓嬪彂鐗堟湰',
showContentId: '',
attForm: {
att: '',
@@ -187,11 +189,14 @@
// },
],
},
+
+ remark:'',//閿佸畾鍘熷洜
}
},
mounted() {
this.getAttList();
this.getFileData();
+ this.getLockRemark();//鑾峰彇閿佸畾鍘熷洜
this.onLoad(this.page);
},
@@ -206,6 +211,22 @@
}
})
},
+ getLockRemark () {
+ //鑾峰彇閿佸畾鍘熷洜
+ let nodeId = this.row.variables.nodeId;
+ if(!nodeId){
+ nodeId = this.row.variables.curedNodeId;
+ }
+ if(nodeId){
+ queryLockRemark(nodeId).then(res => {
+ if (res.data.code == 200) {
+ this.remark = res.data.data || '';
+ } else {
+ this.remark = '';
+ }
+ });
+ }
+ },
diffFile(index, row) {
console.log(row)
axios({
--
Gitblit v1.9.3