From 32d659432b0e6627758faf39380fc569e56b9799 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期一, 11 八月 2025 16:26:48 +0800
Subject: [PATCH] 1
---
src/views/flow/todolist.vue | 269 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 209 insertions(+), 60 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index a246d90..7d845cc 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -5,16 +5,18 @@
@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>
</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="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">
@@ -32,7 +34,7 @@
</template>
<script>
-import { getList, approve, getAssignee,reassgin } from '@/api/flow/todolist';
+import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch,getPrevius } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import TodolistLeft from './components/TodolistLeft.vue';
@@ -44,6 +46,7 @@
},
data() {
return {
+
applist: [],
assigneeData: [],
row: {},
@@ -51,6 +54,7 @@
formApprove: {
comment: '',
approve: '', // 榛樿鍚屾剰
+ assignee: ''
},
optionApprove: {
labelWidth: 100,
@@ -77,11 +81,21 @@
label: 'name',
value: 'id',
},
+ filterable: true,
span: 24,
disabled: false,
dicData: [
],
+ // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
+ },
+ {
+ label: '宸ュ簭鐗堟',
+ prop: 'processEdition',
+ type: 'input',
+ span: 24,
+ // disabled: true,
+ display: false,// 闅愯棌鏄剧ず
// rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
},
{
@@ -115,6 +129,7 @@
query: {},
loading: true,
option: {
+ rowKey: "taskId",
addBtn: false,
editBtn: false,
delBtn: false,
@@ -150,16 +165,29 @@
},
],
},
+ {
+ 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: 'categoryName',
- },
+ },*/
{
label: '鏈哄簥',
@@ -220,6 +248,7 @@
data: [],
transferTaskSelection: [],
reassignBox: false,
+ reassignType: 0, // 0:閲嶆柊鎸囨淳锛�1:鑷姩娲惧伐 2: 鑷姩娲惧伐
reassignOption: {
submitBtn: true,
emptyBtn: false,
@@ -246,7 +275,7 @@
span: 24,
prop: 'comment',
type: 'textarea',
- rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ rules: [{ required: false, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
},
],
},
@@ -266,24 +295,23 @@
// });
// },
'formApprove.approve'(val) {
- if (val === 'Y' && this.row.taskDefinitionKey === 'approveTask') {
- this.optionApprove.column[1].disabled = true;
- this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
- } else {
- this.optionApprove.column[1].disabled = false;
- }
+ this.setAssignee(this.row, val);
+ // if(val === 'Y' && ['confirmIsUseableTask'].includes(this.row.taskDefinitionKey) && this.row.variables.isProcessEditionSame=='N') {
+ // // this.optionApprove.column[2].display = true; // 鏄剧ず宸ュ簭鐗堟
+ // } else {
+ // this.optionApprove.column[2].display = false; // 闅愯棌宸ュ簭鐗堟
+ // }
+
},
},
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),
+ };
+ },
},
mounted() {
getAssignee().then(res => {
@@ -291,65 +319,181 @@
this.optionApprove.column[1].dicData = this.assigneeData;
this.reassignOption.column[0].dicData = this.assigneeData;
})
+ this.setApproveBtn()
},
methods: {
+ // 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
+ setApproveBtn () {
+ // 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': // 妫�鏌ョ▼搴忔槸鍚﹀彲鐢�
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },
+ { label: '椹冲洖', value: 'R' },
+ ];
+ break;
+ case 'seniorApproveTask': // 楂樺笀瀹℃牳
+ case 'approveTask': // 楂樺笀瀹℃牳
+
+ default:
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },
+ ];
+ break;
+ }
+ },
+ setAssignee (row, approve) {
+ if (approve === 'Y') {
+ 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','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ this.optionApprove.column[1].disabled = true;
+ this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ }
+ } else if(approve === 'N'){
+ this.formApprove.assignee = ''
+ if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ this.optionApprove.column[1].disabled = true;
+ getPrevius({processInstanceId: row.processInstanceId}).then(res => {
+ console.log(res)
+ if(res.data.code === 200) {
+
+ this.formApprove.assignee = res.data.data // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ }
+ })
+
+ }
+ }
+
+ },
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) {
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, this.formApprove.approve);
console.log('handleAction', row, index);
},
handleSubmit(form, done) {
@@ -365,6 +509,11 @@
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);
--
Gitblit v1.9.3