Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

gaoshp

2025-06-23 8e3411a56294bb5884ff032dda49a862a87339ff

 src/views/flow/todolist.vue

@@ -13,7 +13,7 @@
                </el-button>
            </template>
        </avue-crud>
        <el-dialog title="审批" append-to-body v-model="approveBox" width="20%">
        <el-dialog title="审批" append-to-body v-model="approveBox" width="30%">
            <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
            <!-- <template #footer>
                <span class="dialog-footer">
@@ -28,7 +28,7 @@
<script>
import { getList, approve,getAssignee } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';

import dayjs from 'dayjs';
export default {
    data() {
        return {
@@ -55,7 +55,7 @@
                        rules: [{ required: true, message: '请选择审批结果', trigger: 'blur' }],
                    },
                    {
                        label: '下一审批用户',
                        label: '发送给',
                        prop: 'assignee',
                        type: 'select',
                        // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
@@ -88,11 +88,6 @@
            form: {},
            query: {},
            loading: true,
            page: {
                pageSize: 10,
                currentPage: 1,
                total: 0,
            },
            option: {
                addBtn: false,
                editBtn: false,
@@ -110,7 +105,6 @@
                // viewBtn: true,
                menuWidth: 100,
                dialogClickModal: false,

                column: [
                    {
                        label: '关键字',
@@ -132,7 +126,7 @@
                    },
                    {
                        label: '任务名称',
                        prop: 'taskName',
                        prop: 'processDefinitionName',
                        width: 100,
                    },
                    {
@@ -159,12 +153,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 +187,6 @@
                        label: '到达描述',
                        width: 200,
                        prop: 'comment',
                    },
                    {
                        label: '文件',
                        width: 200,
                        prop: '',
                    },
                    {
                        label: '当前节点',
                        prop: '',
                    },

                ],
@@ -268,13 +271,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,8 +312,14 @@
                // 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;