From 11f434b5919b65bd4702f42bbd8925219c844fad Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 12 八月 2025 21:44:15 +0800
Subject: [PATCH] update
---
src/views/flow/todolist.vue | 271 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 222 insertions(+), 49 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 9ee8cdb..cd3e679 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -5,15 +5,21 @@
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
@selection-change="selectionTransferTask">
<template #menu-left>
- <el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳
+ <el-button type="primary" plain @click="reassign(0)">閲嶆柊鎸囨淳</el-button>
+ <el-button type="primary" v-if="permission.manual_dispatch" plain @click="reassign(1)">鎵嬪姩娲惧伐
+ </el-button>
+ <el-button type="primary" v-if="permission.auto_dispatch" plain @click="reassign(2)">鑷姩娲惧伐
+ </el-button>
+ <el-button type="primary" 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)">瀹℃壒
+ <el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">
+ {{scope.row.taskDefinitionKey === 'teamLeaderTask' ? '娲惧伐' : '瀹℃壒'}}
</el-button>
</template>
</avue-crud>
- <el-dialog title="鎸囨淳" append-to-body v-model="reassignBox" width="30%">
+ <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">
@@ -23,7 +29,19 @@
</div>
<div class="right">
<TodolistRightTop :row="row" />
- <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
+ <el-tabs
+ type="card"
+ class="demo-tabs"
+ v-model="activeName"
+ >
+ <el-tab-pane label="瀹℃壒" name="approve">
+ <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
+ </el-tab-pane>
+ <el-tab-pane label="娴佺▼杞ㄨ抗" name="log">
+ <processTrace :item="row" v-if="activeName==='log'"></processTrace>
+ </el-tab-pane>
+ </el-tabs>
+
</div>
</div>
</el-drawer>
@@ -31,21 +49,21 @@
</template>
<script>
-import { getList, approve, getAssignee,reassgin } from '@/api/flow/todolist';
+import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch,getPrevius,batchApprove } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import TodolistLeft from './components/TodolistLeft.vue';
import TodolistRightTop from './components/TodolistRightTop.vue';
+import processTrace from './components/process-trace.vue';
export default {
components: {
TodolistLeft,
- TodolistRightTop
+ TodolistRightTop,
+ processTrace
},
data() {
- let rejectText = '椹冲洖';//+this.row.categoryName;
- console.log(this,'ttt');
return {
-
+ activeName: 'approve',
applist: [],
assigneeData: [],
row: {},
@@ -66,7 +84,7 @@
span: 24,
dicData: [
{ label: '閫氳繃', value: 'Y' },
- { label: rejectText, value: 'N' },
+ { label: '椹冲洖', value: 'N' },
],
rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
},
@@ -247,10 +265,23 @@
data: [],
transferTaskSelection: [],
reassignBox: false,
+ reassignType: 0, // 0:閲嶆柊鎸囨淳锛�1:鑷姩娲惧伐 2: 鑷姩娲惧伐
reassignOption: {
submitBtn: true,
emptyBtn: false,
column: [
+ {
+ label: '瀹℃壒缁撴灉',
+ prop: 'approve',
+ type: 'radio',
+ span: 24,
+ display: false,
+ dicData: [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '椹冲洖', value: 'N' },
+ ],
+ rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
+ },
{
label: '鍙戦�佺粰',
prop: 'newAssigneeId',
@@ -263,6 +294,7 @@
},
span: 24,
disabled: false,
+ display: true,
dicData: [
],
@@ -273,7 +305,7 @@
span: 24,
prop: 'comment',
type: 'textarea',
- rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
},
],
},
@@ -301,24 +333,38 @@
// }
},
+ 'reassignForm.approve'(val) {
+ if(this.reassignType ===3) {
+ if(val === 'Y') {
+ this.reassignOption.column[1].disabled = true;
+ this.reassignOption.column[1].display = false;
+ this.reassignForm.newAssigneeId = '';
+ } else {
+ this.reassignOption.column[1].display = false;
+ this.reassignOption.column[1].disabled = false;
+ this.reassignForm.newAssigneeId = '';
+ }
+ }
+
+ }
},
computed: {
...mapGetters(['userInfo', 'permission']),
- // permissionList() {
- // return {
- // addBtn: this.validData(this.permission.menu_add, false),
- // viewBtn: this.validData(this.permission.menu_view, false),
- // delBtn: this.validData(this.permission.menu_delete, false),
- // editBtn: this.validData(this.permission.menu_edit, false),
- // };
- // },
+ permissionList() {
+ return {
+ manual_dispatch: this.validData(this.permission.manual_dispatch, false),
+ auto_dispatch: this.validData(this.permission.auto_dispatch, false),
+ batch_approve: this.validData(this.permission.batch_approve, true),
+ };
+ },
},
mounted() {
getAssignee().then(res => {
this.assigneeData = res.data.data;
this.optionApprove.column[1].dicData = this.assigneeData;
- this.reassignOption.column[0].dicData = this.assigneeData;
+ this.reassignOption.column[1].dicData = this.assigneeData;
})
+ this.setApproveBtn()
},
methods: {
// 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
@@ -364,15 +410,22 @@
this.formApprove.assignee = row.variables.programmer
} else if (row.taskDefinitionKey == "confirmIsUseableTask") {
this.formApprove.assignee = row.variables.checker
- } else if (["approveTask", 'seniorApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ } else if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
this.optionApprove.column[1].disabled = true;
this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
}
} else if(approve === 'N'){
this.formApprove.assignee = ''
- if (["approveTask", 'seniorApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
this.optionApprove.column[1].disabled = true;
- this.formApprove.assignee = row.varables.assignee; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ getPrevius({processInstanceId: row.processInstanceId}).then(res => {
+ console.log(res)
+ if(res.data.code === 200) {
+
+ this.formApprove.assignee = res.data.data // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ }
+ })
+
}
}
@@ -380,41 +433,160 @@
selectionTransferTask(list) {
this.transferTaskSelection = list;
},
- reassign() {// 閲嶆柊鎸囨淳
+ reassign(val) {// 閲嶆柊鎸囨淳
+ this.reassignType = val;
if (this.transferTaskSelection.length === 0) {
- this.$message.warning('璇烽�夋嫨闇�瑕侀噸鏂版寚娲剧殑浠诲姟');
+ this.$message.warning('璇烽�夋嫨闇�瑕佹搷浣滅殑浠诲姟');
return;
}
- if (this.transferTaskSelection.length > 1) {
+ if (this.transferTaskSelection.length > 1 && this.reassignType === 0) {
this.$message.warning('璇烽�夋嫨涓�鏉�');
return;
}
- this.reassignBox = true;
+ if(val === 2) {
+ this.$confirm('璇风‘璁ゆ槸鍚﹁繘琛屾壒閲忚嚜鍔ㄦ淳宸ワ紵', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ autoDispatch({
+ taskIds: this.transferTaskSelection.map(v => v.taskId),
+ processInstanceIds: this.transferTaskSelection.map(v => v.processInstanceId),
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.onLoad(this.page, this.query);
+
+ }).catch(err => {
+ this.$message.success('鎿嶄綔澶辫触');
+ })
+ }).catch(() => {
+ // this.$message.info('宸插彇娑堟搷浣�');
+ });
+ } else {
+ this.reassignBox = true;
+
+ if(val === 3) {//鎵归噺瀹℃壒鏃� 鏄剧ず閫氳繃椹冲洖
+ this.reassignOption.column[0].display = true;
+ this.reassignOption.column[0].dicData[1].label = '涓嶉�氳繃';
+ this.reassignForm.approve = 'Y';
+ this.reassignForm.newAssigneeId = '';
+ this.reassignOption.column[1].disabled = true;
+ this.reassignOption.column[1].display = true;
+ } else {
+ this.reassignOption.column[0].display = false;
+ this.reassignForm.approve = '';
+
+ }
+ if(val ===1) {
+ this.reassignForm.newAssigneeId = this.transferTaskSelection[0].variables.programmer;
+ }
+ }
+
+
},
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()
+ let tip = ''
+ this.reassignType === 1 ? tip = '璇风‘璁ゆ槸鍚︽墜鍔ㄦ淳宸�' : this.reassignType === 2 ? tip = '璇风‘璁ゆ槸鍚﹁嚜鍔ㄦ淳宸�' : tip = '璇风‘璁ゆ槸鍚﹂噸鏂版寚娲�';
+ if (this.reassignType === 0) {
+ this.$confirm(tip, '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then((res) => {
+ console.log(res,'>>>>>>')
+ reassgin({
+ ...form,
+ taskId: this.transferTaskSelection[0].taskId,
+ processInstanceId: this.transferTaskSelection[0].processInstanceId,
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.reassignBox = false;
+ this.$refs?.reassginform?.resetForm();
+ this.onLoad(this.page, this.query);
+ done()
- }).catch(err => {
- console.error(err);
- done()
- })
- });
- done();
+ }).catch(err => {
+ this.$message.error('鎿嶄綔澶辫触');
+ done()
+ })
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
+ });
+
+ } else if (this.reassignType === 1) {
+ this.$confirm(tip, '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ manualDispatch({
+ assignee: form.newAssigneeId,
+ comment: form.comment,
+ taskIds: this.transferTaskSelection.map(v => v.taskId),
+ processInstanceIds: this.transferTaskSelection.map(v => v.processInstanceId),
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.reassignBox = false;
+ this.$refs?.reassginform?.resetForm();
+ this.onLoad(this.page, this.query);
+ done()
+
+ }).catch(err => {
+ console.error(err);
+ done()
+ })
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
+ });
+ } else if (this.reassignType === 3) {
+ this.$confirm('纭瑕佽繘琛屾壒閲忓鎵瑰悧锛�', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ batchApprove({
+ assignee: form.newAssigneeId,
+ comment: form.comment,
+ approve: form.approve,
+ taskIds: this.transferTaskSelection.map(v => v.taskId),
+ processInstanceIds: this.transferTaskSelection.map(v => v.processInstanceId),
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.reassignBox = false;
+ this.$refs?.reassginform?.resetForm();
+ this.onLoad(this.page, this.query);
+ done()
+
+ }).catch(err => {
+ console.error(err);
+ done()
+ })
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
+ });
+ }
},
handleAction(row, index) {
this.formApprove = {
@@ -530,6 +702,7 @@
.right {
flex: 1;
+ padding: 0 10px;
}
}
</style>
--
Gitblit v1.9.3