From 4b04e45c82740e8aad72b8ac664884b3d17b090e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 19:56:51 +0800
Subject: [PATCH] 调整界面
---
src/api/flow/todolist.js | 1
src/views/flowmgr/programexport.vue | 2 +
src/views/flow/donelist.vue | 2 +
src/views/flowmgr/processQuery3.vue | 1
src/views/flow/todolist.vue | 56 +++++++++++++++++-----------
src/views/flowmgr/processQuery1.vue | 1
src/views/flowmgr/processQuery2.vue | 21 ++--------
7 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/src/api/flow/todolist.js b/src/api/flow/todolist.js
index f8cc7c7..578efce 100644
--- a/src/api/flow/todolist.js
+++ b/src/api/flow/todolist.js
@@ -35,6 +35,7 @@
});
}
export const getAssignee = (params) => {
+ console.log('fu',params)
return request({
url: `/blade-mdm/flow/flow-user-list?deptId=0`,
method: 'get',
diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index 5453e24..661781d 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -36,6 +36,7 @@
emptyBtn: false,
submitBtn: false,
menuBtn: false,
+
labelWidth: 100,
span: 8,
column: [
@@ -185,6 +186,7 @@
columnBtn: false,
tip: false,
searchShow: true,
+ searchEnter:true,
searchMenuSpan: 6,
dialogWidth: '60%',
border: true,
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index e274b21..08ea98e 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -93,8 +93,6 @@
label: '鍙戦�佺粰',
prop: 'assignee',
type: 'select',
- // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
- // dicFlag: true,
props: {
label: 'name',
value: 'id',
@@ -106,15 +104,6 @@
dicData: [
],
- // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
- },
- {
- label: '宸ュ簭鐗堟',
- prop: 'processEdition',
- type: 'input',
- span: 24,
- // disabled: true,
- display: false,// 闅愯棌鏄剧ず
// rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
},
{
@@ -155,6 +144,7 @@
columnBtn: false,
tip: false,
// simplePage: true,
+ searchEnter:true,
searchShow: true,
searchMenuSpan: 6,
dialogWidth: '60%',
@@ -304,8 +294,6 @@
prop: 'newAssigneeId',
filterable:true,
type: 'select',
- // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
- // dicFlag: true,
props: {
label: 'name',
value: 'id',
@@ -377,39 +365,57 @@
},
},
mounted() {
- getAssignee().then(res => {
+ getAssignee(this.row).then(res => {
this.assigneeData = res.data.data;
this.optionApprove.column[1].dicData = this.assigneeData;
this.reassignOption.column[1].dicData = this.assigneeData;
})
- this.setApproveBtn()
+ //this.setApproveBtn(row)
},
methods: {
// 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
- setApproveBtn () {
+ setApproveBtn (row) {
// 1.瀹℃壒鐣岄潰radio鏂囨湰淇敼锛屾櫘閫氳妭鐐圭殑2涓猺adio鏂囨湰 閫氳繃锛坅pprove=Y),涓嶉�氳繃(鐜板湪鐨勯┏鍥�)(approve=N)
+
this.optionApprove.column[0].dicData = [
{ label: '閫氳繃', value: 'Y' },
{ label: '涓嶉�氳繃', value: 'N' },
];
switch (this.row.taskDefinitionKey) {
case 'teamLeaderTask': // 浠诲姟娲惧伐
- case 'cureProgramTask': // 鍥哄寲缂栧埗
this.optionApprove.column[0].dicData = [
{ label: '閫氳繃', value: 'Y' },
{ label: '缁撴潫', value: 'N' },
];
break;
- case 'confirmIsUseableTask': // 妫�鏌ョ▼搴忔槸鍚﹀彲鐢�
+ case 'cureProgramTask': // 鍥哄寲缂栧埗,鍙互閫氳繃锛堢粰鏍″锛夛紱涓嶉�氳繃N锛堢粰绋嬪簭绠＄悊鍛橈級
this.optionApprove.column[0].dicData = [
{ label: '閫氳繃', value: 'Y' },
- { label: '涓嶉�氳繃', value: 'N' },
- { label: '椹冲洖', value: 'R' },
+ { label: '涓嶉�氳繃', value: 'N' },//缁欑▼搴忕鐞嗗憳
+
+ ];
+ break;
+ case 'confirmIsUseableTask': // 妫�鏌ョ▼搴忔槸鍚﹀彲鐢紝椹冲洖鏄粰
+ this.optionApprove.column[0].dicData = [
+ { label: '鍙敤', value: 'Y' }, //缁欐牎瀵�
+ { label: '涓嶅彲鐢�', value: 'N' },//缁欑紪鍒�
+ { label: '椹冲洖', value: 'R' },//缁欓┏鍥炵粍闀�
+ ];
+ break;
+ case 'programmingTask': //璇曞垏 缂栧埗鑺傜偣
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },//缁欑粍闀�
+ { label: '缁撴潫', value: 'E' },//缁撴潫娴佺▼
+ ];
+ break;
+ case 'programMgrConfirm'://鍥哄寲娴佺▼ 绋嬪簭绠＄悊鍛橈紝鍙兘缁撴潫
+ this.optionApprove.column[0].dicData = [
+ { label: '缁撴潫', value: 'E' },
];
break;
case 'seniorApproveTask': // 楂樺笀瀹℃牳
case 'approveTask': // 楂樺笀瀹℃牳
-
default:
this.optionApprove.column[0].dicData = [
{ label: '閫氳繃', value: 'Y' },
@@ -455,7 +461,8 @@
}else if(["cureProgramTask"].includes(row.taskDefinitionKey)) {
//鍥哄寲缂栧埗鑺傜偣锛屼笉閫氳繃缁欐暟鎺х鐞嗗憳
//TODO 鎸夋壘瑙掕壊瀹氫綅缁欏叾涓竴涓暟鎺х鐞嗗憳
- this.formApprove.assignee = '';
+ this.optionApprove.column[1].disabled = false;
+ //this.formApprove.assignee = '';
}else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
//鍒ゆ柇鏄惁鍙敤鑺傜偣锛屼笉鍙敤锛岀粰缂栧埗
this.formApprove.assignee = row.variables.programmer;
@@ -470,6 +477,10 @@
//鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄┏鍥烇紝缁欑粍闀�
this.formApprove.assignee = row.variables.teamLeader;
}
+ }else if(approve === 'E'){//END 缁撴潫娴佺▼锛屼笉鍙�夊鐞嗕汉
+ //椹冲洖锛岀洰鍓嶅彧鏈夋鏌ョ▼搴忔槸鍚﹀彲鐢ㄨ妭鐐�
+ this.optionApprove.column[1].disabled = true;//澶勭悊浜洪�夐」绂佺敤
+ this.formApprove.assignee = ''
}
},
@@ -639,6 +650,7 @@
this.approveBox = true;
this.row = row
this.setAssignee(row, this.formApprove.approve);
+ this.setApproveBtn(row);
console.log('handleAction', row, index);
},
handleSubmit(form, done) {
diff --git a/src/views/flowmgr/processQuery1.vue b/src/views/flowmgr/processQuery1.vue
index 202d3d1..3563c50 100644
--- a/src/views/flowmgr/processQuery1.vue
+++ b/src/views/flowmgr/processQuery1.vue
@@ -85,6 +85,7 @@
// simplePage: true,
searchShow: true,
searchMenuSpan: 7,
+ searchEnter:true,
dialogWidth: '70%',
// tree: true,
border: true,
diff --git a/src/views/flowmgr/processQuery2.vue b/src/views/flowmgr/processQuery2.vue
index 7ef1d56..43384db 100644
--- a/src/views/flowmgr/processQuery2.vue
+++ b/src/views/flowmgr/processQuery2.vue
@@ -10,27 +10,15 @@
@search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
@selection-change="selectionChange">
- <!-- <template slot="view" slot-scope="{ row }">
- <div class="custom-view-footer">
- <p>杩欐槸鑷畾涔夌殑搴曢儴鍐呭</p>
- <p>褰撳墠琛屾暟鎹細{{ row }}</p>
- </div>
- </template> -->
+
<template #menu-left>
<!-- <el-button type="primary" plain @click="exportWebSite">瀵煎嚭鍥炰紶娑夊瘑缃�</el-button> -->
- <!-- <el-button type="primary" plain @click="reassign">鎸傝浇杞﹀簥绋嬪簭搴�</el-button> -->
- <!-- <el-button type="primary" plain @click="exportExcel">瀵煎嚭鍒癊XCEL</el-button> -->
- <!-- <el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳
- </el-button> -->
+
</template>
<template #menu="scope">
<el-button type="primary" text size="default" @click.stop="customView(scope.row, scope.index, 0)">鏌ョ湅
</el-button>
- <!-- <el-button type="primary" text size="default" v-if="scope.row.processDefinitionKey === 'dispatch'"
- @click.stop="handleAction(scope.row, scope.index, 1)">瀹℃壒琛ㄦ墦鍗�
- </el-button>
- <el-button type="danger" text size="default" @click.stop="handleAction(scope.row, scope.index, 0)">鍒犻櫎
- </el-button> -->
+
</template>
</avue-crud>
@@ -82,15 +70,14 @@
viewBtn: false,
columnBtn: false,
tip: false,
- // simplePage: true,
searchShow: true,
searchMenuSpan: 7,
+ searchEnter:true,
dialogWidth: '70%',
// tree: true,
border: true,
index: true,
selection: true,
-
menuWidth: 80,
// menu: false,
labelWidth: 90,
diff --git a/src/views/flowmgr/processQuery3.vue b/src/views/flowmgr/processQuery3.vue
index 8f2b433..ee0bbbf 100644
--- a/src/views/flowmgr/processQuery3.vue
+++ b/src/views/flowmgr/processQuery3.vue
@@ -85,6 +85,7 @@
// simplePage: true,
searchShow: true,
searchMenuSpan: 7,
+ searchEnter:true,
dialogWidth: '70%',
// tree: true,
border: true,
diff --git a/src/views/flowmgr/programexport.vue b/src/views/flowmgr/programexport.vue
index 47cb60d..e14f9b2 100644
--- a/src/views/flowmgr/programexport.vue
+++ b/src/views/flowmgr/programexport.vue
@@ -73,6 +73,7 @@
// simplePage: true,
searchShow: true,
searchMenuSpan: 6,
+ searchEnter:true,
dialogWidth: '60%',
// tree: true,
border: true,
@@ -146,6 +147,7 @@
tip: false,
// simplePage: true,
searchShow: true,
+ searchEnter:true,
searchMenuSpan: 6,
dialogWidth: '60%',
// tree: true,
--
Gitblit v1.9.3