From 7acbfc9ec91fc7cc6f0f57541331900165311bf5 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期三, 06 八月 2025 20:18:32 +0800
Subject: [PATCH] update
---
src/views/flow/todolist.vue | 236 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 193 insertions(+), 43 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 6587758..809e9ab 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -2,42 +2,56 @@
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
@search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
- @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
+ @selection-change="selectionTransferTask">
<template #menu-left>
<el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳
</el-button>
</template>
<template #menu="scope">
- <el-button type="primary" text size="default" v-if="permission.flow_model_update"
- @click.stop="handleAction(scope.row, scope.index)">瀹℃壒
+ <el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">瀹℃壒
</el-button>
</template>
</avue-crud>
- <el-dialog title="瀹℃壒" append-to-body v-model="approveBox" width="30%">
- <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
- <!-- <template #footer>
- <span class="dialog-footer">
- <el-button @click="deployBox = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="handleDoDeploy" :loading="deployLoading">纭� 瀹�</el-button>
- </span>
- </template> -->
+ <el-dialog title="鎸囨淳" append-to-body v-model="reassignBox" width="30%">
+ <avue-form ref="reassginform" :option="reassignOption" v-model="reassignForm" @submit="toPerson"></avue-form>
</el-dialog>
+ <el-drawer title="瀹℃壒" append-to-body v-model="approveBox" size="100%" v-if="approveBox">
+ <div class="approve-box">
+ <div class="left">
+ <TodolistLeft :row="row" @selection-change="selectionChange" />
+ </div>
+ <div class="right">
+ <TodolistRightTop :row="row" />
+ <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
+ </div>
+ </div>
+ </el-drawer>
</basic-container>
</template>
<script>
-import { getList, approve,getAssignee } from '@/api/flow/todolist';
+import { getList, approve, getAssignee,reassgin } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
+import TodolistLeft from './components/TodolistLeft.vue';
+import TodolistRightTop from './components/TodolistRightTop.vue';
export default {
+ components: {
+ TodolistLeft,
+ TodolistRightTop
+ },
data() {
return {
+
+ applist: [],
assigneeData: [],
row: {},
approveBox: false,
formApprove: {
comment: '',
- approve: '', // 榛樿鍚屾剰
+ approve: 'Y', // 榛樿鍚屾剰
+ assignee: ''
},
optionApprove: {
labelWidth: 100,
@@ -64,10 +78,11 @@
label: 'name',
value: 'id',
},
+ filterable: true,
span: 24,
disabled: false,
dicData: [
-
+
],
// rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
},
@@ -76,7 +91,20 @@
span: 24,
prop: 'comment',
type: 'textarea',
- rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ rules: [
+ {
+ validator: (rule, value, callback) => {
+ console.log('-------',this.formApprove)
+ if (value === '' && this.formApprove.approve !== 'Y') {
+ callback(new Error('璇疯緭鍏ュ娉�'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }
+ ]
},
],
},
@@ -89,6 +117,7 @@
query: {},
loading: true,
option: {
+ rowKey: "taskId",
addBtn: false,
editBtn: false,
delBtn: false,
@@ -101,7 +130,7 @@
// tree: true,
border: true,
index: true,
- // selection: true,
+ selection: true,
// viewBtn: true,
menuWidth: 100,
dialogClickModal: false,
@@ -124,17 +153,30 @@
},
],
},
+ {
+ label: '鏍囬',
+ prop: '',
+ width: 100,
+ render: ({ row }) => {
+ return h('p',
+ {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.title)
+ }
+ },
{
- label: '浠诲姟鍚嶇О',
+ label: '娴佺▼鍚嶇О',
prop: 'processDefinitionName',
width: 100,
- },
+ },/*
{
label: '娴佺▼绫诲瀷',
width: 100,
- prop: 'processDefinitionName',
- },
-
+ prop: 'categoryName',
+ },*/
+
{
label: '鏈哄簥',
width: 100,
@@ -176,7 +218,7 @@
{
label: '鏂囦欢',
width: 200,
- prop: '',
+ prop: 'file',
},
{
label: '鍒拌揪鏃堕棿',
@@ -192,6 +234,39 @@
],
},
data: [],
+ transferTaskSelection: [],
+ reassignBox: false,
+ reassignOption: {
+ submitBtn: true,
+ emptyBtn: false,
+ column: [
+ {
+ label: '鍙戦�佺粰',
+ prop: 'newAssigneeId',
+ type: 'select',
+ // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
+ // dicFlag: true,
+ props: {
+ label: 'name',
+ value: 'id',
+ },
+ span: 24,
+ disabled: false,
+ dicData: [
+
+ ],
+ rules: [{ required: true, message: '璇疯緭鍏ラ�夋嫨', trigger: 'blur' }],
+ },
+ {
+ label: '澶囨敞',
+ span: 24,
+ prop: 'comment',
+ type: 'textarea',
+ rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ },
+ ],
+ },
+ reassignForm: {}
};
},
watch: {
@@ -207,11 +282,14 @@
// });
// },
'formApprove.approve'(val) {
- if (val === 'Y' && this.row.taskDefinitionKey === 'approveTask') {
+ if (val === 'Y' && ["approveTask", 'seniorApproveTask'].includes(this.row.taskDefinitionKey)) {// 楂樺笀
this.optionApprove.column[1].disabled = true;
this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
- } else {
- this.optionApprove.column[1].disabled = false;
+ } else if(val === 'Y'){
+ this.setAssignee(this.row);
+ } else if(val === 'N') {
+ this.formApprove.assignee = ''
+ // this.formApprove.assignee = row.variables.senior;
}
},
},
@@ -227,48 +305,101 @@
// },
},
mounted() {
- getAssignee().then(res=> {
+ getAssignee().then(res => {
this.assigneeData = res.data.data;
this.optionApprove.column[1].dicData = this.assigneeData;
+ this.reassignOption.column[0].dicData = this.assigneeData;
})
},
methods: {
+ selectionTransferTask(list) {
+ this.transferTaskSelection = list;
+ },
+ reassign() {// 閲嶆柊鎸囨淳
+ if (this.transferTaskSelection.length === 0) {
+ this.$message.warning('璇烽�夋嫨闇�瑕侀噸鏂版寚娲剧殑浠诲姟');
+ return;
+ }
+ if (this.transferTaskSelection.length > 1) {
+ this.$message.warning('璇烽�夋嫨涓�鏉�');
+ return;
+ }
+ this.reassignBox = true;
+ },
+ toPerson(form, done) {
+ this.$confirm('璇风‘璁ゆ槸鍚︽寚娲�', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ console.log('toPerson', form);
+ reassgin({
+ ...form,
+ taskId: this.transferTaskSelection[0].taskId,
+ processInstanceId: this.transferTaskSelection[0].processInstanceId,
+ }).then(res => {
+ this.$message.success('鎸囨淳鎴愬姛');
+ this.reassignBox = false;
+ this.$refs?.reassginform?.resetForm();
+ this.onLoad(this.page, this.query);
+ done()
+
+ }).catch(err => {
+ console.error(err);
+ done()
+ })
+ });
+ done();
+ },
+ setAssignee (row) {
+ if (["check", 'cureCheckTask '].includes(row.taskDefinitionKey)) {// 鏍″
+ this.formApprove.assignee = row.variables.senior;
+ } else if (["programmingTask",'cureProgramTask'].includes(row.taskDefinitionKey)) {// 缂栧埗锛屾牎瀵�
+ this.formApprove.assignee = row.variables.checker;
+ } else if (row.taskDefinitionKey == "teamLeaderTask") {
+ this.formApprove.assignee = row.variables.programmer
+ } else if (row.taskDefinitionKey == "confirmIsUseableTask") {
+ this.formApprove.assignee = row.variables.checker
+ } else if (["approveTask", 'seniorApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+
+ }
+ },
handleAction(row, index) {
this.formApprove = {
comment: '',
- approve: '', // 榛樿鍚�
+ approve: 'Y', // 榛樿鍚�
}
this.approveBox = true;
this.row = row
- if(row.taskDefinitionKey=="check") {
- this.formApprove.assignee = row.variables.senior;
- } else if(row.taskDefinitionKey=="programmingTask") {
- this.formApprove.assignee = row.variables.checker;
- } else if(row.taskDefinitionKey=="teamLeaderTask") {
- this.formApprove.assignee = row.variables.programmer
- } else if(row.taskDefinitionKey=="confirmIsUseableTask") {
- this.formApprove.assignee = row.variables.checker
- } else if(row.taskDefinitionKey=="approveTask") {
-
- }
+ this.setAssignee(row);
console.log('handleAction', row, index);
},
handleSubmit(form, done) {
+ if(this.row.taskDefinitionKey === 'programmingTask') {
+ // if(this.applist.length !== 1) {
+ // done();
+ // return this.$message.success('璇烽�夋嫨1涓▼搴�');
+ // }
+ }
approve({
...this.formApprove,
taskId: this.row.taskId,
processInstanceId: this.row.processInstanceId,
+ // programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
}).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ done();
+ return;
+ }
this.$message.success('瀹℃壒鎴愬姛');
this.approveBox = false;
this.onLoad(this.page, this.query);
done();
}).catch(err => {
+ done();
console.error(err);
});
- },
- reassign() {// 閲嶆柊鎸囨淳
-
},
searchChange(params, done) {
let data = {}
@@ -317,7 +448,7 @@
} catch (error) {
console.error('鏃ユ湡鏍煎紡鍖栭敊璇�', error);
}
-
+
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
const data = res.data.data;
@@ -326,8 +457,27 @@
this.loading = false;
});
},
+ selectionChange(applist) {
+ this.applist = applist
+ },
},
};
</script>
-<style></style>
+<style scoped="scoped" lang="scss">
+.approve-box {
+ display: flex;
+
+ &>div {
+ border: 1px solid #ccc;
+ }
+
+ .left {
+ width: 400px;
+ }
+
+ .right {
+ flex: 1;
+ }
+}
+</style>
--
Gitblit v1.9.3