From 87acb007ca24a88652412d77b649199467b2a729 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期三, 09 七月 2025 17:25:18 +0800
Subject: [PATCH] 1
---
src/views/flow/todolist.vue | 203 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 159 insertions(+), 44 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 4776245..568b4ab 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -2,7 +2,8 @@
<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>
@@ -13,25 +14,37 @@
</el-button>
</template>
</avue-crud>
- <el-dialog title="瀹℃壒" append-to-body v-model="approveBox" width="20%">
- <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,
@@ -55,7 +68,7 @@
rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
},
{
- label: '涓嬩竴瀹℃壒鐢ㄦ埛',
+ label: '鍙戦�佺粰',
prop: 'assignee',
type: 'select',
// dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
@@ -67,7 +80,7 @@
span: 24,
disabled: false,
dicData: [
-
+
],
// rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
},
@@ -88,11 +101,6 @@
form: {},
query: {},
loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
option: {
addBtn: false,
editBtn: false,
@@ -106,11 +114,10 @@
// tree: true,
border: true,
index: true,
- // selection: true,
+ selection: true,
// viewBtn: true,
menuWidth: 100,
dialogClickModal: false,
-
column: [
{
label: '鍏抽敭瀛�',
@@ -132,15 +139,15 @@
},
{
label: '浠诲姟鍚嶇О',
- prop: 'taskName',
+ prop: 'processDefinitionName',
width: 100,
},
{
label: '娴佺▼绫诲瀷',
width: 100,
- prop: 'processDefinitionName',
+ prop: 'categoryName',
},
-
+
{
label: '鏈哄簥',
width: 100,
@@ -167,6 +174,24 @@
// hide: true,
},
{
+ label: '涓婁竴姝ョ敤鎴�',
+ width: 200,
+ prop: '',
+ formatter: (val, value, label) => {
+ return `${val?.variables?.approveUserNickName || ''}`;
+ },
+ },
+ {
+ label: '褰撳墠鑺傜偣',
+ width: 200,
+ prop: 'taskName',
+ },
+ {
+ label: '鏂囦欢',
+ width: 200,
+ prop: '',
+ },
+ {
label: '鍒拌揪鏃堕棿',
width: 200,
prop: 'createTime',
@@ -176,19 +201,43 @@
width: 200,
prop: 'comment',
},
- {
- label: '鏂囦欢',
- width: 200,
- prop: '',
- },
- {
- label: '褰撳墠鑺傜偣',
- prop: '',
- },
],
},
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: {
@@ -224,12 +273,50 @@
// },
},
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);
+
+ }).catch(err => {
+ console.error(err);
+ })
+ });
+ done();
+ },
handleAction(row, index) {
this.formApprove = {
comment: '',
@@ -237,15 +324,15 @@
}
this.approveBox = true;
this.row = row
- if(row.taskDefinitionKey=="check") {
+ if (row.taskDefinitionKey == "check") {
this.formApprove.assignee = row.variables.senior;
- } else if(row.taskDefinitionKey=="programmingTask") {
+ } else if (row.taskDefinitionKey == "programmingTask") {
this.formApprove.assignee = row.variables.checker;
- } else if(row.taskDefinitionKey=="teamLeaderTask") {
+ } else if (row.taskDefinitionKey == "teamLeaderTask") {
this.formApprove.assignee = row.variables.programmer
- } else if(row.taskDefinitionKey=="confirmIsUseableTask") {
+ } else if (row.taskDefinitionKey == "confirmIsUseableTask") {
this.formApprove.assignee = row.variables.checker
- } else if(row.taskDefinitionKey=="approveTask") {
+ } else if (row.taskDefinitionKey == "approveTask") {
}
console.log('handleAction', row, index);
@@ -255,6 +342,7 @@
...this.formApprove,
taskId: this.row.taskId,
processInstanceId: this.row.processInstanceId,
+ programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
}).then(res => {
this.$message.success('瀹℃壒鎴愬姛');
this.approveBox = false;
@@ -264,9 +352,6 @@
console.error(err);
});
},
- reassign() {// 閲嶆柊鎸囨淳
-
- },
searchChange(params, done) {
let data = {}
this.query = params;
@@ -275,11 +360,17 @@
params.createTimeBegin = params?.processCreateTime?.[0] || '';
params.createTimeEnd = params?.processCreateTime?.[1] || '';
console.log(params);
+ // data = {
+ // createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
+ // createTimeEnd: dayjs(params.createTimeEnd).isValid() ? dayjs(params.createTimeEnd).format('YYYY-MM-DD') : '',
+ // keyword: params.keyword || ''
+ // }
data = {
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
keyword: params.keyword || ''
}
+ this.query = data
this.onLoad(this.page, data);
done();
},
@@ -303,17 +394,41 @@
// category: params.category ? flowCategory(params.category) : null,
mode: this.mode,
};
- delete query.processCreateTime; // 鍒犻櫎涓嶅繀瑕佺殑鏌ヨ鏉′欢
+ try {
+ delete query.processCreateTime; // 鍒犻櫎涓嶅繀瑕佺殑鏌ヨ鏉′欢
+ } catch (error) {
+ console.error('鏃ユ湡鏍煎紡鍖栭敊璇�', error);
+ }
+
this.loading = true;
- getList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+ getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
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