From 561224d0c6ea8767766a8114ce15c98e31b6a0d9 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期二, 08 七月 2025 23:54:10 +0800
Subject: [PATCH] 1
---
src/views/flow/todolist.vue | 128 +++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 35 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 0ce9190..250ad09 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -13,25 +13,45 @@
</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>
+ <!-- <el-dialog title="瀹℃壒" append-to-body v-model="approveBox" width="100%">
+ <div class="approve-box">
+ <div class="left">
+ <TodolistLeft :row="row"/>
+ </div>
+ <div class="right">
+ <TodolistRightTop :row="row" />
+ <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
+ </div>
+ </div>
+ </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,getAssignee } 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() {
return {
+ applist: [],
assigneeData: [],
row: {},
approveBox: false,
@@ -55,7 +75,7 @@
rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
},
{
- label: '涓嬩竴瀹℃壒鐢ㄦ埛',
+ label: '鍙戦�佺粰',
prop: 'assignee',
type: 'select',
// dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
@@ -88,11 +108,6 @@
form: {},
query: {},
loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
option: {
addBtn: false,
editBtn: false,
@@ -110,7 +125,6 @@
// viewBtn: true,
menuWidth: 100,
dialogClickModal: false,
-
column: [
{
label: '鍏抽敭瀛�',
@@ -132,13 +146,13 @@
},
{
label: '浠诲姟鍚嶇О',
- prop: 'taskName',
+ prop: 'processDefinitionName',
width: 100,
},
{
label: '娴佺▼绫诲瀷',
width: 100,
- prop: 'processDefinitionName',
+ prop: 'categoryName',
},
{
@@ -159,12 +173,30 @@
width: 200,
prop: 'processCreateTime',
type: 'datetime',
- format: 'YYYY-MM-DD',
- valueFormat: 'YYYY-MM-DD',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
search: true,
searchRange: true,
searchSpan: 8,
// hide: true,
+ },
+ {
+ label: '涓婁竴姝ョ敤鎴�',
+ width: 200,
+ prop: '',
+ formatter: (val, value, label) => {
+ return `${val?.variables?.approveUserNickName || ''}`;
+ },
+ },
+ {
+ label: '褰撳墠鑺傜偣',
+ width: 200,
+ prop: 'taskName',
+ },
+ {
+ label: '鏂囦欢',
+ width: 200,
+ prop: '',
},
{
label: '鍒拌揪鏃堕棿',
@@ -175,15 +207,6 @@
label: '鍒拌揪鎻忚堪',
width: 200,
prop: 'comment',
- },
- {
- label: '鏂囦欢',
- width: 200,
- prop: '',
- },
- {
- label: '褰撳墠鑺傜偣',
- prop: '',
},
],
@@ -255,6 +278,7 @@
...this.formApprove,
taskId: this.row.taskId,
processInstanceId: this.row.processInstanceId,
+ programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
}).then(res => {
this.$message.success('瀹℃壒鎴愬姛');
this.approveBox = false;
@@ -268,13 +292,25 @@
},
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() {
@@ -297,16 +333,38 @@
// 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