From 00b58c85949c809a209a895c66f113d78eb10174 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 03 九月 2025 17:04:16 +0800
Subject: [PATCH] 增加车床程序处理；退回改为实际编程员
---
src/views/flow/components/TodolistLeft.vue | 2 +-
src/views/flow/todolist.vue | 21 +++++++++++++++++----
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/views/flow/components/TodolistLeft.vue b/src/views/flow/components/TodolistLeft.vue
index a195b40..b98283e 100644
--- a/src/views/flow/components/TodolistLeft.vue
+++ b/src/views/flow/components/TodolistLeft.vue
@@ -14,7 +14,7 @@
<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" max-height="200" highlight-current-row>
+ <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> -->
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index c995284..c207d0d 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -221,6 +221,7 @@
label: '鏈哄簥',
width: 100,
prop: '',
+
formatter: (val, value, label) => {
return `${val?.variables?.machineCode}`;
},
@@ -260,11 +261,15 @@
label: '鏂囦欢',
width: 200,
prop: 'file',
+ showOverflowTooltip:true,
},
{
label: '鍒拌揪鏃堕棿',
width: 120,
prop: 'createTime',
+ showOverflowTooltip:true,
+
+
},
{
label: '鍒拌揪鎻忚堪',
@@ -457,11 +462,13 @@
this.optionApprove.column[1].disabled = true;
if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {
- //瀹℃壒鑺傜偣锛屼笉閫氳繃缁欑紪鍒讹細缂栧埗鏄矗浠讳汉锛屼笉缁欐牎瀵逛簡
- this.formApprove.assignee = row.variables.programmer;
+ //瀹℃壒鑺傜偣锛屼笉閫氳繃缁欑紪鍒讹細缂栧埗鏄矗浠讳汉锛岀粰瀹為檯缂栫▼鍛�
+ //this.formApprove.assignee = row.variables.programmer;
+ this.formApprove.assignee = row.variables.actProgrammer;//缁欏疄闄呯紪绋嬪憳
} else if(["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)){
//鏍″鑺傜偣,涓婁竴姝ユ槸缂栫▼
- this.formApprove.assignee = row.variables.programmer;
+ //this.formApprove.assignee = row.variables.programmer;
+ this.formApprove.assignee = row.variables.actProgrammer;//缁欏疄闄呯紪绋嬪憳
}else if (["programmingTask"].includes(row.taskDefinitionKey)) {
// 璇曞垏缂栧埗鑺傜偣,涓婁竴姝ユ槸缁勯暱
this.formApprove.assignee = row.variables.teamLeader;
@@ -501,7 +508,7 @@
this.transferTaskSelection = list;
},
reassign(val) {// 閲嶆柊鎸囨淳
-
+ //var 0:鎵归噺杞淳锛�1锛氭墜鍔ㄦ淳宸ワ紱2锛氳嚜鍔ㄦ淳宸ワ紱3锛氭壒閲忓鎵�
this.reassignType = val;
if (this.transferTaskSelection.length === 0) {
this.$message.warning('璇烽�夋嫨闇�瑕佹搷浣滅殑浠诲姟');
@@ -535,6 +542,7 @@
// this.$message.info('宸插彇娑堟搷浣�');
});
} else {
+ //0閲嶆柊鎸囨淳 3鎵归噺瀹℃壒 锛�1鎵嬪姩娲惧伐
this.reassignBox = true;
if(val === 3) {//鎵归噺瀹℃壒鏃� 鏄剧ず閫氳繃椹冲洖
@@ -545,9 +553,14 @@
this.reassignOption.column[1].disabled = true;
this.reassignOption.column[1].display = true;
} else {
+ //0
this.reassignOption.column[0].display = false;
this.reassignForm.approve = '';
+ if(val === 0 || val === 1) {//0閲嶆柊鎸囨淳 1鎵嬪姩娲惧伐 ,闇�瑕佹樉绀哄鐞嗕汉
+ this.reassignOption.column[1].disabled = false;
+ this.reassignOption.column[1].display = true;
+ }
}
if(val ===1) {
this.reassignForm.newAssigneeId = this.transferTaskSelection[0].variables.programmer;
--
Gitblit v1.9.3