1

李喆(开发组)

2025-07-04 ed323a0c8ebbf8c7693fa8d5084f579f23da553b

 src/views/flow/todolist.vue

@@ -1,8 +1,8 @@
<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">
            <template #menu-left>
                <el-button type="primary" plain @click="reassign">重新指派
                </el-button>
@@ -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">
@@ -26,22 +26,23 @@
</template>

<script>
import { getList, approve } from '@/api/flow/todolist';
import { getList, approve,getAssignee } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';

import dayjs from 'dayjs';
export default {
    data() {
        return {
            assigneeData: [],
            row: {},
            approveBox: false,
            formApprove: {
                comment: '',
                approve: 'Y', // 默认同意
                approve: '', // 默认同意
            },
            optionApprove: {
                labelWidth: 100,
                column: [
                    

                    {
                        label: '审批结果',
                        prop: 'approve',
@@ -52,6 +53,23 @@
                            { label: '驳回', 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',
                        },
                        span: 24,
                        disabled: false,
                        dicData: [
                            
                        ],
                        // rules: [{ required: true, message: '请选择下一审批用户', trigger: 'blur' }],
                    },
                    {
                        label: '备注',
@@ -70,13 +88,6 @@
            form: {},
            query: {},
            loading: true,
            selectionList: [],
            parentId: 0,
            page: {
                pageSize: 10,
                currentPage: 1,
                total: 0,
            },
            option: {
                addBtn: false,
                editBtn: false,
@@ -92,20 +103,9 @@
                index: 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,15 +124,9 @@
                            },
                        ],
                    },

                    {
                        label: '编号',
                        prop: 'taskId',
                        width: 100,
                    },
                    {
                        label: '任务名称',
                        prop: 'taskName',
                        prop: 'processDefinitionName',
                        width: 100,
                    },
                    {
@@ -140,45 +134,59 @@
                        width: 100,
                        prop: 'processDefinitionName',
                    },
                    {
                        label: '实例编号',
                        width: 100,
                        type: 'processInstanceId',
                    },
                    
                    {
                        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,
                        width: 200,
                        prop: '',
                    },
                    {
                        label: '到达时间',
                        width: 100,
                        prop: '',
                        width: 200,
                        prop: 'createTime',
                    },
                    {
                        label: '到达描述',
                        width: 200,
                        prop: 'comment',
                    },

                ],
@@ -198,6 +206,14 @@
        //         }
        //     });
        // },
        '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;
            }
        },
    },
    computed: {
        ...mapGetters(['userInfo', 'permission']),
@@ -210,13 +226,34 @@
        //     };
        // },
    },
    mounted() {
        getAssignee().then(res=> {
            this.assigneeData = res.data.data;
            this.optionApprove.column[1].dicData = this.assigneeData;
        })
    },
    methods: {
        handleAction(row, index) {
            this.formApprove = {
                comment: '',
                approve: '', // 默认同
            }
            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") {

            }
            console.log('handleAction', row, index);
        },
        handleSubmit (form,done) {
        handleSubmit(form, done) {
            approve({
                ...this.formApprove,
                taskId: this.row.taskId,
@@ -234,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() {
@@ -263,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;