commit

2025-11-20 08:51:26 +08:00
parent e6a1721f77
commit 5e477a25e5
12 changed files with 557 additions and 468 deletions
@@ -2,18 +2,31 @@ package com.budwk.app.flow.service;

 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
+import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.constant.FlowConst;
 import com.budwk.app.flow.engine.FlowEngine;
-import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.flow.engine.event.ProcessEvent;
+import com.budwk.app.flow.engine.event.ProcessPublisher;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.*;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import org.nutz.dao.Chain;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.List;

@IocBean
 public class FlowCommonService {

    @Inject
    private FlowEngine flowEngine;
+    @Inject
+    private Dao dao;

    /**
     * 执行任务
@@ -65,4 +78,36 @@ public class FlowCommonService {
        }
    }

+    public void revokeTask(Long taskId) {
+        // 自己任务
+        ProcessTask selfTask = dao.fetch(ProcessTask.class, taskId);
+        selfTask.setTaskState(ProcessTaskStateEnum.DOING.getCode());
+
+        // 撤销任务
+        List<ProcessTask> taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getTaskParentId, "=", taskId));
+        for (ProcessTask task : taskList) {
+            task.setTaskState(ProcessTaskStateEnum.WITHDRAW.getCode());
+            dao.update(task);
+        }
+        // 会签并行任务 撤销后续任务
+        if (selfTask.getPerformType().equals(ProcessTaskPerformTypeEnum.COUNTERSIGN.getCode())) {
+            List<ProcessTask> doingTasks = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getTaskState, "=", ProcessTaskStateEnum.DOING.getCode())
+                    .and(ProcessTask::getProcessInstanceId, "=", selfTask.getProcessInstanceId()));
+            for (ProcessTask doingTask : doingTasks) {
+                doingTask.setTaskState(ProcessTaskStateEnum.WITHDRAW.getCode());
+                dao.update(doingTask);
+            }
+        }
+
+        // 激活
+        dao.update(selfTask);
+
+        // 流程激活
+        dao.update(ProcessInstance.class, Chain.make("state", ProcessInstanceStateEnum.DOING.getCode()),Cnd.where(ProcessInstance::getId, "=", selfTask.getProcessInstanceId()));
+
+        // 发送任务撤回事件 确保上面执行成功
+        for (ProcessTask task : taskList) {
+            ProcessPublisher.notify(ProcessEvent.builder().eventType(ProcessEventTypeEnum.PROCESS_TASK_REVOKE).sourceId(task.getId()).build());
+        }
+    }
 }
@@ -6,10 +6,15 @@ import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.constant.FlowConst;
-import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.engine.event.ProcessEvent;
+import com.budwk.app.flow.engine.event.ProcessPublisher;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.*;
 import com.budwk.app.flow.service.FlowCommonService;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalMerge;
 import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
 import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingService;
@@ -17,6 +22,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
@@ -26,6 +32,7 @@ import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.json.Json;
 import org.nutz.lang.random.R;
+import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
@@ -142,4 +149,44 @@ public class ProposalCommitteeFilingController {
        return Result.success();
    }

+    @At
+    @SaCheckPermission("proposal.committeeFiling")
+    @ApiOperation("并案撤回")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result revokeTask(@Valid String taskId) {
+        ProcessTask processTask = dao.fetch(ProcessTask.class, Cnd.where(ProcessTask::getId, "=", taskId));
+
+        NutMap json = Json.fromJson(NutMap.class, processTask.getVariable());
+
+        List<String> proposalIds = json.getList("proposalIds", String.class);
+
+        dao.clear(ProposalMerge.class, Cnd.where(ProposalMerge::getProposalId, "in", proposalIds));
+
+
+        List<String> processTaskIds = json.getList("processTaskIds", String.class);
+        processTaskIds.forEach(processTaskId -> {
+            // 自己任务
+            ProcessTask selfTask = dao.fetch(ProcessTask.class, Cnd.where(ProcessTask::getId, "=", processTaskId));
+            selfTask.setTaskState(ProcessTaskStateEnum.DOING.getCode());
+
+            // 撤销任务
+            List<ProcessTask> taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getTaskParentId, "=", processTaskId));
+            for (ProcessTask task : taskList) {
+                task.setTaskState(ProcessTaskStateEnum.WITHDRAW.getCode());
+                dao.update(task);
+            }
+            // 激活
+            dao.update(selfTask);
+
+            // 流程激活
+            dao.update(ProcessInstance.class, Chain.make("state", ProcessInstanceStateEnum.DOING.getCode()), Cnd.where(ProcessInstance::getId, "=", selfTask.getProcessInstanceId()));
+
+            // 发送任务撤回事件 确保上面执行成功
+            for (ProcessTask task : taskList) {
+                ProcessPublisher.notify(ProcessEvent.builder().eventType(ProcessEventTypeEnum.PROCESS_TASK_REVOKE).sourceId(task.getId()).build());
+            }
+        });
+        return Result.success();
+    }
+
 }
@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.proposal.controller.transact;

 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import com.budwk.app.base.annotation.SLog;
@@ -11,24 +12,41 @@ import com.budwk.app.base.service.BaseService;
 import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
 import com.budwk.app.bpm.models.BpmProcessTask;
 import com.budwk.app.bpm.service.BpmService;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.event.ProcessEvent;
+import com.budwk.app.flow.engine.event.ProcessPublisher;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessEventTypeEnum;
+import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.flow.service.ProcessTaskService;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalMerge;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
 import com.budwk.app.zhgh.democratic.proposal.param.ProposalCommitteeFilingUnitApprovalParam;
 import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
 import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingUnitService;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
 import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
@@ -44,9 +62,15 @@ import java.util.List;
 public class ProposalCommitteeFilingUnitController {

    @Inject
-    private BaseService baseService;
+    private Dao dao;
    @Inject
-    private BpmService bpmService;
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private ProcessTaskService processTaskService;
+    @Inject
+    private FlowCommonService flowCommonService;
+    @Inject
+    private BaseService baseService;
    @Inject
    private ProposalCommitteeFilingUnitService proposalCommitteeFilingUnitService;

@@ -64,58 +88,53 @@ public class ProposalCommitteeFilingUnitController {
                SELECT
                	info.*,
                	type.name AS typeName,
-                	tcs.fullName AS sessionName,
-                	tcd.`name` AS delegationName,
-                	inst.id processInstanceId,
-                	inst.processInstanceNodeId,
-                	inst.processInstanceNodeName,
-                	inst.processInstanceTaskIds,
-                	inst.processInstanceStatus,
-                	task.id processInstanceTaskId,
-                	task.taskStatus processInstanceTaskStatus,
-                	COUNT(p.consolidationIds) > 0 AS isConsolidation,
-                	EXISTS (
-                         SELECT 1
-                         FROM bpm_process_task next_task
-                         WHERE next_task.prevTaskId = task.id
-                         AND next_task.taskStatus = 'COMPLETE'
-                   ) AS nextTaskIsComplete
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                	ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.id taskId,
+                    t.taskName AS taskKey,
+                    t.displayName taskName,
+                    t.taskType,
+                    t.performType taskPerformType,
+                    t.taskState,
+                    t.finishTime,
+                    t.taskParentId,
+                    t.variable taskVariable,
+                    IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                    IF(rt.id IS NOT NULL OR (ins.state = 20 AND info.caseFilingResult = 'NOT'), 1, 0) AS canRevoke
                FROM
-                	bpm_process_task task
-                	INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId
-                	INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId
-                	INNER JOIN proposal_info info ON info.id = inst.processInstanceBusinessId
-                	LEFT JOIN proposal_consolidation p ON JSON_CONTAINS(p.consolidationIds, JSON_QUOTE(info.id))
+                	wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                    LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                    LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
+                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
                    LEFT JOIN proposal_type type on type.id = info.typeId
-                	LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
-                	LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
-                	LEFT JOIN bpm_process_task nt ON nt.prevTaskId = task.id AND nt.taskStatus = 'COMPLETE'
+                    LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
                $condition
                """);
        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "committeeFilingUnit");
        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
-            cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
        }
-        cnd.and("nd.nodeCode", "=", 70);
        if (approval) {
-            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE);
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
        } else {
-            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE);
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
        }
        ProposalSearchParam.buildSearch(cnd, pageForm);
-        cnd.and(new Static("""
-                NOT EXISTS(
-                    SELECT 1
-                    FROM bpm_process_task t2
-                    WHERE t2.processInstanceId = task.processInstanceId
-                    AND t2.processTaskNodeCode = task.processTaskNodeCode
-                    AND t2.createdOn > task.createdOn
-                )
-                """));
-        cnd.groupBy("info.id");
-        cnd.groupBy("task.id");
+        cnd.groupBy("t.id");
+        cnd.desc("t.createdAt");
        sql.setCondition(cnd);
-        Pagination pagination = baseService.listPageVO(pageForm, sql, ProposalInfoPageVO.class);
+        Pagination pagination = proposalCommitteeFilingUnitService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
        return Result.success(pagination);
    }

@@ -183,4 +202,54 @@ public class ProposalCommitteeFilingUnitController {
        return Result.success(list);
    }

+    @At
+    @SaCheckPermission("proposal.committeeFilingUnit")
+    @ApiOperation("执行任务")
+    public Result executeTask(@Param("data") String data) {
+        Dict args = Json.fromJson(Dict.class, data);
+        String proposalId = args.getStr("proposalId");
+
+        // 查询是否提案
+
+        // 单条审核
+        List<String> mergeProposalIds = proposalCommonService.mergeProposal(proposalId);
+        if (ObjectUtil.isEmpty(mergeProposalIds)) {
+            flowCommonService.executeTask(args);
+            return Result.success();
+        }
+
+        // 并案审核
+        ProcessTask thisTask = dao.fetch(ProcessTask.class, args.getLong(FlowConst.PROCESS_TASK_ID_KEY));
+        List<ProcessTask> mergeTasks = processTaskService.getDoingTaskByBizIdTaskName(mergeProposalIds, thisTask.getTaskName());
+        for (ProcessTask mergeTask : mergeTasks) {
+            Dict cloneArgs = args.clone();
+            cloneArgs.put(FlowConst.PROCESS_TASK_ID_KEY, mergeTask.getId());
+            flowCommonService.executeTask(cloneArgs);
+        }
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("proposal.committeeFilingUnit")
+    @ApiOperation("并案撤回")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result revokeTask(@Valid String taskId) {
+        ProcessTask processTask = dao.fetch(ProcessTask.class, Cnd.where(ProcessTask::getId, "=", taskId));
+
+        NutMap json = Json.fromJson(NutMap.class, processTask.getVariable());
+
+        List<String> proposalIds = json.getList("proposalIds", String.class);
+
+        List<ProcessInstance> list = dao.query(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", proposalIds));
+        List<Long> list1 = list.stream().map(ProcessInstance::getId).toList();
+
+        for (Long id : list1) {
+            ProcessTask task = dao.fetch(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", id).and(ProcessTask::getTaskState,"=", 20).limit(1).desc(ProcessTask::getId));
+            flowCommonService.revokeTask(task.getId());
+        }
+        dao.update(ProposalInfo.class, Chain.make("caseFilingResult", null), Cnd.where(ProposalInfo::getId, "in", proposalIds));
+        return Result.success();
+    }
+
+
 }
@@ -7,6 +7,7 @@ import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.flow.service.FlowCommonService;
@@ -17,12 +18,14 @@ import com.budwk.app.sys.services.SysRoleService;
 import com.budwk.app.sys.services.SysUserService;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
 import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
 import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
@@ -77,6 +80,8 @@ public class ProposalUnderTakeReplyController {
    @SaCheckPermission("proposal.unitReply")
    @ApiOperation("分页列表")
    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval, boolean transfer) {
+        // 2025-11-19 不知道什么jb意思，先注了
+        // CASE WHEN t.taskState = 20 AND ( rt.id IS NULL OR rt.taskState = 10 ) THEN 1 ELSE 0 END AS canRevoke,
        Sql sql = Sqls.create("""
                SELECT
                	info.*,
@@ -100,7 +105,7 @@ public class ProposalUnderTakeReplyController {
                    t.variable taskVariable,
                    IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
                    IFNULL(GROUP_CONCAT(DISTINCT nt.taskName),'结束') curTaskKey,
-                    CASE WHEN t.taskState = 20 AND ( rt.id IS NULL OR rt.taskState = 10 ) THEN 1 ELSE 0 END AS canRevoke,
+                    IF(rt.id IS NOT NULL, 1, 0) AS canRevoke,
                    t.variable->>'$.underTakeName' AS underTakeName,
                    IF(JSON_EXTRACT(t.variable, '$.underTakeIsMaster') = true, 1, 0) AS underTakeIsMaster,
                    t.variable->>'$.tf_transferUserId' AS tf_transferUserId,
@@ -137,7 +142,7 @@ public class ProposalUnderTakeReplyController {
        sql.setCondition(cnd);
        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);

-        List<NutMap> list = pagination.getList();
+        /*List<NutMap> list = pagination.getList();
        for (NutMap row : list) {
            if (row.getInt("taskIsMaster") == 1) {
                boolean b = Stream.of("master_reply", "slave_reply", "school_leader")
@@ -148,7 +153,7 @@ public class ProposalUnderTakeReplyController {
                row.setv("canRevoke", b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode());
            }
        }
-        pagination.setList(list);
+        pagination.setList(list);*/

        return Result.success(pagination);
    }
@@ -234,4 +239,22 @@ public class ProposalUnderTakeReplyController {
        return Result.success();
    }

+    @At
+    @SaCheckPermission("proposal.unitReply")
+    @ApiOperation("并案撤回")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result revokeTask(@Valid String taskId, String proposalId) {
+
+        List<String> proposalIds = proposalCommonService.mergeProposal(proposalId);
+
+        List<ProcessInstance> list = dao.query(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", proposalIds));
+        List<Long> list1 = list.stream().map(ProcessInstance::getId).toList();
+
+        for (Long id : list1) {
+            ProcessTask task = dao.fetch(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", id).and(ProcessTask::getTaskState,"=", 20).limit(1).desc(ProcessTask::getId));
+            flowCommonService.revokeTask(task.getId());
+        }
+        return Result.success();
+    }
+
 }
@@ -87,7 +87,7 @@ public class ProposalUndertakeSuggestionController {
                """);
 		Cnd cnd = Cnd.NEW();
 		cnd.and("t.taskState", "=", 10);
-		cnd.and("t.taskName", "=", "committee");
+		cnd.and("t.taskName", "=", "committeeFilingUnit");

 		if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
 			// 查询当前登录用户负责的承办单位
@@ -95,7 +95,7 @@ public class ProposalWriteController {
        args.set(FlowConst.FORM_DATA, proposalInfo);
        args.set(FlowConst.TASK_FORM_DATA_PREFIX + "source", proposalInfo.getSource());

-        ProcessInstance instance = flowEngine.startProcessInstanceByKey("JDHTA_NC", proposalInfo.getId(), SecurityUtil.getUserId(), args);
+        ProcessInstance instance = flowEngine.startProcessInstanceByKey("JDHTA", proposalInfo.getId(), SecurityUtil.getUserId(), args);

        // 自动完成第一个申请任务
        List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
@@ -169,6 +169,34 @@ const PROPOSAL_INFO = {
                            <div v-html="task.taskFormData.tf_opinion"></div>
                        </el-descriptions-item>
                    </el-descriptions>
+                    <!--提案委员会确定承办单位-->
+                    <el-descriptions border class="flow-task-form" :column="3" :key="task.id"
+                                     v-else-if="task.taskName === 'committeeFilingUnit'">
+                        <el-descriptions-item label="办理用户">{{ task.taskFormData.userName
+                            }}({{task.taskFormData.loginName}})
+                        </el-descriptions-item>
+                        <el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
+                        <el-descriptions-item label="立案结果">
+                            <div style="display: flex;justify-content: center">
+                                <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
+                                          :value="task.ext.tf_caseFilingResult"></dict-tag>
+
+                                <template v-if="task.ext.tf_caseFilingType">
+                                    (
+                                    <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_TYPE"
+                                              :value="task.ext.tf_caseFilingType"></dict-tag>
+                                    )
+                                </template>
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item label="主办单位" :span="3">{{task.ext.tf_masterUnitName}}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="协办单位" :span="3">{{task?.ext?.tf_slaveUnitNameStr}}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="办理意见" :span="3">
+                            <div v-html="task.taskFormData.tf_opinion"></div>
+                        </el-descriptions-item>
+                    </el-descriptions>

                    <el-descriptions border class="flow-task-form" :column="3" :key="task.id" v-else>
                        <el-descriptions-item label="承办单位"
@@ -24,24 +24,6 @@ layout("/layouts/platform.html"){
                <search-item label="姓名/工号">
                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
                </search-item>
-<!--                <search-item label="提案人姓名">-->
-<!--                    <el-input-->
-<!--                            @keyup.enter.native="doSearch"-->
-<!--                            clearable-->
-<!--                            placeholder="请输入提案人姓名"-->
-<!--                            v-model="pageForm.createUserName"-->
-<!--                            style="width: 100%"-->
-<!--                    ></el-input>-->
-<!--                </search-item>-->
-<!--                <search-item label="提案人工号">-->
-<!--                    <el-input-->
-<!--                            @keyup.enter.native="doSearch"-->
-<!--                            clearable-->
-<!--                            placeholder="请输入提案人工号"-->
-<!--                            v-model="pageForm.createUserLoginName"-->
-<!--                            style="width: 100%"-->
-<!--                    ></el-input>-->
-<!--                </search-item>-->
            </search>
        </el-card>

@@ -55,7 +37,8 @@ layout("/layouts/platform.html"){
            </table-tool>
            <el-table :data="tableData" @sort-change="pageOrder" ref="tableRef" row-key="id" style="width: 100%">
                <el-table-column type="selection" width="50" fixed="left" v-if="!pageForm.approval"></el-table-column>
-                <el-table-column label="序号" width="50" type="index" :index="indexMethod" fixed="left"></el-table-column>
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"
+                                 fixed="left"></el-table-column>
                <el-table-column
                        :label="column.label"
                        :prop="column.prop"
@@ -107,15 +90,15 @@ layout("/layouts/platform.html"){
                                </el-radio>
                            </el-radio-group>
                        </el-form-item>
-                        <el-form-item v-if="['CONFIRM_FILING'].includes(formData.tf_caseFilingResult)" label="立案类型"
-                                      prop="tf_caseFilingType"
-                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                            <el-radio-group v-model="formData.tf_caseFilingType" size="small">
-                                <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_TYPE" :label="item.code" border>
-                                    {{item.label}}
-                                </el-radio>
-                            </el-radio-group>
-                        </el-form-item>
+                        <!--   <el-form-item v-if="['CONFIRM_FILING'].includes(formData.tf_caseFilingResult)" label="立案类型"
+                                         prop="tf_caseFilingType"
+                                         :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                               <el-radio-group v-model="formData.tf_caseFilingType" size="small">
+                                   <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_TYPE" :label="item.code" border>
+                                       {{item.label}}
+                                   </el-radio>
+                               </el-radio-group>
+                           </el-form-item>-->
                        <el-form-item
                                label="主办单位"
                                v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
@@ -135,7 +118,6 @@ layout("/layouts/platform.html"){
                        <el-form-item label="协办单位"
                                      v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
                                      prop="tf_slaveUnitIds"
-                                      :rules="[{required:['CONFIRM_FILING'].includes(formData.tf_caseFilingResult),message:'必填',trigger:['change','blur']}]"

                        >
                            <el-select v-model="formData.tf_slaveUnitIds" filterable clearable multiple
@@ -149,9 +131,9 @@ layout("/layouts/platform.html"){
                                ></el-option>
                            </el-select>
                        </el-form-item>
-                        <el-form-item label="审核意见" prop="approvalOpinion"
+                        <el-form-item label="审核意见" prop="tf_opinion"
                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                            <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                        </el-form-item>
                    </el-form>
                    <el-row type="flex" justify="end">
@@ -164,7 +146,7 @@ layout("/layouts/platform.html"){
        </template>

        <template #public>
-            <merge ref="mergeRef" @close="$refs.guava.index()"></merge>
+            <merge ref="mergeRef" @close="$refs.guava.index()" @refresh="doSearch"></merge>
        </template>
    </guava>
 </div>
@@ -228,28 +210,31 @@ layout("/layouts/platform.html"){
            },

            handleTaskAction(val) {
-                this.$confirm("您确定要提交吗？", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(() => {
-                    const loading = createLoading('提交中')
-                    this.$axios.post("/flow/common/executeTask", {
-                        data: JSON.stringify({
-                            ...this.formData,
-                            submitType: val,
-                            tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
-                            tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
-                            tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
+                this.$refs.formRef.validate(valid => {
+                    if (!valid) return
+                    this.$confirm("您确定要提交吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    }).then(() => {
+                        const loading = createLoading('提交中')
+                        this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val,
+                                tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
+                                tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
+                                tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.guava.index()
+                                this.$message.success(res.msg)
+                                this.doSearch()
+                            }
+                        }).finally(() => {
+                            loading.close()
                        })
-                    }).then((res) => {
-                        if (res.code === 0) {
-                            this.$refs.guava.index()
-                            this.$message.success(res.msg)
-                            this.doSearch()
-                        }
-                    }).finally(() => {
-                        loading.close()
                    })
                })
            },
@@ -277,7 +262,7 @@ layout("/layouts/platform.html"){
                    cancelButtonText: "取消",
                    type: "info"
                }).then(() => {
-                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                    this.$axios.post("/platform/proposal/committeeFiling/revokeTask", {taskId: row.taskId}).then((res) => {
                        if (res.code === 0) {
                            this.$message.success(res.msg)
                            this.doSearch()
@@ -22,59 +22,59 @@ const merge = {
                <div class="process-title">
                    {{formData.taskName}}
                </div>
-                <el-form :model="formData" ref="formRef" label-width="120px" :rules="formRules" label-suffix="">
-                    <el-form-item label="立案结果" prop="tf_caseFilingResult"
-                                  :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                        <el-radio-group v-model="formData.tf_caseFilingResult" size="small">
-                            <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT" :label="item.code"
-                                      border>{{item.label}}
-                            </el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item v-if="['CONFIRM_FILING'].includes(formData.tf_caseFilingResult)" label="立案类型"
-                                  prop="tf_caseFilingType"
-                                  :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                        <el-radio-group v-model="formData.tf_caseFilingType" size="small">
-                            <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_TYPE" :label="item.code" border>
-                                {{item.label}}
-                            </el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item
-                            label="主办单位"
-                            v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
-                            :rules="[{required:['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult),message:'必填',trigger:['change','blur']}]"
-                            prop="tf_masterUnitId"
-                    >
-                        <el-select v-model="formData.tf_masterUnitId" filterable clearable style="width: 100%">
-                            <el-option
-                                    v-for="item in underTakeOptions"
-                                    :label="item.name"
-                                    :value="item.id"
-                                    :key="item.id"
-                                    :disabled="formData && formData.tf_slaveUnitIds.includes(item.id)"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="协办单位"
-                                  v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
-                                  prop="tf_slaveUnitIds"
-                    >
-                        <el-select v-model="formData.tf_slaveUnitIds" filterable clearable multiple
-                                   style="width: 100%">
-                            <el-option
-                                    v-for="item in underTakeOptions"
-                                    :label="item.name"
-                                    :value="item.id"
-                                    :key="item.id"
-                                    :disabled="item.id===formData.tf_masterUnitId"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="审核意见" prop="approvalOpinion"
-                                  :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                        <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
-                    </el-form-item>
+                <el-form :model="formData" ref="formRef" label-width="120px"  label-suffix=":">
+                <el-form-item label="立案结果" prop="tf_caseFilingResult"
+                              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                    <el-radio-group v-model="formData.tf_caseFilingResult" size="small">
+                        <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT" :label="item.code"
+                                  border>{{item.label}}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <!-- <el-form-item v-if="['CONFIRM_FILING'].includes(formData.tf_caseFilingResult)" label="立案类型"
+                               prop="tf_caseFilingType"
+                               :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                     <el-radio-group v-model="formData.tf_caseFilingType" size="small">
+                         <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_TYPE" :label="item.code" border>
+                             {{item.label}}
+                         </el-radio>
+                     </el-radio-group>
+                 </el-form-item>-->
+                <el-form-item
+                        label="主办单位"
+                        v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
+                        :rules="[{required:['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult),message:'必填',trigger:['change','blur']}]"
+                        prop="tf_masterUnitId"
+                >
+                    <el-select v-model="formData.tf_masterUnitId" filterable clearable style="width: 100%">
+                        <el-option
+                                v-for="item in underTakeOptions"
+                                :label="item.name"
+                                :value="item.id"
+                                :key="item.id"
+                                :disabled="formData && formData.tf_slaveUnitIds.includes(item.id)"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="协办单位"
+                              v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
+                              prop="tf_slaveUnitIds"
+                >
+                    <el-select v-model="formData.tf_slaveUnitIds" filterable clearable multiple
+                               style="width: 100%">
+                        <el-option
+                                v-for="item in underTakeOptions"
+                                :label="item.name"
+                                :value="item.id"
+                                :key="item.id"
+                                :disabled="item.id===formData.tf_masterUnitId"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="审核意见" prop="approvalOpinion"
+                              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                    <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
+                </el-form-item>
                </el-form>
                <el-row type="flex" justify="end">
                    <el-button @click="$emit('close')" size="small">取消</el-button>
@@ -118,29 +118,34 @@ const merge = {
            })
        },
        handleTaskAction(val) {
-            this.$confirm("您确定要提交吗？", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                const loading = createLoading('提交中')
-                this.$axios.post("/platform/proposal/committeeFiling/merge", {
-                    data: JSON.stringify({
-                        ...this.formData,
-                        proposalIds: this.selection.map(v => v.id),
-                        submitType: val,
-                        tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
-                        tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
-                        tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
+            this.$refs.formRef.validate(valid => {
+                if (!valid) return
+
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    const loading = createLoading('提交中')
+                    this.$axios.post("/platform/proposal/committeeFiling/merge", {
+                        data: JSON.stringify({
+                            ...this.formData,
+                            proposalIds: this.selection.map(v => v.id),
+                            submitType: val,
+                            tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
+                            tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
+                            tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
+                        })
+                    }).then((res) => {
+                        if (res.code === 0) {
+                            this.$emit('close')
+                            this.$emit('refresh')
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    }).finally(() => {
+                        loading.close()
                    })
-                }).then((res) => {
-                    if (res.code === 0) {
-                        this.$emit('close')
-                        this.$message.success(res.msg)
-                        this.doSearch()
-                    }
-                }).finally(() => {
-                    loading.close()
                })
            })
        }
@@ -9,32 +9,36 @@ layout("/layouts/platform.html"){
        <el-card shadow="never">
            <search @search="doSearch">
                <search-item label="提案编号">
-                    <el-input v-model="pageForm.code" placeholder="提案编号" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>
+                    <el-input v-model="pageForm.code" placeholder="提案编号" @keyup.enter.native="doSearch" clearable
+                              style="width: 100%"></el-input>
                </search-item>
                <search-item label="提案名称">
-                    <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>
+                    <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
+                              style="width: 100%"></el-input>
                </search-item>
                <search-item label="提案人姓名">
                    <el-input
-                        @keyup.enter.native="doSearch"
-                        clearable
-                        placeholder="请输入提案人姓名"
-                        v-model="pageForm.createUserName"
-                        style="width: 100%"
+                            @keyup.enter.native="doSearch"
+                            clearable
+                            placeholder="请输入提案人姓名"
+                            v-model="pageForm.createUserName"
+                            style="width: 100%"
                    ></el-input>
                </search-item>
                <search-item label="提案人工号">
                    <el-input
-                        @keyup.enter.native="doSearch"
-                        clearable
-                        placeholder="请输入提案人工号"
-                        v-model="pageForm.createUserLoginName"
-                        style="width: 100%"
+                            @keyup.enter.native="doSearch"
+                            clearable
+                            placeholder="请输入提案人工号"
+                            v-model="pageForm.createUserLoginName"
+                            style="width: 100%"
                    ></el-input>
                </search-item>
                <search-item label="教代会">
-                    <el-select @change="meetingChange" clearable filterable placeholder="所属教代会" v-model="pageForm.sessionId">
-                        <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+                    <el-select @change="meetingChange" clearable filterable placeholder="所属教代会"
+                               v-model="pageForm.sessionId">
+                        <el-option :key="item.id" :label="item.fullName" :value="item.id"
+                                   v-for="item in sessionOptions"></el-option>
                    </el-select>
                </search-item>
            </search>
@@ -42,56 +46,50 @@ layout("/layouts/platform.html"){

        <el-card shadow="never">
            <table-tool>
-                <el-button @click="openConsolidationApproval" size="small" type="primary" class="mr5">重新并案审核</el-button>
-                <el-radio-group v-model="pageForm.approval" @change="doSearch();$refs.tableRef.clearSelection()" size="small">
+                <el-radio-group v-model="pageForm.approval" @change="doSearch();$refs.tableRef.clearSelection()"
+                                size="small">
                    <el-radio-button :label="true">已审核</el-radio-button>
                    <el-radio-button :label="false">未审核</el-radio-button>
                </el-radio-group>
            </table-tool>
            <el-table
-                :data="tableData"
-                ref="tableRef"
-                @sort-change="pageOrder"
-                header-align="center"
-                style="width: 100%"
-                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+                    :data="tableData"
+                    ref="tableRef"
+                    @sort-change="pageOrder"
+                    header-align="center"
+                    style="width: 100%"
+                    :row-key="(val)=>{val.id + val.processInstanceTaskId}"
            >
-                <el-table-column
-                    v-if="!pageForm.approval"
-                    type="selection"
-                    reserve-selection
-                    :selectable="(row)=>row.processInstanceTaskStatus==='ACTIVE'"
-                ></el-table-column>
                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
-                <el-table-column label="提案编号" prop="code" width="120" sortable></el-table-column>
-                <el-table-column label="提案名称" prop="name" show-overflow-tooltip></el-table-column>
-                <el-table-column label="提案人" prop="createUserName"></el-table-column>
-                <el-table-column label="代表团" prop="delegationName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="立案结果" prop="caseFilingResult">
-                    <template scope="{row}">
-                        <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-tag>
+                <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :key="column.key"
+                        :min-width="column.width"
+                        :fixed="column.fixed"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                        v-if="column.visible !== false"
+                >
+                    <template v-if="column.prop === 'caseFilingResult'" scope="{row}">
+                        <dict-tag v-if="row.taskState!==10"
+                                  :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
+                                  :value="row.caseFilingResult"></dict-tag>
+                    </template>
+                    <template v-else-if="column.prop === 'merge'" scope="{row}">
+                        <el-tag v-if="row.merge" size="small">是</el-tag>
+                    </template>
+                    <template v-else-if="column.prop === 'instanceState'" scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
                    </template>
                </el-table-column>
-                <el-table-column label="是否并案" prop="isConsolidation">
-                    <template scope="{row}">
-                        <el-tag size="mini" v-if="row.isConsolidation" type="success">是</el-tag>
-                        <el-tag size="mini" v-else type="danger">否</el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
                <el-table-column label="操作" fixed="right" width="200px">
                    <template scope="{row}">
-                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
-                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(row)" size="mini" type="primary">
-                            审核
+                        <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">审核
                        </el-button>
-                        <el-button
-                            v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
-                            @click="openRevoke(row.processInstanceTaskId)"
-                            size="mini"
-                            type="danger"
-                        >
-                            撤回
+                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
                        </el-button>
                    </template>
                </el-table-column>
@@ -99,152 +97,100 @@ layout("/layouts/platform.html"){
            <!--#include("/layouts/pagination.html"){}#-->
        </el-card>

-        <template #public>
-            <proposal-info ref="infoRef"></proposal-info>
-            <div v-if="showApprovalForm">
-                <div class="process-title">{{formData.processInstanceNodeName}}</div>
-
-                <el-alert v-if="formData.isConsolidation" type="success" title="提醒：本提案已并案，您只需审核一次即可！"></el-alert>
-                <el-divider></el-divider>
-
-                <el-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
-                    <el-form-item label="立案结果" prop="caseFilingResult" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                        <el-radio-group v-model="formData.caseFilingResult" size="small">
-                            <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT" :label="item.code" border>{{item.label}}</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item
-                        label="主办单位"
-                        v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.caseFilingResult)"
-                        :rules="[{required:['CONFIRM_FILING','SUGGESTION'].includes(formData.caseFilingResult),message:'必填',trigger:['change','blur']}]"
-                    >
-                        <el-select v-model="formData.hostUnitId" filterable clearable style="width: 100%">
-                            <el-option
-                                v-for="item in underTakeOptions"
-                                :label="item.name"
-                                :value="item.id"
-                                :key="item.id"
-                                :disabled="formData && formData.helpUnitIds.includes(item.id)"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="协办单位" v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.caseFilingResult)">
-                        <el-select v-model="formData.helpUnitIds" filterable clearable multiple style="width: 100%">
-                            <el-option
-                                v-for="item in underTakeOptions"
-                                :label="item.name"
-                                :value="item.id"
-                                :key="item.id"
-                                :disabled="item.id===formData.hostUnitId"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                        <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
-                    </el-form-item>
-<!--                    <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
-<!--                        <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
-<!--                    </el-form-item>-->
-                </el-form>
-                <el-row type="flex" justify="end">
-                    <el-button plain @click="$refs.guava.index()">取消</el-button>
-                    <el-button type="primary" @click="doApproval('DYNAMIC')">提交</el-button>
-                </el-row>
-            </div>
-        </template>
-
        <template #edit>
-            <div class="process-title">并案提案列表</div>
-            <el-table :data="consolidationProposalTableData" size="small">
-                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
-                <el-table-column label="提案编号" prop="code" width="120px" sortable></el-table-column>
-                <el-table-column label="提案名称" prop="name" show-overflow-tooltip></el-table-column>
-                <el-table-column label="提案人" prop="createUserName" width="200px"></el-table-column>
-                <el-table-column label="代表团" prop="delegationName" width="300px"></el-table-column>
-                <el-table-column label="立案结果" prop="caseFilingResult" width="100px">
-                    <template scope="{row}">
-                        <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column label="是否并案" prop="isConsolidation" width="100px">
-                    <template scope="{row}">
-                        <el-tag size="mini" v-if="row.isConsolidation" type="success">是</el-tag>
-                        <el-tag size="mini" v-else type="danger">否</el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" width="100px">
-                    <template scope="{row}">
-                        <el-link size="mini" type="primary" @click="openViewDialog(row)">查看</el-link>
-                    </template>
-                </el-table-column>
-            </el-table>
+            <proposal-info ref="proposalInfoRef">
+                <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        {{formData.taskName}}
+                    </div>
+                    <el-form :model="formData" ref="formRef" label-width="120px" :rules="formRules" label-suffix="">
+                        <el-form-item label="立案结果" prop="tf_caseFilingResult"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <el-radio-group v-model="formData.tf_caseFilingResult" size="small">
+                                <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT" :label="item.code"
+                                          border>{{item.label}}
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <!--   <el-form-item v-if="['CONFIRM_FILING'].includes(formData.tf_caseFilingResult)" label="立案类型"
+                                         prop="tf_caseFilingType"
+                                         :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                               <el-radio-group v-model="formData.tf_caseFilingType" size="small">
+                                   <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_TYPE" :label="item.code" border>
+                                       {{item.label}}
+                                   </el-radio>
+                               </el-radio-group>
+                           </el-form-item>-->
+                        <el-form-item
+                                label="主办单位"
+                                v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
+                                :rules="[{required:['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult),message:'必填',trigger:['change','blur']}]"
+                                prop="tf_masterUnitId"
+                        >
+                            <el-select v-model="formData.tf_masterUnitId" filterable clearable style="width: 100%">
+                                <el-option
+                                        v-for="item in underTakeOptions"
+                                        :label="item.name"
+                                        :value="item.id"
+                                        :key="item.id"
+                                        :disabled="formData && formData.tf_slaveUnitIds.includes(item.id)"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="协办单位"
+                                      v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
+                                      prop="tf_slaveUnitIds"

-            <div class="process-title">{{consolidationFormData.processInstanceNodeName}}</div>
-            <el-form :model="consolidationFormData" ref="consolidationFormRef" label-position="left" label-width="80px">
-                <el-form-item label="立案结果" prop="caseFilingResult" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                    <el-radio-group v-model="consolidationFormData.caseFilingResult" size="small">
-                        <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT" :label="item.code" border>{{item.label}}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item
-                    label="主办单位"
-                    v-if="['CONFIRM_FILING','SUGGESTION'].includes(consolidationFormData.caseFilingResult)"
-                    :rules="[{required:['CONFIRM_FILING','SUGGESTION'].includes(consolidationFormData.caseFilingResult),message:'必填',trigger:['change','blur']}]"
-                >
-                    <el-select v-model="consolidationFormData.hostUnitId" filterable clearable style="width: 100%">
-                        <el-option
-                            v-for="item in underTakeOptions"
-                            :label="item.name"
-                            :value="item.id"
-                            :key="item.id"
-                            :disabled="consolidationFormData && consolidationFormData.helpUnitIds.includes(item.id)"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="协办单位" v-if="['CONFIRM_FILING','SUGGESTION'].includes(consolidationFormData.caseFilingResult)">
-                    <el-select v-model="consolidationFormData.helpUnitIds" filterable clearable multiple style="width: 100%">
-                        <el-option
-                            v-for="item in underTakeOptions"
-                            :label="item.name"
-                            :value="item.id"
-                            :key="item.id"
-                            :disabled="item.id===consolidationFormData.hostUnitId"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                    <user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea>
-                </el-form-item>
-                <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                    <pc-signature v-model="consolidationFormData.approvalSignature"></pc-signature>
-                </el-form-item>
-            </el-form>
-            <el-row type="flex" justify="end">
-                <el-button plain @click="$refs.guava.index()">取消</el-button>
-                <el-button type="primary" @click="doConsolidationApproval('PASS')">提交</el-button>
-            </el-row>
+                        >
+                            <el-select v-model="formData.tf_slaveUnitIds" filterable clearable multiple
+                                       style="width: 100%">
+                                <el-option
+                                        v-for="item in underTakeOptions"
+                                        :label="item.name"
+                                        :value="item.id"
+                                        :key="item.id"
+                                        :disabled="item.id===formData.tf_masterUnitId"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="审核意见" prop="tf_opinion"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
+                        </el-form-item>
+                    </el-form>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">提交</el-button>
+                    </el-row>
+                </div>
+            </proposal-info>
        </template>
-
-        <el-dialog title="提案详情" :visible.sync="viewDialogVisible" width="1200px" top="50px" append-to-body>
-            <div style="max-height: 80vh; overflow-y: auto">
-                <proposal-info ref="infoDialogRef"></proposal-info>
-            </div>
-        </el-dialog>
    </guava>
 </div>

 <script>
-    <!--#include("../../common/info.js"){}#-->
+    <!--#include('../../common/info.js'){}#-->
    const vue = new Vue({
        el: "#app",
        dicts: ["PROPOSAL_CASE_FILING_RESULT"],
        store,
        mixins: [initTableMixins],
        components: {
-            "proposal-info": PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO,
        },
        data() {
            return {
+                tableColumns: [
+                    {label: "提案编号", prop: "code"},
+                    {label: "提案名称", prop: "name", width: "200px"},
+                    {label: "提案类别", prop: "typeName"},
+                    {label: "届次", prop: "sessionName"},
+                    {label: "立案结果", prop: "caseFilingResult"},
+                    {label: "代表团", prop: "delegationName"},
+                    {label: "当前节点", prop: "curTaskName"},
+                    {label: "流程状态", prop: "instanceState"}
+                ],
                sessionOptions: [],
                delegationOptions: [],
                underTakeOptions: [],
@@ -265,59 +211,60 @@ layout("/layouts/platform.html"){
        },
        methods: {
            openView(row) {
-                this.$refs.guava.public(() => {
-                    this.$refs.infoRef.onOpen(row.id)
+                this.$refs.guava.edit(() => {
                    this.showApprovalForm = false
+                    this.$refs.proposalInfoRef.onOpen(row)
                })
            },
-            openApproval(row) {
-                this.$refs.guava.public(() => {
-                    this.$refs.infoRef.onOpen(row.id)
-                    this.formData = row.approvalParam
-                    this.formData.isConsolidation = row.isConsolidation
-
-                    this.$axios
-                        .post(loc() + "/committeeFiling", {
-                            processInstanceId: row.processInstanceId,
-                            processInstanceTaskId: row.processInstanceTaskId
-                        })
-                        .then((res) => {
-                            if (res.code === 0) {
-                                this.$set(this.formData, "caseFilingResult", res.data.caseFilingResult)
-                                this.$set(this.formData, "hostUnitId", res.data.hostUnitId)
-                                this.$set(this.formData, "helpUnitIds", res.data.helpUnitIds || [])
-                                this.$set(this.formData, "approvalOpinion", res.data.approvalOpinion)
-                                this.$set(this.formData, "proposalIds", res.data.consolidationIds || [row.id])
-                            }
-                        })
+            openAudit(row) {
+                this.$refs.guava.edit(() => {
                    this.showApprovalForm = true
-                })
-            },
-            doApproval(approvalType) {
-                this.formData.bpmTaskApprovalType = approvalType
-                this.$refs.approvalFormRef.validate((valid) => {
-                    if (valid) {
-                        this.$axios
-                            .post(loc() + "/approval", {
-                                approval: JSON.stringify(this.formData)
-                            })
-                            .then((res) => {
-                                if (res.code === 0) {
-                                    this.$refs.guava.index()
-                                    this.$message.success(res.msg)
-                                    this.doSearch()
-                                }
-                            })
+                    this.formData = {
+                        proposalId: row.id,
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName,
+                        tf_masterUnitId: null,
+                        tf_slaveUnitIds: []
                    }
+                    this.$refs.proposalInfoRef.onOpen(row)
                })
            },
-            openRevoke(taskId) {
+            handleTaskAction(val) {
+                this.$refs.formRef.validate(valid => {
+                    if (!valid) return
+                    this.$confirm("您确定要提交吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    }).then(() => {
+                        const loading = createLoading('提交中')
+                        this.$axios.post("/platform/proposal/committeeFilingUnit/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val,
+                                tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
+                                tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
+                                tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.guava.index()
+                                this.$message.success(res.msg)
+                                this.doSearch()
+                            }
+                        }).finally(() => {
+                            loading.close()
+                        })
+                    })
+                })
+            },
+            onRevoke(row) {
                this.$confirm("您确定要撤回吗？", "提示", {
                    confirmButtonText: "确定",
                    cancelButtonText: "取消",
                    type: "info"
                }).then(() => {
-                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                    this.$axios.post("/platform/proposal/committeeFilingUnit/revokeTask", {taskId: row.taskId}).then((res) => {
                        if (res.code === 0) {
                            this.$message.success(res.msg)
                            this.doSearch()
@@ -326,73 +273,13 @@ layout("/layouts/platform.html"){
                })
            },

-            viewSingleProposal(row) {
-                this.proposalInfoVisible = true
-                this.$nextTick(() => {
-                    this.$refs.infoRef.onOpen(row.id)
-                })
-            },
-
-            //打开并案审核
-            openConsolidationApproval() {
-                const selection = this.$refs.tableRef.selection
-                if (selection.length < 2) {
-                    this.$message.error("并案审核至少需要选择两条提案")
-                    return
-                }
-                this.consolidationProposalTableData = selection
-                this.$refs.guava.edit()
-
-                this.consolidationFormData = selection[0].approvalParam
-                this.$set(this.consolidationFormData, "caseFilingResult", null)
-                this.$set(this.consolidationFormData, "hostUnitId", null)
-                this.$set(this.consolidationFormData, "helpUnitIds", [])
-                this.$set(this.consolidationFormData, "helpUnitIds", [])
-                this.$set(this.consolidationFormData, "approvalOpinion", null)
-                this.$set(
-                    this.consolidationFormData,
-                    "proposalIds",
-                    selection.map((v) => v.id)
-                )
-            },
-
-            openViewDialog(row) {
-                this.viewDialogVisible = true
-                this.$nextTick(() => {
-                    this.$refs.infoDialogRef.onOpen(row.id)
-                })
-            },
-
-            //并案审核
-            doConsolidationApproval() {
-                this.consolidationFormData.bpmTaskApprovalType = "DYNAMIC"
-                this.$refs.consolidationFormRef.validate((valid) => {
-                    if (valid) {
-                        this.$axios
-                            .post(loc() + "/approval", {
-                                approval: JSON.stringify(this.consolidationFormData)
-                            })
-                            .then((res) => {
-                                if (res.code === 0) {
-                                    this.$refs.guava.index()
-                                    this.$refs.tableRef.clearSelection()
-                                    this.$message.success(res.msg)
-                                    this.doSearch()
-                                }
-                            })
-                    }
-                })
-            },
-
            //教代会change
            async meetingChange(val) {
                this.formData.delegationId = null
                this.formData.committeeId = null
-                this.delegationOptions = await proposal.getDelegation(val)
-                this.committeeOptions = await this.getInstitutions(val)
            },
            listDelegation() {
-                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => {
                    if (res.code === 0) {
                        this.delegationOptions = res.data
                    }
@@ -23,8 +23,8 @@ layout("/layouts/platform.html"){
        <el-card shadow="never">
            <table-tool :columns.sync="tableColumns">
                <el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
-                    <el-radio-button :label="true">已审核</el-radio-button>
-                    <el-radio-button :label="false">未审核</el-radio-button>
+                    <el-radio-button :label="true">已附议</el-radio-button>
+                    <el-radio-button :label="false">未附议</el-radio-button>
                </el-radio-group>
            </table-tool>
            <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
@@ -54,7 +54,7 @@ layout("/layouts/platform.html"){
                <el-table-column label="操作" fixed="right" width="300px">
                    <template slot-scope="{row}">
                        <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
-                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">审核
+                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">附议
                        </el-button>
 <!--                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回-->
 <!--                        </el-button>-->
@@ -176,14 +176,14 @@ layout("/layouts/platform.html"){
                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                            <text-editor v-model="formData.tf_opinion"></text-editor>
                        </el-form-item>
-                        <el-form-item label="校领导" prop="tf_nextNodeOperator"
+                    <!--    <el-form-item label="校领导" prop="tf_nextNodeOperator"
                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]"
                                      v-if="supportCandidate && formData.underTakeIsMaster">
                            <el-select v-model="formData.tf_nextNodeOperator" placeholder="请选择校领导">
                                <el-option :key="item.id" :label="item.userName" :value="item.userId"
                                           v-for="item in candidates"></el-option>
                            </el-select>
-                        </el-form-item>
+                        </el-form-item>-->
                    </el-form>
                    <el-row type="flex" justify="end">
                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
@@ -340,7 +340,7 @@ layout("/layouts/platform.html"){
                    cancelButtonText: "取消",
                    type: "info"
                }).then(() => {
-                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                    this.$axios.post("/platform/proposal/unitReply/revokeTask", {taskId: row.taskId, proposalId: row.id}).then((res) => {
                        if (res.code === 0) {
                            this.$message.success(res.msg)
                            this.doSearch()