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

lzhe

2025-08-12 b1bc97edafe1367503a57be94e38070525474593

 src/views/flow/todolist.vue

@@ -294,6 +294,7 @@
                        },
                        span: 24,
                        disabled: false,
                        display: false,
                        dicData: [

                        ],
@@ -332,6 +333,17 @@
            // }
            
        },
        'reassignForm.approve'(val) {
            if(val === 'Y') {
                this.reassignOption.column[1].disabled = true;
                this.reassignOption.column[1].display = false;
                this.reassignForm.newAssigneeId = '';
            } else {
                this.reassignOption.column[1].display = false;
                this.reassignOption.column[1].disabled = false;
                this.reassignForm.newAssigneeId = '';
            }
        }
    },
    computed: {
        ...mapGetters(['userInfo', 'permission']),
@@ -450,10 +462,14 @@
                    })
                });
            } else {

                this.reassignBox = true;
                if(val === 3) {//批量审批时 显示通过驳回
                    this.reassignOption.column[0].display = true;
                    this.reassignOption.column[0].dicData[1].label = '不通过';
                    this.reassignForm.approve = 'Y';
                    this.reassignForm.newAssigneeId = '';
                    this.reassignOption.column[1].disabled = true;
                    this.reassignOption.column[1].display = true;
                } else {
                    this.reassignOption.column[0].display = false;
                }