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

李喆(开发组)

2025-08-05 b5f9a120401311bb4cdedda17618ed5464d185c9

 src/views/flow/todolist.vue

@@ -9,8 +9,7 @@
                </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>
@@ -44,6 +43,7 @@
    },
    data() {
        return {
            
            applist: [],
            assigneeData: [],
            row: {},
@@ -89,7 +89,20 @@
                        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'
                            }
                        ]
                    },
                ],
            },
@@ -102,6 +115,7 @@
            query: {},
            loading: true,
            option: {
                rowKey: "taskId",
                addBtn: false,
                editBtn: false,
                delBtn: false,
@@ -138,15 +152,15 @@
                        ],
                    },
                    {
                        label: '任务名称',
                        label: '流程名称',
                        prop: 'processDefinitionName',
                        width: 100,
                    },
                    },/*
                    {
                        label: '流程类型',
                        width: 100,
                        prop: 'categoryName',
                    },
                    },*/

                    {
                        label: '机床',
@@ -189,7 +203,7 @@
                    {
                        label: '文件',
                        width: 200,
                        prop: '',
                        prop: 'file',
                    },
                    {
                        label: '到达时间',
@@ -310,9 +324,11 @@
                    this.reassignBox = false;
                    this.$refs?.reassginform?.resetForm();
                    this.onLoad(this.page, this.query);
                    done()

                }).catch(err => {
                    console.error(err);
                    done()
                })
            });
            done();
@@ -339,22 +355,28 @@
        },
        handleSubmit(form, done) {
            if(this.row.taskDefinitionKey === 'programmingTask') {
                if(this.applist.length !== 1) {
                    done();
                    return this.$message.success('请选择1个程序');
                }
                // 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(',') : '',
                // 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);
            });
        },