From 5834870bf878dcfda0d8dd80fe00479f82bffff7 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 10 八月 2025 00:48:35 +0800
Subject: [PATCH] 自动排工
---
src/api/flow/todolist.js | 21 ++++++
src/views/flow/todolist.vue | 127 +++++++++++++++++++++++++++++++-----------
2 files changed, 114 insertions(+), 34 deletions(-)
diff --git a/src/api/flow/todolist.js b/src/api/flow/todolist.js
index 0a4c132..5da2964 100644
--- a/src/api/flow/todolist.js
+++ b/src/api/flow/todolist.js
@@ -1,7 +1,7 @@
/*
* @Date: 2025-06-12 22:38:05
* @LastEditors: gaoshp
- * @LastEditTime: 2025-08-02 13:51:54
+ * @LastEditTime: 2025-08-10 00:26:43
* @FilePath: /mdmweb/src/api/flow/todolist.js
*/
import request from '@/axios';
@@ -68,6 +68,7 @@
},
})
}
+// 閲嶆柊鎸囨淳
export const reassgin = data => {
return request({
url: '/blade-mdm/flow/transferTask',
@@ -75,4 +76,22 @@
params: data,
data: {}
})
+}
+// 鎵嬪姩娲惧伐
+export const manualDispatch = data => {
+ return request({
+ url: '/blade-mdm/flow/batchDispatch',
+ method: 'post',
+ params: data,
+ data: {}
+ })
+}
+// 鑷姩娲惧伐
+export const autoDispatch = data => {
+ return request({
+ url: '/blade-mdm/flow/batchDispatchAuto',
+ method: 'post',
+ params: data,
+ data: {}
+ })
}
\ No newline at end of file
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index df8b663..5f6b693 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -5,10 +5,10 @@
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
@selection-change="selectionTransferTask">
<template #menu-left>
- <el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳</el-button>
- <el-button type="primary" v-if="permission.manual_dispatch" 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">鑷姩娲惧伐
+ <el-button type="primary" v-if="permission.auto_dispatch" plain @click="reassign(2)">鑷姩娲惧伐
</el-button>
</template>
<template #menu="scope">
@@ -16,7 +16,7 @@
</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">
@@ -34,7 +34,7 @@
</template>
<script>
-import { getList, approve, getAssignee,reassgin } from '@/api/flow/todolist';
+import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import TodolistLeft from './components/TodolistLeft.vue';
@@ -45,8 +45,6 @@
TodolistRightTop
},
data() {
- let rejectText = '椹冲洖';//+this.row.categoryName;
- console.log(this,'ttt');
return {
applist: [],
@@ -69,7 +67,7 @@
span: 24,
dicData: [
{ label: '閫氳繃', value: 'Y' },
- { label: rejectText, value: 'N' },
+ { label: '椹冲洖', value: 'N' },
],
rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
},
@@ -250,6 +248,7 @@
data: [],
transferTaskSelection: [],
reassignBox: false,
+ reassignType: 0, // 0:閲嶆柊鎸囨淳锛�1:鑷姩娲惧伐 2: 鑷姩娲惧伐
reassignOption: {
submitBtn: true,
emptyBtn: false,
@@ -381,40 +380,102 @@
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('鎿嶄綔澶辫触');
+ })
+ });
+ } else {
+ 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()
+ 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(() => {
+ 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()
- })
- });
+ }).catch(err => {
+ this.$message.error('鎿嶄綔澶辫触');
+ 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()
+ })
+ });
+ }
+
done();
},
handleAction(row, index) {
--
Gitblit v1.9.3