现场编制功能适配

yangys

2025-09-17 ae2c3f847da927b6124e872d8d74c0457a1eea14

 src/views/flow/todolist.vue

@@ -1,6 +1,7 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
            :search="query"
            @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
            @selection-change="selectionTransferTask">
@@ -10,23 +11,31 @@
                </el-button>
                <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.manual_dispatch" plain @click="reassign(1)">手动派工
                </el-button>
                <el-button type="primary" :disabled="this.transferTaskSelection.length==0" plain @click="reassign(0)">重新指派</el-button>
                <el-button type="primary" :disabled="this.transferTaskSelection.length==0" plain @click="reassign(0)">转派</el-button>
                <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.batch_approve" plain @click="reassign(3)">批量审批
                </el-button>

                <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.batch_on_machine" plain @click="showBatchOnMachine()">现场编制
                </el-button>
            </template>
            <template #menu="scope">
                <el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">
                    {{scope.row.taskDefinitionKey === 'teamLeaderTask' ? '派工' : '审批'}}
                    {{approveButtonText(scope.row.taskDefinitionKey)}}
                </el-button>
            </template>
              
        </avue-crud>
        <el-dialog title=" " append-to-body v-model="reassignBox" width="30%">
            <avue-form ref="reassginform" :option="reassignOption" v-model="reassignForm" @submit="toPerson"></avue-form>
        </el-dialog>
        <el-drawer title="审批" append-to-body v-model="approveBox" size="100%" v-if="approveBox">
        <el-dialog title="现场编制" append-to-body v-model="onMachineBox" width="30%">
            <avue-form :option="onMachineOption" v-model="onMachineForm" @submit="batchOnMachine"></avue-form>
        </el-dialog>
        <div  class="box-drawer">
        <el-drawer title="审批" append-to-body v-model="approveBox" size="100%" v-if="approveBox" class="remark-drawer">
            <div class="approve-box">
                <div class="left">
                    <TodolistLeft :row="row" @selection-change="selectionChange" />
                    <TodolistLeft ref="todolistLeft" :row="row" @selection-change="selectionChange" />
                </div>
                <div class="right">
                    <TodolistRightTop :row="row" />
@@ -36,7 +45,9 @@
                        v-model="activeName"
                    >
                        <el-tab-pane label="审批" name="approve">
                            <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
                            <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" >
                                
                            </avue-form>
                        </el-tab-pane>
                        <el-tab-pane label="流程轨迹" name="log">
                            <processTrace :item="row" v-if="activeName==='log'"></processTrace>
@@ -46,13 +57,11 @@
                </div>
            </div>
        </el-drawer>
        </div>
    </basic-container>
    <div>
        <!--<top-todo ref="topTodoComponent" />-->
    </div>
</template>
<script>
import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch,todoChangeNotify,batchApprove } from '@/api/flow/todolist';
import { getList, approve, getAssignee,getAssigneeTree,reassgin,manualDispatch,autoDispatch,todoChangeNotify,batchApprove, batchApproveOnMachine } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import TodolistLeft from './components/TodolistLeft.vue';
@@ -72,13 +81,18 @@
            assigneeData: [],
            allAssigneeData: [],
            managerAssigneeData: [],//数控管理员角色的审批用户

            assignee2Data:[],

            row: {},
            approveBox: false,
            formApprove: {
                comment: '',
                approve: '', // 默认同意
                assignee: ''
                approve: '',
                assignee: '',
            },
    

            optionApprove: {
                labelWidth: 100,
                column: [
@@ -97,26 +111,25 @@
                    {
                        label: '发送给',
                        prop: 'assignee',
                        type: 'select',
                        props: {
                            label: 'name',
                            value: 'id',
                        component: 'elTreeSelect',
                        params: {
                            props:{
                                label: 'name',
                                value:'id',
                                disabled: (data) => data.nodeType==='dept',
                                isLeaf: (data) => data.children==null || data.children.length==0,
                            },
                        },
                        display: true,
                        filterable: true,
                        span: 24,
                        disabled: false,
                        dicData: [

                        ],
                        // rules: [{ required: true, message: '请选择下一审批用户', trigger: 'blur' }],
                    },
                    {
                        label: '备注',
                        span: 24,
                        prop: 'comment',
                        type: 'textarea',
                        // rules: [{ required: true, message: '请输入审批意见', trigger: 'blur' }],
                        rules: [
                            {
                            validator: (rule, value, callback) => {
@@ -131,6 +144,7 @@
                            }
                        ]
                    },
                    
                ],
            },
            page: {
@@ -139,7 +153,12 @@
                total: 0,
            },
            form: {},
            query: {},
            query: {
                machineSpec: ['1','2']
            },
            defaultQuery: {
                machineSpec: ['1','2']
            },
            loading: true,
            option: {
                rowKey: "taskId",
@@ -148,12 +167,10 @@
                delBtn: false,
                columnBtn: false,
                tip: false,
                // simplePage: true,
                searchEnter:true,
                searchShow: true,
                searchMenuSpan: 6,
                searchMenuSpan: 4,
                dialogWidth: '60%',
                // tree: true,
                border: true,
                index: true,
                selection: true,
@@ -164,7 +181,7 @@
                    {
                        label: '关键字',
                        prop: 'keyword',
                        width: 300,
                        width: 200,
                        search: true,
                        searchType: 'input',
                        hide: true,
@@ -176,6 +193,27 @@
                            {
                                label: '工控网车床程序',
                                value: 2,
                            },
                        ],
                    },
                    {
                        label: '机床类型',
                        prop: 'machineSpec',
                        width: 200,
                        search: true,
                        searchType: 'select',
                        multiple:true,
                        clearable:false,
                        hide: true,
                        emptyValues :["1",'2'],
                        dicData: [
                            {
                                label: '车床',
                                value: '1',
                            },
                            {
                                label: '加工中心',
                                value: '2',
                            },
                        ],
                    },
@@ -221,7 +259,7 @@
                        label: '机床',
                        width: 100,
                        prop: '',
                        
                        showOverflowTooltip:true,
                        formatter: (val, value, label) => {
                            return `${val?.variables?.machineCode}`;
                        },
@@ -242,6 +280,7 @@
                        search: true,
                        searchRange: true,
                        searchSpan: 8,
                        showOverflowTooltip:true,
                        // hide: true,
                    },
                    {
@@ -254,7 +293,8 @@
                    },
                    {
                        label: '当前节点',
                        width: 100,
                        width: 120,
                        showOverflowTooltip:true,
                        prop: 'taskName',
                    },
                    {
@@ -302,6 +342,25 @@
                    {
                        label: '发送给',
                        prop: 'newAssigneeId',
                        component: 'elTreeSelect',
                        params: {
                            props:{
                                label: 'name',
                                value:'id',
                                disabled: (data) => data.nodeType==='dept',
                                isLeaf: (data) => data.children==null || data.children.length==0,
                            },
                        },
                        display: true,
                        filterable: true,
                        span: 24,
                        disabled: false,
                        rules: [{ required: true, message: '请输入选择', trigger: 'blur' }],
                    },
                    /*
                    {
                        label: '发送给',
                        prop: 'newAssigneeId',
                        filterable:true,
                        type: 'select',
                        props: {
@@ -315,17 +374,61 @@

                        ],
                        rules: [{ required: true, message: '请输入选择', trigger: 'blur' }],
                    },*/
                    {
                        label: '备注',
                        span: 24,
                        prop: 'comment',
                        type: 'textarea',
                    },
                ],
            },
            reassignForm: {},

            onMachineBox: false,//现场编制框
            onMachineForm: {},
            onMachineOption: {
                submitBtn: true,
                emptyBtn: false,
                column: [
                    {
                        label: '审批结果',
                        prop: 'approve',
                        type: 'radio',
                        span: 24,
                        display: false,
                        dicData: [
                            { label: '通过', value: 'Y' },
                            { label: '驳回', value: 'N' },
                        ],
                        rules: [{ required: true, message: '请选择审批结果', trigger: 'blur' }],
                    },
                    {
                        label: '发送给',
                        prop: 'assignee',
                        component: 'elTreeSelect',
                        params: {
                            props:{
                                label: 'name',
                                value:'id',
                                disabled: (data) => data.nodeType==='dept',
                                isLeaf: (data) => data.children==null || data.children.length==0,
                            },
                        },
                        display: true,
                        filterable: true,
                        span: 24,
                        disabled: false,
                        rules: [{ required: true, message: '请输入选择', trigger: 'blur' }],
                    },
                    {
                        label: '备注',
                        span: 24,
                        prop: 'comment',
                        type: 'textarea',
                        // rules: [{ required: true, message: '请输入审批意见', trigger: 'blur' }],
                    },
                ],
            },
            reassignForm: {}
        };
    },
    watch: {
@@ -361,6 +464,7 @@
    },
    mounted() {
        //this.setApproveBtn(row)
        /*
        getAssignee({
                taskId: 0,
             }).then(res => {
@@ -368,9 +472,46 @@
                this.assigneeData = res.data.data;
                this.reassignOption.column[1].dicData = this.assigneeData;
             });
        */
         getAssigneeTree({
                taskId: 0,
             }).then(res => {
                this.assigneeData = res.data.data;
                //初始化数控管理员的数组
                for(var i=0;i<this.assigneeData.length;i++){
                    for(var j=0;j<this.assigneeData[i].children.length;j++){
                        if(this.assigneeData[i].children[j].nodeType=='manager'){
                            this.managerAssigneeData[this.managerAssigneeData.length] = this.assigneeData[i].children[j];
                        }
                    }
                }
                
                this.optionApprove.column[1].data = this.assigneeData;
                this.reassignOption.column[1].data = this.assigneeData;
                this.onMachineOption.column[1].data = this.assigneeData;
             });
    },
    methods: {
        
        approveButtonText(taskDefinitionKey){
            let lower = taskDefinitionKey.toLowerCase();
            if(taskDefinitionKey === 'teamLeaderTask') {
                return '派工'
            }else if(taskDefinitionKey == 'unlockProgramConfirm') {
                //解锁，编制复核
                return '复核'
            }else if(taskDefinitionKey == 'programMgrConfirm') {
                //固化，程序管理员确认
                return '确认'
            }else if(lower.indexOf('program')>-1) {
                return '编制'
            }else if(lower.indexOf('check')>-1) {
                return '校对'
            }else if(lower.indexOf('useable')>-1) {
                return '检查'
            }else{
                return '审批'
            } 
        },
        setApproveBtn (row) { // 设置审批结果的状态
            // 1.审批界面radio文本修改，普通节点的2个radio文本 通过（approve=Y),不通过(现在的驳回)(approve=N)
            
@@ -431,10 +572,10 @@
            
            if (["cureProgramTask"].includes(row.taskDefinitionKey)) {
                if(approve === 'N'){
                    this.optionApprove.column[1].dicData = this.managerAssigneeData;
                    this.optionApprove.column[1].data = this.managerAssigneeData;
                }else{
                    //this.assigneeData = this.allAssigneeData;
                    this.optionApprove.column[1].dicData = this.allAssigneeData;
                    //this.optionApprove.column[1].dicData = this.allAssigneeData;
                    this.optionApprove.column[1].data = this.assigneeData;
                }
            }
            if (approve === 'Y') {//审批通过的情况
@@ -442,7 +583,7 @@
                this.optionApprove.column[1].disabled = false;
                if (["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)) {// 校对节点
                    this.formApprove.assignee = row.variables.senior;
                } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)) {// 编制节点
                } else if (["programmingTask",'cureProgramTask','replaceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)) {// 编制节点
                    this.formApprove.assignee = row.variables.checker;
                } else if (row.taskDefinitionKey == "teamLeaderTask") {// 任务派工(组长)
                    this.optionApprove.column[1].disabled = false;
@@ -461,10 +602,16 @@
                //根据在线文档34行，'发送给'是禁用，但有默认选项
                this.optionApprove.column[1].disabled = true;

                if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {
                if (["approveTask", 'seniorApproveTask','replaceApprove','appendApproveTask'].includes(row.taskDefinitionKey)) {
                    //审批节点，不通过给编制：编制是责任人，给实际编程员
                    //this.formApprove.assignee = row.variables.programmer;
                    this.formApprove.assignee = row.variables.actProgrammer;//给实际编程员
                    if(row.variables.actProgrammer){
                        this.formApprove.assignee = row.variables.actProgrammer;//给实际编程员
                    }else{
                        this.formApprove.assignee = row.variables.programmer;//无编程员给主管工艺
                    }
                }else if(['unlockApproveTask'].includes(row.taskDefinitionKey)){
                    //解锁高师审批节点,上一步是编程
                    this.formApprove.assignee = row.variables.programmer;//给主管工艺
                } else if(["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)){
                    //校对节点,上一步是编程
                    //this.formApprove.assignee = row.variables.programmer;
@@ -476,17 +623,14 @@
                    //固化编制节点，不通过给数控管理员
                    //TODO 按找角色定位给其中一个数控管理员
                    this.optionApprove.column[1].disabled = false;
                    for(var i=0;i<this.assigneeData.length;i++){
                        if(this.assigneeData[i].manager == true){
                            this.formApprove.assignee = this.assigneeData[i].id;
                            break;
                        }
                    
                    if(this.managerAssigneeData.length>0){
                        this.formApprove.assignee = this.managerAssigneeData[0].id;
                    }
                    //this.formApprove.assignee = '';
                }else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
                    //判断是否可用节点，不可用，给编制
                    this.formApprove.assignee = row.variables.programmer;
                }if(['teamLeaderTask','repalceProgrammingTask','unlockProgramConfirm'].includes(row.taskDefinitionKey)){
                }if(['teamLeaderTask','replaceProgrammingTask','unlockProgramConfirm'].includes(row.taskDefinitionKey)){
                    //初始节点不通过就是结束流程，处理人为空
                    this.formApprove.assignee = '';
                }
@@ -567,8 +711,41 @@
                }
            }
            
            
        },
        showBatchOnMachine(){//显示现场编制对话框
            this.onMachineBox = true;
            this.onMachineForm.assignee = this.transferTaskSelection[0].variables.checker;

        },
        batchOnMachine() {//编制批量处理（现场编制）
           
            this.$confirm('请确认是否将选定任务设置为现场编制？', '', {
                confirmButtonText: this.$t('submitText'),
                cancelButtonText: this.$t('cancelText'),
                type: 'warning',
            }).then(() => {
                batchApproveOnMachine({
                    taskIds: this.transferTaskSelection.map(v => v.taskId),
                    processInstanceIds: this.transferTaskSelection.map(v => v.processInstanceId),
                    assignee: this.onMachineForm.assignee,
                }).then(res => {
                    if(res.data.code !== 200) {
                        this.$message.error(res.data.msg);
                        return;
                    }
                    this.$message.success('操作成功');
                    this.onMachineBox = false;
                    this.onLoad(this.page, this.query);
                    todoChangeNotify();
                }).catch(err => {
                    this.$message.success('操作失败');
                })
            }).catch(() => {
                // this.$message.info('已取消操作');
            });
           
        },

        toPerson(form, done) {
            let tip = ''
            this.reassignType === 1 ? tip = '请确认是否手动派工' : this.reassignType === 2 ? tip = '请确认是否自动派工' : tip = '请确认是否重新指派';
@@ -676,20 +853,24 @@
            }
        },
        handleAction(row, index) {
             getAssignee({
             getAssigneeTree({
                taskId: row.taskId,
             }).then(res => {
                //if(row.taskDefinitionKey === '')
      
                this.assigneeData = res.data.data;
                this.allAssigneeData = res.data.data;

                this.managerAssigneeData=[];
                //初始化数控管理员的数组
                for(var i=0;i<this.allAssigneeData.length;i++){
                    if(this.allAssigneeData[i].manager == true){
                        this.managerAssigneeData[this.managerAssigneeData.length] = this.allAssigneeData[i];
                for(var i=0;i<this.assigneeData.length;i++){
                    for(var j=0;j<this.assigneeData[i].children.length;j++){
                        if(this.assigneeData[i].children[j].nodeType=='manager'){
                            this.managerAssigneeData[this.managerAssigneeData.length] = this.assigneeData[i].children[j];
                        }
                    }
                }
                this.optionApprove.column[1].dicData = this.assigneeData;
                this.reassignOption.column[1].dicData = this.assigneeData;
                this.optionApprove.column[1].data = this.assigneeData;
                this.reassignOption.column[1].data = this.assigneeData;
            })
            this.formApprove = {
                comment: '',
@@ -700,20 +881,42 @@

            this.setAssignee(row, this.formApprove.approve);
            this.setApproveBtn(row);
            console.log('handleAction', row, index);
            //console.log('handleAction', row, index);
        },
        handleSubmit(form, done) {
            if(this.row.taskDefinitionKey === 'programmingTask') {
                // if(this.applist.length !== 1) {
                //     done();
                //     return this.$message.success('请选择1个程序');
                // }
        async handleSubmit(form, done) {

            let programOnMachine = 'N'
            let goApprove = true;
            if(this.row.taskDefinitionKey==='programmingTask' || this.row.taskDefinitionKey==='cureProgramTask'){
                programOnMachine = this.$refs.todolistLeft.programOnMachine?'Y':'N';

                let atts = this.$refs.todolistLeft.tableData;
                let otherFileCOunt = atts.filter(att => att.program === false).length;
                if(otherFileCOunt == 0){
                    let confirResult = await this.$confirm('文件列表中无其他文件，确认要提交吗？', '', {
                        confirmButtonText: this.$t('submitText'),
                        cancelButtonText: this.$t('cancelText'),
                        type: 'warning',
                    }).then(()=>{
                        goApprove = true;
                    }).catch(action => {
                        //取消操作
                        goApprove = false;
                    });

                }
                
            }
            if(goApprove == false){
                done();
                return;
            }

            approve({
                ...this.formApprove,
                taskId: this.row.taskId,
                processInstanceId: this.row.processInstanceId,
                // programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
                programOnMachine: programOnMachine
            }).then(res => {
                if(res.data.code !== 200) {
                    this.$message.error(res.data.msg);
@@ -735,6 +938,7 @@
            let data = {}
            this.query = params;
            this.page.currentPage = 1;
            /*
            console.log('searchChange', params);
            params.createTimeBegin = params?.processCreateTime?.[0] || '';
            params.createTimeEnd = params?.processCreateTime?.[1] || '';
@@ -744,11 +948,12 @@
                keyword: params.keyword || ''
            }
            this.query = data
            this.onLoad(this.page, data);
            */
            this.onLoad(this.page, {});
            done();
        },
        searchReset() {
            this.query = {};
            this.query = this.defaultQuery;
            this.onLoad(this.page);
        },
        currentChange(currentPage) {
@@ -764,7 +969,6 @@
        onLoad(page, params = {}) {
            const query = {
                ...this.query,
                // category: params.category ? flowCategory(params.category) : null,
                mode: this.mode,
            };
            try {
@@ -772,7 +976,9 @@
            } catch (error) {
                console.error('日期格式化错误', error);
            }

             console.log('params',params);
            console.log('q',query);
            console.log('thisq',this.query);
            this.loading = true;
            getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
                const data = res.data.data;
@@ -788,7 +994,19 @@
};
</script>

<style lang="scss">
.remark-drawer  {
    .el-drawer__header {
        padding-top:5px;
      margin-bottom: 0px !important;
    }
    .el-drawer__body{
        padding-top:5px;
    }
}
</style>
<style scoped="scoped" lang="scss">

.approve-box {
    display: flex;