From 9ff7d57765b1eb3704b9425819cdb9c5708e0ab1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 14 八月 2025 22:53:32 +0800
Subject: [PATCH] 错误捕获
---
src/views/flow/todolist.vue | 132 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 121 insertions(+), 11 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 7a8ff98..cd3e679 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -10,9 +10,12 @@
</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>
@@ -26,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>
@@ -34,19 +49,21 @@
</template>
<script>
-import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch } 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() {
return {
-
+ activeName: 'approve',
applist: [],
assigneeData: [],
row: {},
@@ -254,6 +271,18 @@
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',
type: 'select',
@@ -265,6 +294,7 @@
},
span: 24,
disabled: false,
+ display: true,
dicData: [
],
@@ -275,7 +305,7 @@
span: 24,
prop: 'comment',
type: 'textarea',
- rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
},
],
},
@@ -303,6 +333,20 @@
// }
},
+ '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']),
@@ -310,6 +354,7 @@
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),
};
},
},
@@ -317,7 +362,7 @@
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()
},
@@ -373,7 +418,14 @@
this.formApprove.assignee = ''
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 // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ }
+ })
+
}
}
@@ -411,9 +463,27 @@
}).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;
+ }
}
@@ -426,7 +496,8 @@
confirmButtonText: this.$t('submitText'),
cancelButtonText: this.$t('cancelText'),
type: 'warning',
- }).then(() => {
+ }).then((res) => {
+ console.log(res,'>>>>>>')
reassgin({
...form,
taskId: this.transferTaskSelection[0].taskId,
@@ -446,6 +517,10 @@
this.$message.error('鎿嶄綔澶辫触');
done()
})
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
});
} else if (this.reassignType === 1) {
@@ -474,10 +549,44 @@
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();
});
}
-
- done();
},
handleAction(row, index) {
this.formApprove = {
@@ -593,6 +702,7 @@
.right {
flex: 1;
+ padding: 0 10px;
}
}
</style>
--
Gitblit v1.9.3