From 9ac5f1a6b99e8a07ebc4c4be082ced3c219f4e2e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 06 九月 2025 17:45:15 +0800
Subject: [PATCH] 文字修复
---
src/views/flow/todolist.vue | 154 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 117 insertions(+), 37 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index c207d0d..8583dff 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -10,13 +10,13 @@
</el-button>
<el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.manual_dispatch" plain @click="reassign(1)">鎵嬪姩娲惧伐
</el-button>
- <el-button type="primary" :disabled="this.transferTaskSelection.length==0" plain @click="reassign(0)">閲嶆柊鎸囨淳</el-button>
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" plain @click="reassign(0)">杞淳</el-button>
<el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.batch_approve" plain @click="reassign(3)">鎵归噺瀹℃壒
</el-button>
</template>
<template #menu="scope">
<el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">
- {{scope.row.taskDefinitionKey === 'teamLeaderTask' ? '娲惧伐' : '瀹℃壒'}}
+ {{approveButtonText(scope.row.taskDefinitionKey)}}
</el-button>
</template>
</avue-crud>
@@ -36,7 +36,9 @@
v-model="activeName"
>
<el-tab-pane label="瀹℃壒" name="approve">
- <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
+ <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" >
+
+ </avue-form>
</el-tab-pane>
<el-tab-pane label="娴佺▼杞ㄨ抗" name="log">
<processTrace :item="row" v-if="activeName==='log'"></processTrace>
@@ -47,12 +49,9 @@
</div>
</el-drawer>
</basic-container>
- <div>
- <!--<top-todo ref="topTodoComponent" />-->
- </div>
</template>
<script>
-import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch,todoChangeNotify,batchApprove } from '@/api/flow/todolist';
+import { getList, approve, getAssignee,getAssigneeTree,reassgin,manualDispatch,autoDispatch,todoChangeNotify,batchApprove } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import TodolistLeft from './components/TodolistLeft.vue';
@@ -72,13 +71,18 @@
assigneeData: [],
allAssigneeData: [],
managerAssigneeData: [],//鏁版帶绠＄悊鍛樿鑹茬殑瀹℃壒鐢ㄦ埛
+
+ assignee2Data:[],
+
row: {},
approveBox: false,
formApprove: {
comment: '',
- approve: '', // 榛樿鍚屾剰
- assignee: ''
+ approve: '',
+ assignee: '',
},
+
+
optionApprove: {
labelWidth: 100,
column: [
@@ -93,7 +97,7 @@
{ label: '椹冲洖', value: 'N' },
],
rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
- },
+ },/*
{
label: '鍙戦�佺粰',
prop: 'assignee',
@@ -109,7 +113,24 @@
dicData: [
],
- // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
+
+ },*/
+ {
+ label: '鍙戦�佺粰',
+ prop: 'assignee',
+ component: 'elTreeSelect',
+ params: {
+ props:{
+ label: 'name',
+ value:'id',
+ disabled: (data) => data.nodeType==='dept',
+ isLeaf: (data) => data.children==null || data.children.length==0,
+ },
+ },
+ display: true,
+ filterable: true,
+ span: 24,
+ disabled: false,
},
{
label: '澶囨敞',
@@ -131,6 +152,7 @@
}
]
},
+
],
},
page: {
@@ -148,12 +170,10 @@
delBtn: false,
columnBtn: false,
tip: false,
- // simplePage: true,
searchEnter:true,
searchShow: true,
searchMenuSpan: 6,
dialogWidth: '60%',
- // tree: true,
border: true,
index: true,
selection: true,
@@ -221,7 +241,7 @@
label: '鏈哄簥',
width: 100,
prop: '',
-
+ showOverflowTooltip:true,
formatter: (val, value, label) => {
return `${val?.variables?.machineCode}`;
},
@@ -242,6 +262,7 @@
search: true,
searchRange: true,
searchSpan: 8,
+ showOverflowTooltip:true,
// hide: true,
},
{
@@ -254,7 +275,8 @@
},
{
label: '褰撳墠鑺傜偣',
- width: 100,
+ width: 120,
+ showOverflowTooltip:true,
prop: 'taskName',
},
{
@@ -302,6 +324,25 @@
{
label: '鍙戦�佺粰',
prop: 'newAssigneeId',
+ component: 'elTreeSelect',
+ params: {
+ props:{
+ label: 'name',
+ value:'id',
+ disabled: (data) => data.nodeType==='dept',
+ isLeaf: (data) => data.children==null || data.children.length==0,
+ },
+ },
+ display: true,
+ filterable: true,
+ span: 24,
+ disabled: false,
+ rules: [{ required: true, message: '璇疯緭鍏ラ�夋嫨', trigger: 'blur' }],
+ },
+ /*
+ {
+ label: '鍙戦�佺粰',
+ prop: 'newAssigneeId',
filterable:true,
type: 'select',
props: {
@@ -315,13 +356,12 @@
],
rules: [{ required: true, message: '璇疯緭鍏ラ�夋嫨', trigger: 'blur' }],
- },
+ },*/
{
label: '澶囨敞',
span: 24,
prop: 'comment',
type: 'textarea',
- // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
},
],
},
@@ -361,6 +401,7 @@
},
mounted() {
//this.setApproveBtn(row)
+ /*
getAssignee({
taskId: 0,
}).then(res => {
@@ -368,9 +409,45 @@
this.assigneeData = res.data.data;
this.reassignOption.column[1].dicData = this.assigneeData;
});
+ */
+ getAssigneeTree({
+ taskId: 0,
+ }).then(res => {
+ this.assigneeData = res.data.data;
+ //鍒濆鍖栨暟鎺х鐞嗗憳鐨勬暟缁�
+ for(var i=0;i<this.assigneeData.length;i++){
+ for(var j=0;j<this.assigneeData[i].children.length;j++){
+ if(this.assigneeData[i].children[j].nodeType=='manager'){
+ this.managerAssigneeData[this.managerAssigneeData.length] = this.assigneeData[i].children[j];
+ }
+ }
+ }
+
+ this.optionApprove.column[1].data = this.assigneeData;
+ this.reassignOption.column[1].data = this.assigneeData;
+ });
},
methods: {
-
+ approveButtonText(taskDefinitionKey){
+ let lower = taskDefinitionKey.toLowerCase();
+ if(taskDefinitionKey === 'teamLeaderTask') {
+ return '娲惧伐'
+ }else if(taskDefinitionKey == 'unlockProgramConfirm') {
+ //瑙ｉ攣锛岀紪鍒跺鏍�
+ return '澶嶆牳'
+ }else if(taskDefinitionKey == 'programMgrConfirm') {
+ //鍥哄寲锛岀▼搴忕鐞嗗憳纭
+ return '纭'
+ }else if(lower.indexOf('program')>-1) {
+ return '缂栧埗'
+ }else if(lower.indexOf('check')>-1) {
+ return '鏍″'
+ }else if(lower.indexOf('useable')>-1) {
+ return '妫�鏌�'
+ }else{
+ return '瀹℃壒'
+ }
+ },
setApproveBtn (row) { // 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
// 1.瀹℃壒鐣岄潰radio鏂囨湰淇敼锛屾櫘閫氳妭鐐圭殑2涓猺adio鏂囨湰 閫氳繃锛坅pprove=Y),涓嶉�氳繃(鐜板湪鐨勯┏鍥�)(approve=N)
@@ -431,10 +508,10 @@
if (["cureProgramTask"].includes(row.taskDefinitionKey)) {
if(approve === 'N'){
- this.optionApprove.column[1].dicData = this.managerAssigneeData;
+ this.optionApprove.column[1].data = this.managerAssigneeData;
}else{
- //this.assigneeData = this.allAssigneeData;
- this.optionApprove.column[1].dicData = this.allAssigneeData;
+ //this.optionApprove.column[1].dicData = this.allAssigneeData;
+ this.optionApprove.column[1].data = this.assigneeData;
}
}
if (approve === 'Y') {//瀹℃壒閫氳繃鐨勬儏鍐�
@@ -461,10 +538,12 @@
//鏍规嵁鍦ㄧ嚎鏂囨。34琛岋紝'鍙戦�佺粰'鏄鐢紝浣嗘湁榛樿閫夐」
this.optionApprove.column[1].disabled = true;
- if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {
+ if (["approveTask", 'seniorApproveTask','replaceApprove','appendApproveTask'].includes(row.taskDefinitionKey)) {
//瀹℃壒鑺傜偣锛屼笉閫氳繃缁欑紪鍒讹細缂栧埗鏄矗浠讳汉锛岀粰瀹為檯缂栫▼鍛�
- //this.formApprove.assignee = row.variables.programmer;
this.formApprove.assignee = row.variables.actProgrammer;//缁欏疄闄呯紪绋嬪憳
+ }else if(['unlockApproveTask'].includes(row.taskDefinitionKey)){
+ //瑙ｉ攣楂樺笀瀹℃壒鑺傜偣,涓婁竴姝ユ槸缂栫▼
+ this.formApprove.assignee = row.variables.programmer;//缁欎富绠″伐鑹�
} else if(["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)){
//鏍″鑺傜偣,涓婁竴姝ユ槸缂栫▼
//this.formApprove.assignee = row.variables.programmer;
@@ -476,13 +555,10 @@
//鍥哄寲缂栧埗鑺傜偣锛屼笉閫氳繃缁欐暟鎺х鐞嗗憳
//TODO 鎸夋壘瑙掕壊瀹氫綅缁欏叾涓竴涓暟鎺х鐞嗗憳
this.optionApprove.column[1].disabled = false;
- for(var i=0;i<this.assigneeData.length;i++){
- if(this.assigneeData[i].manager == true){
- this.formApprove.assignee = this.assigneeData[i].id;
- break;
- }
+
+ if(this.managerAssigneeData.length>0){
+ this.formApprove.assignee = this.managerAssigneeData[0].id;
}
- //this.formApprove.assignee = '';
}else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
//鍒ゆ柇鏄惁鍙敤鑺傜偣锛屼笉鍙敤锛岀粰缂栧埗
this.formApprove.assignee = row.variables.programmer;
@@ -676,20 +752,24 @@
}
},
handleAction(row, index) {
- getAssignee({
+ getAssigneeTree({
taskId: row.taskId,
}).then(res => {
- //if(row.taskDefinitionKey === '')
+
this.assigneeData = res.data.data;
this.allAssigneeData = res.data.data;
+
+ this.managerAssigneeData=[];
//鍒濆鍖栨暟鎺х鐞嗗憳鐨勬暟缁�
- for(var i=0;i<this.allAssigneeData.length;i++){
- if(this.allAssigneeData[i].manager == true){
- this.managerAssigneeData[this.managerAssigneeData.length] = this.allAssigneeData[i];
+ for(var i=0;i<this.assigneeData.length;i++){
+ for(var j=0;j<this.assigneeData[i].children.length;j++){
+ if(this.assigneeData[i].children[j].nodeType=='manager'){
+ this.managerAssigneeData[this.managerAssigneeData.length] = this.assigneeData[i].children[j];
+ }
}
}
- this.optionApprove.column[1].dicData = this.assigneeData;
- this.reassignOption.column[1].dicData = this.assigneeData;
+ this.optionApprove.column[1].data = this.assigneeData;
+ this.reassignOption.column[1].data = this.assigneeData;
})
this.formApprove = {
comment: '',
@@ -700,7 +780,7 @@
this.setAssignee(row, this.formApprove.approve);
this.setApproveBtn(row);
- console.log('handleAction', row, index);
+ //console.log('handleAction', row, index);
},
handleSubmit(form, done) {
if(this.row.taskDefinitionKey === 'programmingTask') {
--
Gitblit v1.9.3