审批按钮调整

yangys

2025-08-16 f1b4ff31d9cb91fcda228a9781ddb8b3c792f8ba

审批按钮调整

 src/views/basesetting/produceplan.vue

@@ -128,19 +128,6 @@
                        hide: true,
                        display: false,
                    },
                    // {
                    //     label: '序号',
                    //     prop: 'index',
                    //     type: 'index',
                    // },
                    {
                        label: '图号',
                        prop: 'drawingNo',
                        type: 'input',
                        display: true,
                        span: 24,
                        rules: [{ required: true, message: '请输入图号', trigger: 'blur' }],
                    },
                    {
                        label: '专业组长',
                        prop: 'teamLeaderId',

 src/views/flow/components/TodolistRightTop.vue

@@ -16,15 +16,19 @@
        <el-form-item label="创建人">
            <el-input v-model="formInline.startUserName" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item label="任务车间">
            <el-input v-model="formInline.workshop" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item label="零组件号">
            <el-input v-model="formInline.drawingNo" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item label="图号版次">
            <el-input v-model="formInline.drawingNoEdition" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item label="工艺版次">
            <el-input v-model="formInline.craftEdition" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item label="任务车间">
            <el-input v-model="formInline.workshop" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        
        <el-form-item label="产品型号">
            <el-input v-model="formInline.productModel" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
@@ -37,9 +41,7 @@
        <el-form-item label="工序版次">
            <el-input v-model="formInline.processEdition" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item label="零组件号">
            <el-input v-model="formInline.drawingNo" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        
        <el-form-item label="加工机床">
            <el-input v-model="formInline.machineCode" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
@@ -54,6 +56,9 @@
        </el-form-item>
        <el-form-item label="程序包名">
            <el-input v-model="formInline.programPackageName" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item label="偏离单">
            <el-input v-model="formInline.deviation" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item label="当前节点">
            <el-input v-model="formInline.taskName" placeholder="" style="width: 200px"></el-input>
@@ -89,7 +94,7 @@
            processName: this.row.variables.processName || '',
            processNo: this.row.variables.processNo || '',
            processEdition: this.row.variables.processEdition || '',
			
            deviation: this.row.variables.deviation || '',
            planStartTime: this.row.variables.planStartTime || '',
            productModel: this.row.variables.productModel || '',
            programPackageName: this.row.variables.programPackageName || '',

 src/views/flow/donelist.vue

@@ -68,8 +68,16 @@
                    },
                    {
                        label: '流程名称',
                        prop: 'processDefinitionName',
                        prop: '',
                        width: 100,
                        render: ({ row }) => {
                            return h('p',
                                {
                                    attrs: {},
                                    class: {},
                                    style: {},
                                }, row?.variables?.myProcessName)
                        }
                    },/*
                    {
                        label: '流程类型',

 src/views/flow/todolist.vue

@@ -198,8 +198,16 @@
                    },
                    {
                        label: '流程名称',
                        prop: 'processDefinitionName',
                        prop: '',
                        width: 100,
                        render: ({ row }) => {
                            return h('p',
                                {
                                    attrs: {},
                                    class: {},
                                    style: {},
                                }, row?.variables?.myProcessName)
                        }
                    },/*
                    {
                        label: '流程类型',
@@ -402,35 +410,55 @@
            }
        },
        setAssignee (row, approve) {
            if (approve === 'Y') {
                if (["check", 'cureCheckTask '].includes(row.taskDefinitionKey)) {// 校对
            if (approve === 'Y') {//审批通过的情况

                this.optionApprove.column[1].disabled = false;
                if (["check", 'cureCheckTask','repalceCheckTask'].includes(row.taskDefinitionKey)) {// 校对节点
                    this.formApprove.assignee = row.variables.senior;
                } else if (["programmingTask",'cureProgramTask'].includes(row.taskDefinitionKey)) {// 编制，校对
                } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask'].includes(row.taskDefinitionKey)) {// 编制节点
                    this.formApprove.assignee = row.variables.checker;
                } else if (row.taskDefinitionKey == "teamLeaderTask") {// 任务派工
                } else if (row.taskDefinitionKey == "teamLeaderTask") {// 任务派工(组长)
                    this.optionApprove.column[1].disabled = false;
                    this.formApprove.assignee = row.variables.programmer
                } else if (row.taskDefinitionKey == "confirmIsUseableTask") {
                } else if (row.taskDefinitionKey == "confirmIsUseableTask") {//判断程序是否可用节点，都是发送给校对
                    this.formApprove.assignee = row.variables.checker
                } else if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 高师审核
                    this.optionApprove.column[1].disabled = true;
                    this.formApprove.assignee = ''; // 如果是通过，则默认指派给自己
                    this.optionApprove.column[1].disabled = true;//最后一个节点"发送给" 禁用
                    this.formApprove.assignee = ''; // 如果是通过流程直接结束
                }
            } else if(approve === 'N'){
                this.formApprove.assignee = ''
                if(row.taskDefinitionKey == "teamLeaderTask") {
                    this.optionApprove.column[1].display = false;
                //不通过的情况
                //根据在线文档34行，驳回'发送给'是禁用，但有默认选项
                this.optionApprove.column[1].disabled = true;

                //this.formApprove.assignee = ''
                //if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {
                    //数控程序审核(高师)，是最后一个节点，不通过 都是禁用'发送给'，直接给 校对人员
                    //this.optionApprove.column[1].disabled = true;
                //}
                if(["cureProgramTask"].includes(row.taskDefinitionKey)) {
                    //固化编制节点，不通过就结束了，assignee设置=''
                    this.formApprove.assignee = '';
                }
                if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 高师审核
                    this.optionApprove.column[1].disabled = true;
                    getPrevius({processInstanceId: row.processInstanceId}).then(res => {
                        console.log(res)
                        if(res.data.code === 200) {
                            
                            this.formApprove.assignee = res.data.data // 如果是通过，则默认指派给自己
                        }
                    })
                if(["teamLeaderTask" ,'repalceProgrammingTask'].includes(row.taskDefinitionKey)) {
                    //组长，替换流程的程序编制，禁用'发送给'
                    //this.optionApprove.column[1].disabled = true;
                }else {
                    //除了组长，替换流程的编制，其他节点的不通过，都是给上一个步骤的处理人
                    if(!["cureProgramTask"].includes(row.taskDefinitionKey)) {
                        //非固化编制节点，需要初始化默认处理人
                        getPrevius({processInstanceId: row.processInstanceId}).then(res => {
                            console.log(res)
                            if(res.data.code === 200) {
                                this.formApprove.assignee = res.data.data // 如果是通过，则默认指派给自己
                            }
                        });
                    }
                    
                }

                
                
            }
            
        },

 src/views/flowmgr/backImport.vue

@@ -126,9 +126,9 @@

    },
    handleWarehouse() {
      // if (this.selection.length == 0) {
      //   return this.$message.error("请选择数据")
      // }
      if (this.selection.length == 0) {
         return this.$message.error("请选择数据")
      }
      let selection = [];
      this.selection.forEach(item => {
        selection.push(item.id);

 src/views/flowmgr/processQuery.vue

@@ -147,8 +147,16 @@
                    },
                    {
                        label: '流程名称',
                        prop: 'processDefinitionName',
                        prop: '',
                        width: 80,
                        render: ({ row }) => {
                            return h('p',
                                {
                                    attrs: {},
                                    class: {},
                                    style: {},
                                }, row?.variables?.myProcessName)
                        }
                    },
                    {
                        label: '工艺版次',

 src/views/flowmgr/programexport.vue

@@ -23,7 +23,7 @@
                </avue-crud>
            </el-tab-pane>
            <el-tab-pane label="已办" name="completed">
                <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud" @current-change="currentChange"
                <avue-crud :option="optionCompleted" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud" @current-change="currentChange"
                    @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange">
                    <template #menu-left>
                        <!-- <el-button type="primary" plain @click="exportWebSite">导出回传涉密网</el-button> -->
@@ -120,6 +120,68 @@
                        searchSpan: 8,
                    },
                ],
            },
            optionCompleted: {
                addBtn: false,
                editBtn: false,
                delBtn: false,
                viewBtn: true,
                columnBtn: false,
                tip: false,
                // simplePage: true,
                searchShow: true,
                searchMenuSpan: 6,
                dialogWidth: '60%',
                // tree: true,
                border: true,
                index: true,
                selection: true,
                // viewBtn: true,
                menuWidth: 200,
                menu: false,
                dialogClickModal: false,
                column: [
                    {
                        label: '流程标题',
                        prop: 'title',
                    },
                    {
                        label: '图号',
                        prop: 'drawingNo',
                    },
                    {
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                    },
                    {
                        label: '工序名称',
                        prop: 'processName',
                    },
                    {
                        label: '程序名称',
                        prop: 'name',
                        search: true,
                    },
                    {
                        label: '通过时间',
                        prop: 'createTime',
                    },
                    {
                        label: '已办时间',
                        prop: 'updateTime',
                    },
                    {
                        label: '通过时间',
                        prop: 'passTime',
                        search: true,
                        hide: true,
                        type: 'datetime',
                        format: 'YYYY-MM-DD HH:mm:ss',
                        valueFormat: 'YYYY-MM-DD HH:mm:ss',
                        searchRange: true,
                        searchSpan: 8,
                    },
                ],
            }
        };
    },