From 08472b4b62d832a3f54183edf7a288897375392d Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期日, 10 八月 2025 00:23:29 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flow/todolist.vue | 424 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 341 insertions(+), 83 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index fc0148b..df8b663 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -1,47 +1,67 @@
<template>
<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">
+ @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
+ @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">閲嶆柊鎸囨淳</el-button>
+ <el-button type="primary" v-if="permission.manual_dispatch" plain @click="reassign">鎵嬪姩娲惧伐
+ </el-button>
+ <el-button type="primary" v-if="permission.auto_dispatch" plain @click="reassign">鑷姩娲惧伐
</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="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 } 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() {
+ let rejectText = '椹冲洖';//+this.row.categoryName;
+ console.log(this,'ttt');
return {
+
+ applist: [],
+ assigneeData: [],
row: {},
approveBox: false,
formApprove: {
comment: '',
- approve: 'Y', // 榛樿鍚屾剰
+ approve: '', // 榛樿鍚屾剰
+ assignee: ''
},
optionApprove: {
labelWidth: 100,
column: [
-
+
{
label: '瀹℃壒缁撴灉',
prop: 'approve',
@@ -49,16 +69,56 @@
span: 24,
dicData: [
{ label: '閫氳繃', value: 'Y' },
- { label: '椹冲洖', value: 'N' },
+ { label: rejectText, value: 'N' },
],
rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
+ },
+ {
+ label: '鍙戦�佺粰',
+ prop: 'assignee',
+ type: 'select',
+ // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
+ // dicFlag: true,
+ props: {
+ 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' }],
},
{
label: '澶囨敞',
span: 24,
prop: 'comment',
type: 'textarea',
- rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ rules: [
+ {
+ validator: (rule, value, callback) => {
+ console.log('-------',this.formApprove)
+ if (value === '' && this.formApprove.approve !== 'Y') {
+ callback(new Error('璇疯緭鍏ュ娉�'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }
+ ]
},
],
},
@@ -70,14 +130,8 @@
form: {},
query: {},
loading: true,
- selectionList: [],
- parentId: 0,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
option: {
+ rowKey: "taskId",
addBtn: false,
editBtn: false,
delBtn: false,
@@ -90,22 +144,11 @@
// tree: true,
border: true,
index: true,
- // selection: true,
+ selection: true,
// viewBtn: true,
- menuWidth: 320,
+ menuWidth: 100,
dialogClickModal: false,
column: [
- {
- label: '鍒涘缓鏃堕棿',
- prop: 'createTime',
- type: 'datetime',
- format: 'YYYY-MM-DD',
- valueFormat: 'YYYY-MM-DD',
- search: true,
- searchRange: true,
- searchSpan: 8,
- hide: true,
- },
{
label: '鍏抽敭瀛�',
prop: 'keyword',
@@ -124,66 +167,120 @@
},
],
},
-
- {
- label: '缂栧彿',
- prop: 'taskId',
+ {
+ label: '鏍囬',
+ prop: '',
width: 100,
+ render: ({ row }) => {
+ return h('p',
+ {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.title)
+ }
},
{
- label: '浠诲姟鍚嶇О',
- prop: 'taskName',
+ label: '娴佺▼鍚嶇О',
+ prop: 'processDefinitionName',
width: 100,
- },
+ },/*
{
label: '娴佺▼绫诲瀷',
width: 100,
- prop: 'processDefinitionName',
- },
- {
- label: '瀹炰緥缂栧彿',
- width: 100,
- type: 'processInstanceId',
- },
+ prop: 'categoryName',
+ },*/
+
{
label: '鏈哄簥',
width: 100,
- type: 'tree',
+ prop: '',
+ formatter: (val, value, label) => {
+ return `${val?.variables?.machineCode}`;
+ },
},
{
label: '鍒涘缓浜�',
width: 100,
- type: 'tree',
+ prop: 'startUserName',
},
{
label: '鍒涘缓鏃堕棿',
- width: 100,
- prop: 'createTime',
+ width: 200,
+ prop: 'processCreateTime',
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ search: true,
+ searchRange: true,
+ searchSpan: 8,
+ // hide: true,
},
{
- label: '鍒拌揪鏃堕棿',
- width: 100,
+ label: '涓婁竴姝ョ敤鎴�',
+ width: 200,
prop: '',
+ formatter: (val, value, label) => {
+ return `${val?.variables?.approveUserNickName || ''}`;
+ },
},
{
- label: '鍒拌揪鎻忚堪',
- width: 100,
- prop: 'comment',
+ label: '褰撳墠鑺傜偣',
+ width: 200,
+ prop: 'taskName',
},
{
label: '鏂囦欢',
- width: 100,
- prop: '',
+ width: 200,
+ prop: 'file',
},
{
label: '鍒拌揪鏃堕棿',
- width: 100,
- prop: '',
+ width: 200,
+ prop: 'createTime',
+ },
+ {
+ label: '鍒拌揪鎻忚堪',
+ width: 200,
+ prop: 'comment',
},
],
},
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: {
@@ -198,49 +295,185 @@
// }
// });
// },
+ 'formApprove.approve'(val) {
+ 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 => {
+ this.assigneeData = res.data.data;
+ this.optionApprove.column[1].dicData = this.assigneeData;
+ this.reassignOption.column[0].dicData = this.assigneeData;
+ })
},
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'].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)) {// 楂樺笀瀹℃牳
+ this.optionApprove.column[1].disabled = true;
+ this.formApprove.assignee = row.varables.assignee; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ }
+ }
+
+ },
+ 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);
+ done()
+
+ }).catch(err => {
+ console.error(err);
+ done()
+ })
+ });
+ done();
+ },
handleAction(row, index) {
+ this.formApprove = {
+ comment: '',
+ approve: 'Y', // 榛樿鍚�
+ }
this.approveBox = true;
this.row = row
+ this.setAssignee(row, this.formApprove.approve);
console.log('handleAction', row, index);
},
- handleSubmit (form,done) {
+ handleSubmit(form, done) {
+ if(this.row.taskDefinitionKey === 'programmingTask') {
+ // if(this.applist.length !== 1) {
+ // done();
+ // return this.$message.success('璇烽�夋嫨1涓▼搴�');
+ // }
+ }
approve({
...this.formApprove,
taskId: this.row.taskId,
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);
done();
}).catch(err => {
+ done();
console.error(err);
});
},
- reassign() {// 閲嶆柊鎸囨淳
-
- },
searchChange(params, done) {
+ let data = {}
this.query = params;
this.page.currentPage = 1;
console.log('searchChange', params);
- params.createTimeBegin = params.createTime[0] || '';
- params.createTimeEnd = params.createTime[1] || '';
+ params.createTimeBegin = params?.processCreateTime?.[0] || '';
+ params.createTimeEnd = params?.processCreateTime?.[1] || '';
console.log(params);
- this.onLoad(this.page, 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();
},
searchReset() {
@@ -263,16 +496,41 @@
// category: params.category ? flowCategory(params.category) : null,
mode: this.mode,
};
+ 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