diff --git a/src/main/java/com/budwk/app/flow/controller/FlowCommonController.java b/src/main/java/com/budwk/app/flow/controller/FlowCommonController.java
index 1042d3d9..a3670f22 100644
--- a/src/main/java/com/budwk/app/flow/controller/FlowCommonController.java
+++ b/src/main/java/com/budwk/app/flow/controller/FlowCommonController.java
@@ -80,7 +80,17 @@ public class FlowCommonController {
     @At
     @SaCheckLogin
     @ApiOperation("已办任务")
-    public Result doneTasks(Long instanceId) {
+    public Result doneTasks(Long instanceId, String bizId) {
+        if (instanceId == null && StrUtil.isBlank(bizId)) {
+            return Result.error("参数错误");
+        }
+        if (instanceId == null) {
+            ProcessInstance instance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", bizId));
+            if (instance == null) {
+                return Result.success(Collections.emptyList());
+            }
+            instanceId = instance.getId();
+        }
         List<ProcessTaskVO> doneTaskVos = new ArrayList<>();
         List<ProcessTask> doneTaskList = flowEngine.processTaskService().getDoneTaskList(instanceId, null);
         for (ProcessTask doneTask : doneTaskList) {
diff --git a/src/main/java/com/budwk/app/flow/controller/FlowDefineController.java b/src/main/java/com/budwk/app/flow/controller/FlowDefineController.java
index 2ec8651e..05c2c9e8 100644
--- a/src/main/java/com/budwk/app/flow/controller/FlowDefineController.java
+++ b/src/main/java/com/budwk/app/flow/controller/FlowDefineController.java
@@ -1,13 +1,13 @@
 package com.budwk.app.flow.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.entity.ProcessDefine;
 import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.service.ProcessDefineService;
-import com.budwk.app.flow.vo.ProcessDefineVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.nutz.aop.interceptor.ioc.TransAop;
@@ -45,6 +45,15 @@ public class FlowDefineController {
     public void preview(HttpServletRequest request) {
         request.setAttribute("defineId", request.getParameter("defineId"));
         request.setAttribute("instanceId", request.getParameter("instanceId"));
+
+        String defineKey = request.getParameter("defineKey");
+        if (StrUtil.isNotBlank(defineKey)) {
+            ProcessDefine define = dao.fetch(ProcessDefine.class, Cnd.where(ProcessDefine::getName, "=", defineKey).desc(ProcessDefine::getVersion));
+            if (define != null) {
+                request.setAttribute("defineId", define.getId());
+            }
+        }
+
     }
 
 
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java
index 547f2d05..01e926ce 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java
@@ -75,9 +75,12 @@ public class ArticleWriteController {
     @ApiOperation("保存新闻投稿")
     @Aop(TransAop.READ_COMMITTED)
     public Result save(@Param("article") Article article) {
+//        dao.insertOrUpdate(article);
+//        // 启动流程 阻塞在第一个任务节点
+//        ProcessInstance instance = flowEngine.startProcessInstanceByKey("XWTG", article.getId(), SecurityUtil.getUserId(), null);
+
+        // 保存
         dao.insertOrUpdate(article);
-        // 启动流程 阻塞在第一个任务节点
-        ProcessInstance instance = flowEngine.startProcessInstanceByKey("XWTG", article.getId(), SecurityUtil.getUserId(), null);
         return Result.success(article);
     }
 
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalApplyControllerX.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalApplyControllerX.java
deleted file mode 100644
index cd7fc5ac..00000000
--- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalApplyControllerX.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.budwk.app.zhgh.democratic.proposal.controller.transact;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.budwk.app.base.page.Pagination;
-import com.budwk.app.base.result.Result;
-import com.budwk.app.flow.engine.FlowEngine;
-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.service.ProposalWriteService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.nutz.aop.interceptor.ioc.TransAop;
-import org.nutz.dao.Cnd;
-import org.nutz.dao.Sqls;
-import org.nutz.dao.sql.Sql;
-import org.nutz.ioc.aop.Aop;
-import org.nutz.ioc.loader.annotation.Inject;
-import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.lang.util.NutMap;
-import org.nutz.mvc.annotation.At;
-import org.nutz.mvc.annotation.Ok;
-import org.nutz.mvc.annotation.Param;
-
-@IocBean
-@At("/platform/proposal/apply")
-@Ok("json:full")
-@Api("撰写提案")
-public class ProposalApplyControllerX {
-
-    @Inject
-    private FlowEngine flowEngine;
-    @Inject
-    private ProposalWriteService proposalWriteService;
-
-    @At("/index")
-    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/apply/index.html")
-    @SaCheckLogin
-    public void index() {
-
-    }
-
-    @At("/form")
-    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/apply/form.html")
-    @SaCheckLogin
-    public void form() {
-    }
-
-    @At
-    @SaCheckLogin
-    public Result pageData(Integer pageNumber, Integer pageSize) {
-        Sql sql = Sqls.create("""
-                SELECT
-                  info.*,
-                  type.name AS typeName,
-                  tcs.fullName AS sessionName,
-                  tcd.`name` AS delegationName,
-                  ins.id AS instanceId,
-                  ins.businessNo,
-                  ins.state instanceState,
-                  ins.variable instanceVariable,
-                  t.id taskId,
-                  t.taskName AS taskKey,
-                  t.displayName taskName,
-                  t.taskType,
-                  t.performType taskPerformType,
-                  t.taskState,
-                  t.finishTime,
-                  t.taskParentId,
-                  t.variable taskVariale,
-                  IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
-                  (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
-                FROM
-                  proposal_info info
-                  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 `wf_process_instance` ins ON ins.businessNo = info.id
-                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
-                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
-                $condition
-                """);
-        Cnd cnd = Cnd.NEW();
-        cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
-        cnd.desc("info.createdAt");
-        sql.setCondition(cnd);
-        Pagination<NutMap> pagination = proposalWriteService.listPageMap(pageNumber, pageSize, sql);
-        return Result.success(pagination);
-    }
-
-    @At
-    @SaCheckLogin
-    public Result info(String id) {
-        ProposalInfo info = proposalWriteService.fetch(id);
-        return Result.success(info);
-    }
-
-
-    @At
-    @SaCheckLogin
-    @Aop(TransAop.READ_COMMITTED)
-    @ApiOperation("删除")
-    public Result delete(@Param("id") String id) {
-        proposalWriteService.delete(id);
-        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
-        return Result.success();
-    }
-
-}
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java
index a1ab046a..dae7a0cf 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java
@@ -1,18 +1,14 @@
 package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 
-import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
 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.base.service.BaseService;
-import com.budwk.app.base.utils.PageUtil;
 import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
 import com.budwk.app.bpm.param.BpmTaskApprovalParam;
 import com.budwk.app.bpm.service.BpmService;
-import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 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;
@@ -30,13 +26,11 @@ 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.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * 团长审核
@@ -48,78 +42,99 @@ import java.util.List;
 @Api(tags = "提案-办理-团长审核")
 public class ProposalDelegationController {
 
+    @Inject
+    private BaseService baseService;
     @Inject
     private ProposalCommonService proposalCommonService;
+    @Inject
+    private ProposalDelegationService proposalDelegationService;
+    @Inject
+    private BpmService bpmService;
 
-    @At("/index")
+    @At("")
     @Ok("beetl:/platform/zhgh/democratic/proposal/transact/delegation/index.html")
-    @SaCheckLogin
+    @SaCheckPermission("proposal.delegation")
     public void index() {
-
-    }
-
-    @At("/form")
-    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/delegation/form.html")
-    @SaCheckLogin
-    public void form() {
     }
 
     @At
-    @SaCheckPermission("proposal.seconded")
-    @SaCheckLogin
-    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
+    @SaCheckPermission("proposal.delegation")
+    @ApiOperation("分页列表")
+    public Result pageData(@Valid ProposalSearchParam pageForm,boolean approval) {
         Sql sql = Sqls.create("""
-                 SELECT
-                  info.*,
-                  type.name AS typeName,
-                  tcs.fullName AS sessionName,
-                  tcd.`name` AS delegationName,
-                  ins.id AS instanceId,
-                  ins.businessNo,
-                  ins.state instanceState,
-                  ins.variable instanceVariale,
-                  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, 1, 0) AS canRevoke
+                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,
+                	EXISTS (
+                         SELECT 1
+                         FROM bpm_process_task next_task
+                         WHERE next_task.prevTaskId = task.id
+                         AND next_task.taskStatus = 'COMPLETE'
+                   ) AS nextTaskIsComplete
                 FROM
-                  wf_process_task t
-                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
-                  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 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
+                	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_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
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        cnd.and("t.taskName", "=", "93d5ba64-8220-4e62-9783-83422f474b36");
-        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
-
+        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
+            cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
+        }
+        cnd.and("nd.nodeCode", "=", 30);
         if (approval) {
-            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE);
+            cnd.groupBy("info.id");
         } else {
-            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE);
         }
-
-        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
-            cnd.desc("info.createdAt");
-        } else {
-            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
-        }
-        cnd.groupBy("t.id");
+        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
+                )
+                """));
         sql.setCondition(cnd);
-        Pagination<NutMap> pageVO = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
-        return Result.success(pageVO);
+        Pagination pagination = baseService.listPageVO(pageForm, sql, ProposalInfoPageVO.class);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.delegation")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "提案", msg = "团长审核")
+    @ApiOperation("审核")
+    public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) {
+        proposalDelegationService.approval(approvalParam);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("proposal.delegation")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "提案", msg = "团长审核撤回")
+    @ApiOperation("撤回")
+    public Result revoke(@Valid String taskId) {
+        proposalDelegationService.revokeTask(taskId);
+//        bpmService.revokeTask(taskId);
+        return Result.success();
     }
 
 }
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java
index 76cd5f69..b7195a50 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java
@@ -1,23 +1,19 @@
 package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
 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.base.service.BaseService;
-import com.budwk.app.base.utils.PageUtil;
 import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
 import com.budwk.app.bpm.param.BpmTaskApprovalParam;
 import com.budwk.app.bpm.service.BpmService;
-import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 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.param.ProposalSearchParam;
 import com.budwk.app.zhgh.democratic.proposal.service.ProposalSecondedService;
-import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService;
 import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,13 +27,11 @@ 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.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * 附议提案
@@ -52,76 +46,84 @@ public class ProposalSecondedController {
     @Inject
     private Dao dao;
     @Inject
+    private BaseService baseService;
+    @Inject
     private ProposalCommonService proposalCommonService;
+    @Inject
+    private BpmService bpmService;
+    @Inject
+    private ProposalSecondedService proposalSecondedService;
 
-    @At("/index")
+
+    @At("")
     @Ok("beetl:/platform/zhgh/democratic/proposal/transact/seconded/index.html")
     @SaCheckPermission("proposal.seconded")
     public void index() {
     }
 
-    @At("/form")
-    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/seconded/form.html")
-    @SaCheckPermission("proposal.seconded")
-    public void form() {
-    }
-
-
     @At
     @SaCheckPermission("proposal.seconded")
     public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
         Sql sql = Sqls.create("""
-                 SELECT
-                  info.*,
-                  type.name AS typeName,
-                  tcs.fullName AS sessionName,
-                  tcd.`name` AS delegationName,
-                  ins.id AS instanceId,
-                  ins.businessNo,
-                  ins.state instanceState,
-                  ins.variable instanceVariale,
-                  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, 1, 0) AS canRevoke
+                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,
+                	JSON_EXTRACT( task.createVariable, '$.userName' ) AS seconderName,
+                	COUNT( nt.id ) OVER ( PARTITION BY task.id ) > 0 AS nextTaskIsComplete 
                 FROM
-                  wf_process_task t
-                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
-                  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 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
+                	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_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'
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        cnd.and("t.taskName", "=", "74458b33-ad6e-46c4-b8d9-1aa897142b25");
-        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
-
+        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
+            cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
+        }
+        cnd.and("nd.nodeCode", "=", 20);
         if (approval) {
-            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE);
         } else {
-            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE);
         }
-
-        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
-            cnd.desc("info.createdAt");
-        } else {
-            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
-        }
-        cnd.groupBy("t.id");
+        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("task.id");
         sql.setCondition(cnd);
-        Pagination<NutMap> pageVO = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
-        return Result.success(pageVO);
+        Pagination pagination = baseService.listPageVO(pageForm, sql, ProposalInfoPageVO.class);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.seconded")
+    @ApiOperation("附议")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "提案", msg = "提案人附议")
+    public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) {
+        proposalSecondedService.approval(approvalParam);
+        return Result.success();
     }
 
 }
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalLianDecisionHandler.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalLianDecisionHandler.java
new file mode 100644
index 00000000..cccb268d
--- /dev/null
+++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalLianDecisionHandler.java
@@ -0,0 +1,21 @@
+package com.budwk.app.zhgh.democratic.proposal.handler;
+
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.DecisionHandler;
+import com.budwk.app.flow.engine.core.Execution;
+
+/**
+ * 提案立案
+ */
+public class ProposalLianDecisionHandler implements DecisionHandler {
+    @Override
+    public String decide(Execution execution) {
+
+        // 立案结果
+        String caseFilingResult = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "case_filing_result");
+
+
+
+        return caseFilingResult;
+    }
+}
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalUnitReplyAssignmentHandler.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalUnitReplyAssignmentHandler.java
new file mode 100644
index 00000000..4cb60abe
--- /dev/null
+++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalUnitReplyAssignmentHandler.java
@@ -0,0 +1,33 @@
+package com.budwk.app.zhgh.democratic.proposal.handler;
+
+import com.budwk.app.flow.engine.AssignmentHandler;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.model.TaskModel;
+import org.nutz.dao.Dao;
+
+import java.util.List;
+
+/**
+ * 承办单位答复人处理类
+ */
+public class ProposalUnitReplyAssignmentHandler implements AssignmentHandler {
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        List<String> unitIds = (List<String>)execution.getArgs().get("unitIds");
+
+
+        return List.of();
+    }
+
+    @Override
+    public String getMessage() {
+        return "承办单位答复人";
+    }
+
+    @Override
+    public int getOrder() {
+        return 20;
+    }
+}
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalApplyInterceptor.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalApplyInterceptor.java
index 6614509c..dc808e1a 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalApplyInterceptor.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalApplyInterceptor.java
@@ -1,11 +1,13 @@
 package com.budwk.app.zhgh.democratic.proposal.interceptor;
 
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.flow.constant.FlowConst;
 import com.budwk.app.flow.engine.FlowInterceptor;
 import com.budwk.app.flow.engine.core.Execution;
 import com.budwk.app.flow.engine.core.ServiceContext;
 import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService;
 import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
@@ -17,9 +19,17 @@ import org.nutz.json.Json;
 public class ProposalApplyInterceptor implements FlowInterceptor {
     @Override
     public void intercept(Execution execution) {
+        ProposalWriteService writeService = ServiceContext.find(ProposalWriteService.class);
+
+
         String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA);
         ProposalInfo info = Json.fromJson(ProposalInfo.class, formDataStr);
 
+        if (StrUtil.isBlank(info.getId())) {
+            String code = writeService.generateProposalCode(info.getSessionId(), info.getDelegationId());
+            info.setCode(code);
+        }
+
         Dao dao = ServiceContext.find(Dao.class);
         dao.insertOrUpdate(info);
         execution.getArgs().set(FlowConst.FORM_DATA, Json.toJson(info));
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxAdminController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxAdminController.java
deleted file mode 100644
index 93d11d39..00000000
--- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxAdminController.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.budwk.app.zhgh.democratic.suggestionBox.controller;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import cn.hutool.core.util.StrUtil;
-import com.budwk.app.base.page.Pagination;
-import com.budwk.app.base.param.PageForm;
-import com.budwk.app.base.result.Result;
-import com.budwk.app.base.service.BaseService;
-import com.budwk.app.web.commons.auth.utils.SecurityUtil;
-import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox;
-import io.swagger.annotations.Api;
-import org.nutz.aop.interceptor.ioc.TransAop;
-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.SqlExpressionGroup;
-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.mvc.annotation.At;
-import org.nutz.mvc.annotation.Ok;
-import org.nutz.mvc.annotation.Param;
-
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-@IocBean
-@At("/platform/suggestionBox/admin")
-@Ok("json:full")
-@Api(tags = "意见箱管理员端")
-public class SuggestionBoxAdminController {
-
-    @Inject
-    private Dao dao;
-    @Inject
-    private BaseService baseService;
-
-    @At("/h5")
-    @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/admin.html")
-    @SaCheckLogin
-    public void h5() {
-
-    }
-
-    @At
-    @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/taskForm.html")
-    @SaCheckLogin
-    public void taskForm() {
-
-    }
-
-
-    /**
-     * 分页数据
-     *
-     * @param pageForm  分页
-     * @param status    状态 是否回复
-     * @param timeRange 时间范围 今日 本周 本月
-     * @return
-     */
-    @At("/pageData")
-    @SaCheckLogin
-    public Result pageData(PageForm pageForm, Integer status, String timeRange, String keyword) {
-        Sql sql = Sqls.create("select * from suggestion_box $condition");
-        Cnd cnd = Cnd.NEW();
-        cnd.and("submitterId", "=", SecurityUtil.getUserId());
-        cnd.andEX("isReply", "=", status);
-        if (StrUtil.isNotBlank(timeRange)) {
-            switch (timeRange) {
-                case "today":
-                    cnd.and(new Static("DATE(submitTime) = CURDATE()"));
-                    break;
-                case "week":
-                    cnd.and(new Static("WEEKOFYEAR(submitTime) = WEEKOFYEAR(CURDATE())"));
-                    break;
-                case "month":
-                    cnd.and(new Static("MONTH(submitTime) = MONTH(CURDATE())"));
-                    break;
-                default:
-                    break;
-            }
-        }
-        if (StrUtil.isNotBlank(keyword)) {
-            SqlExpressionGroup seg = new SqlExpressionGroup();
-            seg.orLike("submitterName", keyword);
-            seg.orLike("content", keyword);
-            seg.orLike("title", keyword);
-            cnd.and(seg);
-        }
-        cnd.desc("submitTime");
-        sql.setCondition(cnd);
-        Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
-        return Result.success(pagination);
-    }
-
-    /**
-     * 统计
-     */
-    @At("/getStats")
-    @SaCheckLogin
-    public Result stats() {
-        // 查询总意见数
-        int total = dao.count(SuggestionBox.class);
-        // 待回复数
-        int pending = dao.count(SuggestionBox.class, Cnd.where("isReply", "=", 0));
-        // 已回复数
-        int replied = dao.count(SuggestionBox.class, Cnd.where("isReply", "=", 1));
-        // 今日新增
-        int today = dao.count(SuggestionBox.class, Cnd.NEW().and(new Static("DATE(submitTime) = CURDATE()")));
-        return Result.success(Map.of("total", total, "pending", pending, "replied", replied, "today", today));
-    }
-
-    /**
-     * 答复
-     */
-    @At
-    @SaCheckLogin
-    @Aop(TransAop.READ_COMMITTED)
-    public Result reply(@Param("reply") SuggestionBox suggestionBox, @Param("taskId") String taskId) {
-        // 1. 保存业务数据
-        suggestionBox.setIsReply(true);
-        suggestionBox.setReplyTime(LocalDateTime.now());
-        suggestionBox.setReplyUserId(SecurityUtil.getUserId());
-        suggestionBox.setReplyUserName(SecurityUtil.getUserUsername());
-        dao.update(suggestionBox, "isReply|replyContent|replyTime|replyUserId|replyUserName");
-
-//        // 2. 完成工作流任务
-//        taskService.complete(taskId, new HashMap<>() {{
-//            put("replyContent", suggestionBox.getReplyContent());
-//            put("replyTime", suggestionBox.getReplyTime());
-//            put("replyUserId", suggestionBox.getReplyUserId());
-//            put("replyUserName", suggestionBox.getReplyUserName());
-//        }});
-
-        return Result.success();
-    }
-
-
-    /**
-     * 根据ID获取意见箱数据
-     */
-    @At("/getSuggestionById")
-    @SaCheckLogin
-    public Result getSuggestionById(@Param("id") String id) {
-        SuggestionBox suggestionBox = dao.fetch(SuggestionBox.class, id);
-        if (suggestionBox == null) {
-            return Result.error("数据不存在");
-        }
-        return Result.success(suggestionBox);
-    }
-}
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxController.java
deleted file mode 100644
index a5a112b8..00000000
--- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxController.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.budwk.app.zhgh.democratic.suggestionBox.controller;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import cn.hutool.core.lang.Dict;
-import com.budwk.app.base.page.Pagination;
-import com.budwk.app.base.param.PageForm;
-import com.budwk.app.base.result.Result;
-import com.budwk.app.base.service.BaseService;
-import com.budwk.app.flow.constant.FlowConst;
-import com.budwk.app.flow.engine.FlowEngine;
-import com.budwk.app.web.commons.auth.utils.SecurityUtil;
-import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox;
-import io.swagger.annotations.Api;
-import org.nutz.aop.interceptor.ioc.TransAop;
-import org.nutz.dao.Cnd;
-import org.nutz.dao.Dao;
-import org.nutz.dao.Sqls;
-import org.nutz.dao.sql.Sql;
-import org.nutz.ioc.aop.Aop;
-import org.nutz.ioc.loader.annotation.Inject;
-import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.mvc.annotation.At;
-import org.nutz.mvc.annotation.Ok;
-import org.nutz.mvc.annotation.Param;
-
-@IocBean
-@At("/platform/suggestionBox")
-@Ok("json:full")
-@Api(tags = "意见箱")
-public class SuggestionBoxController {
-
-    @Inject
-    private Dao dao;
-    @Inject
-    private BaseService baseService;
-    @Inject
-    private FlowEngine flowEngine;
-
-//    @At
-//    @SaCheckLogin
-//    @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/index.html")
-//    public void apply() {
-//
-//    }
-//
-//
-//    @At("/h5")
-//    @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/index.html")
-//    @SaCheckLogin
-//    public void h5Index() {
-//
-//    }
-//
-//    @At("/h5/write")
-//    @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/write.html")
-//    @SaCheckLogin
-//    public void h5Write() {
-//
-//    }
-//
-//    @At("/h5/mine")
-//    @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/mine.html")
-//    @SaCheckLogin
-//    public void h5Mine() {
-//
-//    }
-
-    @At
-    @SaCheckLogin
-    @Aop(TransAop.READ_COMMITTED)
-    public Result submit(@Param("suggestion") SuggestionBox suggestionBox) {
-        Dict dict = Dict.create();
-        dict.set(FlowConst.FORM_DATA, suggestionBox);
-        flowEngine.startProcessInstanceByKey("JYXC", "", SecurityUtil.getUserId(), dict);
-        return Result.success();
-    }
-
-    @At
-    @SaCheckLogin
-    @Aop(TransAop.READ_COMMITTED)
-    public Result delete(@Param("id") String id) {
-        dao.delete(SuggestionBox.class, id);
-//        FlowInstance instance = dao.fetch(FlowInstance.class, Cnd.where(FlowInstance::getBusinessId, "=", id));
-//        if (instance != null) {
-//            insService.remove(List.of(instance.getId()));
-//        }
-        return Result.success();
-    }
-
-    /**
-     * 我的意见列表
-     */
-    @At
-    @SaCheckLogin
-    public Result pageData(PageForm pageForm) {
-        Sql sql = Sqls.create("""
-                SELECT
-                  info.*,
-                  ins.id instanceId,
-                  ins.business_id,
-                  ins.node_type,
-                  ins.node_code,
-                  ins.node_name,
-                  ins.flow_status
-                FROM
-                  suggestion_box info
-                  LEFT JOIN flow_instance ins ON ins.business_id = info.id
-                $condition
-                """);
-        Cnd cnd = Cnd.NEW();
-        cnd.and("info.submitterId", "=", SecurityUtil.getUserId());
-        cnd.desc("info.submitTime");
-        sql.setCondition(cnd);
-        Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
-        return Result.success(pagination);
-    }
-
-}
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionApplyController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java
similarity index 88%
rename from src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionApplyController.java
rename to src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java
index 7ba6fe48..085ec124 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionApplyController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java
@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.aop.Aop;
@@ -21,29 +22,25 @@ import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
 @IocBean
-@At("/platform/suggestionBox2/apply")
+@At("/platform/suggestionBox/mine")
 @Ok("json:full")
-@Api("意见箱")
-public class SuggestionApplyController {
+@Api("意见箱-我的")
+public class SuggestionBoxMineController {
 
     @Inject
-    private SuggestionBoxService suggestionBoxService;
+    private Dao dao;
     @Inject
     private FlowEngine flowEngine;
+    @Inject
+    private SuggestionBoxService suggestionBoxService;
 
-    @At("/index")
-    @Ok("beetl:/platform/zhgh/dayofficework/suggestionBox/apply/index.html")
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/suggestionBox/mine/index.html")
     @SaCheckLogin
     public void index() {
 
     }
 
-    @At("/form")
-    @Ok("beetl:/platform/zhgh/dayofficework/suggestionBox/apply/form.html")
-    @SaCheckLogin
-    public void form() {
-    }
-
 
     @At
     @SaCheckLogin
@@ -61,6 +58,7 @@ public class SuggestionApplyController {
                   ins.businessNo,
                   ins.state instanceState,
                   ins.variable instanceVariale,
+                  ins.processDefineId instanceProcessDefineId,
                   t.id taskId,
                   t.taskName AS taskKey,
                   t.displayName taskName,
@@ -71,7 +69,7 @@ public class SuggestionApplyController {
                   t.taskParentId,
                   t.variable taskVariale,
                   IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
-                  (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
+                  (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask' AND taskState in (10,20)) AS startTaskId
                 FROM
                   suggestion_box info
                   LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
@@ -97,4 +95,5 @@ public class SuggestionApplyController {
         return Result.success();
     }
 
+
 }
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java
new file mode 100644
index 00000000..2e279796
--- /dev/null
+++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java
@@ -0,0 +1,80 @@
+package com.budwk.app.zhgh.democratic.suggestionBox.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.hutool.core.lang.Dict;
+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.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.List;
+
+@IocBean
+@At("/platform/suggestionBox/write")
+@Ok("json:full")
+@Api("意见箱-撰写")
+public class SuggestionBoxWriteController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/suggestionBox/write/index.html")
+    @SaCheckLogin
+    public void index() {
+
+    }
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("保存申请")
+    public Result save(@Param("data") SuggestionBox suggestionBox) {
+        dao.insertOrUpdate(suggestionBox);
+        return Result.success();
+    }
+
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("提交申请")
+    public Result submit(@Param("data") SuggestionBox suggestionBox) {
+        dao.insertOrUpdate(suggestionBox);
+        // 开启流程实例
+        Dict args = Dict.create();
+        args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
+        args.set(FlowConst.FORM_DATA, suggestionBox);
+        ProcessInstance instance = flowEngine.startProcessInstanceByKey("JYXC", suggestionBox.getId(), SecurityUtil.getUserId(), args);
+
+        // 自动完成第一个申请任务
+        List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
+        for (ProcessTask task : doingTaskList) {
+            flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
+        }
+        return Result.success();
+    }
+
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("获取申请信息")
+    public Result info(@Param("id") String id) {
+        SuggestionBox box = dao.fetch(SuggestionBox.class, id);
+        return Result.success(box);
+    }
+
+
+}
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionCommonController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionCommonController.java
new file mode 100644
index 00000000..ea2dde09
--- /dev/null
+++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionCommonController.java
@@ -0,0 +1,33 @@
+package com.budwk.app.zhgh.democratic.suggestionBox.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+@IocBean
+@At("/platform/suggestionBox/common")
+@Ok("json:full")
+@Api("意见箱-公共")
+public class SuggestionCommonController {
+
+    @Inject
+    private Dao dao;
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("获取申请信息")
+    public Result info(@Param("id") String id) {
+        SuggestionBox box = dao.fetch(SuggestionBox.class, id);
+        return Result.success(box);
+    }
+
+
+}
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java
index b78ca772..49346cc9 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java
@@ -22,7 +22,7 @@ import org.nutz.mvc.annotation.Ok;
 import java.util.List;
 
 @IocBean
-@At("/platform/suggestionBox2/xgh")
+@At("/platform/suggestionBox/xgh")
 @Ok("json:full")
 @Api("意见箱")
 public class SuggestionXghController {
@@ -30,20 +30,13 @@ public class SuggestionXghController {
     @Inject
     private SuggestionBoxService suggestionBoxService;
 
-    @At("/index")
-    @Ok("beetl:/platform/zhgh/dayofficework/suggestionBox/xgh/index.html")
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/suggestionBox/xgh/index.html")
     @SaCheckLogin
     public void index() {
 
     }
 
-    @At("/form")
-    @Ok("beetl:/platform/zhgh/dayofficework/suggestionBox/xgh/form.html")
-    @SaCheckLogin
-    public void form() {
-    }
-
-
     @At
     @SaCheckLogin
     public Result pageData(PageForm pageForm, String title, Integer year, boolean approval) {
@@ -60,6 +53,7 @@ public class SuggestionXghController {
                   ins.businessNo,
                   ins.state instanceState,
                   ins.variable instanceVariale,
+                  ins.processDefineId instanceProcessDefineId,
                   t.id taskId,
                   t.taskName AS taskKey,
                   t.displayName taskName,
diff --git a/src/main/resources/static/assets/platform/css/common.css b/src/main/resources/static/assets/platform/css/common.css
index 1b236f8f..2687073f 100644
--- a/src/main/resources/static/assets/platform/css/common.css
+++ b/src/main/resources/static/assets/platform/css/common.css
@@ -630,6 +630,8 @@ td.no-b {
     position: relative;
     line-height: 1.1;
     font-family: inherit;
+    display: flex;
+    align-items: center;
 }
 
 .process-title::before {
diff --git a/src/main/resources/static/components/plugins/snaker/snakerChart.vue b/src/main/resources/static/components/plugins/snaker/snakerChart.vue
new file mode 100644
index 00000000..f730721c
--- /dev/null
+++ b/src/main/resources/static/components/plugins/snaker/snakerChart.vue
@@ -0,0 +1,43 @@
+<script>
+module.exports = {
+  name: "snakerChart",
+  data() {
+    return {
+      designVisible: false,
+      designUrl: ""
+    }
+  },
+  methods: {
+    onOpenFull(processDefineId,instanceId) {
+      this.designVisible = true
+      this.designUrl = `/flow/define/preview?defineId=${processDefineId}&instanceId=${instanceId}`
+    },
+    onOpen(processDefineKey){
+      this.designVisible = true
+      this.designUrl = `/flow/define/preview?defineKey=${processDefineKey}`
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog title="流程图预览" :visible.sync="designVisible" width="80%" top="50px" append-to-body>
+    <div class="diagram-viewer">
+      <iframe v-if="designVisible" :src="designUrl" frameborder="0"></iframe>
+    </div>
+  </el-dialog>
+</template>
+
+<style scoped>
+.diagram-viewer {
+  height: 65vh;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.diagram-viewer iframe {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/main/resources/static/components/plugins/snaker/snakerStart.vue b/src/main/resources/static/components/plugins/snaker/snakerStart.vue
new file mode 100644
index 00000000..78478541
--- /dev/null
+++ b/src/main/resources/static/components/plugins/snaker/snakerStart.vue
@@ -0,0 +1,35 @@
+<script>
+module.exports = {
+  name: "snakerStart",
+  props: {
+    define_key:{
+      type: String,
+      required: true
+    },
+    label: {
+      type: String,
+      required: true
+    }
+  },
+  methods:{
+    openChart() {
+      this.$refs.snakerChartRef.onOpen(this.define_key)
+    }
+  }
+}
+</script>
+
+<template>
+  <div>
+    <el-row type="flex" justify="space-between" slot="header">
+      <h3 style="color: var(--color-primary)">{{ label }}</h3>
+      <el-link type="primary" @click="openChart">流程图</el-link>
+    </el-row>
+    <snaker-chart ref="snakerChartRef"></snaker-chart>
+  </div>
+
+</template>
+
+<style scoped>
+
+</style>
diff --git a/src/main/resources/views/layouts/v4/apps.html b/src/main/resources/views/layouts/v4/apps.html
index 9a48295f..fcfc8736 100644
--- a/src/main/resources/views/layouts/v4/apps.html
+++ b/src/main/resources/views/layouts/v4/apps.html
@@ -54,6 +54,10 @@ layout("/layouts/v4/baseLayout.html"){
         background-color: #f0f0f0;
     }
 
+    .apps-sidebar-item i{
+        min-width: 22px;
+    }
+
     .apps-content {
         flex: 1;
         padding: 20px;
diff --git a/src/main/resources/views/layouts/v4/baseLayout.html b/src/main/resources/views/layouts/v4/baseLayout.html
index d5b81c09..ec10b51d 100644
--- a/src/main/resources/views/layouts/v4/baseLayout.html
+++ b/src/main/resources/views/layouts/v4/baseLayout.html
@@ -347,6 +347,8 @@
                 "snaker-flow-history-approval",
                 httpVueLoader("/components/plugins/snaker/snakerFlowHisApproval.vue?v=" + new Date().getTime())
             )
+            Vue.component("snaker-chart", httpVueLoader("/components/plugins/snaker/snakerChart.vue?v=" + new Date().getTime()))
+            Vue.component("snaker-start", httpVueLoader("/components/plugins/snaker/snakerStart.vue?v=" + new Date().getTime()))
         </script>
 
         <style>
@@ -654,7 +656,7 @@
                 function toggleFooter() {
                     var currentPath = window.location.pathname
                     var footer = $("#v4-footer")
-                    
+
                     if (currentPath === "/platform/v4/home2") {
                         footer.show()
                     } else {
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html
index 1f589f5a..2bb7de4a 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html
@@ -55,11 +55,11 @@ layout("/layouts/platform.html"){
             </el-form-item>
             <el-form-item prop="files" label="稿件">
                 <file-upload
-                    :value.sync="formData.files"
-                    :upload_number="5"
-                    upload_result_category="array"
-                    complete_result
-                    upload_mode="drag"
+                        :value.sync="formData.files"
+                        :upload_number="5"
+                        upload_result_category="array"
+                        complete_result
+                        upload_mode="drag"
                 ></file-upload>
             </el-form-item>
         </el-form>
@@ -90,13 +90,13 @@ layout("/layouts/platform.html"){
                 instanceId: GetQueryString("instanceId"),
                 formData: {},
                 formRules: {
-                    title: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
-                    excerpt: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
-                    clubId: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
-                    files: [{ required: false, message: "必填", trigger: ["change", "blur"] }],
-                    origin: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
-                    mobile: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
-                    mobile2: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
+                    title: [{required: true, message: "必填", trigger: ["change", "blur"]}],
+                    excerpt: [{required: true, message: "必填", trigger: ["change", "blur"]}],
+                    clubId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
+                    files: [{required: false, message: "必填", trigger: ["change", "blur"]}],
+                    origin: [{required: true, message: "必填", trigger: ["change", "blur"]}],
+                    mobile: [{required: true, message: "必填", trigger: ["change", "blur"]}],
+                    mobile2: [{required: true, message: "必填", trigger: ["change", "blur"]}]
                 },
                 permission: {}
             }
@@ -108,14 +108,11 @@ layout("/layouts/platform.html"){
                         this.$message.warning("请填写标题")
                         return
                     }
-                    this.$axios.post("/platform/article/write/save", {
-                        article: JSON.stringify(this.formData),
-                        taskId: this.taskId,
-                        instanceId: this.instanceId
-                    }).then((res) => {
+                    this.$axios.post("/platform/article/write/save", {article: JSON.stringify(this.formData)}).then((res) => {
                         if (res.code === 0) {
                             this.$message.success("保存成功")
-                            this.$store.dispatch("pjaxRoute", "/platform/article/mine")
+                            //this.$store.dispatch("pjaxRoute", "/platform/article/mine")
+                            window.location.href = "/platform/article/mine"
                         }
                     })
                 })
@@ -130,7 +127,7 @@ layout("/layouts/platform.html"){
                         }).then((res) => {
                             if (res.code === 0) {
                                 this.$message.success("提交成功")
-                                this.$store.dispatch("pjaxRoute", "/platform/article/mine")
+                                window.location.href = "/platform/article/mine"
                             }
                         })
                     }
@@ -147,13 +144,13 @@ layout("/layouts/platform.html"){
 
             init() {
                 if (this.id) {
-                    this.$axios.post("/platform/article/write/get", { id: this.id }).then((res) => {
+                    this.$axios.post("/platform/article/write/get", {id: this.id}).then((res) => {
                         if (res.code === 0) {
                             this.formData = res.data
                         }
                     })
                 } else {
-                    const { username, loginname, id, unit, union, mobile } = this.$store.state.user
+                    const {username, loginname, id, unit, union, mobile} = this.$store.state.user
                     this.formData = {
                         userName: username,
                         loginName: loginname,
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/approval/index.html b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/approval/index.html
new file mode 100644
index 00000000..d4c90884
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/approval/index.html
@@ -0,0 +1,204 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                        placeholder="选择年"
+                        style="width: 100%"
+                        type="year"
+                        v-model="pageForm.year"
+                        value-format="yyyy"
+                    ></el-date-picker>
+                </search-item>
+                <search-item label="会议名称">
+                    <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称"
+                              v-model="pageForm.searchKeyword">
+                    </el-input>
+                </search-item>
+                <search-item label="所属工会：">
+                    <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable style="width: 100%">
+                        <el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                </search-item>
+
+            </search>
+
+        </el-card>
+        <el-card shadow="never">
+            <table-tool label="会议列表">
+                <el-radio-group v-model="pageForm.audit" size="small" @change="doSearch">
+                    <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"
+                :size="tableSize"
+                @sort-change="pageOrder"
+                class="vi-table"
+                row-key="processTaskId"
+                style="width: 100%; margin-bottom: 20px"
+            >
+                <el-table-column
+                    :index="indexMethod"
+                    align="center"
+                    header-align="center"
+                    label="序号"
+                    type="index"
+                    width="80px"
+                ></el-table-column>
+
+                <el-table-column
+                    :key="column.prop"
+                    :label="column.label"
+                    :prop="column.prop"
+                    :sortable="column.sortable"
+                    align="center"
+                    header-align="center"
+                    show-overflow-tooltip
+                    v-for="column in tableColumns"
+                >
+                </el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column align="center" header-align="center" label="操作" prop="userOnline"
+                                 width="200">
+                    <template slot-scope="{row}">
+                        <el-button @click="openView(row)" size="mini" type="primary">
+                            查看
+                        </el-button>
+                        <template v-if="$auth.hasRole('SCHOOL_UNION_WC_AUDIT_ADMIN')">
+                            <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'"
+                                       @click="openApproval(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>
+                        </template>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #public>
+            <info ref="info"></info>
+            <div v-if="showApprovalForm">
+                <el-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
+                    <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:false,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="danger" @click="doApproval('BACK')">退回重新填写</el-button>
+                    <el-button type="danger" @click="doApproval('REJECT')">拒绝</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">同意</el-button>
+                </el-row>
+            </div>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        dicts: ["PROCESS_INSTANCE_STATE"],
+        data() {
+            return {
+                unionList: [],
+                pageForm: {
+                    year: this.$moment().format("YYYY")
+                },
+                tableColumns: [
+                    { prop: "meetingName", label: "会议名称" },
+                    { prop: "meetingTime", label: "会议时间" },
+                    { prop: "fullName", label: "届次" },
+                    { prop: "createUserName", label: "申请人" },
+                    { prop: "meetingType", label: "会议类型" },
+                    { prop: "createTime", label: "申请时间" }
+                ],
+                showApprovalForm: false,
+            }
+        },
+        components: {
+            "info": INFO,
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.info.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.info.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+        },
+        async created() {
+            this.unionList = await this.$businessTool.listUnion()
+            this.pageData()
+        }
+    })
+
+</script>
+
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/common/info.js b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/common/info.js
new file mode 100644
index 00000000..256978a3
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/common/info.js
@@ -0,0 +1,80 @@
+const INFO = {
+    template: `
+    <div>
+        <div>
+            <el-descriptions :column="2" border class="margin-top" style="margin: 10px" title="">
+                <el-descriptions-item label="会议名称" span="2">
+                    <span class="item-center">  {{ viewData.meetingName }}</span>
+                </el-descriptions-item>
+                <el-descriptions-item label="类型">
+                    {{viewData.fullName}}
+                </el-descriptions-item>
+                <el-descriptions-item label="申请人">
+                    {{viewData.createUserName}}
+                </el-descriptions-item>
+                <el-descriptions-item label="申请时间">
+                    {{viewData.createTime}}
+                </el-descriptions-item>
+                <el-descriptions-item label="申请单位">
+                    {{viewData.unitName}}
+                </el-descriptions-item>
+                <el-descriptions-item label="申请工会">
+                    {{viewData.unitName}}
+                </el-descriptions-item>
+                <el-descriptions-item></el-descriptions-item>
+                <el-descriptions-item label="会议议程" span="2">
+                    <div v-html="viewData.meetingTopic"></div>
+                </el-descriptions-item>
+                <el-descriptions-item label="备注" span="2">
+                    {{viewData.meetingRemark}}
+                </el-descriptions-item>
+                <el-descriptions-item label="请示附件" span="2">
+                    <file-preview :files="viewData.files" complete_result></file-preview>
+                </el-descriptions-item>
+            </el-descriptions>
+        </div>
+        <div>
+             <div v-for="nodeTask in viewData.nodeTasks" :key="nodeTask.id">
+                <div class="process-title">
+                    {{nodeTask.nodeName}}
+                </div>
+                <div v-if="nodeTask.nodeCode === 20">
+                     <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id">
+                        <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' + task.actualOwnerUserName }}</el-descriptions-item>
+                        <el-descriptions-item label="审核时间">{{ task.endOn }}</el-descriptions-item>
+                        <el-descriptions-item label="审核结果">
+                            <div v-if="task.extVariable">
+                                <el-tag type="success" size="mini" v-if="task.extVariable.bpmTaskApprovalType === 'PASS'">同意</el-tag>
+                                <el-tag type="danger" size="mini" v-if="task.extVariable.bpmTaskApprovalType === 'BACK'">退回重新填写</el-tag>
+                                <el-tag type="danger" size="mini" v-if="task.extVariable.bpmTaskApprovalType === 'REJECT'">建议撤销</el-tag>
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}</el-descriptions-item>
+                        <el-descriptions-item label="签字" :span="3">
+                            <el-image :src="task.extVariable.approvalSignature"
+                                      v-if="task.extVariable && task.extVariable.approvalSignature"
+                                      class="signature-image"></el-image>
+                        </el-descriptions-item>
+                     </el-descriptions>
+                </div>
+             </div>
+        </div>
+    </div>
+    `,
+    data() {
+        return {
+            viewData: {}
+        }
+    },
+    methods: {
+        onOpen(id) {
+            this.$axios.post("/platform/grassrootsCongress/meeting/findOne", { id: id }).then((resp) => {
+                if (resp.code === 0) {
+                    // resp.data.files = JSON.parse(resp.data.files)
+                    this.viewData = resp.data
+                    console.log(resp.data)
+                }
+            })
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/audit/index.html b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/audit/index.html
new file mode 100644
index 00000000..81805cab
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/audit/index.html
@@ -0,0 +1,196 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                        placeholder="选择年"
+                        style="width: 100%"
+                        type="year"
+                        v-model="pageForm.year"
+                        value-format="yyyy"
+                    ></el-date-picker>
+                </search-item>
+                <search-item label="资料名称">
+                    <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入资料名称"
+                              v-model="pageForm.searchKeyword">
+                    </el-input>
+                </search-item>
+
+            </search>
+
+        </el-card>
+
+
+        <el-card class="mt10" shadow="never">
+            <table-tool label="资料列表">
+                <el-radio-group v-model="pageForm.audit" size="small" @change="doSearch">
+                    <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"
+                :size="tableSize"
+                @sort-change="pageOrder"
+                class="vi-table"
+                row-key="processTaskId"
+                style="width: 100%; margin-bottom: 20px"
+            >
+                <el-table-column
+                    :index="indexMethod"
+                    align="center"
+                    header-align="center"
+                    label="序号"
+                    type="index"
+                    width="80px"
+                ></el-table-column>
+
+                <el-table-column
+                    :key="column.prop"
+                    :label="column.label"
+                    :prop="column.prop"
+                    :sortable="column.sortable"
+                    align="center"
+                    header-align="center"
+                    show-overflow-tooltip
+                    v-for="column in tableColumns"
+                >
+                    <template scope="{row}" v-if="column.prop=='createdAt'">
+                        {{$moment(row.createdAt).format("YYYY-MM-DD")}}
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column align="center" header-align="center" label="操作" prop="userOnline"
+                                 width="300">
+                    <template slot-scope="{row}">
+                        <el-button @click="openView(row)" size="mini" type="primary">
+                            查看
+                        </el-button>
+                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'"
+                                   @click="openApproval(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>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #public>
+            <info ref="info"></info>
+            <div v-if="showApprovalForm">
+                <el-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
+                    <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:false,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="danger" @click="doApproval('BACK')">退回重新填写</el-button>
+                    <el-button type="danger" @click="doApproval('REJECT')">拒绝</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">同意</el-button>
+                </el-row>
+            </div>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        dicts: ["PROCESS_INSTANCE_STATE"],
+        data() {
+            return {
+                pageForm: {
+                    year: this.$moment().format("YYYY")
+                },
+                tableColumns: [
+                    { prop: "materialsName", label: "资料名称" },
+                    { prop: "fullName", label: "所属教代会" },
+                    { prop: "materialsType", label: "资料类型" },
+                    { prop: "userName", label: "上传人" },
+                    { prop: "unionName", label: "工会" },
+                    { prop: "createdAt", label: "上传时间" }
+                ],
+                showApprovalForm: false,
+            }
+        },
+        components: {
+            "info": INFO
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.info.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.info.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/common/approvalRecord.js b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/common/approvalRecord.js
new file mode 100644
index 00000000..83cba943
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/common/approvalRecord.js
@@ -0,0 +1,68 @@
+const GRASSROOTS_CONGRESS_MATERIALS_APPROVAL_RECORD_COMPONENT = {
+    template: `
+        <div class="process-task-record">
+            <template v-if="approvalRecord.length > 0" v-for="item in approvalRecord">
+                <div v-if="item.taskName === '3104afc7-f897-4664-b58a-e99ef7ae4c59'" class="mb25">
+                    <div class="process-title">
+                        {{item.displayName}}
+                    </div>
+                    <el-descriptions :column="3" border :key="item.displayName + item.taskParentId">
+                        <template v-for="task in item.processTaskVOList">
+                            <el-descriptions-item label="姓名">{{task.taskActor?.actorUserName}}</el-descriptions-item>                
+                            <el-descriptions-item label="工号">{{task.taskActor?.actorId}}</el-descriptions-item> 
+                            <el-descriptions-item label="填写时间">{{$moment(task.createdAt).format('YYYY-MM-DD HH:mm:ss')}}</el-descriptions-item>
+                        </template>
+                    </el-descriptions>
+                </div>
+                <div v-else>
+                    <div class="process-title">
+                        {{item.displayName}}
+                    </div>
+                    <el-descriptions :column="3" border :key="item.displayName + item.taskParentId">
+                        <template v-for="task in item.processTaskVOList">
+                            <el-descriptions-item label="姓名">{{task.taskActor?.actorUserName}}</el-descriptions-item>                
+                            <el-descriptions-item label="工号">{{task.taskActor?.actorId}}</el-descriptions-item>   
+                            <el-descriptions-item label="审核时间">{{task.finishTime ? task.finishTime : '暂无'}}</el-descriptions-item>
+                            <el-descriptions-item label="审核结果">
+                                {{Object.keys(task.ext.submitTypeText).length !== 0 ? task.ext.submitTypeText : '暂无'}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核意见" :span="3">{{task.ext.comment ? task.ext.comment : '暂无'}}</el-descriptions-item>
+                        </template>                      
+                    </el-descriptions>
+                </div>
+            </template>
+            <el-empty v-else description="暂无审核记录"></el-empty>
+        </div>
+    `,
+    dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
+    props: {
+        id: {
+            type: String,
+            required: true
+        }
+    },
+    watch: {
+        id: {
+            handler: function (val) {
+                if (val) {
+                    this.findOne()
+                }
+            },
+            immediate: true
+        }
+    },
+    data() {
+        return {
+            approvalRecord: []
+        }
+    },
+    methods: {
+        findOne() {
+            this.$axios.post("/platform/wf/processCommon/approvalRecord", { businessNo: this.id }).then((res) => {
+                if (res.code === 0) {
+                    this.approvalRecord = res.data
+                }
+            })
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/common/info.js b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/common/info.js
new file mode 100644
index 00000000..473a01f0
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/common/info.js
@@ -0,0 +1,81 @@
+const INFO = {
+    template: `
+        <div>
+            <div>
+                <el-descriptions :column="2" border class="margin-top" style="margin: 10px" title="">
+                      <el-descriptions-item label="会议名称" span="2">
+                          <span class="item-center">  {{ viewData.materialsName }}</span>
+                      </el-descriptions-item>
+                       <el-descriptions-item label="上传人">
+                       {{viewData.userName}}
+                       </el-descriptions-item>
+                       <el-descriptions-item label="上传时间">
+                       {{viewData.createdDate}}
+                       </el-descriptions-item>
+                       <el-descriptions-item label="所属工会">
+                       {{viewData.unionName}}
+                       </el-descriptions-item>
+                       <el-descriptions-item label="教代会届次">
+                       {{viewData.fullName}}
+                       </el-descriptions-item>
+                       <el-descriptions-item label="资料类型">
+                       {{viewData.materialsType}}
+                       </el-descriptions-item>
+                       <el-descriptions-item></el-descriptions-item>
+                        <el-descriptions-item label="请示附件" span="2">
+                        <file-preview :files="viewData.files" complete_result></file-preview>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </div>
+            
+            
+            <div>
+                 <div v-for="nodeTask in viewData.nodeTasks" :key="nodeTask.id">
+                    <div class="process-title">
+                        {{nodeTask.nodeName}}
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 20">
+                         <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id">
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' + task.actualOwnerUserName }}</el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn }}</el-descriptions-item>
+                            <el-descriptions-item label="审核结果">
+                                <div v-if="task.extVariable">
+                                    <el-tag type="success" size="mini" v-if="task.extVariable.bpmTaskApprovalType === 'PASS'">同意</el-tag>
+                                    <el-tag type="danger" size="mini" v-if="task.extVariable.bpmTaskApprovalType === 'BACK'">退回重新填写</el-tag>
+                                    <el-tag type="danger" size="mini" v-if="task.extVariable.bpmTaskApprovalType === 'REJECT'">建议撤销</el-tag>
+                                </div>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}</el-descriptions-item>
+                            <el-descriptions-item label="签字" :span="3">
+                                <el-image :src="task.extVariable.approvalSignature"
+                                          v-if="task.extVariable && task.extVariable.approvalSignature"
+                                          class="signature-image"></el-image>
+                            </el-descriptions-item>
+                         </el-descriptions>
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 50">
+                        
+                    </div>
+                 </div>
+            </div>
+            
+        </div>
+    `,
+    data() {
+        return {
+            viewData: {}
+        }
+    },
+    methods: {
+        onOpen(id) {
+            this.$axios.post("/platform/grassrootsCongress/materials/manage/findOne", { id: id }).then((resp) => {
+                if (resp.code === 0) {
+                    if (resp.data.files) {
+                        resp.data.files = JSON.parse(resp.data.files)
+                    }
+                    this.viewData = resp.data
+                }
+            })
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/common/viewForm.js b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/common/viewForm.js
new file mode 100644
index 00000000..d549032e
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/common/viewForm.js
@@ -0,0 +1,45 @@
+const GRASSROOTS_CONGRESS_MATERIALS_VIEW_FORM = {
+    template: `
+        <el-descriptions :column="2" border class="margin-top" style="margin: 10px" title="">
+              <el-descriptions-item label="会议名称" span="2">
+                  <span class="item-center">  {{ viewData.materialsName }}</span>
+              </el-descriptions-item>
+               <el-descriptions-item label="上传人">
+               {{viewData.userName}}
+               </el-descriptions-item>
+               <el-descriptions-item label="上传时间">
+               {{viewData.createdDate}}
+               </el-descriptions-item>
+               <el-descriptions-item label="所属工会">
+               {{viewData.unionName}}
+               </el-descriptions-item>
+               <el-descriptions-item label="教代会届次">
+               {{viewData.fullName}}
+               </el-descriptions-item>
+               <el-descriptions-item label="资料类型">
+               {{viewData.materialsType}}
+               </el-descriptions-item>
+               <el-descriptions-item></el-descriptions-item>
+                <el-descriptions-item label="请示附件" span="2">
+                <file-preview :files="viewData.files" complete_result></file-preview>
+            </el-descriptions-item>
+        </el-descriptions>
+    `,
+    data() {
+        return {
+            viewData: {},
+        }
+    },
+    methods: {
+        initData(id) {
+            this.$axios.post("/platform/grassrootsCongress/materials/manage/findOne", { id: id }).then(resp => {
+                if (resp.code === 0) {
+                    if (resp.data.files){
+                        resp.data.files = JSON.parse(resp.data.files)
+                    }
+                    this.viewData = resp.data
+                }
+            })
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/manage/addFrom.js b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/manage/addFrom.js
new file mode 100644
index 00000000..8166b519
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/manage/addFrom.js
@@ -0,0 +1,149 @@
+const GRASSROOTS_CONGRESS_MATERIALS_ADD_FROM = {
+    template: `
+        <el-dialog
+            :close-on-click-modal="false"
+            :title="title"
+            :visible.sync="formDialogVisible"
+            width="50%">
+        
+            <el-form :model="formData" :rules="formRules" label-width="120px" ref="addForm">
+        
+                <el-form-item label="上传人" prop="userName">
+                    <el-input readonly v-model="formData.userName">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="所属教代会" prop="sessionId">
+                    <el-select placeholder="请选择" style="width: 100%" v-model="formData.sessionId" @change="sessionChange">
+                        <el-option
+                            :key="item.id"
+                            :label="item.fullName"
+                            :value="item.id"
+                            v-for="item in sessionOptions">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="资料名称" prop="materialsName">
+                    <el-input
+                        clearable
+                        maxlength="50"
+                        placeholder="请填写会议名称"
+                        v-model="formData.materialsName">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="资料类型" prop="materialsType">
+                    <dict-select code="GRASSROOTS_CONGRESS_MATERIALS"
+                                 v-model="formData.materialsType"></dict-select>
+                </el-form-item>
+                <el-form-item label="附件上传" prop="files">
+                    <file-upload
+                        :upload_number="3"
+                        :value.sync="formData.files"
+                        accept=".doc,.docx,.xls,.xlsx,.pdf,.jpg,.png,.jpeg"
+                        complete_result
+                        upload_mode="file"
+                        upload_result_category="array"
+                    >
+                        <template #explain>
+                            图片类请上传jpg/png/jpeg等格式，文档类请上传doc/docx/xls/xlsx/pdf等格式，上传数量为3个
+                        </template>
+                    </file-upload>
+                </el-form-item>
+        
+            </el-form>
+        
+        
+            <span class="dialog-footer" slot="footer">
+            <el-button @click="doSubmit('doSave')" type="primary">保 存</el-button>
+            <el-button @click="doSubmit('doSubmit')" type="primary">提 交</el-button>
+          </span>
+        </el-dialog>
+    `,
+    store,
+    mixins: [initTableMixins],
+    data() {
+        return {
+            formRules: {
+                sessionId: [{ required: true, message: "请填写所属教代会", trigger: ["blur", "change"] }],
+                materialsName: [
+                    {
+                        required: true,
+                        message: "请填写资料名称",
+                        trigger: ["blur", "change"]
+                    }
+                ],
+                materialsType: [
+                    {
+                        required: true,
+                        message: "请填写资料类型",
+                        trigger: ["blur", "change"]
+                    }
+                ],
+                files: [{ required: true, message: "请填写资料类型", trigger: ["blur", "change"] }]
+            },
+            formDialogVisible: false,
+            title: "",
+            sessionOptions: []
+        }
+    },
+    methods: {
+        sessionChange(id) {
+            const sess = this.sessionOptions.find((s) => s.id === id)
+            this.$set(this.formData, "fullName", sess.fullName)
+        },
+        addDialog() {
+            this.title = "新增会议资料"
+            this.formDialogVisible = true
+            if (this.$refs["addForm"]) this.$refs["addForm"].resetFields()
+            this.querySessionList()
+            this.init()
+        },
+        openEdit(id) {
+            this.title = "编辑会议资料"
+            this.formDialogVisible = true
+            this.findOne(id)
+        },
+        findOne(id) {
+            this.$axios.post("/platform/grassrootsCongress/materials/manage/findOne", { id }).then((resp) => {
+                if (resp.code === 0) {
+                    if (resp.data.files) {
+                        resp.data.files = JSON.parse(resp.data.files)
+                    }
+                    this.formData = resp.data
+                }
+            })
+        },
+        async doSubmit(type) {
+            if (type === "doSubmit") {
+                let valid = await this.$refs["addForm"].validate()
+                if (!valid) return
+            }
+            this.formLoading = true
+            const data = { ...this.formData }
+            data.files = JSON.stringify(data.files)
+            const url =
+                type === "doSave" ? "/platform/grassrootsCongress/materials/manage/doSave" : "/platform/grassrootsCongress/materials/manage/doSubmit"
+            this.$axios.post(url, { data: JSON.stringify(data) }).then((resp) => {
+                if (resp.code === 0) {
+                    this.$message.success(resp.msg)
+                    this.init()
+                    this.formDialogVisible = false
+                    this.$emit("do_search")
+                }
+                this.formLoading = false
+            })
+        },
+        init() {
+            this.$set(this.formData, "userId", this.$store.state.user.id)
+            this.$set(this.formData, "userName", this.$store.state.user.username)
+            this.$set(this.formData, "loginName", this.$store.state.user.loginName)
+            this.$set(this.formData, "unionName", this.$store.state.user.union.name)
+        },
+        querySessionList(unionId) {
+            this.$axios.post("/platform/grassrootsCongress/meeting/querySessionList", { unionId }).then((resp) => {
+                if (resp.code === 0) {
+                    this.sessionOptions = resp.data
+                }
+            })
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/manage/index.html b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/manage/index.html
new file mode 100644
index 00000000..573fc101
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/materials/manage/index.html
@@ -0,0 +1,175 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                        placeholder="选择年"
+                        style="width: 100%"
+                        type="year"
+                        v-model="pageForm.year"
+                        value-format="yyyy"
+                    ></el-date-picker>
+                </search-item>
+                <search-item label="资料名称">
+                    <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入资料名称"
+                              v-model="pageForm.searchKeyword">
+                    </el-input>
+                </search-item>
+
+            </search>
+
+        </el-card>
+        <el-card class="mt10" shadow="never">
+            <table-tool label="资料列表">
+                <el-button @click="openAdd" icon="el-icon-s-promotion" size="mini" type="primary">
+                    上传资料
+                </el-button>
+            </table-tool>
+
+            <el-table
+                :data="tableData"
+                :size="tableSize"
+                @sort-change="pageOrder"
+                class="vi-table"
+                row-key="processTaskId"
+                style="width: 100%; margin-bottom: 20px"
+            >
+                <el-table-column
+                    :index="indexMethod"
+                    align="center"
+                    header-align="center"
+                    label="序号"
+                    type="index"
+                    width="80px"
+                ></el-table-column>
+
+                <el-table-column
+                    :key="column.prop"
+                    :label="column.label"
+                    :prop="column.prop"
+                    :sortable="column.sortable"
+                    align="center"
+                    header-align="center"
+                    show-overflow-tooltip
+                    v-for="column in tableColumns"
+                >
+                    <template scope="{row}" v-if="column.prop=='createdAt'">
+                        {{$moment(row.createdAt).format("YYYY-MM-DD")}}
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column align="center" header-align="center" label="操作" prop="userOnline"
+                                 width="300">
+                    <template slot-scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                        <el-button v-if="[10,40].includes(row.processInstanceNodeCode)" size="mini" type="primary" @click="openEdit(row)">编辑</el-button>
+                        <el-button
+                                v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
+                                size="mini"
+                                type="danger"
+                                @click="openRevoke(row)"
+                        >
+                            撤销
+                        </el-button>
+                        <el-button v-if="[10].includes(row.processInstanceNodeCode)" size="mini" type="danger" @click="doDelete(row)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+
+        </el-card>
+
+        <template #public>
+            <info ref="infoRef"></info>
+        </template>
+    </guava>
+
+    <add-form @do_search="doSearch" ref="addForm"></add-form>
+</div>
+
+<script>
+    <!--#include("addFrom.js"){}#-->
+    <!--#include("../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        dicts: ["PROCESS_INSTANCE_STATE"],
+        data() {
+            return {
+                pageForm: {
+                    year: this.$moment().format("YYYY")
+                },
+                tableColumns: [
+                    { prop: "materialsName", label: "资料名称" },
+                    { prop: "fullName", label: "所属教代会" },
+                    { prop: "materialsType", label: "资料类型" },
+                    { prop: "userName", label: "上传人" },
+                    { prop: "unionName", label: "工会" },
+                    { prop: "createdAt", label: "上传时间" }
+                ],
+            }
+        },
+        components: {
+            "add-form": GRASSROOTS_CONGRESS_MATERIALS_ADD_FROM,
+            "info": INFO
+        },
+        methods: {
+            doDelete(row) {
+                this.$confirm("确定要删除此会议资料吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/grassrootsCongress/materials/manage/doDelete", { id: row.id }).then(resp => {
+                        if (resp.code === 0) {
+                            this.$message.success(resp.msg)
+                            this.doSearch()
+                        }
+                    })
+                }).catch(() => {
+
+                })
+            },
+            openRevoke(row) {
+                this.$confirm("您确定要撤销申请吗?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revokeApply", { id: row.id }).then((resp) => {
+                        this.$message.success(resp.msg)
+                        this.doSearch()
+                    })
+                })
+            },
+            openView(row){
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            openEdit(row) {
+                this.$refs.addForm.addDialog()
+                this.$refs.addForm.openEdit(row.id)
+            },
+            openAdd() {
+                this.$refs.addForm.addDialog()
+            }
+        },
+        created() {
+            this.pageData()
+        }
+    })
+
+
+</script>
+
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meetings/addFrom.js b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meetings/addFrom.js
new file mode 100644
index 00000000..dd795c46
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meetings/addFrom.js
@@ -0,0 +1,228 @@
+const GRASSROOTS_CONGRESS_MEETINGS_ADD_FROM = {
+    template: `
+    <div>
+     <el-form :model="formData" :rules="formRules" label-width="120px" ref="addForm">
+
+                <el-row :gutter="40">
+                    <el-col :span="12">
+                        <el-form-item label="届数" prop="j">
+                            <dict-select @change="jChange" code="TEACHER_CONGRESS_J"
+                                         v-model="formData.j"></dict-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+
+                        <el-form-item label="次数" prop="c">
+                            <dict-select @change="cChange" code="TEACHER_CONGRESS_C"
+                                         v-model="formData.c"></dict-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="12">
+                        <el-form-item label="会议名称" prop="meetingName">
+                            <el-input
+                                clearable
+                                maxlength="100"
+                                placeholder="请填写会议名称"
+                                v-model="formData.meetingName">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="类型" prop="meetingType">
+                            <el-radio-group v-model="formData.meetingType">
+                                <el-radio-button label="换届会">换届会</el-radio-button>
+                                <el-radio-button label="届中会">届中会</el-radio-button>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="申请单位" prop="unitName">
+                            <el-input :clearable="false"
+                                      placeholder="申请单位"
+                                      readonly
+                                      v-model="formData.unitName">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="所在工会" prop="unionName">
+                            <el-input :clearable="false"
+                                      placeholder="所在工会"
+                                      readonly
+                                      v-model="formData.unionName">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="会议时间" prop="meetingTime">
+                            <el-date-picker
+                                :clearable="false"
+                                format="yyyy-MM-dd HH:mm"
+                                placeholder="选择会议时间"
+                                style="width: 100%"
+                                type="datetime"
+                                v-model="formData.meetingTime"
+                                value-format="yyyy-MM-dd HH:mm">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="申请时间" prop="createTime">
+                            <el-input :clearable="false"
+                                      placeholder="申请时间"
+                                      readonly
+                                      v-model="formData.createTime">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="会议议程" prop="meetingTopic">
+                            <text-editor v-model="formData.meetingTopic"></text-editor>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="meetingRemark">
+                            <el-input :rows="4" maxlength="500" placeholder="请输入备注" type="textarea"
+                                      v-model="formData.meetingRemark"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="请示附件" prop="files">
+                            <file-upload
+                                :value.sync="formData.files"
+                                :upload_number="1"
+                                upload_result_category="array"
+                                complete_result
+                                upload_mode="drag"
+                                accept=".doc,.docx,.xls,.xlsx,.pdf"
+                            >
+                                <template #explain>
+                                    图片类请上传jpg/png/jpeg等格式，文档类请上传doc/docx/xls/xlsx/pdf等格式，上传数量为1个
+                                </template>
+                            </file-upload>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <div style="justify-content: flex-end;display: flex">
+                    <el-button v-if="id" @click="$store.dispatch('pjaxRoute', '/platform/grassrootsCongress/myMeeting')">返回</el-button>
+                    <el-button :loading="formLoading" @click="doSubmit('doSave')" type="primary">保 存
+                    </el-button>
+                    <el-button :loading="formLoading" @click="doSubmit('doSubmit')" type="primary">提 交
+                    </el-button>
+                </div>
+            </el-form>
+    </div>
+    `,
+    store,
+    mixins: [initTableMixins],
+    data() {
+        return {
+            id: "",
+            formRules: {
+                meetingName: [
+                    {
+                        required: true,
+                        message: "请填写会议名称",
+                        trigger: ["blur", "change"]
+                    }
+                ],
+                meetingTime: [
+                    {
+                        required: true,
+                        message: "请填写会议时间",
+                        trigger: ["blur", "change"]
+                    }
+                ],
+                meetingTopic: [
+                    {
+                        required: true,
+                        message: "请填写会议议程",
+                        trigger: ["blur", "change"]
+                    }
+                ],
+                files: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                j: [
+                    {
+                        required: true,
+                        message: "请填写届数",
+                        trigger: ["blur", "change"]
+                    }
+                ],
+                c: [
+                    {
+                        required: true,
+                        message: "请填写次数",
+                        trigger: ["blur", "change"]
+                    }
+                ]
+            },
+            formData: {
+                j: "",
+                c: "",
+                files: [],
+                meetingName: "",
+                meetingType: "届中会"
+            }
+        }
+    },
+    methods: {
+        jChange() {
+            const j = this.formData.j ? "第" + this.formData.j : ""
+            const c = this.formData.c ? "第" + this.formData.c : ""
+            const str = "关于召开" + this.formData.unitName + j + c + "教职工代表大会、工会会员代表大会的请示"
+            this.formData.meetingName = str
+        },
+        cChange() {
+            const j = this.formData.j ? "第" + this.formData.j : ""
+            const c = this.formData.c ? "第" + this.formData.c : ""
+            const str = "关于召开" + this.formData.unitName + j + c + "教职工代表大会、工会会员代表大会的请示"
+            this.formData.meetingName = str
+        },
+        async doSubmit(type) {
+            if (type === "doSubmit") {
+                let valid = await this.$refs["addForm"].validate()
+                if (!valid) return
+            }
+            this.formLoading = true
+            this.formData.fullName = this.formData.j + this.formData.c
+            const data = { ...this.formData }
+            data.files = JSON.stringify(data.files)
+            const url = type === "doSave" ? "/platform/grassrootsCongress/meeting/doSave" : "/platform/grassrootsCongress/meeting/doSubmit"
+            this.$axios.post(url, { data: JSON.stringify(data) }).then((resp) => {
+                if (resp.code === 0) {
+                    this.$message.success(resp.msg)
+                    if (this.$refs["addForm"]) this.$refs["addForm"].resetFields()
+                    this.init()
+                    if (data.id) {
+                        this.formLoading = false
+                        this.$store.dispatch("pjaxRoute", "/platform/grassrootsCongress/myMeeting")
+                    }
+                } else {
+                    this.$message.warning(resp.msg)
+                }
+                this.formLoading = false
+            })
+        },
+        findOne(id) {
+            this.$axios.post("/platform/grassrootsCongress/meeting/findOne", { id: id }).then((resp) => {
+                if (resp.code === 0) {
+                    this.formData = resp.data
+                }
+            })
+        },
+        init(id) {
+            if (id) {
+                this.id = id
+                this.findOne(id)
+            } else {
+                this.$set(this.formData, "createTime", this.$moment(new Date()).format("YYYY-MM-DD"))
+                this.$set(this.formData, "unionId", this.$store.state.user.union.id)
+                this.$set(this.formData, "unionName", this.$store.state.user.union.name)
+                this.$set(this.formData, "unitId", this.$store.state.user.unit.id)
+                this.$set(this.formData, "unitName", this.$store.state.user.unit.name)
+            }
+        }
+    },
+    created() {}
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meetings/index.html b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meetings/index.html
new file mode 100644
index 00000000..8c933866
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meetings/index.html
@@ -0,0 +1,38 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <guava>
+        <el-card shadow="never">
+            <template #header>
+                <h3 style="color: var(--color-primary)">双代会请示</h3>
+            </template>
+            <add-form ref="addForm"></add-form>
+        </el-card>
+    </guava>
+</div>
+
+<script>
+    <!--#include("addFrom.js"){}#-->
+    new Vue({
+        el: "#app",
+        data() {
+            return {
+            }
+        },
+        components: {
+            "add-form": GRASSROOTS_CONGRESS_MEETINGS_ADD_FROM
+        },
+        methods: {},
+        created() {
+            setTimeout(() => {
+                this.$refs.addForm.init(GetQueryString('id'))
+            }, 500)
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meetingstatistics/index.html b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meetingstatistics/index.html
new file mode 100644
index 00000000..0528eac2
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meetingstatistics/index.html
@@ -0,0 +1,102 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <template>
+            <el-card shadow="never">
+                <search @search="doSearch">
+                    <search-item label="年度">
+                        <el-date-picker placeholder="选择年" style="width: 100%" type="year"
+                                        @change="getAllJc()"
+                                        v-model="pageForm.year" value-format="yyyy"></el-date-picker>
+                    </search-item>
+                    <search-item label="届次">
+                        <el-select placeholder="届次" style="width: 100%;" v-model="pageForm.fullName">
+                            <el-option :key="item" :label="item" :value="item"
+                                       v-for="item in fullNameList"></el-option>
+                        </el-select>
+                    </search-item>
+                    <search-item label="所属工会">
+                        <el-select clearable placeholder="所属工会" style="width: 100%;" v-model="pageForm.unionId">
+                            <el-option :key="item.id" :label="item.name" :value="item.id"
+                                       v-for="item in unions"></el-option>
+                        </el-select>
+                    </search-item>
+                </search>
+            </el-card>
+
+            <el-card shadow="never" class="mt10">
+                <table-tool label="工会列表"></table-tool>
+                <el-table v-if="tableData" :data="tableData" border>
+                    <el-table-column label="序号" type="index" width="50"></el-table-column>
+                    <el-table-column label="工会名称" prop="name"></el-table-column>
+                    <el-table-column label="工会编码" prop="unionCode"></el-table-column>
+                    <el-table-column label="届次名称" prop="fullName">
+                        <template slot-scope="scope">
+                            {{ pageForm.fullName }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="当年会议次数" prop="unionNum"></el-table-column>
+                </el-table>
+                <el-empty v-else :image-size="200"></el-empty>
+            </el-card>
+        </template>
+    </guava>
+</div>
+<script>
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        data() {
+            return {
+                pageForm: {
+                    year: this.$moment().format("YYYY")
+                },
+                fullNameList: [],
+                unions: []
+            }
+        },
+        methods: {
+            getAllJc() {
+                this.$axios.post("/platform/grassrootsCongress/myMeeting/getAllJc",{year:this.pageForm.year}).then((resp) => {
+                    if (resp.code === 0) {
+                        this.fullNameList = resp.data
+                        if (this.fullNameList && this.fullNameList.length > 0) {
+                            this.pageForm.fullName = this.fullNameList[0]
+                        }
+                    }
+                })
+            },
+            initData() {
+                const isAdmin = this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])
+                if (isAdmin) {
+                    this.$businessTool.listUnion(this.pageForm.unionId).then((data) => {
+                        this.unions = data
+                    })
+                } else {
+                    this.$businessTool.listUnion(this.$store.state.user.union.id).then((data) => {
+                        this.unions = data
+                    })
+                }
+                this.getAllJc()
+            },
+            pageData() {
+                this.$axios.post(loc() + '/pageData', this.pageForm)
+                    .then(res => {
+                        if (res.code === 0) {
+                            this.tableData = res.data
+                        }
+                    })
+            }
+        },
+        created() {
+            this.initData()
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/myMeetings/index.html b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/myMeetings/index.html
new file mode 100644
index 00000000..522a214b
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/myMeetings/index.html
@@ -0,0 +1,169 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker placeholder="选择年" style="width: 100%" type="year" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
+                </search-item>
+                <search-item label="会议名称">
+                    <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称" v-model="pageForm.searchKeyword"></el-input>
+                </search-item>
+                <template v-if="$auth.hasRoleOr('SYSADMIN,SCHOOL_UNION_ADMIN')">
+                    <search-item label="所属工会">
+                        <el-select clearable placeholder="所属工会" style="width: 100%;" v-model="pageForm.unionId">
+                            <el-option :key="item.id" :label="item.name" :value="item.id"
+                                       v-for="item in unions"></el-option>
+                        </el-select>
+                    </search-item>
+                </template>
+            </search>
+        </el-card>
+
+        <el-card shadow="never">
+            <table-tool label="会议列表"></table-tool>
+            <el-table
+                :data="tableData"
+                :size="tableSize"
+                @sort-change="pageOrder"
+                class="vi-table"
+                row-key="processTaskId"
+                style="width: 100%; margin-bottom: 20px"
+            >
+                <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index" width="80px"></el-table-column>
+
+                <el-table-column
+                    :key="column.prop"
+                    :label="column.label"
+                    :prop="column.prop"
+                    :sortable="column.sortable"
+                    align="center"
+                    header-align="center"
+                    show-overflow-tooltip
+                    v-for="column in tableColumns"
+                ></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column align="center" header-align="center" label="操作" prop="userOnline" width="300">
+                    <template slot-scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                        <el-button v-if="[10,40].includes(row.processInstanceNodeCode)" size="mini" type="primary" @click="openEdit(row)">
+                            编辑
+                        </el-button>
+                        <el-button
+                            v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
+                            size="mini"
+                            type="danger"
+                            @click="openRevoke(row)"
+                        >
+                            撤销
+                        </el-button>
+                        <el-button v-if="[10].includes(row.processInstanceNodeCode)" size="mini" type="danger" @click="doDelete(row)">删除</el-button>
+                        <template v-if="$auth.hasRole('SYSADMIN') && ![10].includes(row.processInstanceNodeCode)">
+                            <el-button size="mini" type="danger" @click="doDelete(row)">删除</el-button>
+                        </template>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #public>
+            <info ref="infoRef"></info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        dicts: ["PROCESS_INSTANCE_STATE"],
+        data() {
+            return {
+                unionList: [],
+                pageForm: {
+                    year: this.$moment().format("YYYY")
+                },
+                tableColumns: [
+                    { prop: "meetingName", label: "会议名称" },
+                    { prop: "meetingTime", label: "会议时间" },
+                    { prop: "fullName", label: "届次" },
+                    { prop: "createUserName", label: "申请人" },
+                    { prop: "unionName", label: "所属工会" },
+                    { prop: "meetingType", label: "会议类型" },
+                    { prop: "createTime", label: "申请时间" }
+                ],
+                businessNo: "",
+                unions: []
+            }
+        },
+        components: {
+            info: INFO
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            openRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { id: row.id }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            openEdit(row) {
+                this.$store.dispatch("pjaxRoute", "/platform/grassrootsCongress/meeting?id=" + row.id)
+            },
+            doDelete(row) {
+                this.$confirm("确定要删除此会议吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/grassrootsCongress/myMeeting/doDelete", { id: row.id }).then((resp) => {
+                        if (resp.code === 0) {
+                            this.$message.success(resp.msg)
+                            this.doSearch()
+                        } else {
+                            this.$message.warning(resp.msg)
+                        }
+                    })
+                })
+            },
+            initData() {
+                const isAdmin = this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])
+                if (isAdmin) {
+                    this.$businessTool.listUnion(this.pageForm.unionId).then((data) => {
+                        this.unions = data
+                    })
+                } else {
+                    this.$businessTool.listUnion(this.$store.state.user.union.id).then((data) => {
+                        this.unions = data
+                    })
+                }
+            }
+        },
+        async created() {
+            this.initData()
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/myMeetings/viewFrom.js b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/myMeetings/viewFrom.js
new file mode 100644
index 00000000..3e7e3cf1
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/myMeetings/viewFrom.js
@@ -0,0 +1,54 @@
+const GRASSROOTS_CONGRESS_MEETINGS_VIEW_FROM = {
+    template: `
+    <div>
+        <el-descriptions :column="2" border class="margin-top" style="margin: 10px" title="">
+            <el-descriptions-item label="会议名称" span="2">
+                <span class="item-center">  {{ viewData.meetingName }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="类型">
+                {{viewData.fullName}}
+            </el-descriptions-item>
+            <el-descriptions-item label="申请人">
+                {{viewData.createUserName}}
+            </el-descriptions-item>
+            <el-descriptions-item label="申请时间">
+                {{viewData.createTime}}
+            </el-descriptions-item>
+            <el-descriptions-item label="申请单位">
+                {{viewData.unitName}}
+            </el-descriptions-item>
+            <el-descriptions-item label="申请工会">
+                {{viewData.unitName}}
+            </el-descriptions-item>
+            <el-descriptions-item></el-descriptions-item>
+            <el-descriptions-item label="会议议程" span="2">
+                <div v-html="viewData.meetingTopic"></div>
+            </el-descriptions-item>
+            <el-descriptions-item label="备注" span="2">
+                {{viewData.meetingRemark}}
+            </el-descriptions-item>
+            <el-descriptions-item label="请示附件" span="2">
+                <file-preview :files="viewData.files" complete_result></file-preview>
+            </el-descriptions-item>
+        </el-descriptions>
+    </div>
+    
+</el-tabs>
+
+    `,
+    data() {
+        return {
+            viewData: {}
+        }
+    },
+    methods: {
+        initData(id) {
+            this.$axios.post("/platform/grassrootsCongress/meeting/findOne", { id: id }).then(resp => {
+                if (resp.code === 0) {
+                    resp.data.files = JSON.parse(resp.data.files)
+                    this.viewData = resp.data
+                }
+            })
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
new file mode 100644
index 00000000..423fbfd7
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
@@ -0,0 +1,331 @@
+const PROPOSAL_INFO_COMPONENT = {
+    name: "ProposalInfo",
+    /*language=HTML*/
+    template: `
+        <div class="proposal-info">
+            <div class="process-title">
+                提案基础信息
+            </div>
+            <h3 style="text-align: center;font-weight: 600" class="pt10 pb10">
+                {{ viewData.name }}
+            </h3>
+            <el-descriptions :column="3" border>
+                <el-descriptions-item label="提案编号">{{ viewData.code }}</el-descriptions-item>
+                <el-descriptions-item label="提案人">{{viewData.createUserName }}</el-descriptions-item>
+                <el-descriptions-item label="提案时间">{{ viewData.createTime }}</el-descriptions-item>
+                <el-descriptions-item label="教代会届次"> {{ viewData.sessionName || '暂无' }}</el-descriptions-item>
+                <el-descriptions-item label="提案人单位">{{ viewData.unitName }}</el-descriptions-item>
+                <el-descriptions-item :label="viewData.mannerCode!=='W03'?'代表团名称':'委员会名称'">
+                    {{ viewData.mannerCode !== 'W03' ? viewData.delegationName : viewData.committeeName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="提案类别">
+                    {{viewData.typeName}}
+                </el-descriptions-item>
+                <el-descriptions-item label="立案结果" :span="2">
+                    <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
+                              :value="viewData.caseFilingResult"></dict-tag>
+                </el-descriptions-item>
+                <el-descriptions-item label="提案摘要" :span="3">
+                    <div class="text-left">{{viewData.excerpt}}</div>
+                </el-descriptions-item>
+                <el-descriptions-item label="提案内容" :span="3">
+                    <div class="text-left" v-html="viewData.brief"></div>
+                </el-descriptions-item>
+                <el-descriptions-item label="改进建议和措施" :span="3">
+                    <div class="text-left" v-html="viewData.measures"></div>
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" :span="3">
+                    <file-preview :files="viewData.files" complete_result></file-preview>
+                </el-descriptions-item>
+                <!--                <el-descriptions-item label="签字" :span="3">-->
+                <!--                    <el-image :src="viewData.signature" class="signature-image">-->
+                <!--                         <div slot="error" class="image-slot">-->
+                <!--                            <i class="el-icon-picture-outline"></i>-->
+                <!--                         </div>-->
+                <!--                    </el-image>-->
+                <!--                </el-descriptions-item>-->
+            </el-descriptions>
+
+            <!--并案信息-->
+            <template v-if="viewData.consolidationProposals">
+                <div class="process-title">
+                    并案信息
+                </div>
+                <el-table :data="viewData.consolidationProposals">
+                    <el-table-column label="序号" type="index" width="100px"></el-table-column>
+                    <el-table-column label="提案编号" prop="code" 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="typeName"></el-table-column>
+                    <el-table-column label="届次" prop="sessionName"></el-table-column>
+                    <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                    <el-table-column label="操作" width="100px">
+                        <template slot-scope="{row}">
+                            <el-link type="primary" size="mini" @click="openView(row.id)">查看</el-link>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </template>
+
+            <div class="process-title">
+                附议人信息
+            </div>
+            <el-table :data="viewData.seconders" size="small">
+                <el-table-column label="姓名" prop="createVariable.userName"></el-table-column>
+                <el-table-column label="工号" prop="createVariable.loginName"></el-table-column>
+                <el-table-column label="单位" prop="createVariable.unitName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="分工会" prop="createVariable.unionName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="代表团" prop="createVariable.delegationName"></el-table-column>
+                <el-table-column label="邀请时间" prop="createdOn"></el-table-column>
+                <el-table-column label="附议时间" prop="endOn"></el-table-column>
+                <el-table-column label="附议结果" prop="extVariable.bpmTaskApprovalType">
+                    <template slot-scope="{row}">
+                               <span v-if="row.extVariable && row.extVariable.bpmTaskApprovalType">
+                                   <el-tag size="mini" type="success"
+                                           v-if="row.extVariable.bpmTaskApprovalType==='PASS'">同意</el-tag>
+                                   <el-tag size="mini" type="danger"
+                                           v-if="row.extVariable.bpmTaskApprovalType==='REJECT'">拒绝</el-tag>
+                               </span>
+                    </template>
+                </el-table-column>
+                <!--                       <el-table-column label="签字" prop="extVariable.bpmTaskApprovalType">-->
+                <!--                           <template slot-scope="{row}">-->
+                <!--                               <el-image :src="row.extVariable.approvalSignature" v-if="row.extVariable && row.extVariable.approvalSignature"></el-image>-->
+                <!--                       </template>-->
+                </el-table-column>
+            </el-table>
+
+            <div>
+                <div v-for="nodeTask in viewData.nodeTasks" :key="nodeTask.id">
+                    <div class="process-title" v-if="nodeTask.nodeCode !== 20">
+                        {{nodeTask.nodeName}}
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 30">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id" style="margin-bottom: 10px">
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审核结果">
+                                <div v-if="task.extVariable">
+                                    <el-tag type="success" size="mini"
+                                            v-if="task.extVariable.bpmTaskApprovalType === 'PASS'">同意
+                                    </el-tag>
+                                    <el-tag type="danger" size="mini"
+                                            v-if="task.extVariable.bpmTaskApprovalType === 'BACK'">退回重新填写
+                                    </el-tag>
+                                    <el-tag type="danger" size="mini"
+                                            v-if="task.extVariable.bpmTaskApprovalType === 'REJECT'">建议撤销
+                                    </el-tag>
+                                </div>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字" :span="3">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 60">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id">
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审核结果">
+                                <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
+                                          :value="task.extVariable.caseFilingResult">
+                                </dict-tag>
+                            </el-descriptions-item>
+                            <template
+                                v-if="task.extVariable.caseFilingResult!=='NOT' && task.extVariable.caseFilingResult!==''">
+                                <el-descriptions-item label="主办单位" :span="3">{{ task.extVariable.hostUnit}}
+                                </el-descriptions-item>
+                                <el-descriptions-item label="协办单位" :span="3">{{
+                                    task.extVariable.helpUnits.join(',')}}
+                                </el-descriptions-item>
+                            </template>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+
+                    <div v-if="nodeTask.nodeCode === 63">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id" style="margin-bottom: 10px">
+                            <el-descriptions-item label="承办单位">
+                                {{ task.createVariable.underTakeName}}
+                                ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="能否承办" :span="3">
+                                {{task.extVariable.canTake}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                        </el-descriptions>
+                    </div>
+
+                    <div v-if="nodeTask.nodeCode === 70">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id" style="margin-bottom: 10px;">
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审核结果">
+                                <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
+                                          :value="task.extVariable.caseFilingResult">
+                                </dict-tag>
+                            </el-descriptions-item>
+                            <template
+                                v-if="task.extVariable.caseFilingResult!=='NOT' && task.extVariable.caseFilingResult!==''">
+                                <el-descriptions-item label="主办单位" :span="3">{{ task.extVariable.hostUnit}}
+                                </el-descriptions-item>
+                                <el-descriptions-item label="协办单位" :span="3">{{
+                                    task.extVariable.helpUnits.join(',')}}
+                                </el-descriptions-item>
+                            </template>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+
+                    <div v-if="nodeTask.nodeCode === 80">
+                        <el-descriptions :column="3" border v-if="!hide_slave" v-for="task in nodeTask.tasks"
+                                         :key="task.id" style="margin-bottom: 10px">
+                            <el-descriptions-item label="承办单位">
+                                <span class="text-primary">
+                                     {{ task.createVariable.underTakeName}}
+                                    ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                                </span>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="答复内容" :span="3">
+                                <div v-html="task.extVariable.approvalOpinion"></div>
+                            </el-descriptions-item>
+                        </el-descriptions>
+                        <el-descriptions :column="3" border v-if="hide_slave"
+                                         v-for="task in nodeTask.tasks.filter(v=>v.createVariable?.isMaster == true)"
+                                         :key="task.id" style="margin-bottom: 10px">
+                            <el-descriptions-item label="承办单位">
+                                <span class="text-primary">
+                                     {{ task.createVariable.underTakeName}}
+                                    ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                                </span>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="答复内容" :span="3">
+                                <div v-html="task.extVariable.approvalOpinion"></div>
+                            </el-descriptions-item>
+                        </el-descriptions>
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 90">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id" style="margin-bottom: 10px;">
+                            <el-descriptions-item label="承办单位">
+                                {{ task.createVariable.underTakeName}}
+                                ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                            </el-descriptions-item>
+                            <el-descriptions-item label="校领导">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审批时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审批结果" :span="3">
+                                <el-tag size="mini" type="success" v-if="task.extVariable.bpmTaskApprovalType==='PASS'">
+                                    同意
+                                </el-tag>
+                                <el-tag size="mini" type="danger"
+                                        v-if="task.extVariable.bpmTaskApprovalType==='BACK_OTHER_NODE'">退回重新答复
+                                </el-tag>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审批意见" :span="3">
+                                {{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 100">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id">
+                            <el-descriptions-item label="反馈人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="反馈时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="反馈结果">{{ task.extVariable.feedBackScore}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="反馈意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                             <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>  -->
+                        </el-descriptions>
+                    </div>
+
+                </div>
+            </div>
+
+            <el-dialog title="提案详情" :visible.sync="viewDialogVisible" width="1200px" append-to-body top="5vh">
+                <div style="max-height: 80vh;overflow-y: auto">
+                    <proposal-info ref="infoDialogRef"></proposal-info>
+                </div>
+            </el-dialog>
+        </div>
+
+    `,
+    dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT"],
+    props:{
+        hide_slave:false
+    },
+    data() {
+        return {
+            viewData: {},
+            viewDialogVisible: false
+        }
+    },
+    methods: {
+        onOpen(id) {
+            this.$axios.post("/platform/proposal/common/proposalInfo", { id }).then((res) => {
+                if (res.code === 0) {
+                    this.viewData = res.data
+                }
+            })
+        },
+        openView(id) {
+            this.viewDialogVisible = true
+            this.$nextTick(() => {
+                this.$refs.infoDialogRef.onOpen(id)
+            })
+        }
+    },
+    style:
+        /*language=CSS*/
+        `
+            .proposal-info .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell{
+                text-align: left;
+            }
+        `
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/config/all/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/config/all/index.html
new file mode 100644
index 00000000..8c3680db
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/config/all/index.html
@@ -0,0 +1,123 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <el-card shadow="never">
+        <template #header>
+            <h3 style="color: var(--color-primary)">提案全局配置</h3>
+        </template>
+        <el-form :model="formData" :rules="formRules" label-width="200px" ref="formRef" label-position="top" size="small">
+            <el-form-item label="附议人数量" prop="seconderNum">
+                <el-input-number :min="0" :max="10" v-model="formData.seconderNum"></el-input-number>
+            </el-form-item>
+            <el-form-item label="案由最少字数" prop="briefMinLength">
+                <el-input-number :min="0" v-model="formData.briefMinLength"></el-input-number>
+            </el-form-item>
+            <el-form-item label="校领导单位" prop="schoolLeaderUnitIds">
+                <el-select clearable filterable placeholder="校领导单位" multiple v-model="formData.schoolLeaderUnitIds" style="width: 100%">
+                    <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="协办单位是否需要答复" prop="slaveUnitNeedReply">
+                <el-radio-group v-model="formData.slaveUnitNeedReply" size="small">
+                    <el-radio border :label="true">是</el-radio>
+                    <el-radio border :label="false">否</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="协办单位是否首先答复" prop="slaveUnitFirstReply" v-if="formData.slaveUnitNeedReply">
+                <span slot="label">
+                    协办单位是否首先答复
+                    <el-tooltip content="开启后协办单位答复完成之后主办单位才可答复" placement="right">
+                        <i class="el-icon-question"></i>
+                    </el-tooltip>
+                </span>
+                <el-radio-group v-model="formData.slaveUnitFirstReply" size="small">
+                    <el-radio border :label="true">是</el-radio>
+                    <el-radio border :label="false">否</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="协办单位领导单位是否需要审批" prop="slaveUnitLeaderNeedApprove">
+                <el-radio-group v-model="formData.slaveUnitLeaderNeedApprove" size="small">
+                    <el-radio border :label="true">是</el-radio>
+                    <el-radio border :label="false">否</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="撰写须知" prop="writeRemind">
+                <text-editor v-model="formData.writeRemind"></text-editor>
+            </el-form-item>
+        </el-form>
+        <el-row type="flex" justify="end">
+            <el-button type="primary" @click="save" style="width: 200px">保存</el-button>
+        </el-row>
+    </el-card>
+</div>
+<script>
+    new Vue({
+        el: "#app",
+        data() {
+            return {
+                unitOptions: [],
+                formData: {},
+                formRules: {
+                    seconderNum: [{ required: true, message: "请输入附议人数量", trigger: ["blur", "change"] }],
+                    briefMinLength: [{ required: true, message: "请输入案由最少字数", trigger: ["blur", "change"] }],
+                    slaveUnitNeedReply: [{ required: true, message: "请选择协办单位是否需要答复", trigger: ["blur", "change"] }],
+                    slaveUnitFirstReply: [{ required: true, message: "请选择协办单位是否首先答复", trigger: ["blur", "change"] }],
+                    slaveUnitLeaderNeedApprove: [{ required: true, message: "请选择协办单位领导单位是否需要审批", trigger: ["blur", "change"] }],
+                    writeRemind: [
+                        {
+                            required: true,
+                            validator: (rule, value, callback) => {
+                                value === "<p><br></p>" ? callback(new Error("请输入撰写须知")) : callback()
+                            },
+                            message: "请输入撰写须知",
+                            trigger: ["blur", "change"]
+                        }
+                    ],
+                    schoolLeaderUnitIds: [{ required: true, message: "请选择校领导单位", trigger: ["blur", "change"] }]
+                }
+            }
+        },
+        watch: {
+            "formData.writeRemind"(val) {
+                this.$refs.formRef.validateField(["writeRemind"], (errMsg) => {})
+            }
+        },
+        methods: {
+            init() {
+                this.$axios.post(loc() + "/findOne").then((res) => {
+                    if (res.code === 0) {
+                        this.formData = res.data
+                    }
+                })
+            },
+            save() {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        this.$axios
+                            .post(loc() + "/update", {
+                                config: JSON.stringify(this.formData)
+                            })
+                            .then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.init()
+                                }
+                            })
+                    }
+                })
+            },
+            listUnit() {
+                this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
+            }
+        },
+        created() {
+            this.init()
+            this.listUnit()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/config/type/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/config/type/index.html
new file mode 100644
index 00000000..f7db934f
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/config/type/index.html
@@ -0,0 +1,106 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <el-card shadow="never">
+        <search @search="doSearch">
+            <search-item label="名称">
+                <el-input v-model="pageForm.name" placeholder="请输入名称"></el-input>
+            </search-item>
+        </search>
+    </el-card>
+
+    <el-card shadow="never">
+        <table-tool>
+            <el-button type="primary" size="mini" icon="el-icon-plus" @click="openAdd">新增</el-button>
+        </table-tool>
+        <el-table :data="tableData" border stripe>
+            <el-table-column label="序号" type="index" :index="indexMethod" width="50px"></el-table-column>
+            <el-table-column prop="name" label="名称"></el-table-column>
+            <el-table-column prop="code" label="编码"></el-table-column>
+            <el-table-column label="操作" width="150px">
+                <template slot-scope="{row}">
+                    <el-button size="mini" type="primary" @click="openEdit(row)">编辑</el-button>
+                    <el-button size="mini" type="danger" @click="doDelete(row.id)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!--#include("/layouts/pagination.html"){}#-->
+    </el-card>
+
+    <el-dialog :visible.sync="dialogVisible" :title="formData.id?'编辑':'新增'" width="500px">
+        <el-form :model="formData" :rules="formRules" label-width="80px" ref="formRef" size="small">
+            <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" max="10"></el-input>
+            </el-form-item>
+            <el-form-item label="编码" prop="code">
+                <el-input v-model="formData.code" placeholder="请输入编码" max="10"></el-input>
+            </el-form-item>
+        </el-form>
+        <div slot="footer">
+            <el-button @click="dialogVisible=false">取消</el-button>
+            <el-button type="primary" @click="submit">提交</el-button>
+        </div>
+    </el-dialog>
+</div>
+
+<script>
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        data() {
+            return {
+                formRules: {
+                    name: [{ required: true, message: "请输入名称", trigger: ["blur", "change"] }],
+                    code: [{ required: true, message: "请输入编码", trigger: ["blur", "change"] }]
+                },
+                dialogVisible: false
+            }
+        },
+        methods: {
+            openAdd() {
+                this.formData = {}
+                this.dialogVisible = true
+            },
+            openEdit(row) {
+                this.formData = { ...row }
+                this.dialogVisible = true
+            },
+            submit() {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        this.$axios.post(loc() + (this.formData.id ? "/update" : "/insert"), this.formData).then((res) => {
+                            if (res.code === 0) {
+                                this.$message.success(res.msg)
+                                this.dialogVisible = false
+                                this.pageData()
+                            }
+                        })
+                    }
+                })
+            },
+            doDelete(id) {
+                this.$confirm("您确定要删除吗?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post(loc() + "/delete", { id }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData
+                        }
+                    })
+                })
+            }
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/baiscForm.js b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/baiscForm.js
new file mode 100644
index 00000000..ba555abb
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/baiscForm.js
@@ -0,0 +1,92 @@
+const BASIC_XC_FORM_COMPONENT = {
+    template: `
+            <div>
+                <table-tool>
+                    <el-button type="primary" size="small" icon="el-icon-plus" @click="openAdd()">新建机构</el-button>
+                </table-tool>
+                <el-table key="1" :data="tableData" ref="tableRef">
+                       <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                       <el-table-column prop="name" label="机构名称"></el-table-column>
+                       <el-table-column prop="name" label="机构编码"></el-table-column>
+                       <el-table-column prop="name" label="备注"></el-table-column>
+                       <el-table-column label="操作" width="100px">
+                           <template slot-scope="{row}">
+                               <el-link size="mini" type="primary" @click="openEdit(row)">编辑</el-link>
+                               <el-link size="mini" type="danger" @click="del(row.id)">删除</el-link>
+                           </template>
+                       </el-table-column>
+                </el-table>
+
+                <el-dialog :visible.sync="dialogFormVisible" :title="formData.id?'编辑':'新增'" width="40%">
+                    <el-form :model="formData" ref="formRef" :rules="rules" label-width="100px">
+                        <el-form-item label="上级机构">
+                            <el-input :value="formData.parentName" disabled></el-input>
+                        </el-form-item>
+                        <el-form-item label="机构名称" prop="name">
+                             <el-select v-if="parentData.name==='专门委员会'"
+                                        v-model="formData.committee"
+                                        value-key="id"
+                                        style="width: 100%"
+                                        @change="committeeChange"
+                                       :disabled="formData.id!=null">
+                                <el-option v-for="i in committeeOptions" :label="i.name" :value="i" :key="i.id"></el-option>
+                            </el-select>
+                             <el-input v-else placeholder="请输入机构名称" :disabled="formData.id!=null"
+                                       v-model="formData.name"></el-input>
+                        </el-form-item>
+                        <el-form-item label="备注" prop="notes">
+                            <el-input v-model="formData.notes" placeholder="请输入备注"></el-input>
+                        </el-form-item>
+                    </el-form>
+                    <div slot="footer" class="dialog-footer">
+                        <el-button @click="dialogFormVisible = false">取 消</el-button>
+                        <el-button type="primary" @click="doSubmit">确 定</el-button>
+                    </div>
+                </el-dialog>
+
+            </div>
+        `,
+    mixins: [initTableMixins],
+    data() {
+        return {
+            rules: {},
+            parentNode: {},
+            parentData: {},
+            committeeOptions: []
+        }
+    },
+    methods: {
+        openEdit(row) {},
+        doSubmit() {
+            this.$refs.formRef.validate((valid) => {
+                if (valid) {
+                    this.$axios.post(loc() + (this.formData.id ? "/update" : "/insert"), this.formData).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                            this.$emit("refresh", null)
+                        }
+                    })
+                }
+            })
+        },
+
+        del(id) {
+            this.$confirm("您确定要删除吗？", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.$axios.post(loc() + "/delete", { id }).then((res) => {
+                    if (res.code === 0) {
+                        this.$message.success(res.msg)
+                        this.doSearch()
+                        this.$emit("refresh", null)
+                    }
+                })
+            })
+        },
+
+        committeeChange(val) {}
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/index.html
new file mode 100644
index 00000000..ce45d5da
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/index.html
@@ -0,0 +1,97 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <el-row type="flex" :gutter="10" style="height: calc(100vh - 126px)">
+        <el-col :span="5">
+            <tree @node-click="treeNodeClick" ref="treeRef"></tree>
+        </el-col>
+        <el-col :span="19">
+            <el-card shadow="never" style="height: 100%">
+                <el-card shadow="never" style="border: 1px solid var(--border-color-lighter)">
+                    <el-row type="flex" :gutter="20">
+                        <el-col :span="6">
+                            <el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入关键字"></el-input>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
+                        </el-col>
+                    </el-row>
+                </el-card>
+                <el-card shadow="never" style="border: 1px solid var(--border-color-lighter)">
+                    <table-tool>
+                        <el-button type="primary" size="small" icon="el-icon-refresh" @click="syncSysUnit">同步系统单位</el-button>
+                    </table-tool>
+                    <el-table :data="tableData" border size="small" ref="tableRef" height="calc(100vh - 400px)">
+                        <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                        <el-table-column prop="name" label="单位名称" show-overflow-tooltip></el-table-column>
+                        <el-table-column prop="code" label="单位编码" width="150px"></el-table-column>
+                        <el-table-column prop="branchSchoolLeader" label="分管校领导及联系方式" width="180px"></el-table-column>
+                        <el-table-column prop="unitLeader" label="单位领导及联系方式" width="180px" show-overflow-tooltip></el-table-column>
+                        <el-table-column label="操作" width="350px">
+                            <template slot-scope="{row}">
+                                <el-link size="mini" type="primary" @click="$refs.userRef.onOpen(row.id,true)">设置分管校领导</el-link>
+                                <el-link size="mini" type="primary" @click="$refs.userRef.onOpen(row.id,false)">设置单位领导</el-link>
+                                <el-link size="mini" type="danger">删除</el-link>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <!--#include("/layouts/pagination.html"){}#-->
+                </el-card>
+            </el-card>
+        </el-col>
+    </el-row>
+
+    <user ref="userRef" @refresh="doSearch"></user>
+</div>
+
+<script>
+    <!--#include("tree.js"){}#-->
+    <!--#include("user.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        components: {
+            tree: TREE_COMPONENT,
+            user: USER_COMPONENT
+        },
+        computed: {
+            hasChildren() {
+                if (this.currentTreeData) {
+                    return this.currentTreeData.children && this.currentTreeData.children.length > 0
+                } else {
+                    return false
+                }
+            }
+        },
+        data() {
+            return {
+                currentTreeNode: null,
+                currentTreeData: null
+            }
+        },
+        methods: {
+            treeNodeClick(data, node) {
+                this.currentTreeData = data
+                this.currentTreeNode = node
+            },
+
+            syncSysUnit() {
+                this.$axios.post(loc() + "/syncSysUnit").then((res) => {
+                    if (res.code === 0) {
+                        this.$message.success(res.msg)
+                        this.$refs.treeRef.listTree()
+                    }
+                })
+            }
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/tree.js b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/tree.js
new file mode 100644
index 00000000..e86c5488
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/tree.js
@@ -0,0 +1,50 @@
+const TREE_COMPONENT = {
+    template: `
+            <el-card shadow="never" style="height: 100%" body-style="{ height: '100%' }">
+                <el-input placeholder="输入关键字进行查找" v-model="name" clearable class="mb10">
+                </el-input>
+                <div style="max-height: calc(100vh - 200px);overflow-y: auto">
+                    <el-tree
+                        :data="treeData"
+                        ref="treeRef"
+                        :expand-on-click-node="false"
+                        :props="{
+                            children: 'children',
+                            label: 'name'
+                         }"
+                        default-expand-all
+                        @node-click="treeNodeClick"
+                        :filter-node-method="filterNode"
+                    ></el-tree>
+                </div>
+            </el-card>
+        `,
+    data() {
+        return {
+            currentTreeNode: null,
+            currentTreeData: null,
+            sessionOptions: [],
+            name: null,
+            treeData: []
+        }
+    },
+    methods: {
+        treeNodeClick(data, node) {
+            this.currentTreeData = data
+            this.currentTreeNode = node
+            this.$emit("node-click", data, node)
+        },
+        filterNode() {},
+        listTree() {
+            this.$axios.post("/platform/proposal/config/unit/tree").then((res) => {
+                if (res.code === 0) {
+                    this.treeData = res.data
+                    this.$emit("node-click", this.treeData[0], null)
+                }
+            })
+        }
+    },
+    created() {
+        this.listTree()
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/user.js b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/user.js
new file mode 100644
index 00000000..730400bb
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/user.js
@@ -0,0 +1,66 @@
+const USER_COMPONENT = {
+    template: `
+        <el-dialog title="设置领导" :visible.sync="visible" width="1000px" :close-on-click-modal="false">
+            <el-transfer
+                ref="transferRef"
+                :titles="['可选人员', '已选人员']"
+                filterable
+                :props="{
+                    key: 'id',
+                    label: 'label'
+                }"
+                :left-default-checked="[]"
+                :filter-method="filterUnit"
+                v-model="selectUserIds"
+                :data="allUsers"
+            ></el-transfer>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="visible = false">取 消</el-button>
+                <el-button type="primary" @click="doSubmit">确 定</el-button>
+            </div>
+        </el-dialog>    
+    `,
+    data() {
+        return {
+            visible: false,
+            selectUserIds: [],
+            allUsers: [],
+            unitId: null,
+            isSchoolLeader: ""
+        }
+    },
+    methods: {
+        onOpen(id, isSchoolLeader) {
+            this.isSchoolLeader = isSchoolLeader
+            this.unitId = id
+            this.visible = true
+            this.$axios
+                .post("/platform/proposal/config/unit/" + (isSchoolLeader ? "branchSchoolLeaderTransferData" : "unitUsersTransferData"), { id })
+                .then((res) => {
+                    this.selectUserIds = res.data.selectUserIds
+                    this.allUsers = res.data.allUsers
+                })
+            this.$refs.transferRef.clearQuery("left")
+            this.$refs.transferRef.clearQuery("right")
+        },
+
+        doSubmit() {
+            this.$axios
+                .post("/platform/proposal/config/unit/" + (this.isSchoolLeader ? "updateBranchSchoolLeader" : "updateUnitLeader"), {
+                    userIds: JSON.stringify(this.selectUserIds),
+                    id: this.unitId
+                })
+                .then((res) => {
+                    if (res.code === 0) {
+                        this.visible = false
+                        this.$message.success(res.msg)
+                        this.$emit("refresh", null)
+                    }
+                })
+        },
+
+        filterUnit(query, item) {
+            return item.username.indexOf(query) > -1
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html
new file mode 100644
index 00000000..e1a5e4d7
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html
@@ -0,0 +1,287 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案名称"
+                        v-model="pageForm.name"
+                        style="width: 100%"
+                    ></el-input>
+                </search-item>
+                <search-item label="提案编码">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案编码"
+                        v-model="pageForm.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案分工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案单位">
+                    <el-select clearable filterable placeholder="提案单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">提案类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">立案结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-button type="primary" size="small" @click="exportAllProposalAsZip">导出全部提案压缩包</el-button>
+                <el-button type="primary" size="small" @click="exportAllProposalFeedBackAsZip">导出全部提案反馈表压缩包</el-button>
+                <el-button type="primary" size="small" @click="exportProposalSummaryAsExcel">导出汇总表</el-button>
+                <el-button type="primary" size="small" @click="exportProposalRegisterSummaryAsExcel">导出立案汇总表</el-button>
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="提案编号" prop="code" width="200px"></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="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></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>
+                    </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="masterUnderTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="协办单位" prop="slaveUnderTakeNames" show-overflow-tooltip></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 size="mini" type="primary" @click="exportDocx(row.id)">导出</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <proposal-info ref="infoRef"></proposal-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                businessNo: "",
+                tabActive: "0",
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportAllProposalAsZip() {
+                this.$downLoad(loc() + "/exportAllProposalAsZip", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+            exportAllProposalFeedBackAsZip() {
+                this.$downLoad(loc() + "/exportAllProposalFeedBackAsZip", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+            exportDocx(id) {
+                this.$downLoad("/platform/proposal/common/exportProposalAsDocx", { id })
+            },
+            exportProposalSummaryAsExcel() {
+                this.$downLoad("/platform/proposal/export/comprehensive/exportProposalSummaryAsExcel", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+            exportProposalRegisterSummaryAsExcel() {
+                this.$downLoad("/platform/proposal/export/comprehensive/exportProposalRegisterSummaryAsExcel", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+
+            listProposalType() {
+                this.$axios.post("/platform/proposal/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/chart/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/chart/index.html
new file mode 100644
index 00000000..effff155
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/chart/index.html
@@ -0,0 +1,263 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <el-card shadow="never">
+        <el-row type="flex" justify="center">
+            <el-select @change="doSearch" clearable filterable placeholder="所属教代会" v-model="pageForm.sessionId" style="width: 100%">
+                <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+            </el-select>
+        </el-row>
+    </el-card>
+    <el-row :gutter="10" class="mt10">
+        <el-col :span="12" v-loading="loading.satisfiedLoading">
+            <el-card class="box-card" shadow="never">
+                <div slot="header">
+                    <span>提案满意度</span>
+                </div>
+                <div class="text item">
+                    <div id="satisfiedChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+        <el-col :span="12" v-loading="loading.typeLoading">
+            <el-card class="box-card" shadow="never">
+                <div slot="header" class="clearfix">
+                    <span>提案类别</span>
+                </div>
+                <div class="text item">
+                    <div id="typeChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+    </el-row>
+    <el-row :gutter="10" class="mt10">
+        <el-col :span="12" v-loading="loading.resultLoading">
+            <el-card shadow="never">
+                <div slot="header" class="clearfix">
+                    <span>立案结果</span>
+                </div>
+                <div class="text item">
+                    <div id="resultChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+        <el-col :span="12" v-loading="loading.stateLoading">
+            <el-card shadow="never">
+                <div slot="header" class="clearfix">
+                    <span>提案状态</span>
+                </div>
+                <div class="text item">
+                    <div id="stateChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+    </el-row>
+</div>
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    const chart = {
+        satisfiedChart: undefined,
+        resultChart: undefined,
+        typeChart: undefined,
+        stateChart: undefined
+    }
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        data() {
+            return {
+                pageForm: {
+                    sessionId: null
+                },
+                sessionOptions: [],
+                loading: {
+                    satisfiedLoading: false,
+                    resultLoading: false,
+                    typeLoading: false,
+                    stateLoading: false
+                }
+            }
+        },
+        methods: {
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.doSearch()
+                        }
+                    }
+                })
+            },
+
+            doSearch() {
+                this.typeChart()
+                this.resultChart()
+                this.stateChart()
+                this.feedBackScoreChart()
+            },
+
+            typeChart() {
+                this.$axios.post(loc() + "/typeData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        this.loading.typeLoading = false
+                        if (chart.typeChart) {
+                            chart.typeChart.changeData(res.data)
+                            return
+                        }
+                        chart.typeChart = new G2Plot.Column("typeChart", {
+                            data: res.data,
+                            xField: "typeName",
+                            yField: "count",
+                            meta: {
+                                type: {
+                                    alias: "类别"
+                                },
+                                sales: {
+                                    alias: "数量"
+                                }
+                            },
+                            xAxis: {
+                                label: {
+                                    autoRotate: true,
+                                    autoHide: false,
+                                    autoEllipsis: false
+                                }
+                            }
+                        })
+                        chart.typeChart.render()
+                    }
+                })
+            },
+
+            resultChart() {
+                this.$axios.post(loc() + "/resultData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        if (chart.resultChart) {
+                            chart.resultChart.changeData(res.data)
+                            return
+                        }
+                        chart.resultChart = new G2Plot.Radar("resultChart", {
+                            data: res.data,
+                            xField: "name",
+                            yField: "count",
+                            seriesField: "type",
+                            meta: {
+                                num: {
+                                    alias: "数量",
+                                    min: 0
+                                }
+                            },
+                            xAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            yAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        type: "line",
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            area: {},
+                            point: {
+                                size: 2
+                            }
+                        })
+                        chart.resultChart.render()
+                    }
+                })
+            },
+
+            stateChart() {
+                this.$axios.post(loc() + "/stateData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        if (chart.stateChart) {
+                            chart.stateChart.changeData(res.data)
+                            return
+                        }
+                        chart.stateChart = new G2Plot.Radar("stateChart", {
+                            data: res.data,
+                            xField: "name",
+                            yField: "count",
+                            xAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            yAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        type: "line",
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            point: {
+                                size: 2
+                            }
+                        })
+                        chart.stateChart.render()
+                    }
+                })
+            },
+
+            feedBackScoreChart() {
+                this.$axios.post(loc() + "/feedBackScoreData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        if (chart.feedBackScoreChart) {
+                            chart.feedBackScoreChart.changeData(res.data)
+                            return
+                        }
+                        chart.satisfiedChart = new G2Plot.Pie("satisfiedChart", {
+                            data: res.data,
+                            appendPadding: 10,
+                            angleField: "count",
+                            colorField: "name",
+                            radius: 0.75,
+                            color: ["#9661BC", "#5B8FF9", "#61DDAA"],
+                            label: {
+                                type: "spider",
+                                labelHeight: 28,
+                                content: "{name}\n{percentage}"
+                            },
+                            interactions: [{ type: "element-selected" }, { type: "element-active" }]
+                        })
+
+                        chart.satisfiedChart.render()
+                    }
+                })
+            }
+        },
+        created() {
+            this.listSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/collectProgress/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/collectProgress/index.html
new file mode 100644
index 00000000..2246dc27
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/collectProgress/index.html
@@ -0,0 +1,238 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案名称"
+                        v-model="pageForm.name"
+                        style="width: 100%"
+                    ></el-input>
+                </search-item>
+                <search-item label="提案编码">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案编码"
+                        v-model="pageForm.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案分工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案单位">
+                    <el-select clearable filterable placeholder="提案单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">提案类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">征集状态</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in collectOptions"
+                        :key="item.code"
+                        :effect="pageForm.collectIds && pageForm.collectIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('collectIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <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"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="附议人数" prop="seconderSum"></el-table-column>
+                <el-table-column label="已附议" prop="completeCount"></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <proposal-info ref="infoRef"></proposal-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                collectOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    collectIds: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+
+            listCollectState() {
+                this.$axios.post("/platform/proposal/query/collectProgress/collectState").then((res) => {
+                    if (res.code === 0) {
+                        this.collectOptions = res.data
+                    }
+                })
+            },
+
+            listProposalType() {
+                this.$axios.post("/platform/proposal/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+            this.listCollectState()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html
new file mode 100644
index 00000000..87adb0f6
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html
@@ -0,0 +1,257 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案名称"
+                        v-model="pageForm.name"
+                        style="width: 100%"
+                    ></el-input>
+                </search-item>
+                <search-item label="提案编码">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案编码"
+                        v-model="pageForm.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案分工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案单位">
+                    <el-select clearable filterable placeholder="提案单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">提案类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">立案结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="提案编号" prop="code" width="100px" show-overflow-tooltip></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="typeName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></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>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否并案" prop="isConsolidation" width="100">
+                    <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="masterUnderTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="协办单位" prop="slaveUnderTakeNames" show-overflow-tooltip></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 size="mini" type="primary" @click="exportDocx(row.id)">导出</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <proposal-info ref="infoRef"></proposal-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportDocx(id) {
+                this.$downLoad("/platform/proposal/common/exportProposalAsDocx", { id })
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+            listProposalType() {
+                this.$axios.post("/platform/proposal/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/delegation/index.html
new file mode 100644
index 00000000..55fa8d4c
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/delegation/index.html
@@ -0,0 +1,150 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <template>
+            <el-card shadow="never">
+                <el-row type="flex" justify="center">
+                    <el-select @change="doSearch" clearable filterable placeholder="所属教代会" v-model="sessionId" style="width: 100%">
+                        <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+                    </el-select>
+                </el-row>
+            </el-card>
+
+            <el-card shadow="never" class="mt10">
+                <table-tool label="代表团列表"></table-tool>
+                <el-table :data="tableData" ref="tableRef" header-align="center" style="width: 100%" row-key="id" show-summary>
+                    <el-table-column
+                        :index="indexMethod"
+                        align="center"
+                        header-align="center"
+                        label="序号"
+                        type="index"
+                        width="80px"
+                    ></el-table-column>
+                    <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        header-align="center"
+                        min-width="100px"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
+                        <template scope="{row}" v-if="column.prop=='dbtName'">
+                            <el-link @click="openView(row)" type="primary">{{row.dbtName}}</el-link>
+                        </template>
+                    </el-table-column>
+                    <el-table-column header-align="center" label="立案率" prop="caseRate">
+                        <template scope="{row}">
+                            <span v-if="row.SUBMIT_COUNT && !isNaN(row.CONFIRM_FILING) && !isNaN(row.SUBMIT_COUNT)">
+                                {{ ((row.CONFIRM_FILING / row.SUBMIT_COUNT) * 100).toFixed(2) }}%
+                            </span>
+                            <span v-else>0.00%</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-card>
+        </template>
+    </guava>
+
+    <el-dialog :title="dialogTitle" :visible.sync="delegationVisible" width="70%" :close-on-click-modal="false">
+        <proposal-table
+            :delegation-id="delegationId"
+            :session-id="sessionId"
+            @view-single-proposal="viewSingleProposal"
+            ref="proposalTable"
+        ></proposal-table>
+    </el-dialog>
+
+    <el-dialog title="提案详情" :visible.sync="proposalInfoVisible" width="1200px" append-to-body top="5vh">
+        <div style="max-height: 80vh; overflow-y: auto">
+            <proposal-info ref="infoRef"></proposal-info>
+        </div>
+    </el-dialog>
+</div>
+<script>
+    <!--#include("proposalTable.js"){}#-->
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        data() {
+            return {
+                sessionId: "",
+                sessionOptions: [],
+                tableColumns: [
+                    { label: "代表团名称", prop: "dbtName" },
+                    { label: "提案总数", prop: "TOTAL" },
+                    { label: "已提交提案数", prop: "SUBMIT_COUNT" }
+                ],
+                delegationId: "",
+                dialogTitle: "",
+                delegationVisible: false,
+                proposalInfoVisible: false
+            }
+        },
+        components: {
+            "proposal-table": PROPOSAL_TABLE,
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        methods: {
+            openView(row) {
+                this.delegationId = row.id
+                this.dialogTitle = row.dbtName + "所属提案"
+                this.delegationVisible = true
+                this.$nextTick(() => {
+                    this.$refs.proposalTable.pageData()
+                })
+            },
+            viewSingleProposal(row) {
+                this.proposalInfoVisible = true
+                this.$nextTick(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            setTableColumnsByProposalResult() {
+                this.$businessTool.getDictOptions("PROPOSAL_CASE_FILING_RESULT").then((data) => {
+                    data.forEach((item) => {
+                        this.tableColumns.push({
+                            label: item.name,
+                            prop: item.code
+                        })
+                    })
+                })
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        sessionId: this.sessionId
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.setTableColumnsByProposalResult()
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/delegation/proposalTable.js b/src/main/resources/views/platform/zhgh/democratic/proposal/query/delegation/proposalTable.js
new file mode 100644
index 00000000..5df32ce7
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/delegation/proposalTable.js
@@ -0,0 +1,50 @@
+const PROPOSAL_TABLE = {
+    template: `
+        <div>
+            <el-table :data="tableData" ref="tableRef" header-align="center" style="width: 100%" row-key="id" @sort-change="pageOrder">
+                <el-table-column label="序号" width="50px" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="提案编号" prop="code" width="200px"></el-table-column>
+                <el-table-column label="提案名称" prop="name"></el-table-column>
+                <el-table-column label="提案人" prop="createUserName"></el-table-column>
+                <el-table-column label="提案类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="$emit('view-single-proposal',row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+             <!--#include("/layouts/pagination.html"){}#-->
+        </div>
+    `,
+    props: {
+        sessionId: {
+            type: String,
+            required: true
+        },
+        delegationId: {
+            type: String,
+            required: true
+        }
+    },
+    mixins: [initTableMixins],
+    data() {
+        return {
+            pageForm: {}
+        }
+    },
+    methods: {
+        pageData() {
+            this.pageForm.sessionId = this.sessionId
+            this.pageForm.delegationId = this.delegationId
+            this.$axios.post("/platform/proposal/query/delegation/getProposalsByDelegation", this.pageForm).then((res) => {
+                if (res.code === 0) {
+                    this.tableData = res.data.list
+                    this.pageForm.totalCount = res.data.totalCount
+                }
+            })
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/history/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/history/index.html
new file mode 100644
index 00000000..4796a5ff
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/history/index.html
@@ -0,0 +1,255 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案名称"
+                        v-model="pageForm.name"
+                        style="width: 100%"
+                    ></el-input>
+                </search-item>
+                <search-item label="提案编码">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案编码"
+                        v-model="pageForm.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案分工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案单位">
+                    <el-select clearable filterable placeholder="提案单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">提案类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">立案结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <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"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></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>
+                    </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="当前节点" 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 size="mini" type="primary" @click="exportDocx(row.id)">导出</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <proposal-info ref="infoRef"></proposal-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportDocx(id) {
+                window.open(loc() + "/exportDocx")
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+            listProposalType() {
+                this.$axios.post("/platform/proposal/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/underTakeReply/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/underTakeReply/index.html
new file mode 100644
index 00000000..65d233a3
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/underTakeReply/index.html
@@ -0,0 +1,96 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <el-card shadow="never">
+        <search @search="doSearch">
+            <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>
+            </search-item>
+            <search-item label="承办单位">
+                <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                    <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>
+                </el-select>
+            </search-item>
+        </search>
+    </el-card>
+
+    <el-card shadow="never">
+        <el-table :data="tableData">
+            <el-table-column label="序号" type="index" width="50"></el-table-column>
+            <el-table-column label="单位名称" prop="name" width="400" sortable show-overflow-tooltip></el-table-column>
+            <el-table-column label="提案总数" prop="sum" sortable></el-table-column>
+            <el-table-column label="主办提案">
+                <el-table-column label="提案数量" prop="hostSum" sortable></el-table-column>
+                <el-table-column label="已答复" prop="hostReplySum" sortable></el-table-column>
+                <el-table-column label="未答复" prop="hostNoReplySum" sortable></el-table-column>
+            </el-table-column>
+            <el-table-column label="协办提案">
+                <el-table-column label="提案数量" prop="helpSum" sortable></el-table-column>
+                <el-table-column label="已答复" prop="hostReplySum" sortable v-if="slaveNeedReply"></el-table-column>
+                <el-table-column label="未答复" prop="hostNoReplySum" sortable v-if="slaveNeedReply"></el-table-column>
+            </el-table-column>
+        </el-table>
+    </el-card>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                underTakeOptions: [],
+                slaveNeedReply: false
+            }
+        },
+        methods: {
+            meetingChange() {
+                this.doSearch()
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+            pageData() {
+                this.$axios.post(loc() + "/data", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        this.tableData = res.data.tableData
+                        this.slaveNeedReply = res.data.slaveNeedReply
+                    }
+                })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/yearReport/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/yearReport/index.html
new file mode 100644
index 00000000..15e4c769
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/yearReport/index.html
@@ -0,0 +1,259 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案名称"
+                        v-model="pageForm.name"
+                        style="width: 100%"
+                    ></el-input>
+                </search-item>
+                <search-item label="提案编码">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案编码"
+                        v-model="pageForm.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案分工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案单位">
+                    <el-select clearable filterable placeholder="提案单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">提案类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">立案结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-button type="primary" size="small" @click="exportYearReport">导出提案报告</el-button>
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" size="small" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="提案编号" prop="code" width="200px"></el-table-column>
+                <el-table-column label="提案名称" prop="name"></el-table-column>
+                <el-table-column label="提案人" prop="createUserName"></el-table-column>
+                <el-table-column label="提案类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></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>
+                    </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="masterUnderTakeName"></el-table-column>
+                <el-table-column label="协办单位" prop="slaveUnderTakeNames" show-overflow-tooltip></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <proposal-info ref="infoRef"></proposal-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportYearReport() {
+                this.$downLoad(loc() + "/exportYearReport", this.pageForm)
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+            listProposalType() {
+                this.$axios.post("/platform/proposal/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html
new file mode 100644
index 00000000..f87cb4da
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html
@@ -0,0 +1,282 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案名称"
+                        v-model="pageForm.name"
+                        style="width: 100%"
+                    ></el-input>
+                </search-item>
+                <search-item label="提案编码">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案编码"
+                        v-model="pageForm.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案分工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案单位">
+                    <el-select clearable filterable placeholder="提案单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="提案编号" prop="code" width="200px"></el-table-column>
+                <el-table-column label="提案名称" prop="name">
+                    <template scope="{row}">
+                        <el-link type="primary" @click="onOpen(row)">{{row.name}}</el-link>
+                    </template>
+                </el-table-column>
+                <el-table-column label="提案人" prop="createUserName"></el-table-column>
+                <el-table-column label="提案类别" prop="typeName"></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>
+                    </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"></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 size="mini" type="primary" @click="onOpenEdit(row)">修改</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #view>
+            <proposal-info ref="infoRef"></proposal-info>
+        </template>
+        <template #edit>
+            <el-form :model="formData" ref="form" label-width="120px">
+                <el-row :gutter="20" type="flex">
+                    <el-col :span="12">
+                        <el-form-item label="代表姓名" prop="createUserName">
+                            <el-input readonly v-model="formData.createUserName" disabled></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="提案时间" prop="createTime">
+                            <el-input readonly v-model="formData.createTime" disabled></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="20" type="flex">
+                    <el-col :span="12">
+                        <el-form-item label="提案名称" prop="name">
+                            <el-input maxlength="100" placeholder="提案名称" v-model="formData.name"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="提案方式" prop="source">
+                            <el-input :value="dict.type.PROPOSAL_SOURCE.find(v=>v.code === formData.source)?.name" disabled></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-form-item prop="typeId" label="提案类别" :rules="[{required:true,message:'请选择类型',trigger:'blur'}]">
+                    <el-select v-model="formData.typeId">
+                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in typeOptions"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="提案摘要" prop="excerpt">
+                    <el-input
+                        v-model="formData.excerpt"
+                        type="textarea"
+                        autosize
+                        :autosize="{ minRows: 4, maxRows: 4}"
+                        placeholder="提案摘要"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item label="提案内容和依据" prop="brief">
+                    <text-editor v-model="formData.brief" key="brief" placeholder="提案内容和依据"></text-editor>
+                </el-form-item>
+                <el-form-item label="改进建议和措施" prop="measures">
+                    <text-editor v-model="formData.measures" key="measures" placeholder="改进建议和措施"></text-editor>
+                </el-form-item>
+            </el-form>
+            <el-row type="flex" justify="end">
+                <el-button @click="$refs.guava.index()">取 消</el-button>
+                <el-button type="primary" @click="doUpdateBasic">确 定</el-button>
+            </el-row>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("/platform/zhgh/democratic/proposal/common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_SOURCE"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    types: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                },
+                typeDialog: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            onOpenEdit(row) {
+                this.$refs.guava.edit()
+                this.$nextTick(() => {
+                    this.formData = { ...row }
+                })
+            },
+            doUpdateBasic() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要修改吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning"
+                        }).then(() => {
+                            this.$axios.post("/platform/senior/basic/update", this.formData).then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.$refs.guava.index()
+                                    this.doSearch()
+                                }
+                            })
+                        })
+                    }
+                })
+            },
+
+            listProposalType() {
+                this.$axios.post("/platform/proposal/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/delete/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/delete/index.html
new file mode 100644
index 00000000..1993bea7
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/delete/index.html
@@ -0,0 +1,205 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案名称"
+                        v-model="pageForm.name"
+                        style="width: 100%"
+                    ></el-input>
+                </search-item>
+                <search-item label="提案编码">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案编码"
+                        v-model="pageForm.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案分工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案单位">
+                    <el-select clearable filterable placeholder="提案单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" size="small" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="提案编号" prop="code" width="200px"></el-table-column>
+                <el-table-column label="提案名称" prop="name"></el-table-column>
+                <el-table-column label="提案人" prop="createUserName"></el-table-column>
+                <el-table-column label="提案类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></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>
+                    </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"></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 size="mini" type="danger" @click="del(row.id)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #view>
+            <proposal-info ref="infoRef"></proposal-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    types: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            del(id) {
+                this.$confirm("您确定删除该提案吗？", "提示", {
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/senior/delete/delete", { id: id }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html
new file mode 100644
index 00000000..d146c262
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html
@@ -0,0 +1,255 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案名称"
+                        v-model="pageForm.name"
+                        style="width: 100%"
+                    ></el-input>
+                </search-item>
+                <search-item label="提案编码">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入提案编码"
+                        v-model="pageForm.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案分工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案单位">
+                    <el-select clearable filterable placeholder="提案单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" size="small" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="提案编号" prop="code" width="200px"></el-table-column>
+                <el-table-column label="提案名称" prop="name">
+                    <template scope="{row}">
+                        <el-link type="primary" @click="onOpen(row)">{{row.name}}</el-link>
+                    </template>
+                </el-table-column>
+                <el-table-column label="提案人" prop="createUserName"></el-table-column>
+                <el-table-column label="提案类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></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>
+                    </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"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="200px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="onOpen(row)">查看</el-button>
+                        <el-button size="mini" type="primary" @click="onOpenEdit(row)">修改</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <proposal-info ref="infoRef"></proposal-info>
+        </template>
+    </guava>
+
+    <el-dialog title="修改提案类别" :close-on-click-modal="false" width="40%" :visible.sync="typeDialog">
+        <el-form :model="formData" ref="form" label-width="120px">
+            <el-form-item prop="oldTypeName" label="原类型">
+                <el-input disabled :value="formData.oldTypeName" type="text"></el-input>
+            </el-form-item>
+            <el-form-item prop="typeId" label="更改类型" :rules="[{required:true,message:'请选择类型',trigger:'blur'}]">
+                <el-select v-model="formData.typeId" style="width: 100%">
+                    <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in typeOptions"></el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="typeDialog=false">取 消</el-button>
+            <el-button type="primary" @click="doUpdateType">确 定</el-button>
+        </span>
+    </el-dialog>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                typeOptions: [],
+                sessionOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                businessNo: "",
+                tabActive: "0",
+                pageForm: {
+                    types: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                },
+                typeDialog: false
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            onOpenEdit(row) {
+                this.typeDialog = true
+                this.$nextTick(() => {
+                    this.formData = {
+                        id: row.id,
+                        oldTypeName: this.typeOptions.find((item) => item.id === row.typeId)?.name,
+                        typeId: null
+                    }
+                })
+            },
+            doUpdateType() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要修改吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning"
+                        }).then(() => {
+                            this.$axios.post("/platform/senior/type/update", this.formData).then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.typeDialog = false
+                                    this.doSearch()
+                                }
+                            })
+                        })
+                    }
+                })
+            },
+            listProposalType() {
+                this.$axios.post("/platform/proposal/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html
new file mode 100644
index 00000000..ef7b2189
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html
@@ -0,0 +1,431 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+
+        <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="$refs.tableRef.clearSelection();doSearch()" 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}"
+            >
+                <el-table-column type="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="typeName"></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>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否并案" prop="isConsolidation" width="100">
+                    <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>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
+                            @click="openRevoke(row.processInstanceTaskId)"
+                            size="mini"
+                            type="danger"
+                        >
+                            撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#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-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" clearable filterable 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" clearable filterable 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="danger" @click="doApproval('BACK')">退回重新填写</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">提交</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>
+
+            <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>
+        </template>
+
+        <el-dialog title="提案详情" :visible.sync="viewDialogVisible" width="1200px" top="50px" append-to-body>
+            <div style="max-height: 75vh; overflow-y: auto">
+                <proposal-info ref="infoDialogRef"></proposal-info>
+            </div>
+        </el-dialog>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    const vue = new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                formData: {
+                    hostUnitIds: null,
+                    helpUnitId: []
+                },
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false,
+
+                //并案的提案列表
+                consolidationProposalTableData: [],
+                consolidationFormData: {},
+
+                viewDialogVisible: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.$set(this.formData, "caseFilingResult", null)
+                    this.$set(this.formData, "hostUnitId", null)
+                    this.$set(this.formData, "helpUnitIds", [])
+                    this.$set(this.formData, "helpUnitIds", [])
+                    this.$set(this.formData, "approvalOpinion", null)
+                    this.$set(this.formData, "proposalIds", [])
+                    this.showApprovalForm = true
+                })
+            },
+            doApproval(approvalType) {
+                if (approvalType === "PASS") {
+                    this.formData.bpmTaskApprovalType = "DYNAMIC"
+                    this.formData.proposalIds = [this.formData.processInstanceBusinessId]
+                    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()
+                                    }
+                                })
+                        }
+                    })
+                } else if (approvalType === "BACK") {
+                    if (!this.formData.approvalOpinion) {
+                        this.$message.warning("请填写退回的审核意见")
+                        return
+                    }
+
+                    this.formData.bpmTaskApprovalType = "DYNAMIC"
+                    this.$confirm("您确定要退回到提案人吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "info"
+                    }).then(() => {
+                        this.$axios.post(loc() + "/approvalBack", this.formData).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.guava.index()
+                                this.$message.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    })
+                }
+            },
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            //打开并案审核
+            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) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            listUnderTake() {
+                this.$axios.post(loc() + "/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            }
+        },
+        created() {
+            // this.pageData()
+            this.listUnderTake()
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html
new file mode 100644
index 00000000..9519426a
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html
@@ -0,0 +1,430 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+
+        <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-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}"
+            >
+                <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>
+                    </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>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
+                            @click="openRevoke(row.processInstanceTaskId)"
+                            size="mini"
+                            type="danger"
+                        >
+                            撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#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>
+
+            <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>
+        </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"){}#-->
+    const vue = new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                formData: {
+                    hostUnitIds: null,
+                    helpUnitId: []
+                },
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false,
+                //并案的提案列表
+                consolidationProposalTableData: [],
+                consolidationFormData: {},
+
+                viewDialogVisible: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            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])
+                            }
+                        })
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            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) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            listUnderTake() {
+                this.$axios.post(loc() + "/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            }
+        },
+        created() {
+            this.listOpenSession()
+            this.listUnderTake()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedbackEvaluation/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedbackEvaluation/index.html
new file mode 100644
index 00000000..834df331
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedbackEvaluation/index.html
@@ -0,0 +1,235 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="提案名称">
+                    <el-input
+                        v-model="pageForm.searchKeyword"
+                        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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.approval" @change="doSearch" 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"
+                @sort-change="pageOrder"
+                size="small"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="提案编号" prop="code"></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="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></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>
+                    </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"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="200px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="onOpen(row)">查看</el-button>
+                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(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>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#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-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
+                    <el-form-item label="反馈评价" prop="feedBackScore" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <el-radio-group v-model="formData.feedBackScore">
+                            <el-radio :label="item.code" border v-for="item in dict.type.PROPOSAL_FEEDBACK_UNIT" :key="item.code" size="small">
+                                {{item.label}}
+                            </el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="反馈内容" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <el-input type="textarea" v-model="formData.approvalOpinion" max="1000" :rows="5"></el-input>
+                    </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>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        store,
+        dicts: ["PROPOSAL_FEEDBACK_UNIT", "PROPOSAL_CASE_FILING_RESULT"],
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false,
+                sessionOptions: [],
+                delegationOptions: []
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.$set(this.formData, "implementState", null)
+                    this.$set(this.formData, "approvalOpinion", null)
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            //教代会change
+            async meetingChange(val) {
+                this.formData.delegationId = null
+                this.formData.committeeId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            del() {},
+            openView(id) {}
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/mine/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/mine/index.html
new file mode 100644
index 00000000..6e7e8ed5
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/mine/index.html
@@ -0,0 +1,171 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="提案名称">
+                    <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable 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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="提案编号" prop="code"></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="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作" fixed="right" width="400px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                        <el-button v-if="[10,40,61].includes(row.processInstanceNodeCode)" size="mini" type="primary" @click="openEdit(row)">
+                            编辑提案
+                        </el-button>
+                        <el-button
+                            size="mini"
+                            type="primary"
+                            @click="onOpenInviteSeconder(row)"
+                            v-if="[10,20,40,61].includes(row.processInstanceNodeCode)"
+                        >
+                            邀请附议人
+                        </el-button>
+                        <el-button
+                            v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
+                            size="mini"
+                            type="danger"
+                            @click="openRevoke(row)"
+                        >
+                            撤销
+                        </el-button>
+                        <el-button v-if="[10,40,50,61].includes(row.processInstanceNodeCode)" size="mini" type="danger" @click="del(row.id)">
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <invite-seconder ref="inviteSeconderRef" @refresh="doSearch"></invite-seconder>
+        </template>
+        <template #view>
+            <proposal-info ref="infoRef"></proposal-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    <!--#include("inviteSeconder.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT,
+            "invite-seconder": PROPOSAL_INVITE_SECONDER_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                businessNo: null
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            openEdit(row) {
+                this.$store.dispatch("pjaxRoute", "/platform/proposal/write?id=" + row.id)
+            },
+            openRevoke(row) {
+                this.$confirm("您确定要撤销申请吗?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/proposal/mine/revokeApply", { id: row.id }).then((resp) => {
+                        this.$message.success(resp.msg)
+                        this.doSearch()
+                    })
+                })
+            },
+            onOpenInviteSeconder(row) {
+                this.$axios.post(loc() + "/inviteCheck", { id: row.id }).then((res) => {
+                    if (res.code === 0) {
+                        this.$refs.guava.public(() => {
+                            this.$refs.inviteSeconderRef.onOpen(row)
+                        })
+                    }
+                })
+            },
+
+            //教代会change
+            async meetingChange(val) {
+                this.formData.delegationId = null
+                this.formData.committeeId = null
+                this.delegationOptions = await proposal.getDelegation(val)
+                this.committeeOptions = await this.getInstitutions(val)
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                    }
+                })
+            },
+            withdraw({ processInstId }) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/withdraw", { processInstId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            del(id) {
+                this.$confirm("您确定要删除吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/delete", { id }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            }
+        },
+        created() {
+            this.listSession()
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/mine/inviteSeconder.js b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/mine/inviteSeconder.js
new file mode 100644
index 00000000..52ad4007
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/mine/inviteSeconder.js
@@ -0,0 +1,150 @@
+const PROPOSAL_INVITE_SECONDER_COMPONENT = {
+    /*language=HTML*/
+    template: `
+        <div>
+            <el-row type="flex" style="column-gap: 10px;">
+                <el-col :span="6">
+                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询"
+                              clearable></el-input>
+                </el-col>
+                <el-col :span="6">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id"
+                                   v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </el-col>
+                <el-col :span="4">
+                    <el-button icon="el-icon-search" type="primary" @click="doSearch">查询</el-button>
+                </el-col>
+            </el-row>
+            <el-divider class="mt10 mb10"></el-divider>
+            <table-tool>
+                <el-button size="small" @click="invite" type="primary" icon="el-icon-plus"
+                           :disabled="pageForm.isInvite">邀请
+                </el-button>
+                <el-radio-group v-model="pageForm.isInvite" @change="doSearch" size="small" style="margin-left: 5px;">
+                    <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" size="small" header-align="center"
+                      style="width: 100%" :row-key="getRowKey">
+                <el-table-column type="selection" reserve-selection v-if="!pageForm.isInvite"></el-table-column>
+                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="工号" prop="loginName"></el-table-column>
+                <el-table-column label="姓名" prop="userName"></el-table-column>
+                <el-table-column label="性别" prop="sex"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <!--                        <el-table-column label="操作" width="150px">-->
+                <!--                            <template scope="{row}">-->
+                <!--                                <el-button size="mini" type="primary" @click="invite(row)">邀请</el-button>-->
+                <!--                            </template>-->
+                <!--                        </el-table-column>-->
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </div>
+    `,
+    mixins: [initTableMixins],
+    data() {
+        return {
+            visible: false,
+            secondedNum: 0,
+            record: {},
+            pageForm: {
+                isInvite: false
+            },
+            config: {},
+            delegationOptions: []
+        }
+    },
+    methods: {
+        getRowKey(val) {
+            return val.loginName + this.pageForm.isInvite
+        },
+
+        async onOpen(record) {
+            this.visible = true
+            this.record = record
+            await this.getConfig()
+            this.listDelegation()
+            this.pageData()
+
+            const { seconderNum } = this.config
+            this.$alert(
+                "（1）请至少选择<span style='color: orange;font-weight: bold'>" +
+                    seconderNum +
+                    "</span>位以上（含" +
+                    seconderNum +
+                    "位）代表附议。<br>\n" +
+                    "（2）邀请附议人后将不能再编辑提案,请确认提案内容后再邀请附议人。<br>",
+                {
+                    title: "温馨提醒",
+                    type: "warning",
+                    dangerouslyUseHTMLString: true,
+                    confirmButtonText: "确定",
+                    callback: () => {}
+                }
+            )
+        },
+        detail(id) {},
+        invite() {
+            const selection = this.$refs.tableRef.selection
+            if (selection.length === 0) {
+                this.$message.warning("请先选择附议人后在点击邀请")
+                return
+            }
+            const loginNames = selection.map((s) => s.loginName)
+            const userName = selection.map((s) => s.userName)
+            this.$confirm("您确定要邀请" + userName.join("、") + "代表附议吗？", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "info"
+            }).then(() => {
+                this.$axios
+                    .post("/platform/proposal/mine/inviteSeconder", {
+                        proposalId: this.record.id,
+                        seconders: JSON.stringify(loginNames)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.$refs.tableRef.clearSelection()
+                            this.pageData()
+                            this.visible = false
+                            this.$emit("refresh", null)
+                        }
+                    })
+            })
+        },
+        pageData() {
+            this.$axios
+                .post(loc() + "/listSeconder", {
+                    ...this.pageForm,
+                    sessionId: this.record.sessionId,
+                    proposalId: this.record.id
+                })
+                .then((res) => {
+                    if (res.code === 0) {
+                        this.tableData = res.data.list
+                        this.pageForm.totalCount = res.data.totalCount
+                    }
+                })
+        },
+
+        //查询代表团
+        listDelegation() {
+            this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.record.sessionId }).then((res) => {
+                if (res.code === 0) {
+                    this.delegationOptions = res.data
+                }
+            })
+        },
+
+        async getConfig() {
+            const { code, data } = await this.$axios.post("/platform/proposal/common/config")
+            if (code === 0) {
+                this.config = data
+            }
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html
new file mode 100644
index 00000000..ac7c00a4
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html
@@ -0,0 +1,247 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.approval" @change="doSearch" 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"
+                @sort-change="pageOrder"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <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="typeName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></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>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否并案" prop="isConsolidation" width="100">
+                    <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="isMasterUnderTake">
+                    <template scope="{row}">
+                        <el-tag v-if="row.isMasterUnderTake" size="mini" type="success">是</el-tag>
+                        <el-tag v-else size="mini" type="info">否</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="承办单位" prop="underTakeName" show-overflow-tooltip></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="onOpen(row)">查看</el-button>
+                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(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>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <proposal-info ref="infoRef" :hide_slave="true"></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="承办单位">
+                        <el-input :value="formData.underTakeName" disabled></el-input>
+                    </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="danger" @click="doApproval('BACK_OTHER_NODE')">退回重新答复</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">同意</el-button>
+                </el-row>
+            </div>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    const vue = new Vue({
+        el: "#app",
+        store,
+        dicts: ["PROPOSAL_CASE_FILING_RESULT"],
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                showApprovalForm: false,
+                pageForm: {
+                    approval: false
+                }
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.$set(this.formData, "implementState", null)
+                    this.$set(this.formData, "approvalOpinion", null)
+                    this.formData.isConsolidation = row.isConsolidation
+                    this.formData.underTakeName = row.underTakeName
+                    this.formData.underTakeId = row.underTakeId
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            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) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            del() {},
+            openView(id) {}
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitRead/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitRead/index.html
new file mode 100644
index 00000000..7ae7ad6a
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitRead/index.html
@@ -0,0 +1,256 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <!--                <el-radio-group v-model="pageForm.approval" @change="doSearch" size="small" v-if="!pageForm.transfer" class="ml5">-->
+                <!--                    <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"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="提案编号" prop="code" 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"></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>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否并案" prop="isConsolidation" width="100">
+                    <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="isMasterUnderTake" width="100">
+                    <template scope="{row}">
+                        <el-tag v-if="row.isMasterUnderTake" size="mini" type="success">是</el-tag>
+                        <el-tag v-else size="mini" type="info">否</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="承办单位" prop="underTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="onOpen(row)">查看</el-button>
+                        <!--                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(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>-->
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#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="承办单位">
+                        <el-input :value="formData.underTakeName" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item label="能否承办" prop="canTake" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <el-radio-group v-model="formData.canTake" size="small">
+                            <el-radio label="可以承办" border>可以承办</el-radio>
+                            <el-radio label="无法承办" border>无法承办</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="初步阅览意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <el-input
+                            v-model="formData.approvalOpinion"
+                            autosize
+                            :autosize="{ minRows: 4}"
+                            type="textarea"
+                            placeholder="请输入初步阅览意见"
+                        ></el-input>
+                    </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>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                pageForm: {
+                    approval: false,
+                    transfer: false
+                },
+                showApprovalForm: false,
+                transferFormData: {},
+                transferDialogVisible: false,
+                transferUserOptions: []
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.$set(this.formData, "implementState", null)
+                    this.$set(this.formData, "approvalOpinion", null)
+                    this.formData.isConsolidation = row.isConsolidation
+                    this.formData.underTakeName = row.underTakeName
+                    this.formData.underTakeId = row.underTakeId
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            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) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            del() {},
+            openView(id) {}
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitReply/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitReply/index.html
new file mode 100644
index 00000000..ea0825ab
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitReply/index.html
@@ -0,0 +1,414 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <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>
+                </search-item>
+                <search-item label="提案名称">
+                    <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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.transfer" @change="doSearch" size="small" v-if="$auth.hasRole('PROPOSAL_UNIT_LEADER')">
+                    <el-radio-button :label="true">已转办</el-radio-button>
+                    <el-radio-button :label="false">未转办</el-radio-button>
+                </el-radio-group>
+
+                <el-radio-group v-model="pageForm.approval" @change="doSearch" size="small" v-if="!pageForm.transfer" class="ml5">
+                    <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"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <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"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></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>
+                    </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="承办单位" prop="underTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="是否主办" prop="isMasterUnderTake" width="100px">
+                    <template scope="{row}">
+                        <el-tag v-if="row.isMasterUnderTake" size="mini" type="success">是</el-tag>
+                        <el-tag v-else size="mini" type="info">否</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="转办答复人" prop="underTakeTransferUserName" v-if="$auth.hasRole('PROPOSAL_UNIT_LEADER')">
+                    <template scope="{row}">
+                        <span v-if="row.underTakeReplyIsTransfer">{{row.underTakeTransferUserName?.join('，') || '-'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作" fixed="right" width="300px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="onOpen(row)">查看</el-button>
+                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(row)" size="mini" type="primary">
+                            答复
+                        </el-button>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='ACTIVE' && $auth.hasRole('PROPOSAL_UNIT_LEADER')"
+                            @click="openTransfer(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>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='TRANSFER' && !row.nextTransferTaskIsComplete"
+                            @click="openRevokeTransfer(row.processInstanceTaskId)"
+                            size="mini"
+                            type="danger"
+                        >
+                            撤回转办
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#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="承办单位">
+                        <el-input :value="formData.underTakeName" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item label="落实情况" prop="implementState" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <dict-select v-model="formData.implementState" code="PROPOSAL_REPLY_IMPLEMENT"></dict-select>
+                    </el-form-item>
+                    <el-form-item label="答复内容" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <text-editor v-model="formData.approvalOpinion"></text-editor>
+                    </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>
+
+        <el-dialog title="转办答复" :visible.sync="transferDialogVisible" width="50%">
+            <el-form :model="transferFormData" ref="transferFormRef" label-position="left" label-width="80px">
+                <el-form-item label="提案名称">
+                    <el-input :value="transferFormData.name" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="转办人" prop="transferUserLoginName" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                    <el-select
+                        v-model="transferFormData.transferUserLoginName"
+                        remote
+                        :remote-method="queryTransferUser"
+                        filterable
+                        placeholder="可按姓名或工号搜索需要转办的用户"
+                        style="width: 100%"
+                    >
+                        <el-option :key="item.id" :label="item.label" :value="item.loginname" v-for="item in transferUserOptions"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button plain @click="transferDialogVisible=false">取消</el-button>
+                <el-button type="primary" @click="doTransfer">提交</el-button>
+            </div>
+        </el-dialog>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                pageForm: {
+                    approval: false,
+                    transfer: false
+                },
+                showApprovalForm: false,
+                transferFormData: {},
+                transferDialogVisible: false,
+                transferUserOptions: []
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+
+            //检查能否答复
+            checkCanReply(taskId) {
+                return this.$axios.post(loc() + "/checkCanReply", { taskId })
+            },
+
+            openApproval(row) {
+                this.checkCanReply(row.processInstanceTaskId).then((res) => {
+                    if (res.code === 0) {
+                        if (res.data && res.data.errMsg) {
+                            this.$alert(res.data.errMsg, "提示", {
+                                type: "warning",
+                                dangerouslyUseHTMLString: true,
+                                confirmButtonText: "已线下沟通，开始答复",
+                                cancelButtonText: "关闭",
+                                showCancelButton: true
+                            })
+                                .then(()=>{
+                                    this.$refs.guava.public(() => {
+                                        this.$refs.infoRef.onOpen(row.id)
+                                        this.formData = row.approvalParam
+                                        this.$set(this.formData, "implementState", null)
+                                        this.formData.isConsolidation = row.isConsolidation
+                                        this.formData.underTakeName = row.underTakeName
+                                        this.formData.underTakeId = row.underTakeId
+                                        this.showApprovalForm = true
+                                    })
+                                })
+                                .catch()
+                        } else {
+                            this.$refs.guava.public(() => {
+                                this.$refs.infoRef.onOpen(row.id)
+                                this.formData = row.approvalParam
+                                this.$set(this.formData, "implementState", null)
+                                if(row.isMasterUnderTake){
+                                    this.$set(this.formData, "approvalOpinion", res.data.allSlaveApprovalOpinion)
+                                }else{
+                                    this.$set(this.formData, "approvalOpinion", null)
+                                }
+                                if(res.data?.task?.endOn){
+                                    this.$set(this.formData, "approvalOpinion", res.data?.task?.extVariable?.approvalOpinion)
+                                    this.$set(this.formData, "implementState", res.data?.task?.extVariable?.implementState)
+                                }
+                                this.formData.isConsolidation = row.isConsolidation
+                                this.formData.underTakeName = row.underTakeName
+                                this.formData.underTakeId = row.underTakeId
+                                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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            openRevokeTransfer(taskId) {
+                this.$confirm("您确定要撤回转办吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revokeTransfer", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            //打开转办答复
+            openTransfer(row) {
+                // this.checkCanReply(row.processInstanceTaskId).then((res) => {
+                //     if (res.code === 0) {
+                //         if (res.data && res.data.errMsg) {
+                //             this.$alert(res.data.errMsg, "提示", {
+                //                 type: "warning"
+                //             })
+                //                 .then()
+                //                 .catch()
+                //         } else {
+                //             this.transferFormData = {
+                //                 name: row.name,
+                //                 proposalId: row.id,
+                //                 underTakeId: row.underTakeId,
+                //                 processInstanceId: row.processInstanceId,
+                //                 processInstanceTaskId: row.processInstanceTaskId,
+                //                 transferUserLoginName: null
+                //             }
+                //             this.transferDialogVisible = true
+                //         }
+                //     }
+                // })
+                this.transferFormData = {
+                    name: row.name,
+                    proposalId: row.id,
+                    underTakeId: row.underTakeId,
+                    processInstanceId: row.processInstanceId,
+                    processInstanceTaskId: row.processInstanceTaskId,
+                    transferUserLoginName: null
+                }
+                this.transferDialogVisible = true
+            },
+
+            //搜索转办人
+            queryTransferUser(keyword) {
+                if (keyword) {
+                    this.$axios.post(loc() + "/queryTransferUser", { keyword }).then((res) => {
+                        if (res.code === 0) {
+                            this.transferUserOptions = res.data
+                        }
+                    })
+                }
+            },
+
+            doTransfer() {
+                this.$refs.transferFormRef.validate((valid) => {
+                    if (valid) {
+                        this.$axios
+                            .post(loc() + "/transfer", {
+                                transfer: JSON.stringify(this.transferFormData)
+                            })
+                            .then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.transferDialogVisible = false
+                                    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) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            del() {},
+            openView(id) {}
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html
new file mode 100644
index 00000000..625049fe
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html
@@ -0,0 +1,339 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <template>
+        <el-card shadow="never">
+            <template #header>
+                <el-row type="flex" justify="space-between" align="center">
+                    <h3 style="color: var(--color-primary)">撰写提案</h3>
+                    <el-button @click="noticeDialogVisible = true" type="text">提案撰写须知</el-button>
+                </el-row>
+            </template>
+            <template>
+                <el-form :model="formData" :rules="formRules" label-width="120px" ref="addForm">
+                    <el-row :gutter="20" type="flex">
+                        <el-col :span="12">
+                            <el-form-item label="代表姓名" prop="createUserName">
+                                <el-input readonly v-model="formData.createUserName" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="提案时间" prop="createTime">
+                                <el-input readonly v-model="formData.createTime" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-row :gutter="20" type="flex">
+                        <el-col :span="12">
+                            <el-form-item label="所属教代会" prop="sessionId">
+                                <el-select
+                                    @change="meetingChange"
+                                    clearable
+                                    filterable
+                                    placeholder="所属教代会"
+                                    v-model="formData.sessionId"
+                                    style="width: 100%"
+                                >
+                                    <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="所属代表团" prop="delegationId">
+                                <el-select clearable filterable placeholder="所属代表团" v-model="formData.delegationId" style="width: 100%" disabled>
+                                    <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item label="所属委员会" prop="committeeId" v-if="formData.mannerCode=='W03'">
+                                <el-select clearable filterable placeholder="所属委员会" v-model="formData.committeeId" style="width: 100%">
+                                    <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in committeeOptions"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-row :gutter="20">
+                        <el-col :span="12">
+                            <el-form-item label="单位" prop="unitName">
+                                <el-input v-model="formData.unitName" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="联系电话" prop="mobile">
+                                <el-input v-model="formData.mobile" clearable placeholder="联系电话"></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-row :gutter="20" type="flex">
+                        <el-col :span="12">
+                            <el-form-item label="提案名称" prop="name">
+                                <el-input maxlength="100" placeholder="提案名称" v-model="formData.name"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="提案方式" prop="source">
+                                <el-select v-model="formData.source" style="width: 100%">
+                                    <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in sourceOptions"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-row :gutter="20" type="flex">
+                        <el-col :span="12">
+                            <el-form-item label="提案类别" prop="typeId">
+                                <el-select v-model="formData.typeId" style="width: 100%">
+                                    <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in typeOptions"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-form-item label="提案摘要" prop="excerpt">
+                        <span slot="label">
+                            提案摘要
+                            <el-tooltip content="请简述提案内容和依据、改进建议和措施摘要" placement="right">
+                                <i class="el-icon-question"></i>
+                            </el-tooltip>
+                        </span>
+                        <el-input
+                            v-model="formData.excerpt"
+                            type="textarea"
+                            autosize
+                            :autosize="{ minRows: 4, maxRows: 4}"
+                            placeholder="提案摘要"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="提案内容和依据" prop="brief">
+                        <text-editor v-model="formData.brief" key="brief" placeholder="提案内容和依据"></text-editor>
+                    </el-form-item>
+                    <el-form-item label="改进建议和措施" prop="measures">
+                        <text-editor v-model="formData.measures" key="measures" placeholder="改进建议和措施"></text-editor>
+                    </el-form-item>
+                    <el-form-item label="附件上传" prop="files">
+                        <file-upload
+                            :value.sync="formData.files"
+                            :upload_number="5"
+                            upload_result_category="array"
+                            upload_mode="drag"
+                            complete_result
+                        ></file-upload>
+                    </el-form-item>
+
+                    <!--# if(@auth.getPrincipalProperty('loginname')!='20130316'){ #-->
+                    <el-form-item label="电子签名" prop="signature">
+                        <pc-signature v-model="formData.signature"></pc-signature>
+                    </el-form-item>
+                    <!--# } #-->
+                </el-form>
+                <el-row justify="end" type="flex" v-if="showButton">
+                    <el-button @click="doSave" type="primary">保存到我的提案</el-button>
+                </el-row>
+            </template>
+        </el-card>
+    </template>
+
+    <el-dialog title="提案撰写须知" :visible.sync="noticeDialogVisible" :show-close="false" width="50%">
+        <div v-html="proposalConfig.writeRemind" style="max-height: 50vh; overflow-y: auto"></div>
+
+        <div slot="footer">
+            <el-button type="primary" @click="noticeDialogVisible = false">我已知晓</el-button>
+        </div>
+    </el-dialog>
+</div>
+
+<script>
+    const vue = new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        data() {
+            return {
+                formData: {},
+                sessionOptions: [],
+                sourceOptions: [],
+                delegationOptions: [],
+                committeeOptions: [],
+                typeOptions: [],
+                formRules: {
+                    createUserName: [{ required: true, message: "请填写提案人", trigger: ["blur", "change"] }],
+                    createTime: [{ required: true, message: "请填写提案时间", trigger: ["blur", "change"] }],
+                    name: [{ required: true, message: "请填写提案名称", trigger: ["blur", "change"] }],
+                    source: [{ required: true, message: "请选择提案方式", trigger: ["blur", "change"] }],
+                    delegationId: [{ required: true, message: "请选择所属代表团", trigger: ["blur", "change"] }],
+                    sessionId: [{ required: true, message: "请选择所属教代会", trigger: ["blur", "change"] }],
+                    committeeId: [{ required: true, message: "请选择所属委员会", trigger: ["blur", "change"] }],
+                    typeId: [{ required: true, message: "请选择提案类别", trigger: ["blur", "change"] }],
+                    implementUnitId: [{ required: false, message: "请选择建以落实部门", trigger: ["blur", "change"] }],
+                    sign: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }],
+                    excerpt: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    brief: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    measures: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    unitName: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    mobile: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    signature: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }]
+                },
+                proposalConfig: {},
+                noticeDialogVisible: false,
+
+                showButton: true
+            }
+        },
+        methods: {
+            async doSave() {
+                const valid = await this.$refs["addForm"].validate()
+                if (valid) {
+                    if (!this.formData.name || this.formData.name.trim().length < 1) {
+                        this.$message.warning("请填写提案名称")
+                        return
+                    }
+                    if (this.formData.brief.length < this.proposalConfig.briefMinLength) {
+                        this.$message.warning("提案内容和依据最少为" + this.proposalConfig.briefMinLength + "字")
+                        return
+                    }
+
+                    this.$axios.post(loc() + "/save", { info: JSON.stringify(this.formData) }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.formData = res.data
+                            this.$store.dispatch("pjaxRoute", "/platform/proposal/mine")
+                        }
+                    })
+                }
+            },
+            async doSubmit() {
+                const valid = await this.$refs["addForm"].validate()
+                if (valid) {
+                    const confirm = await this.$confirm("确定要提交此提案吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "info"
+                    })
+                    if ("confirm" === confirm) {
+                        let data = clone(this.formData)
+                        if (data.files) {
+                            data.files = JSON.stringify(data.files)
+                        }
+                        const resp = await this.$axios.post(loc() + "/doSubmit", {
+                            data: JSON.stringify(data)
+                        })
+                        if (resp.code === 0) {
+                            this.$message.success(resp.msg)
+                            // location.href = "/platform/proposal/transact/compose"
+                        } else {
+                            this.notifyWarning(resp.msg)
+                        }
+                    }
+                }
+            },
+
+            listProposalType() {
+                this.$axios.post("/platform/proposal/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            getProposalConfig() {
+                return this.$axios.post("/platform/proposal/common/config").then((res) => {
+                    if (res.code === 0) {
+                        this.proposalConfig = res.data
+                    }
+                })
+            },
+
+            //教代会change
+            async meetingChange(val) {
+                this.formData.delegationId = null
+                this.formData.committeeId = null
+                this.listDelegation()
+                this.searchMineDelegation()
+                // this.delegationOptions = await proposal.getDelegation(val)
+                // this.committeeOptions = await this.getInstitutions(val)
+            },
+            listDelegation() {
+                return this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.formData.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession(isModify = false) {
+                this.$axios.post("/platform/proposal/common/listOpenSession").then(async (res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (!isModify && this.sessionOptions) {
+                            this.$set(this.formData, "sessionId", this.sessionOptions[0].id)
+                            await this.searchMineDelegation()
+                        }
+                        await this.listDelegation()
+                        await this.listSource()
+                    }
+                })
+            },
+
+            //查询自己有权限的撰写方式
+            listSource() {
+                return this.$axios.post("/platform/proposal/write/listSource", { sessionId: this.formData.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.sourceOptions = res.data
+                    }
+                })
+            },
+
+            //查询自己有权限的代表团
+            searchMineDelegation() {
+                return this.$axios.post("/platform/proposal/write/searchMineDelegation", { sessionId: this.formData.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.$set(this.formData, "delegationId", res.data)
+                    }
+                })
+            },
+
+            init() {
+                const id = GetQueryString("id")
+                if (id) {
+                    this.$axios.post(loc() + "/detail", { id }).then((res) => {
+                        if (res.code === 0) {
+                            this.formData = res.data
+                            this.listOpenSession(true)
+                        }
+                    })
+                } else {
+                    this.$confirm('本届提案征集已结束！', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',
+                    })
+                    this.showButton = false
+
+                    // this.noticeDialogVisible = true
+                    this.listOpenSession(false)
+                    this.$set(this.formData, "createUserId", this.$store.state.user.id)
+                    this.$set(this.formData, "createUserName", this.$store.state.user.username)
+                    this.$set(this.formData, "createUserLoginName", this.$store.state.user.loginname)
+                    this.$set(this.formData, "createTime", this.$moment().format("YYYY-MM-DD"))
+                    this.$set(this.formData, "mobile", this.$store.state.user.mobile)
+                    this.$set(this.formData, "unitName", this.$store.state.user.unit?.name)
+                }
+            }
+        },
+        created() {
+            this.init()
+            this.listProposalType()
+            this.getProposalConfig()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/config/all/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/config/all/index.html
new file mode 100644
index 00000000..158c35a1
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/config/all/index.html
@@ -0,0 +1,123 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <el-card shadow="never">
+        <template #header>
+            <h3 style="color: var(--color-primary)">意见全局配置</h3>
+        </template>
+        <el-form :model="formData" :rules="formRules" label-width="200px" ref="formRef" label-position="top" size="small">
+            <el-form-item label="附议人数量" prop="seconderNum">
+                <el-input-number :min="0" :max="10" v-model="formData.seconderNum"></el-input-number>
+            </el-form-item>
+            <el-form-item label="案由最少字数" prop="briefMinLength">
+                <el-input-number :min="0" v-model="formData.briefMinLength"></el-input-number>
+            </el-form-item>
+            <el-form-item label="校领导单位" prop="schoolLeaderUnitIds">
+                <el-select clearable filterable placeholder="校领导单位" multiple v-model="formData.schoolLeaderUnitIds" style="width: 100%">
+                    <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="协办单位是否需要答复" prop="slaveUnitNeedReply">
+                <el-radio-group v-model="formData.slaveUnitNeedReply" size="small">
+                    <el-radio border :label="true">是</el-radio>
+                    <el-radio border :label="false">否</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="协办单位是否首先答复" prop="slaveUnitFirstReply" v-if="formData.slaveUnitNeedReply">
+                <span slot="label">
+                    协办单位是否首先答复
+                    <el-tooltip content="开启后协办单位答复完成之后主办单位才可答复" placement="right">
+                        <i class="el-icon-question"></i>
+                    </el-tooltip>
+                </span>
+                <el-radio-group v-model="formData.slaveUnitFirstReply" size="small">
+                    <el-radio border :label="true">是</el-radio>
+                    <el-radio border :label="false">否</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="协办单位领导单位是否需要审批" prop="slaveUnitLeaderNeedApprove">
+                <el-radio-group v-model="formData.slaveUnitLeaderNeedApprove" size="small">
+                    <el-radio border :label="true">是</el-radio>
+                    <el-radio border :label="false">否</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="撰写须知" prop="writeRemind">
+                <text-editor v-model="formData.writeRemind"></text-editor>
+            </el-form-item>
+        </el-form>
+        <el-row type="flex" justify="end">
+            <el-button type="primary" @click="save" style="width: 200px">保存</el-button>
+        </el-row>
+    </el-card>
+</div>
+<script>
+    new Vue({
+        el: "#app",
+        data() {
+            return {
+                unitOptions: [],
+                formData: {},
+                formRules: {
+                    seconderNum: [{ required: true, message: "请输入附议人数量", trigger: ["blur", "change"] }],
+                    briefMinLength: [{ required: true, message: "请输入案由最少字数", trigger: ["blur", "change"] }],
+                    slaveUnitNeedReply: [{ required: true, message: "请选择协办单位是否需要答复", trigger: ["blur", "change"] }],
+                    slaveUnitFirstReply: [{ required: true, message: "请选择协办单位是否首先答复", trigger: ["blur", "change"] }],
+                    slaveUnitLeaderNeedApprove: [{ required: true, message: "请选择协办单位领导单位是否需要审批", trigger: ["blur", "change"] }],
+                    writeRemind: [
+                        {
+                            required: true,
+                            validator: (rule, value, callback) => {
+                                value === "<p><br></p>" ? callback(new Error("请输入撰写须知")) : callback()
+                            },
+                            message: "请输入撰写须知",
+                            trigger: ["blur", "change"]
+                        }
+                    ],
+                    schoolLeaderUnitIds: [{ required: true, message: "请选择校领导单位", trigger: ["blur", "change"] }]
+                }
+            }
+        },
+        watch: {
+            "formData.writeRemind"(val) {
+                this.$refs.formRef.validateField(["writeRemind"], (errMsg) => {})
+            }
+        },
+        methods: {
+            init() {
+                this.$axios.post(loc() + "/findOne").then((res) => {
+                    if (res.code === 0) {
+                        this.formData = res.data
+                    }
+                })
+            },
+            save() {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        this.$axios
+                            .post(loc() + "/update", {
+                                config: JSON.stringify(this.formData)
+                            })
+                            .then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.init()
+                                }
+                            })
+                    }
+                })
+            },
+            listUnit() {
+                this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
+            }
+        },
+        created() {
+            this.init()
+            this.listUnit()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/config/type/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/config/type/index.html
new file mode 100644
index 00000000..f7db934f
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/config/type/index.html
@@ -0,0 +1,106 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <el-card shadow="never">
+        <search @search="doSearch">
+            <search-item label="名称">
+                <el-input v-model="pageForm.name" placeholder="请输入名称"></el-input>
+            </search-item>
+        </search>
+    </el-card>
+
+    <el-card shadow="never">
+        <table-tool>
+            <el-button type="primary" size="mini" icon="el-icon-plus" @click="openAdd">新增</el-button>
+        </table-tool>
+        <el-table :data="tableData" border stripe>
+            <el-table-column label="序号" type="index" :index="indexMethod" width="50px"></el-table-column>
+            <el-table-column prop="name" label="名称"></el-table-column>
+            <el-table-column prop="code" label="编码"></el-table-column>
+            <el-table-column label="操作" width="150px">
+                <template slot-scope="{row}">
+                    <el-button size="mini" type="primary" @click="openEdit(row)">编辑</el-button>
+                    <el-button size="mini" type="danger" @click="doDelete(row.id)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!--#include("/layouts/pagination.html"){}#-->
+    </el-card>
+
+    <el-dialog :visible.sync="dialogVisible" :title="formData.id?'编辑':'新增'" width="500px">
+        <el-form :model="formData" :rules="formRules" label-width="80px" ref="formRef" size="small">
+            <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" max="10"></el-input>
+            </el-form-item>
+            <el-form-item label="编码" prop="code">
+                <el-input v-model="formData.code" placeholder="请输入编码" max="10"></el-input>
+            </el-form-item>
+        </el-form>
+        <div slot="footer">
+            <el-button @click="dialogVisible=false">取消</el-button>
+            <el-button type="primary" @click="submit">提交</el-button>
+        </div>
+    </el-dialog>
+</div>
+
+<script>
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        data() {
+            return {
+                formRules: {
+                    name: [{ required: true, message: "请输入名称", trigger: ["blur", "change"] }],
+                    code: [{ required: true, message: "请输入编码", trigger: ["blur", "change"] }]
+                },
+                dialogVisible: false
+            }
+        },
+        methods: {
+            openAdd() {
+                this.formData = {}
+                this.dialogVisible = true
+            },
+            openEdit(row) {
+                this.formData = { ...row }
+                this.dialogVisible = true
+            },
+            submit() {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        this.$axios.post(loc() + (this.formData.id ? "/update" : "/insert"), this.formData).then((res) => {
+                            if (res.code === 0) {
+                                this.$message.success(res.msg)
+                                this.dialogVisible = false
+                                this.pageData()
+                            }
+                        })
+                    }
+                })
+            },
+            doDelete(id) {
+                this.$confirm("您确定要删除吗?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post(loc() + "/delete", { id }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData
+                        }
+                    })
+                })
+            }
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/common/info.js b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/common/info.js
new file mode 100644
index 00000000..7b51ec9d
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/common/info.js
@@ -0,0 +1,319 @@
+const SUGGESTION_INFO_COMPONENT = {
+    name: "suggestion-info",
+    /*language=HTML*/
+    template: `
+        <div class="proposal-info">
+            <div class="process-title">
+                意见和建议信息
+            </div>
+<!--            <h3 style="text-align: center;font-weight: 600" class="pt10 pb10">-->
+<!--                {{ viewData.name }}-->
+<!--            </h3>-->
+            <el-descriptions :column="3" border>
+                <el-descriptions-item label="意见编号">{{ viewData.code }}</el-descriptions-item>
+                <el-descriptions-item label="撰写人">{{viewData.createUserName }}</el-descriptions-item>
+                <el-descriptions-item label="意见时间">{{ viewData.createTime }}</el-descriptions-item>
+                <el-descriptions-item label="教代会届次"> {{ viewData.sessionName || '暂无' }}</el-descriptions-item>
+                <el-descriptions-item label="撰写人单位">{{ viewData.unitName }}</el-descriptions-item>
+                <el-descriptions-item label="代表团名称">{{ viewData.delegationName }}</el-descriptions-item>
+                <el-descriptions-item label="意见类别" :span="3">
+                    {{viewData.typeName}}
+                </el-descriptions-item>
+<!--                <el-descriptions-item label="受理结果" :span="2">-->
+<!--                    <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT"-->
+<!--                              :value="viewData.caseFilingResult"></dict-tag>-->
+<!--                </el-descriptions-item>-->
+<!--                <el-descriptions-item label="意见摘要" :span="3">-->
+<!--                    <div class="text-left">{{viewData.excerpt}}</div>-->
+<!--                </el-descriptions-item>-->
+                <el-descriptions-item label="意见内容" :span="3">
+                    <div class="text-left" v-html="viewData.brief"></div>
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" :span="3">
+                    <file-preview :files="viewData.files" complete_result></file-preview>
+                </el-descriptions-item>
+            </el-descriptions>
+
+            <!--合并信息-->
+            <template v-if="viewData.consolidationProposals">
+                <div class="process-title">
+                    合并信息
+                </div>
+                <el-table :data="viewData.consolidationProposals">
+                    <el-table-column label="序号" type="index" width="100px"></el-table-column>
+                    <el-table-column label="意见编号" prop="code" 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="typeName"></el-table-column>
+                    <el-table-column label="届次" prop="sessionName"></el-table-column>
+                    <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                    <el-table-column label="操作" width="100px">
+                        <template slot-scope="{row}">
+                            <el-link type="primary" size="mini" @click="openView(row.id)">查看</el-link>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </template>
+
+            <div class="process-title">
+                附议人信息
+            </div>
+            <el-table :data="viewData.seconders" size="small">
+                <el-table-column label="姓名" prop="createVariable.userName"></el-table-column>
+                <el-table-column label="工号" prop="createVariable.loginName"></el-table-column>
+                <el-table-column label="单位" prop="createVariable.unitName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="分工会" prop="createVariable.unionName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="代表团" prop="createVariable.delegationName"></el-table-column>
+                <el-table-column label="邀请时间" prop="createdOn"></el-table-column>
+                <el-table-column label="附议时间" prop="endOn"></el-table-column>
+                <el-table-column label="附议结果" prop="extVariable.bpmTaskApprovalType">
+                    <template slot-scope="{row}">
+                               <span v-if="row.extVariable && row.extVariable.bpmTaskApprovalType">
+                                   <el-tag size="mini" type="success"
+                                           v-if="row.extVariable.bpmTaskApprovalType==='PASS'">同意</el-tag>
+                                   <el-tag size="mini" type="danger"
+                                           v-if="row.extVariable.bpmTaskApprovalType==='REJECT'">拒绝</el-tag>
+                               </span>
+                    </template>
+                </el-table-column>
+                <!--                       <el-table-column label="签字" prop="extVariable.bpmTaskApprovalType">-->
+                <!--                           <template slot-scope="{row}">-->
+                <!--                               <el-image :src="row.extVariable.approvalSignature" v-if="row.extVariable && row.extVariable.approvalSignature"></el-image>-->
+                <!--                       </template>-->
+                </el-table-column>
+            </el-table>
+
+            <div>
+                <div v-for="nodeTask in viewData.nodeTasks" :key="nodeTask.id">
+                    <div class="process-title" v-if="nodeTask.nodeCode !== 20">
+                        {{nodeTask.nodeName}}
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 30">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id" style="margin-bottom: 10px">
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审核结果">
+                                <div v-if="task.extVariable">
+                                    <el-tag type="success" size="mini"
+                                            v-if="task.extVariable.bpmTaskApprovalType === 'PASS'">同意
+                                    </el-tag>
+                                    <el-tag type="danger" size="mini"
+                                            v-if="task.extVariable.bpmTaskApprovalType === 'BACK'">退回重新填写
+                                    </el-tag>
+                                    <el-tag type="danger" size="mini"
+                                            v-if="task.extVariable.bpmTaskApprovalType === 'REJECT'">建议撤销
+                                    </el-tag>
+                                </div>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字" :span="3">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 60">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id">
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审核结果">
+                                <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT"
+                                          :value="task.extVariable.caseFilingResult">
+                                </dict-tag>
+                            </el-descriptions-item>
+                            <template
+                                v-if="task.extVariable.caseFilingResult!=='NOT' && task.extVariable.caseFilingResult!==''">
+                                <el-descriptions-item label="主办单位" :span="3">{{ task.extVariable.hostUnit}}
+                                </el-descriptions-item>
+                                <el-descriptions-item label="协办单位" :span="3">{{
+                                    task.extVariable.helpUnits.join(',')}}
+                                </el-descriptions-item>
+                            </template>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+
+                    <div v-if="nodeTask.nodeCode === 63">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id" style="margin-bottom: 10px">
+                            <el-descriptions-item label="承办单位">
+                                {{ task.createVariable.underTakeName}}
+                                ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="能否承办" :span="3">
+                                {{task.extVariable.canTake}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                        </el-descriptions>
+                    </div>
+
+                    <div v-if="nodeTask.nodeCode === 70">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id" style="margin-bottom: 10px;">
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审核结果">
+                                <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT"
+                                          :value="task.extVariable.caseFilingResult">
+                                </dict-tag>
+                            </el-descriptions-item>
+                            <template
+                                v-if="task.extVariable.caseFilingResult!=='NOT' && task.extVariable.caseFilingResult!==''">
+                                <el-descriptions-item label="主办单位" :span="3">{{ task.extVariable.hostUnit}}
+                                </el-descriptions-item>
+                                <el-descriptions-item label="协办单位" :span="3">{{
+                                    task.extVariable.helpUnits.join(',')}}
+                                </el-descriptions-item>
+                            </template>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+
+                    <div v-if="nodeTask.nodeCode === 80">
+                        <el-descriptions :column="3" border v-if="!hide_slave" v-for="task in nodeTask.tasks.filter(v=>!v.isAutoComplete)"
+                                         :key="task.id" style="margin-bottom: 10px">
+                            <el-descriptions-item label="承办单位">
+                                <span class="text-primary">
+                                     {{ task.createVariable.underTakeName}}
+                                    ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                                </span>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="答复内容" :span="3">
+                                <div v-html="task?.extVariable?.approvalOpinion"></div>
+                            </el-descriptions-item>
+                        </el-descriptions>
+                        <el-descriptions :column="3" border v-if="hide_slave"
+                                         v-for="task in nodeTask.tasks.filter(v=>v.createVariable?.isMaster == true)"
+                                         :key="task.id" style="margin-bottom: 10px">
+                            <el-descriptions-item label="承办单位">
+                                <span class="text-primary">
+                                     {{ task.createVariable.underTakeName}}
+                                    ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                                </span>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="答复内容" :span="3">
+                                <div v-html="task?.extVariable?.approvalOpinion"></div>
+                            </el-descriptions-item>
+                        </el-descriptions>
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 90">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id" style="margin-bottom: 10px;">
+                            <el-descriptions-item label="承办单位">
+                                {{ task.createVariable.underTakeName}}
+                                ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                            </el-descriptions-item>
+                            <el-descriptions-item label="校领导">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审批时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审批结果" :span="3">
+                                <el-tag size="mini" type="success" v-if="task.extVariable.bpmTaskApprovalType==='PASS'">
+                                    同意
+                                </el-tag>
+                                <el-tag size="mini" type="danger"
+                                        v-if="task.extVariable.bpmTaskApprovalType==='BACK_OTHER_NODE'">退回重新答复
+                                </el-tag>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审批意见" :span="3">
+                                {{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 100">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id">
+                            <el-descriptions-item label="反馈人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="反馈时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="反馈结果">{{ task.extVariable.feedBackScore}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="反馈意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                             <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>  -->
+                        </el-descriptions>
+                    </div>
+
+                </div>
+            </div>
+
+            <el-dialog title="意见和建议详情" :visible.sync="viewDialogVisible" width="1200px" append-to-body top="5vh">
+                <div style="max-height: 80vh;overflow-y: auto">
+                    <suggestion-info ref="infoDialogRef"></suggestion-info>
+                </div>
+            </el-dialog>
+        </div>
+
+    `,
+    dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+    data() {
+        return {
+            viewData: {},
+            viewDialogVisible: false
+        }
+    },
+    props:{
+        hide_slave:false
+    },
+    methods: {
+        onOpen(id) {
+            this.$axios.post("/platform/suggestion/tc/common/suggestionInfo", { id }).then((res) => {
+                if (res.code === 0) {
+                    this.viewData = res.data
+                }
+            })
+        },
+        openView(id) {
+            this.viewDialogVisible = true
+            this.$nextTick(() => {
+                this.$refs.infoDialogRef.onOpen(id)
+            })
+        }
+    },
+    style:
+        /*language=CSS*/
+        `
+            .proposal-info .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell{
+                text-align: left;
+            }
+        `
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/export/comprehensive/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/export/comprehensive/index.html
new file mode 100644
index 00000000..fd2ea08a
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/export/comprehensive/index.html
@@ -0,0 +1,299 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">意见类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">受理结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.SUGGESTION_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-button type="primary" size="small" @click="exportAllAsZip">导出全部意见压缩包</el-button>
+                <el-button type="primary" size="small" @click="exportFeedBackAsZip">导出全部意见反馈表压缩包</el-button>
+                <el-button type="primary" size="small" @click="exportFeedBackConAsZip">导出全部意见反馈表(合并情况)压缩包</el-button>
+                <el-button type="primary" size="small" @click="exportSummaryAsExcel">导出汇总表</el-button>
+<!--                <el-button type="primary" size="small" @click="exportRegisterSummaryAsExcel">导出受理汇总表</el-button>-->
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" width="200px"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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="masterUnderTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="协办单位" prop="slaveUnderTakeNames" show-overflow-tooltip></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 size="mini" type="primary" @click="exportDocx(row.id)">导出</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                businessNo: "",
+                tabActive: "0",
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportAllAsZip() {
+                this.$downLoad(loc() + "/exportAllAsZip", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+            exportFeedBackAsZip() {
+                this.$downLoad(loc() + "/exportFeedBackAsZip", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+
+            exportFeedBackConAsZip() {
+                this.$downLoad(loc() + "/exportFeedBackConAsZip", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+
+            exportDocx(id) {
+                this.$downLoad("/platform/suggestion/tc/common/exportSuggestionAsDocx", { id })
+            },
+            exportSummaryAsExcel() {
+                this.$downLoad(loc() + "/exportSummaryAsExcel", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+            exportRegisterSummaryAsExcel() {
+                this.$downLoad(loc() + "/exportRegisterSummaryAsExcel", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/chart/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/chart/index.html
new file mode 100644
index 00000000..fadeedf4
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/chart/index.html
@@ -0,0 +1,262 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <el-card shadow="never">
+        <el-row type="flex" justify="center">
+            <el-select @change="doSearch" clearable filterable placeholder="所属教代会" v-model="pageForm.sessionId" style="width: 100%">
+                <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+            </el-select>
+        </el-row>
+    </el-card>
+    <el-row :gutter="10" class="mt10">
+        <el-col :span="12" v-loading="loading.satisfiedLoading">
+            <el-card class="box-card" shadow="never">
+                <div slot="header">
+                    <span>意见满意度</span>
+                </div>
+                <div class="text item">
+                    <div id="satisfiedChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+        <el-col :span="12" v-loading="loading.typeLoading">
+            <el-card class="box-card" shadow="never">
+                <div slot="header" class="clearfix">
+                    <span>意见类别</span>
+                </div>
+                <div class="text item">
+                    <div id="typeChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+    </el-row>
+    <el-row :gutter="10" class="mt10">
+        <el-col :span="12" v-loading="loading.resultLoading">
+            <el-card shadow="never">
+                <div slot="header" class="clearfix">
+                    <span>受理结果</span>
+                </div>
+                <div class="text item">
+                    <div id="resultChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+        <el-col :span="12" v-loading="loading.stateLoading">
+            <el-card shadow="never">
+                <div slot="header" class="clearfix">
+                    <span>意见状态</span>
+                </div>
+                <div class="text item">
+                    <div id="stateChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+    </el-row>
+</div>
+<script>
+    const chart = {
+        satisfiedChart: undefined,
+        resultChart: undefined,
+        typeChart: undefined,
+        stateChart: undefined
+    }
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        data() {
+            return {
+                pageForm: {
+                    sessionId: null
+                },
+                sessionOptions: [],
+                loading: {
+                    satisfiedLoading: false,
+                    resultLoading: false,
+                    typeLoading: false,
+                    stateLoading: false
+                }
+            }
+        },
+        methods: {
+            listSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.doSearch()
+                        }
+                    }
+                })
+            },
+
+            doSearch() {
+                this.typeChart()
+                this.resultChart()
+                this.stateChart()
+                this.feedBackScoreChart()
+            },
+
+            typeChart() {
+                this.$axios.post(loc() + "/typeData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        this.loading.typeLoading = false
+                        if (chart.typeChart) {
+                            chart.typeChart.changeData(res.data)
+                            return
+                        }
+                        chart.typeChart = new G2Plot.Column("typeChart", {
+                            data: res.data,
+                            xField: "typeName",
+                            yField: "count",
+                            meta: {
+                                type: {
+                                    alias: "类别"
+                                },
+                                sales: {
+                                    alias: "数量"
+                                }
+                            },
+                            xAxis: {
+                                label: {
+                                    autoRotate: true,
+                                    autoHide: false,
+                                    autoEllipsis: false
+                                }
+                            }
+                        })
+                        chart.typeChart.render()
+                    }
+                })
+            },
+
+            resultChart() {
+                this.$axios.post(loc() + "/resultData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        if (chart.resultChart) {
+                            chart.resultChart.changeData(res.data)
+                            return
+                        }
+                        chart.resultChart = new G2Plot.Radar("resultChart", {
+                            data: res.data,
+                            xField: "name",
+                            yField: "count",
+                            seriesField: "type",
+                            meta: {
+                                num: {
+                                    alias: "数量",
+                                    min: 0
+                                }
+                            },
+                            xAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            yAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        type: "line",
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            area: {},
+                            point: {
+                                size: 2
+                            }
+                        })
+                        chart.resultChart.render()
+                    }
+                })
+            },
+
+            stateChart() {
+                this.$axios.post(loc() + "/stateData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        if (chart.stateChart) {
+                            chart.stateChart.changeData(res.data)
+                            return
+                        }
+                        chart.stateChart = new G2Plot.Radar("stateChart", {
+                            data: res.data,
+                            xField: "name",
+                            yField: "count",
+                            xAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            yAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        type: "line",
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            point: {
+                                size: 2
+                            }
+                        })
+                        chart.stateChart.render()
+                    }
+                })
+            },
+
+            feedBackScoreChart() {
+                this.$axios.post(loc() + "/feedBackScoreData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        if (chart.feedBackScoreChart) {
+                            chart.feedBackScoreChart.changeData(res.data)
+                            return
+                        }
+                        chart.satisfiedChart = new G2Plot.Pie("satisfiedChart", {
+                            data: res.data,
+                            appendPadding: 10,
+                            angleField: "count",
+                            colorField: "name",
+                            radius: 0.75,
+                            color: ["#9661BC", "#5B8FF9", "#61DDAA"],
+                            label: {
+                                type: "spider",
+                                labelHeight: 28,
+                                content: "{name}\n{percentage}"
+                            },
+                            interactions: [{ type: "element-selected" }, { type: "element-active" }]
+                        })
+
+                        chart.satisfiedChart.render()
+                    }
+                })
+            }
+        },
+        created() {
+            this.listSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/collectProgress/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/collectProgress/index.html
new file mode 100644
index 00000000..727d3a85
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/collectProgress/index.html
@@ -0,0 +1,242 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">意见类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">征集状态</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in collectOptions"
+                        :key="item.code"
+                        :effect="pageForm.collectIds && pageForm.collectIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('collectIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" sortable></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="附议人数" prop="seconderSum"></el-table-column>
+                <el-table-column label="已附议" prop="completeCount"></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                collectOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    collectIds: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+
+            listCollectState() {
+                this.$axios.post(loc() + "/collectState").then((res) => {
+                    if (res.code === 0) {
+                        this.collectOptions = res.data
+                    }
+                })
+            },
+
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+            this.listCollectState()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/comprehensive/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/comprehensive/index.html
new file mode 100644
index 00000000..4bef29a1
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/comprehensive/index.html
@@ -0,0 +1,261 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">意见类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">受理结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.SUGGESTION_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" show-overflow-tooltip></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否合并" prop="isConsolidation" width="100">
+                    <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="masterUnderTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="协办单位" prop="slaveUnderTakeNames" show-overflow-tooltip></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 size="mini" type="primary" @click="exportDocx(row.id)">导出</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportDocx(id) {
+                this.$downLoad("/platform/suggestion/tc/common/exportSuggestionAsDocx", { id })
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/delegation/index.html
new file mode 100644
index 00000000..2786e354
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/delegation/index.html
@@ -0,0 +1,150 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <template>
+            <el-card shadow="never">
+                <el-row type="flex" justify="center">
+                    <el-select @change="doSearch" clearable filterable placeholder="所属教代会" v-model="sessionId" style="width: 100%">
+                        <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+                    </el-select>
+                </el-row>
+            </el-card>
+
+            <el-card shadow="never" class="mt10">
+                <table-tool label="代表团列表"></table-tool>
+                <el-table :data="tableData" ref="tableRef" header-align="center" style="width: 100%" row-key="id" show-summary>
+                    <el-table-column
+                        :index="indexMethod"
+                        align="center"
+                        header-align="center"
+                        label="序号"
+                        type="index"
+                        width="80px"
+                    ></el-table-column>
+                    <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        header-align="center"
+                        min-width="100px"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
+                        <template scope="{row}" v-if="column.prop=='dbtName'">
+                            <el-link @click="openView(row)" type="primary">{{row.dbtName}}</el-link>
+                        </template>
+                    </el-table-column>
+                    <el-table-column header-align="center" label="受理率" prop="caseRate">
+                        <template scope="{row}">
+                            <span v-if="row.SUBMIT_COUNT && !isNaN(row.CONFIRM_FILING) && !isNaN(row.SUBMIT_COUNT)">
+                                {{ ((row.CONFIRM_FILING / row.SUBMIT_COUNT) * 100).toFixed(2) }}%
+                            </span>
+                            <span v-else>0.00%</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-card>
+        </template>
+    </guava>
+
+    <el-dialog :title="dialogTitle" :visible.sync="delegationVisible" width="70%" :close-on-click-modal="false">
+        <proposal-table
+            :delegation-id="delegationId"
+            :session-id="sessionId"
+            @view-single-proposal="viewSingleProposal"
+            ref="proposalTable"
+        ></proposal-table>
+    </el-dialog>
+
+    <el-dialog title="意见详情" :visible.sync="proposalInfoVisible" width="1200px" append-to-body top="5vh">
+        <div style="max-height: 80vh; overflow-y: auto">
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </div>
+    </el-dialog>
+</div>
+<script>
+    <!--#include("proposalTable.js"){}#-->
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        data() {
+            return {
+                sessionId: "",
+                sessionOptions: [],
+                tableColumns: [
+                    { label: "代表团名称", prop: "dbtName" },
+                    { label: "意见总数", prop: "TOTAL" },
+                    { label: "已提交意见数", prop: "SUBMIT_COUNT" }
+                ],
+                delegationId: "",
+                dialogTitle: "",
+                delegationVisible: false,
+                proposalInfoVisible: false
+            }
+        },
+        components: {
+            "proposal-table": PROPOSAL_TABLE,
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        methods: {
+            openView(row) {
+                this.delegationId = row.id
+                this.dialogTitle = row.dbtName + "所属意见"
+                this.delegationVisible = true
+                this.$nextTick(() => {
+                    this.$refs.proposalTable.pageData()
+                })
+            },
+            viewSingleProposal(row) {
+                this.proposalInfoVisible = true
+                this.$nextTick(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            setTableColumnsByProposalResult() {
+                this.$businessTool.getDictOptions("SUGGESTION_CASE_FILING_RESULT").then((data) => {
+                    data.forEach((item) => {
+                        this.tableColumns.push({
+                            label: item.name,
+                            prop: item.code
+                        })
+                    })
+                })
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        sessionId: this.sessionId
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.setTableColumnsByProposalResult()
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/delegation/proposalTable.js b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/delegation/proposalTable.js
new file mode 100644
index 00000000..94c12554
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/delegation/proposalTable.js
@@ -0,0 +1,51 @@
+const PROPOSAL_TABLE = {
+    template: `
+        <div>
+            <el-table :data="tableData" ref="tableRef" header-align="center" style="width: 100%" row-key="id" @sort-change="pageOrder">
+                <el-table-column label="序号" width="50px" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" width="200px"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="$emit('view-single-proposal',row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+             <!--#include("/layouts/pagination.html"){}#-->
+        </div>
+    `,
+    props: {
+        sessionId: {
+            type: String,
+            required: true
+        },
+        delegationId: {
+            type: String,
+            required: true
+        }
+    },
+    mixins: [initTableMixins],
+    data() {
+        return {
+            pageForm: {}
+        }
+    },
+    methods: {
+        pageData() {
+            this.pageForm.sessionId = this.sessionId
+            this.pageForm.delegationId = this.delegationId
+            this.$axios.post("/platform/suggestion/tc/query/delegation/getProposalsByDelegation", this.pageForm).then((res) => {
+                if (res.code === 0) {
+                    this.tableData = res.data.list
+                    this.pageForm.totalCount = res.data.totalCount
+                }
+            })
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/history/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/history/index.html
new file mode 100644
index 00000000..7a84add3
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/history/index.html
@@ -0,0 +1,259 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">意见类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">受理结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.SUGGESTION_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" sortable></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_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="当前节点" 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 size="mini" type="primary" @click="exportDocx(row.id)">导出</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportDocx(id) {
+                this.$downLoad("/platform/suggestion/tc/common/exportSuggestionAsDocx", { id })
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/underTakeReply/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/underTakeReply/index.html
new file mode 100644
index 00000000..2d37593d
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/underTakeReply/index.html
@@ -0,0 +1,96 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <el-card shadow="never">
+        <search @search="doSearch">
+            <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>
+            </search-item>
+            <search-item label="承办单位">
+                <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                    <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>
+                </el-select>
+            </search-item>
+        </search>
+    </el-card>
+
+    <el-card shadow="never">
+        <el-table :data="tableData">
+            <el-table-column label="序号" type="index" width="50"></el-table-column>
+            <el-table-column label="单位名称" prop="name" width="400" sortable show-overflow-tooltip></el-table-column>
+            <el-table-column label="意见总数" prop="sum" sortable></el-table-column>
+            <el-table-column label="主办意见">
+                <el-table-column label="意见数量" prop="hostSum" sortable></el-table-column>
+                <el-table-column label="已答复" prop="hostReplySum" sortable></el-table-column>
+                <el-table-column label="未答复" prop="hostNoReplySum" sortable></el-table-column>
+            </el-table-column>
+            <el-table-column label="协办意见">
+                <el-table-column label="意见数量" prop="helpSum" sortable></el-table-column>
+                <el-table-column label="已答复" prop="hostReplySum" sortable v-if="slaveNeedReply"></el-table-column>
+                <el-table-column label="未答复" prop="hostNoReplySum" sortable v-if="slaveNeedReply"></el-table-column>
+            </el-table-column>
+        </el-table>
+    </el-card>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                underTakeOptions: [],
+                slaveNeedReply: false
+            }
+        },
+        methods: {
+            meetingChange() {
+                this.doSearch()
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+            pageData() {
+                this.$axios.post(loc() + "/data", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        this.tableData = res.data.tableData
+                        this.slaveNeedReply = res.data.slaveNeedReply
+                    }
+                })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/yearReport/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/yearReport/index.html
new file mode 100644
index 00000000..247348f7
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/query/yearReport/index.html
@@ -0,0 +1,259 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入意见编号"
+                        v-model="pageForm.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">意见类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">受理结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.SUGGESTION_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-button type="primary" size="small" @click="exportYearReport">导出意见报告</el-button>
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" size="small" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" width="200px"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name"></el-table-column>-->
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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="masterUnderTakeName"></el-table-column>
+                <el-table-column label="协办单位" prop="slaveUnderTakeNames" show-overflow-tooltip></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <proposal-info ref="infoRef"></proposal-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportYearReport() {
+                this.$downLoad(loc() + "/exportYearReport", this.pageForm)
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+            listProposalType() {
+                this.$axios.post("/platform/proposal/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/senior/basic/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/senior/basic/index.html
new file mode 100644
index 00000000..37224301
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/senior/basic/index.html
@@ -0,0 +1,292 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip>-->
+<!--                    <template scope="{row}">-->
+<!--                        <el-link type="primary" @click="openView(row)">{{row.name}}</el-link>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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 size="mini" type="primary" @click="onOpenEdit(row)">修改</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+        <template #edit>
+            <el-form :model="formData" ref="form" label-width="120px">
+                <el-row :gutter="20" type="flex">
+                    <el-col :span="12">
+                        <el-form-item label="代表姓名" prop="createUserName">
+                            <el-input readonly v-model="formData.createUserName" disabled></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="撰写时间" prop="createTime">
+                            <el-input readonly v-model="formData.createTime" disabled></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="20" type="flex">
+<!--                    <el-col :span="24">-->
+<!--                        <el-form-item label="意见名称" prop="name">-->
+<!--                            <el-input maxlength="100" placeholder="意见名称" v-model="formData.name"></el-input>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
+                    <!--                    <el-col :span="12">-->
+                    <!--                        <el-form-item label="意见方式" prop="source">-->
+                    <!--                            <el-input :value="dict.type.PROPOSAL_SOURCE.find(v=>v.code === formData.source)?.name" disabled></el-input>-->
+                    <!--                        </el-form-item>-->
+                    <!--                    </el-col>-->
+                </el-row>
+                <el-form-item prop="typeId" label="意见类别" :rules="[{required:true,message:'请选择类型',trigger:'blur'}]">
+                    <el-select v-model="formData.typeId">
+                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in typeOptions"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="意见摘要" prop="excerpt">
+                    <span slot="label">
+                        意见摘要
+                        <el-tooltip content="请简述意见内容摘要" placement="right">
+                            <i class="el-icon-question"></i>
+                        </el-tooltip>
+                    </span>
+                    <el-input
+                        v-model="formData.excerpt"
+                        type="textarea"
+                        autosize
+                        :autosize="{ minRows: 4, maxRows: 4}"
+                        placeholder="意见摘要"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item label="意见内容和依据" prop="brief">
+                    <text-editor v-model="formData.brief" key="brief" placeholder="意见内容和依据"></text-editor>
+                </el-form-item>
+                <!--                <el-form-item label="改进建议和措施" prop="measures">-->
+                <!--                    <text-editor v-model="formData.measures" key="measures" placeholder="改进建议和措施"></text-editor>-->
+                <!--                </el-form-item>-->
+            </el-form>
+            <el-row type="flex" justify="end">
+                <el-button @click="$refs.guava.index()">取 消</el-button>
+                <el-button type="primary" @click="doUpdateBasic">确 定</el-button>
+            </el-row>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("/platform/zhgh/democratic/suggestion/tc/common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT", "PROPOSAL_SOURCE"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    types: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                },
+                typeDialog: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            onOpenEdit(row) {
+                this.$refs.guava.edit()
+                this.$nextTick(() => {
+                    this.formData = { ...row }
+                })
+            },
+            doUpdateBasic() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要修改吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning"
+                        }).then(() => {
+                            this.$axios.post(loc() + "/update", this.formData).then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.$refs.guava.index()
+                                    this.doSearch()
+                                }
+                            })
+                        })
+                    }
+                })
+            },
+
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/senior/delete/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/senior/delete/index.html
new file mode 100644
index 00000000..8eb7584f
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/senior/delete/index.html
@@ -0,0 +1,213 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip>-->
+<!--                    <template scope="{row}">-->
+<!--                        <el-link type="primary" @click="openView(row)">{{row.name}}</el-link>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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 size="mini" type="danger" @click="del(row.id)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    types: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            del(id) {
+                this.$confirm("您确定删除该意见吗？", "提示", {
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post(loc() + "/delete", { id: id }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/senior/type/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/senior/type/index.html
new file mode 100644
index 00000000..6badc43a
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/senior/type/index.html
@@ -0,0 +1,259 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip>-->
+<!--                    <template scope="{row}">-->
+<!--                        <el-link type="primary" @click="onOpen(row)">{{row.name}}</el-link>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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="onOpen(row)">查看</el-button>
+                        <el-button size="mini" type="primary" @click="onOpenEdit(row)">修改</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+
+    <el-dialog title="修改意见类别" :close-on-click-modal="false" width="40%" :visible.sync="typeDialog">
+        <el-form :model="formData" ref="form" label-width="120px">
+            <el-form-item prop="oldTypeName" label="原类型">
+                <el-input disabled :value="formData.oldTypeName" type="text"></el-input>
+            </el-form-item>
+            <el-form-item prop="typeId" label="更改类型" :rules="[{required:true,message:'请选择类型',trigger:'blur'}]">
+                <el-select v-model="formData.typeId" style="width: 100%">
+                    <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in typeOptions"></el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="typeDialog=false">取 消</el-button>
+            <el-button type="primary" @click="doUpdateType">确 定</el-button>
+        </span>
+    </el-dialog>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                typeOptions: [],
+                sessionOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                businessNo: "",
+                tabActive: "0",
+                pageForm: {
+                    types: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                },
+                typeDialog: false
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            onOpenEdit(row) {
+                this.typeDialog = true
+                this.$nextTick(() => {
+                    this.formData = {
+                        id: row.id,
+                        oldTypeName: this.typeOptions.find((item) => item.id === row.typeId)?.name,
+                        typeId: null
+                    }
+                })
+            },
+            doUpdateType() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要修改吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning"
+                        }).then(() => {
+                            this.$axios.post(loc() + "/update", this.formData).then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.typeDialog = false
+                                    this.doSearch()
+                                }
+                            })
+                        })
+                    }
+                })
+            },
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFiling/index.html
new file mode 100644
index 00000000..473ef943
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFiling/index.html
@@ -0,0 +1,435 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+
+        <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="$refs.tableRef.clearSelection();doSearch()" 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}"
+            >
+                <el-table-column type="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" sortable></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></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.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否合并" prop="isConsolidation" width="100">
+                    <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>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
+                            @click="openRevoke(row.processInstanceTaskId)"
+                            size="mini"
+                            type="danger"
+                        >
+                            撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-info>
+            <div v-if="showApprovalForm">
+                <div class="process-title">{{formData.processInstanceNodeName}}</div>
+                <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.SUGGESTION_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" clearable filterable 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" clearable filterable 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="danger" @click="doApproval('BACK')">退回重新填写</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">提交</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.SUGGESTION_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>
+
+            <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.SUGGESTION_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>
+        </template>
+
+        <el-dialog title="意见详情" :visible.sync="viewDialogVisible" width="1200px" top="50px" append-to-body>
+            <div style="max-height: 75vh; overflow-y: auto">
+                <suggestion-info ref="infoDialogRef"></suggestion-info>
+            </div>
+        </el-dialog>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    const vue = new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                formData: {
+                    hostUnitIds: null,
+                    helpUnitId: []
+                },
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false,
+
+                //合并的意见列表
+                consolidationProposalTableData: [],
+                consolidationFormData: {},
+
+                viewDialogVisible: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.$set(this.formData, "caseFilingResult", null)
+                    this.$set(this.formData, "hostUnitId", null)
+                    this.$set(this.formData, "helpUnitIds", [])
+                    this.$set(this.formData, "helpUnitIds", [])
+                    this.$set(this.formData, "approvalOpinion", null)
+                    this.$set(this.formData, "proposalIds", [])
+                    this.showApprovalForm = true
+                })
+            },
+            doApproval(approvalType) {
+                if (approvalType === "PASS") {
+                    this.formData.bpmTaskApprovalType = "DYNAMIC"
+                    this.formData.proposalIds = [this.formData.processInstanceBusinessId]
+                    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()
+                                    }
+                                })
+                        }
+                    })
+                } else if (approvalType === "BACK") {
+                    if (!this.formData.approvalOpinion) {
+                        this.$message.warning("请填写退回的审核意见")
+                        return
+                    }
+
+                    this.formData.bpmTaskApprovalType = "DYNAMIC"
+                    this.$confirm("您确定要退回到撰写人吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "info"
+                    }).then(() => {
+                        this.$axios.post(loc() + "/approvalBack", this.formData).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.guava.index()
+                                this.$message.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    })
+                }
+            },
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            //打开合并审核
+            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/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            listUnderTake() {
+                this.$axios.post(loc() + "/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            }
+        },
+        created() {
+            // this.pageData()
+            this.listUnderTake()
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFilingUnit/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFilingUnit/index.html
new file mode 100644
index 00000000..f039cb0d
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFilingUnit/index.html
@@ -0,0 +1,434 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+
+        <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-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}"
+            >
+                <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" sortable></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" 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.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
+                            @click="openRevoke(row.processInstanceTaskId)"
+                            size="mini"
+                            type="danger"
+                        >
+                            撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-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.SUGGESTION_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.SUGGESTION_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>
+
+            <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.SUGGESTION_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>
+        </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"){}#-->
+    const vue = new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                formData: {
+                    hostUnitIds: null,
+                    helpUnitId: []
+                },
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false,
+                //合并的意见列表
+                consolidationProposalTableData: [],
+                consolidationFormData: {},
+
+                viewDialogVisible: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            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])
+                            }
+                        })
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            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/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            listUnderTake() {
+                this.$axios.post(loc() + "/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            }
+        },
+        created() {
+            this.listOpenSession()
+            this.listUnderTake()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/delegation/index.html
new file mode 100644
index 00000000..f36987e8
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/delegation/index.html
@@ -0,0 +1,220 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.approval" @change="doSearch" 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"
+                @sort-change="pageOrder"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></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>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
+                            @click="openRevoke(row.processInstanceTaskId)"
+                            size="mini"
+                            type="danger"
+                        >
+                            撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-info>
+            <div v-if="showApprovalForm">
+                <div class="process-title">{{formData.processInstanceNodeName}}</div>
+                <el-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
+                    <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="danger" @click="doApproval('BACK')">退回重新填写</el-button>
+                    <el-button type="danger" @click="doApproval('REJECT')">建议撤销</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">同意</el-button>
+                </el-row>
+            </div>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                formValidSuccess: false,
+                businessNo: null,
+                sessionOptions: [],
+                delegationOptions: [],
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.showApprovalForm = true
+                })
+            },
+            doApproval(approvalType) {
+                this.formData.bpmTaskApprovalType = approvalType
+                this.$refs.approvalFormRef.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要提交吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "info"
+                        }).then(() => {
+                            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()
+                                    }
+                                })
+                        })
+                    }
+                })
+            },
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            //教代会change
+            async meetingChange(val) {
+                this.formData.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            }
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/mine/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/mine/index.html
new file mode 100644
index 00000000..7662b3a5
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/mine/index.html
@@ -0,0 +1,175 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <!--                <search-item label="名称">-->
+                <!--                    <el-input v-model="pageForm.name" placeholder="名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+                <!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" placeholder="意见内容" @keyup.enter.native="doSearch" clearable 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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code"></el-table-column>
+                <!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作" fixed="right" width="400px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                        <el-button v-if="[10,40,61].includes(row.processInstanceNodeCode)" size="mini" type="primary" @click="openEdit(row)">
+                            编辑
+                        </el-button>
+                        <el-button
+                            size="mini"
+                            type="primary"
+                            @click="onOpenInviteSeconder(row)"
+                            v-if="[10,20,40,61].includes(row.processInstanceNodeCode)"
+                        >
+                            邀请附议人
+                        </el-button>
+                        <el-button
+                            v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
+                            size="mini"
+                            type="danger"
+                            @click="openRevoke(row)"
+                        >
+                            撤销
+                        </el-button>
+                        <el-button v-if="[10,40,50,61].includes(row.processInstanceNodeCode)" size="mini" type="danger" @click="del(row.id)">
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <invite-seconder ref="inviteSeconderRef" @refresh="doSearch"></invite-seconder>
+        </template>
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    <!--#include("inviteSeconder.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT,
+            "invite-seconder": PROPOSAL_INVITE_SECONDER_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                businessNo: null
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            openEdit(row) {
+                this.$store.dispatch("pjaxRoute", "/platform/suggestion/tc/write?id=" + row.id)
+            },
+            openRevoke(row) {
+                this.$confirm("您确定要撤销申请吗?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/suggestion/tc/mine/revokeApply", { id: row.id }).then((resp) => {
+                        this.$message.success(resp.msg)
+                        this.doSearch()
+                    })
+                })
+            },
+            onOpenInviteSeconder(row) {
+                this.$axios.post(loc() + "/inviteCheck", { id: row.id }).then((res) => {
+                    if (res.code === 0) {
+                        this.$refs.guava.public(() => {
+                            this.$refs.inviteSeconderRef.onOpen(row)
+                        })
+                    }
+                })
+            },
+
+            //教代会change
+            async meetingChange(val) {
+                this.formData.delegationId = null
+                this.formData.committeeId = null
+                this.delegationOptions = await proposal.getDelegation(val)
+                this.committeeOptions = await this.getInstitutions(val)
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                    }
+                })
+            },
+            withdraw({ processInstId }) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/withdraw", { processInstId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            del(id) {
+                this.$confirm("您确定要删除吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/delete", { id }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            }
+        },
+        created() {
+            this.listSession()
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/mine/inviteSeconder.js b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/mine/inviteSeconder.js
new file mode 100644
index 00000000..5c111533
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/mine/inviteSeconder.js
@@ -0,0 +1,150 @@
+const PROPOSAL_INVITE_SECONDER_COMPONENT = {
+    /*language=HTML*/
+    template: `
+        <div>
+            <el-row type="flex" style="column-gap: 10px;">
+                <el-col :span="6">
+                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询"
+                              clearable></el-input>
+                </el-col>
+                <el-col :span="6">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id"
+                                   v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </el-col>
+                <el-col :span="4">
+                    <el-button icon="el-icon-search" type="primary" @click="doSearch">查询</el-button>
+                </el-col>
+            </el-row>
+            <el-divider class="mt10 mb10"></el-divider>
+            <table-tool>
+                <el-button size="small" @click="invite" type="primary" icon="el-icon-plus"
+                           :disabled="pageForm.isInvite">邀请
+                </el-button>
+                <el-radio-group v-model="pageForm.isInvite" @change="doSearch" size="small" style="margin-left: 5px;">
+                    <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" size="small" header-align="center"
+                      style="width: 100%" :row-key="getRowKey">
+                <el-table-column type="selection" reserve-selection v-if="!pageForm.isInvite"></el-table-column>
+                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="工号" prop="loginName"></el-table-column>
+                <el-table-column label="姓名" prop="userName"></el-table-column>
+                <el-table-column label="性别" prop="sex"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <!--                        <el-table-column label="操作" width="150px">-->
+                <!--                            <template scope="{row}">-->
+                <!--                                <el-button size="mini" type="primary" @click="invite(row)">邀请</el-button>-->
+                <!--                            </template>-->
+                <!--                        </el-table-column>-->
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </div>
+    `,
+    mixins: [initTableMixins],
+    data() {
+        return {
+            visible: false,
+            secondedNum: 0,
+            record: {},
+            pageForm: {
+                isInvite: false
+            },
+            config: {},
+            delegationOptions: []
+        }
+    },
+    methods: {
+        getRowKey(val) {
+            return val.loginName + this.pageForm.isInvite
+        },
+
+        async onOpen(record) {
+            this.visible = true
+            this.record = record
+            await this.getConfig()
+            this.listDelegation()
+            this.pageData()
+
+            const { seconderNum } = this.config
+            this.$alert(
+                "（1）请至少选择<span style='color: orange;font-weight: bold'>" +
+                    seconderNum +
+                    "</span>位以上（含" +
+                    seconderNum +
+                    "位）代表附议。<br>\n" +
+                    "（2）邀请附议人后将不能再编辑,请确认内容后再邀请附议人。<br>",
+                {
+                    title: "温馨提醒",
+                    type: "warning",
+                    dangerouslyUseHTMLString: true,
+                    confirmButtonText: "确定",
+                    callback: () => {}
+                }
+            )
+        },
+        detail(id) {},
+        invite() {
+            const selection = this.$refs.tableRef.selection
+            if (selection.length === 0) {
+                this.$message.warning("请先选择附议人后在点击邀请")
+                return
+            }
+            const loginNames = selection.map((s) => s.loginName)
+            const userName = selection.map((s) => s.userName)
+            this.$confirm("您确定要邀请" + userName.join("、") + "代表附议吗？", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "info"
+            }).then(() => {
+                this.$axios
+                    .post(loc() + "/inviteSeconder", {
+                        proposalId: this.record.id,
+                        seconders: JSON.stringify(loginNames)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.$refs.tableRef.clearSelection()
+                            this.pageData()
+                            this.visible = false
+                            this.$emit("refresh", null)
+                        }
+                    })
+            })
+        },
+        pageData() {
+            this.$axios
+                .post(loc() + "/listSeconder", {
+                    ...this.pageForm,
+                    sessionId: this.record.sessionId,
+                    proposalId: this.record.id
+                })
+                .then((res) => {
+                    if (res.code === 0) {
+                        this.tableData = res.data.list
+                        this.pageForm.totalCount = res.data.totalCount
+                    }
+                })
+        },
+
+        //查询代表团
+        listDelegation() {
+            this.$axios.post("/platform/suggestion/tc/common/listDelegation", { sessionId: this.record.sessionId }).then((res) => {
+                if (res.code === 0) {
+                    this.delegationOptions = res.data
+                }
+            })
+        },
+
+        async getConfig() {
+            const { code, data } = await this.$axios.post("/platform/suggestion/tc/common/config")
+            if (code === 0) {
+                this.config = data
+            }
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/schoolLeaderApproval/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/schoolLeaderApproval/index.html
new file mode 100644
index 00000000..fd8c3411
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/schoolLeaderApproval/index.html
@@ -0,0 +1,251 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        v-model="pageForm.searchKeyword"-->
+<!--                        placeholder="意见名称"-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.approval" @change="doSearch" 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"
+                @sort-change="pageOrder"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" sortable></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否合并" prop="isConsolidation" width="100">
+                    <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="isMasterUnderTake">
+                    <template scope="{row}">
+                        <el-tag v-if="row.isMasterUnderTake" size="mini" type="success">是</el-tag>
+                        <el-tag v-else size="mini" type="info">否</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="承办单位" prop="underTakeName" show-overflow-tooltip></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="onOpen(row)">查看</el-button>
+                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(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>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <suggestion-info ref="infoRef" :hide_slave="true"></suggestion-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="承办单位">
+                        <el-input :value="formData.underTakeName" disabled></el-input>
+                    </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="danger" @click="doApproval('BACK_OTHER_NODE')">退回重新答复</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">同意</el-button>
+                </el-row>
+            </div>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    const vue = new Vue({
+        el: "#app",
+        store,
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                showApprovalForm: false,
+                pageForm: {
+                    approval: false
+                }
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.$set(this.formData, "implementState", null)
+                    this.$set(this.formData, "approvalOpinion", null)
+                    this.formData.isConsolidation = row.isConsolidation
+                    this.formData.underTakeName = row.underTakeName
+                    this.formData.underTakeId = row.underTakeId
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            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/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            del() {},
+            openView(id) {}
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/seconded/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/seconded/index.html
new file mode 100644
index 00000000..fac895c8
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/seconded/index.html
@@ -0,0 +1,193 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+                <search-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.approval" @change="doSearch" 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"
+                @sort-change="pageOrder"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+<!--                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="附议人" prop="seconderName"></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>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-info>
+            <div v-if="showApprovalForm">
+                <div class="process-title">{{formData.processInstanceNodeName}}</div>
+                <el-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
+                    <!--                    <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:false,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']}]" v-if="formData.processInstanceTaskId !== 'd3a53d97c2ce441083c973fdb798352b' && formData.processInstanceTaskId !== '70989be6710c4a599db297d85dd82928'">-->
+                    <!--                        <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="danger" @click="doApproval('REJECT')">拒绝</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">同意</el-button>
+                </el-row>
+            </div>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    const vue = new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.showApprovalForm = true
+                })
+            },
+            doApproval(approvalType) {
+                this.formData.bpmTaskApprovalType = approvalType
+                this.$refs.approvalFormRef.validate((valid) => {
+                    if (valid || this.formData.processInstanceBusinessId === "d230b43dc00c433e9b69651e11282676") {
+                        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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            //教代会change
+            async meetingChange() {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            //查询教代会
+            listSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.pageForm.sessionId = this.sessionOptions[0].id
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+            //查询代表团
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            }
+        },
+        created() {
+            this.listSession()
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitRead/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitRead/index.html
new file mode 100644
index 00000000..903027c4
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitRead/index.html
@@ -0,0 +1,260 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <!--                <el-radio-group v-model="pageForm.approval" @change="doSearch" size="small" v-if="!pageForm.transfer" class="ml5">-->
+                <!--                    <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"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" sortable></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否合并" prop="isConsolidation" width="100">
+                    <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="isMasterUnderTake" width="100">
+                    <template scope="{row}">
+                        <el-tag v-if="row.isMasterUnderTake" size="mini" type="success">是</el-tag>
+                        <el-tag v-else size="mini" type="info">否</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="承办单位" prop="underTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="onOpen(row)">查看</el-button>
+                        <!--                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(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>-->
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-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="承办单位">
+                        <el-input :value="formData.underTakeName" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item label="能否承办" prop="canTake" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <el-radio-group v-model="formData.canTake" size="small">
+                            <el-radio label="可以承办" border>可以承办</el-radio>
+                            <el-radio label="无法承办" border>无法承办</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="初步阅览意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <el-input
+                            v-model="formData.approvalOpinion"
+                            autosize
+                            :autosize="{ minRows: 4}"
+                            type="textarea"
+                            placeholder="请输入初步阅览意见"
+                        ></el-input>
+                    </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>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                pageForm: {
+                    approval: false,
+                    transfer: false
+                },
+                showApprovalForm: false,
+                transferFormData: {},
+                transferDialogVisible: false,
+                transferUserOptions: []
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.$set(this.formData, "implementState", null)
+                    this.$set(this.formData, "approvalOpinion", null)
+                    this.formData.isConsolidation = row.isConsolidation
+                    this.formData.underTakeName = row.underTakeName
+                    this.formData.underTakeId = row.underTakeId
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            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/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            del() {},
+            openView(id) {}
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitReply/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitReply/index.html
new file mode 100644
index 00000000..02dae08b
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitReply/index.html
@@ -0,0 +1,410 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.transfer" @change="doSearch" size="small" v-if="$auth.hasRole('PROPOSAL_UNIT_LEADER')">
+                    <el-radio-button :label="true">已转办</el-radio-button>
+                    <el-radio-button :label="false">未转办</el-radio-button>
+                </el-radio-group>
+
+                <el-radio-group v-model="pageForm.approval" @change="doSearch" size="small" v-if="!pageForm.transfer" class="ml5">
+                    <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"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" sortable></el-table-column>
+                <!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_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="承办单位" prop="underTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="是否主办" prop="isMasterUnderTake" width="100px">
+                    <template scope="{row}">
+                        <el-tag v-if="row.isMasterUnderTake" size="mini" type="success">是</el-tag>
+                        <el-tag v-else size="mini" type="info">否</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="转办答复人" prop="underTakeTransferUserName" v-if="$auth.hasRole('PROPOSAL_UNIT_LEADER')">
+                    <template scope="{row}">
+                        <span v-if="row.underTakeReplyIsTransfer">{{row.underTakeTransferUserName?.join('，') || '-'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作" fixed="right" width="300px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="onOpen(row)">查看</el-button>
+                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(row)" size="mini" type="primary">
+                            答复
+                        </el-button>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='ACTIVE' && $auth.hasRole('PROPOSAL_UNIT_LEADER')"
+                            @click="openTransfer(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>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='TRANSFER' && !row.nextTransferTaskIsComplete"
+                            @click="openRevokeTransfer(row.processInstanceTaskId)"
+                            size="mini"
+                            type="danger"
+                        >
+                            撤回转办
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-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="承办单位">
+                        <el-input :value="formData.underTakeName" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item label="落实情况" prop="implementState" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <dict-select v-model="formData.implementState" code="PROPOSAL_REPLY_IMPLEMENT"></dict-select>
+                    </el-form-item>
+                    <el-form-item label="答复内容" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <text-editor v-model="formData.approvalOpinion"></text-editor>
+                    </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>
+
+        <el-dialog title="转办答复" :visible.sync="transferDialogVisible" width="50%">
+            <el-form :model="transferFormData" ref="transferFormRef" label-position="left" label-width="80px">
+<!--                <el-form-item label="意见名称">-->
+<!--                    <el-input :value="transferFormData.name" disabled></el-input>-->
+<!--                </el-form-item>-->
+                <el-form-item label="转办人" prop="transferUserLoginName" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                    <el-select
+                        v-model="transferFormData.transferUserLoginName"
+                        remote
+                        :remote-method="queryTransferUser"
+                        filterable
+                        placeholder="可按姓名或工号搜索需要转办的用户"
+                        style="width: 100%"
+                    >
+                        <el-option :key="item.id" :label="item.label" :value="item.loginname" v-for="item in transferUserOptions"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button plain @click="transferDialogVisible=false">取消</el-button>
+                <el-button type="primary" @click="doTransfer">提交</el-button>
+            </div>
+        </el-dialog>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                pageForm: {
+                    approval: false,
+                    transfer: false
+                },
+                showApprovalForm: false,
+                transferFormData: {},
+                transferDialogVisible: false,
+                transferUserOptions: []
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+
+            //检查能否答复
+            checkCanReply(taskId) {
+                return this.$axios.post(loc() + "/checkCanReply", { taskId })
+            },
+
+            openApproval(row) {
+                this.checkCanReply(row.processInstanceTaskId).then((res) => {
+                    if (res.code === 0) {
+                        if (res.data && res.data.errMsg) {
+                            this.$alert(res.data.errMsg, "提示", {
+                                type: "warning",
+                                dangerouslyUseHTMLString: true,
+                                confirmButtonText: "已线下沟通，开始答复",
+                                cancelButtonText: "关闭",
+                                showCancelButton: true
+                            })
+                                .then(()=>{
+                                    this.$refs.guava.public(() => {
+                                        this.$refs.infoRef.onOpen(row.id)
+                                        this.formData = row.approvalParam
+                                        this.$set(this.formData, "implementState", null)
+                                        this.formData.isConsolidation = row.isConsolidation
+                                        this.formData.underTakeName = row.underTakeName
+                                        this.formData.underTakeId = row.underTakeId
+                                        this.showApprovalForm = true
+                                    })
+                                })
+                                .catch()
+                        } else {
+                            this.$refs.guava.public(() => {
+                                this.$refs.infoRef.onOpen(row.id)
+                                this.formData = row.approvalParam
+                                this.$set(this.formData, "implementState", null)
+                                if(row.isMasterUnderTake){
+                                    this.$set(this.formData, "approvalOpinion", res.data.allSlaveApprovalOpinion)
+                                }else{
+                                    this.$set(this.formData, "approvalOpinion", null)
+                                }
+                                if(res.data?.task?.endOn){
+                                    this.$set(this.formData, "approvalOpinion", res.data?.task?.extVariable?.approvalOpinion)
+                                    this.$set(this.formData, "implementState", res.data?.task?.extVariable?.implementState)
+                                }
+                                this.formData.isConsolidation = row.isConsolidation
+                                this.formData.underTakeName = row.underTakeName
+                                this.formData.underTakeId = row.underTakeId
+                                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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            openRevokeTransfer(taskId) {
+                this.$confirm("您确定要撤回转办吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revokeTransfer", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            //打开转办答复
+            openTransfer(row) {
+                // this.checkCanReply(row.processInstanceTaskId).then((res) => {
+                //     if (res.code === 0) {
+                //         if (res.data && res.data.errMsg) {
+                //             this.$alert(res.data.errMsg, "提示", {
+                //                 type: "warning"
+                //             })
+                //                 .then()
+                //                 .catch()
+                //         } else {
+                //
+                //         }
+                //     }
+                // })
+                this.transferFormData = {
+                    name: row.name,
+                    proposalId: row.id,
+                    underTakeId: row.underTakeId,
+                    processInstanceId: row.processInstanceId,
+                    processInstanceTaskId: row.processInstanceTaskId,
+                    transferUserLoginName: null
+                }
+                this.transferDialogVisible = true
+            },
+
+            //搜索转办人
+            queryTransferUser(keyword) {
+                if (keyword) {
+                    this.$axios.post(loc() + "/queryTransferUser", { keyword }).then((res) => {
+                        if (res.code === 0) {
+                            this.transferUserOptions = res.data
+                        }
+                    })
+                }
+            },
+
+            doTransfer() {
+                this.$refs.transferFormRef.validate((valid) => {
+                    if (valid) {
+                        this.$axios
+                            .post(loc() + "/transfer", {
+                                transfer: JSON.stringify(this.transferFormData)
+                            })
+                            .then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.transferDialogVisible = false
+                                    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/suggestion/tc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/tc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            del() {},
+            openView(id) {}
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/write/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/write/index.html
new file mode 100644
index 00000000..1c4cc4a2
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/write/index.html
@@ -0,0 +1,298 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <template>
+        <el-card shadow="never">
+            <template #header>
+                <el-row type="flex" justify="space-between" align="center">
+                    <h3 style="color: var(--color-primary)">撰写意见</h3>
+                    <el-button @click="noticeDialogVisible = true" type="text">意见撰写须知</el-button>
+                </el-row>
+            </template>
+            <template>
+                <el-form :model="formData" :rules="formRules" label-width="120px" ref="addForm">
+                    <el-row :gutter="20" type="flex">
+                        <el-col :span="12">
+                            <el-form-item label="代表姓名" prop="createUserName">
+                                <el-input readonly v-model="formData.createUserName" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="撰写时间" prop="createTime">
+                                <el-input readonly v-model="formData.createTime" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-row :gutter="20" type="flex">
+                        <el-col :span="12">
+                            <el-form-item label="所属教代会" prop="sessionId">
+                                <el-select
+                                    @change="meetingChange"
+                                    clearable
+                                    filterable
+                                    placeholder="所属教代会"
+                                    v-model="formData.sessionId"
+                                    style="width: 100%"
+                                >
+                                    <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="所属代表团" prop="delegationId">
+                                <el-select clearable filterable placeholder="所属代表团" v-model="formData.delegationId" style="width: 100%" disabled>
+                                    <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-row :gutter="20">
+                        <el-col :span="12">
+                            <el-form-item label="单位" prop="unitName">
+                                <el-input v-model="formData.unitName" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="联系电话" prop="mobile">
+                                <el-input v-model="formData.mobile" clearable placeholder="联系电话"></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+<!--                    <el-row :gutter="20" type="flex">-->
+<!--                        <el-col :span="24">-->
+<!--                            <el-form-item label="意见名称" prop="name">-->
+<!--                                <el-input maxlength="100" placeholder="意见名称" v-model="formData.name"></el-input>-->
+<!--                            </el-form-item>-->
+<!--                        </el-col>-->
+<!--                    </el-row>-->
+
+                    <el-row :gutter="20" type="flex">
+                        <el-col :span="12">
+                            <el-form-item label="意见类别" prop="typeId">
+                                <el-select v-model="formData.typeId" style="width: 100%">
+                                    <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in typeOptions"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+<!--                    <el-form-item label="意见摘要" prop="excerpt">-->
+<!--                        <span slot="label">-->
+<!--                            意见摘要-->
+<!--                            <el-tooltip content="请简述意见内容摘要" placement="right">-->
+<!--                                <i class="el-icon-question"></i>-->
+<!--                            </el-tooltip>-->
+<!--                        </span>-->
+<!--                        <el-input-->
+<!--                            v-model="formData.excerpt"-->
+<!--                            type="textarea"-->
+<!--                            autosize-->
+<!--                            :autosize="{ minRows: 4, maxRows: 4}"-->
+<!--                            placeholder="意见摘要"-->
+<!--                        ></el-input>-->
+<!--                    </el-form-item>-->
+                    <el-form-item label="意见内容" prop="brief">
+                        <text-editor v-model="formData.brief" key="brief" placeholder="意见内容"></text-editor>
+                    </el-form-item>
+                    <!--                    <el-form-item label="改进建议和措施" prop="measures">-->
+                    <!--                        <text-editor v-model="formData.measures" key="measures" placeholder="改进建议和措施"></text-editor>-->
+                    <!--                    </el-form-item>-->
+                    <el-form-item label="附件上传" prop="files">
+                        <file-upload
+                            :value.sync="formData.files"
+                            :upload_number="5"
+                            upload_result_category="array"
+                            upload_mode="drag"
+                            complete_result
+                        ></file-upload>
+                    </el-form-item>
+                </el-form>
+                <el-row justify="end" type="flex">
+                    <el-button @click="doSave" type="primary">保存到我的意见</el-button>
+                </el-row>
+            </template>
+        </el-card>
+    </template>
+
+<!--    <el-dialog title="意见撰写须知" :visible.sync="noticeDialogVisible" :show-close="false" width="50%">-->
+<!--        <div v-html="suggestionConfig.writeRemind" style="max-height: 50vh; overflow-y: auto"></div>-->
+<!--        <div slot="footer">-->
+<!--            <el-button type="primary" @click="noticeDialogVisible = false">我已知晓</el-button>-->
+<!--        </div>-->
+<!--    </el-dialog>-->
+</div>
+
+<script>
+    const vue = new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        data() {
+            return {
+                formData: {},
+                sessionOptions: [],
+                delegationOptions: [],
+                committeeOptions: [],
+                typeOptions: [],
+                formRules: {
+                    mode: [{ required: true, message: "请选择", trigger: ["blur", "change"] }],
+                    createUserName: [{ required: true, message: "请填写意见人", trigger: ["blur", "change"] }],
+                    createTime: [{ required: true, message: "请填写意见时间", trigger: ["blur", "change"] }],
+                    name: [{ required: true, message: "请填写意见名称", trigger: ["blur", "change"] }],
+                    source: [{ required: true, message: "请选择意见方式", trigger: ["blur", "change"] }],
+                    delegationId: [{ required: true, message: "请选择所属代表团", trigger: ["blur", "change"] }],
+                    sessionId: [{ required: true, message: "请选择所属教代会", trigger: ["blur", "change"] }],
+                    typeId: [{ required: true, message: "请选择意见类别", trigger: ["blur", "change"] }],
+                    implementUnitId: [{ required: false, message: "请选择建以落实部门", trigger: ["blur", "change"] }],
+                    sign: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }],
+                    excerpt: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    brief: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    measures: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    unitName: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    mobile: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    signature: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }]
+                },
+                suggestionConfig: {},
+                noticeDialogVisible: false
+            }
+        },
+        methods: {
+            async doSave() {
+                const valid = await this.$refs["addForm"].validate()
+                if (valid) {
+                    // if (!this.formData.name || this.formData.name.trim().length < 1) {
+                    //     this.$message.warning("请填写意见名称")
+                    //     return
+                    // }
+                    if (this.formData.brief.length < this.suggestionConfig.briefMinLength) {
+                        this.$message.warning("意见内容最少为" + this.suggestionConfig.briefMinLength + "字")
+                        return
+                    }
+
+                    this.$axios.post(loc() + "/save", { info: JSON.stringify(this.formData) }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.formData = res.data
+                            this.$store.dispatch("pjaxRoute", "/platform/suggestion/tc/mine")
+                        }
+                    })
+                }
+            },
+            async doSubmit() {
+                const valid = await this.$refs["addForm"].validate()
+                if (valid) {
+                    const confirm = await this.$confirm("确定要提交此意见吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "info"
+                    })
+                    if ("confirm" === confirm) {
+                        let data = clone(this.formData)
+                        if (data.files) {
+                            data.files = JSON.stringify(data.files)
+                        }
+                        const resp = await this.$axios.post(loc() + "/doSubmit", {
+                            data: JSON.stringify(data)
+                        })
+                        if (resp.code === 0) {
+                            this.$message.success(resp.msg)
+                            // location.href = "/platform/proposal/transact/compose"
+                        } else {
+                            this.notifyWarning(resp.msg)
+                        }
+                    }
+                }
+            },
+
+            listSuggestionType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            getSuggestionConfig() {
+                return this.$axios.post("/platform/suggestion/tc/common/config").then((res) => {
+                    if (res.code === 0) {
+                        this.suggestionConfig = res.data
+                    }
+                })
+            },
+
+            //教代会change
+            async meetingChange(val) {
+                this.$set(this.formData, "delegationId", null)
+                this.formData.delegationOptions = []
+                this.listDelegation()
+                this.searchSelfDelegation()
+            },
+            listDelegation() {
+                return this.$axios.post("/platform/suggestion/tc/common/listDelegation", { sessionId: this.formData.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+
+            listOpenSession(isModify = false) {
+                this.$axios.post("/platform/suggestion/tc/common/listOpenSession").then(async (res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (!isModify && this.sessionOptions) {
+                            this.$set(this.formData, "sessionId", this.sessionOptions[0].id)
+                            await this.searchSelfDelegation()
+                        }
+                        await this.listDelegation()
+                        await this.listSource()
+                    }
+                })
+            },
+
+            //查询自己有权限的代表团
+            searchSelfDelegation() {
+                return this.$axios.post(loc() + "/selfDelegation", { sessionId: this.formData.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.$set(this.formData, "delegationId", res.data)
+                    }
+                })
+            },
+
+            init() {
+                const id = GetQueryString("id")
+                if (id) {
+                    this.$axios.post(loc() + "/detail", { id }).then((res) => {
+                        if (res.code === 0) {
+                            this.formData = res.data
+                            this.listOpenSession(true)
+                        }
+                    })
+                } else {
+                    this.noticeDialogVisible = true
+                    this.listOpenSession(false)
+                    this.$set(this.formData, "createUserId", this.$store.state.user.id)
+                    this.$set(this.formData, "createUserName", this.$store.state.user.username)
+                    this.$set(this.formData, "createUserLoginName", this.$store.state.user.loginname)
+                    this.$set(this.formData, "createTime", this.$moment().format("YYYY-MM-DD"))
+                    this.$set(this.formData, "mobile", this.$store.state.user.mobile)
+                    this.$set(this.formData, "unitName", this.$store.state.user.unit?.name)
+                }
+            }
+        },
+        created() {
+            this.init()
+            this.listSuggestionType()
+            this.getSuggestionConfig()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/common/info.js b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/common/info.js
new file mode 100644
index 00000000..3c813d67
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/common/info.js
@@ -0,0 +1,323 @@
+const SUGGESTION_INFO_COMPONENT = {
+    name: "suggestion-info",
+    /*language=HTML*/
+    template: `
+        <div class="proposal-info">
+            <div class="process-title">
+                意见基础信息
+            </div>
+            <h3 style="text-align: center;font-weight: 600" class="pt10 pb10">
+                {{ viewData.name }}
+            </h3>
+            <el-descriptions :column="3" border>
+                <el-descriptions-item label="意见编号">{{ viewData.code }}</el-descriptions-item>
+                <el-descriptions-item label="撰写人">{{viewData.createUserName }}</el-descriptions-item>
+                <el-descriptions-item label="意见时间">{{ viewData.createTime }}</el-descriptions-item>
+                <el-descriptions-item label="工代会届次"> {{ viewData.sessionName || '暂无' }}</el-descriptions-item>
+                <el-descriptions-item label="撰写人单位">{{ viewData.unitName }}</el-descriptions-item>
+                <el-descriptions-item label="代表团名称">{{ viewData.delegationName }}</el-descriptions-item>
+                <el-descriptions-item label="意见类别" :span="3">
+                    {{viewData.typeName}}
+                </el-descriptions-item>
+                <!--                <el-descriptions-item label="受理结果" :span="2">-->
+                <!--                    <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT"-->
+                <!--                              :value="viewData.caseFilingResult"></dict-tag>-->
+                <!--                </el-descriptions-item>-->
+                <!--                <el-descriptions-item label="意见摘要" :span="3">-->
+                <!--                    <div class="text-left">{{viewData.excerpt}}</div>-->
+                <!--                </el-descriptions-item>-->
+                <el-descriptions-item label="意见内容" :span="3">
+                    <div class="text-left" v-html="viewData.brief"></div>
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" :span="3">
+                    <file-preview :files="viewData.files" complete_result></file-preview>
+                </el-descriptions-item>
+            </el-descriptions>
+
+            <!--合并信息-->
+            <template v-if="viewData.consolidationProposals">
+                <div class="process-title">
+                    合并信息
+                </div>
+                <el-table :data="viewData.consolidationProposals">
+                    <el-table-column label="序号" type="index" width="100px"></el-table-column>
+                    <el-table-column label="意见编号" prop="code" 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="typeName"></el-table-column>
+                    <el-table-column label="届次" prop="sessionName"></el-table-column>
+                    <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                    <el-table-column label="操作" width="100px">
+                        <template slot-scope="{row}">
+                            <el-link type="primary" size="mini" @click="openView(row.id)">查看</el-link>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </template>
+
+            <div class="process-title">
+                附议人信息
+            </div>
+            <el-table :data="viewData.seconders" size="small">
+                <el-table-column label="姓名" prop="createVariable.userName"></el-table-column>
+                <el-table-column label="工号" prop="createVariable.loginName"></el-table-column>
+                <el-table-column label="单位" prop="createVariable.unitName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="分工会" prop="createVariable.unionName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="代表团" prop="createVariable.delegationName"></el-table-column>
+                <el-table-column label="邀请时间" prop="createdOn"></el-table-column>
+                <el-table-column label="附议时间" prop="endOn"></el-table-column>
+                <el-table-column label="附议结果" prop="extVariable.bpmTaskApprovalType">
+                    <template slot-scope="{row}">
+                               <span v-if="row.extVariable && row.extVariable.bpmTaskApprovalType">
+                                   <el-tag size="mini" type="success"
+                                           v-if="row.extVariable.bpmTaskApprovalType==='PASS'">同意</el-tag>
+                                   <el-tag size="mini" type="danger"
+                                           v-if="row.extVariable.bpmTaskApprovalType==='REJECT'">拒绝</el-tag>
+                               </span>
+                    </template>
+                </el-table-column>
+                <!--                       <el-table-column label="签字" prop="extVariable.bpmTaskApprovalType">-->
+                <!--                           <template slot-scope="{row}">-->
+                <!--                               <el-image :src="row.extVariable.approvalSignature" v-if="row.extVariable && row.extVariable.approvalSignature"></el-image>-->
+                <!--                       </template>-->
+                </el-table-column>
+            </el-table>
+
+            <div>
+                <div v-for="nodeTask in viewData.nodeTasks" :key="nodeTask.id">
+                    <div class="process-title" v-if="nodeTask.nodeCode !== 20">
+                        {{nodeTask.nodeName}}
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 30">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id"
+                                         style="margin-bottom: 10px">
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审核结果">
+                                <div v-if="task.extVariable">
+                                    <el-tag type="success" size="mini"
+                                            v-if="task.extVariable.bpmTaskApprovalType === 'PASS'">同意
+                                    </el-tag>
+                                    <el-tag type="danger" size="mini"
+                                            v-if="task.extVariable.bpmTaskApprovalType === 'BACK'">退回重新填写
+                                    </el-tag>
+                                    <el-tag type="danger" size="mini"
+                                            v-if="task.extVariable.bpmTaskApprovalType === 'REJECT'">建议撤销
+                                    </el-tag>
+                                </div>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字" :span="3">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 60">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id">
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审核结果">
+                                <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT"
+                                          :value="task.extVariable.caseFilingResult">
+                                </dict-tag>
+                            </el-descriptions-item>
+                            <template
+                                    v-if="task.extVariable.caseFilingResult!=='NOT' && task.extVariable.caseFilingResult!==''">
+                                <el-descriptions-item label="主办单位" :span="3">{{ task.extVariable.hostUnit}}
+                                </el-descriptions-item>
+                                <el-descriptions-item label="协办单位" :span="3">{{
+                                    task.extVariable.helpUnits.join(',')}}
+                                </el-descriptions-item>
+                            </template>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+
+                    <div v-if="nodeTask.nodeCode === 63">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id"
+                                         style="margin-bottom: 10px">
+                            <el-descriptions-item label="承办单位">
+                                {{ task.createVariable.underTakeName}}
+                                ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="能否承办" :span="3">
+                                {{task.extVariable.canTake}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                        </el-descriptions>
+                    </div>
+
+                    <div v-if="nodeTask.nodeCode === 70">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id"
+                                         style="margin-bottom: 10px;">
+                            <el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审核时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审核结果">
+                                <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT"
+                                          :value="task.extVariable.caseFilingResult">
+                                </dict-tag>
+                            </el-descriptions-item>
+                            <template
+                                    v-if="task.extVariable.caseFilingResult!=='NOT' && task.extVariable.caseFilingResult!==''">
+                                <el-descriptions-item label="主办单位" :span="3">{{ task.extVariable.hostUnit}}
+                                </el-descriptions-item>
+                                <el-descriptions-item label="协办单位" :span="3">{{
+                                    task.extVariable.helpUnits.join(',')}}
+                                </el-descriptions-item>
+                            </template>
+                            <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+
+                    <div v-if="nodeTask.nodeCode === 80">
+                        <el-descriptions :column="3" border v-if="!hide_slave" v-for="task in nodeTask.tasks"
+                                         :key="task.id" style="margin-bottom: 10px">
+                            <el-descriptions-item label="承办单位">
+                                <span class="text-primary">
+                                     {{ task.createVariable.underTakeName}}
+                                    ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                                </span>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="答复内容" :span="3">
+                                <div v-html="task.extVariable.approvalOpinion"></div>
+                            </el-descriptions-item>
+                        </el-descriptions>
+                        <el-descriptions :column="3" border v-if="hide_slave"
+                                         v-for="task in nodeTask.tasks.filter(v=>v.createVariable?.isMaster == true)"
+                                         :key="task.id" style="margin-bottom: 10px">
+                            <el-descriptions-item label="承办单位">
+                                <span class="text-primary">
+                                     {{ task.createVariable.underTakeName}}
+                                    ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                                </span>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="答复时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="答复内容" :span="3">
+                                <div v-html="task.extVariable.approvalOpinion"></div>
+                            </el-descriptions-item>
+                        </el-descriptions>
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 90">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id"
+                                         style="margin-bottom: 10px;">
+                            <el-descriptions-item label="承办单位">
+                                {{ task.createVariable.underTakeName}}
+                                ({{ task.createVariable.isMaster ? '主办' : '协办'}})
+                            </el-descriptions-item>
+                            <el-descriptions-item label="校领导">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审批时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="审批结果" :span="3">
+                                <el-tag size="mini" type="success" v-if="task.extVariable.bpmTaskApprovalType==='PASS'">
+                                    同意
+                                </el-tag>
+                                <el-tag size="mini" type="danger"
+                                        v-if="task.extVariable.bpmTaskApprovalType==='BACK_OTHER_NODE'">退回重新答复
+                                </el-tag>
+                            </el-descriptions-item>
+                            <el-descriptions-item label="审批意见" :span="3">
+                                {{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                            <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>-->
+                        </el-descriptions>
+                    </div>
+                    <div v-if="nodeTask.nodeCode === 100">
+                        <el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id">
+                            <el-descriptions-item label="反馈人">{{ task.actualOwnerLoginName + '-' +
+                                task.actualOwnerUserName}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="反馈时间">{{ task.endOn}}</el-descriptions-item>
+                            <el-descriptions-item label="反馈结果">{{ task.extVariable.feedBackScore}}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="反馈意见" :span="3">{{ task.extVariable.approvalOpinion}}
+                            </el-descriptions-item>
+                            <!--                             <el-descriptions-item label="签字">-->
+                            <!--                                <el-image :src="task.extVariable.approvalSignature"-->
+                            <!--                                          v-if="task.extVariable && task.extVariable.approvalSignature"-->
+                            <!--                                          class="signature-image"></el-image>-->
+                            <!--                            </el-descriptions-item>  -->
+                        </el-descriptions>
+                    </div>
+
+                </div>
+            </div>
+
+            <el-dialog title="意见和建议详情" :visible.sync="viewDialogVisible" width="1200px" append-to-body top="5vh">
+                <div style="max-height: 80vh;overflow-y: auto">
+                    <suggestion-info ref="infoDialogRef"></suggestion-info>
+                </div>
+            </el-dialog>
+        </div>
+
+    `,
+    dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+    data() {
+        return {
+            viewData: {},
+            viewDialogVisible: false
+        }
+    },
+    props:{
+      hide_slave:false
+    },
+    methods: {
+        onOpen(id) {
+            this.$axios.post("/platform/suggestion/wc/common/suggestionInfo", {id}).then((res) => {
+                if (res.code === 0) {
+                    this.viewData = res.data
+                }
+            })
+        },
+        openView(id) {
+            this.viewDialogVisible = true
+            this.$nextTick(() => {
+                this.$refs.infoDialogRef.onOpen(id)
+            })
+        }
+    },
+    style:
+    /*language=CSS*/
+        `
+            .proposal-info .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell {
+                text-align: left;
+            }
+        `
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/export/comprehensive/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/export/comprehensive/index.html
new file mode 100644
index 00000000..a06788be
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/export/comprehensive/index.html
@@ -0,0 +1,298 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">意见类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">受理结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.SUGGESTION_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-button type="primary" size="small" @click="exportAllProposalAsZip">导出全部意见压缩包</el-button>
+                <el-button type="primary" size="small" @click="exportFeedBackAsZip">导出全部意见反馈表压缩包</el-button>
+                <el-button type="primary" size="small" @click="exportFeedBackConAsZip">导出全部意见反馈表(合并情况)压缩包</el-button>
+                <el-button type="primary" size="small" @click="exportSummaryAsExcel">导出汇总表</el-button>
+<!--                <el-button type="primary" size="small" @click="exportRegisterSummaryAsExcel">导出受理汇总表</el-button>-->
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" width="200px"></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="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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="masterUnderTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="协办单位" prop="slaveUnderTakeNames" show-overflow-tooltip></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 size="mini" type="primary" @click="exportDocx(row.id)">导出</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                businessNo: "",
+                tabActive: "0",
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportAllProposalAsZip() {
+                this.$downLoad(loc() + "/exportAllProposalAsZip", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+            exportFeedBackAsZip() {
+                this.$downLoad(loc() + "/exportFeedBackAsZip", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+
+            exportFeedBackConAsZip() {
+                this.$downLoad(loc() + "/exportFeedBackConAsZip", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+
+            exportDocx(id) {
+                this.$downLoad("/platform/suggestion/tc/common/exportSuggestionAsDocx", { id })
+            },
+            exportSummaryAsExcel() {
+                this.$downLoad(loc() + "/exportSummaryAsExcel", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+            exportRegisterSummaryAsExcel() {
+                this.$downLoad(loc() + "/exportRegisterSummaryAsExcel", {
+                    pageForm: JSON.stringify(this.pageForm)
+                })
+            },
+
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/chart/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/chart/index.html
new file mode 100644
index 00000000..dc78fcb7
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/chart/index.html
@@ -0,0 +1,262 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <el-card shadow="never">
+        <el-row type="flex" justify="center">
+            <el-select @change="doSearch" clearable filterable placeholder="所属工代会" v-model="pageForm.sessionId" style="width: 100%">
+                <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+            </el-select>
+        </el-row>
+    </el-card>
+    <el-row :gutter="10" class="mt10">
+        <el-col :span="12" v-loading="loading.satisfiedLoading">
+            <el-card class="box-card" shadow="never">
+                <div slot="header">
+                    <span>意见满意度</span>
+                </div>
+                <div class="text item">
+                    <div id="satisfiedChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+        <el-col :span="12" v-loading="loading.typeLoading">
+            <el-card class="box-card" shadow="never">
+                <div slot="header" class="clearfix">
+                    <span>意见类别</span>
+                </div>
+                <div class="text item">
+                    <div id="typeChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+    </el-row>
+    <el-row :gutter="10" class="mt10">
+        <el-col :span="12" v-loading="loading.resultLoading">
+            <el-card shadow="never">
+                <div slot="header" class="clearfix">
+                    <span>受理结果</span>
+                </div>
+                <div class="text item">
+                    <div id="resultChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+        <el-col :span="12" v-loading="loading.stateLoading">
+            <el-card shadow="never">
+                <div slot="header" class="clearfix">
+                    <span>意见状态</span>
+                </div>
+                <div class="text item">
+                    <div id="stateChart"></div>
+                </div>
+            </el-card>
+        </el-col>
+    </el-row>
+</div>
+<script>
+    const chart = {
+        satisfiedChart: undefined,
+        resultChart: undefined,
+        typeChart: undefined,
+        stateChart: undefined
+    }
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        data() {
+            return {
+                pageForm: {
+                    sessionId: null
+                },
+                sessionOptions: [],
+                loading: {
+                    satisfiedLoading: false,
+                    resultLoading: false,
+                    typeLoading: false,
+                    stateLoading: false
+                }
+            }
+        },
+        methods: {
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.doSearch()
+                        }
+                    }
+                })
+            },
+
+            doSearch() {
+                this.typeChart()
+                this.resultChart()
+                this.stateChart()
+                this.feedBackScoreChart()
+            },
+
+            typeChart() {
+                this.$axios.post(loc() + "/typeData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        this.loading.typeLoading = false
+                        if (chart.typeChart) {
+                            chart.typeChart.changeData(res.data)
+                            return
+                        }
+                        chart.typeChart = new G2Plot.Column("typeChart", {
+                            data: res.data,
+                            xField: "typeName",
+                            yField: "count",
+                            meta: {
+                                type: {
+                                    alias: "类别"
+                                },
+                                sales: {
+                                    alias: "数量"
+                                }
+                            },
+                            xAxis: {
+                                label: {
+                                    autoRotate: true,
+                                    autoHide: false,
+                                    autoEllipsis: false
+                                }
+                            }
+                        })
+                        chart.typeChart.render()
+                    }
+                })
+            },
+
+            resultChart() {
+                this.$axios.post(loc() + "/resultData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        if (chart.resultChart) {
+                            chart.resultChart.changeData(res.data)
+                            return
+                        }
+                        chart.resultChart = new G2Plot.Radar("resultChart", {
+                            data: res.data,
+                            xField: "name",
+                            yField: "count",
+                            seriesField: "type",
+                            meta: {
+                                num: {
+                                    alias: "数量",
+                                    min: 0
+                                }
+                            },
+                            xAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            yAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        type: "line",
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            area: {},
+                            point: {
+                                size: 2
+                            }
+                        })
+                        chart.resultChart.render()
+                    }
+                })
+            },
+
+            stateChart() {
+                this.$axios.post(loc() + "/stateData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        if (chart.stateChart) {
+                            chart.stateChart.changeData(res.data)
+                            return
+                        }
+                        chart.stateChart = new G2Plot.Radar("stateChart", {
+                            data: res.data,
+                            xField: "name",
+                            yField: "count",
+                            xAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            yAxis: {
+                                line: null,
+                                tickLine: null,
+                                grid: {
+                                    line: {
+                                        type: "line",
+                                        style: {
+                                            lineDash: null
+                                        }
+                                    }
+                                }
+                            },
+                            point: {
+                                size: 2
+                            }
+                        })
+                        chart.stateChart.render()
+                    }
+                })
+            },
+
+            feedBackScoreChart() {
+                this.$axios.post(loc() + "/feedBackScoreData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        if (chart.feedBackScoreChart) {
+                            chart.feedBackScoreChart.changeData(res.data)
+                            return
+                        }
+                        chart.satisfiedChart = new G2Plot.Pie("satisfiedChart", {
+                            data: res.data,
+                            appendPadding: 10,
+                            angleField: "count",
+                            colorField: "name",
+                            radius: 0.75,
+                            color: ["#9661BC", "#5B8FF9", "#61DDAA"],
+                            label: {
+                                type: "spider",
+                                labelHeight: 28,
+                                content: "{name}\n{percentage}"
+                            },
+                            interactions: [{ type: "element-selected" }, { type: "element-active" }]
+                        })
+
+                        chart.satisfiedChart.render()
+                    }
+                })
+            }
+        },
+        created() {
+            this.listSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/collectProgress/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/collectProgress/index.html
new file mode 100644
index 00000000..1aadb730
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/collectProgress/index.html
@@ -0,0 +1,242 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">意见类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">征集状态</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in collectOptions"
+                        :key="item.code"
+                        :effect="pageForm.collectIds && pageForm.collectIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('collectIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <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="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="附议人数" prop="seconderSum"></el-table-column>
+                <el-table-column label="已附议" prop="completeCount"></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                collectOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    collectIds: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+
+            listCollectState() {
+                this.$axios.post(loc() + "/collectState").then((res) => {
+                    if (res.code === 0) {
+                        this.collectOptions = res.data
+                    }
+                })
+            },
+
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+            this.listCollectState()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/comprehensive/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/comprehensive/index.html
new file mode 100644
index 00000000..da0f1ba4
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/comprehensive/index.html
@@ -0,0 +1,261 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">意见类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">受理结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.SUGGESTION_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" width="100px" show-overflow-tooltip></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否合并" prop="isConsolidation" width="100">
+                    <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="masterUnderTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="协办单位" prop="slaveUnderTakeNames" show-overflow-tooltip></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 size="mini" type="primary" @click="exportDocx(row.id)">导出</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportDocx(id) {
+                this.$downLoad("/platform/suggestion/wc/common/exportSuggestionAsDocx", { id })
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/delegation/index.html
new file mode 100644
index 00000000..562b9986
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/delegation/index.html
@@ -0,0 +1,150 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <template>
+            <el-card shadow="never">
+                <el-row type="flex" justify="center">
+                    <el-select @change="doSearch" clearable filterable placeholder="所属工代会" v-model="sessionId" style="width: 100%">
+                        <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+                    </el-select>
+                </el-row>
+            </el-card>
+
+            <el-card shadow="never" class="mt10">
+                <table-tool label="代表团列表"></table-tool>
+                <el-table :data="tableData" ref="tableRef" header-align="center" style="width: 100%" row-key="id" show-summary>
+                    <el-table-column
+                        :index="indexMethod"
+                        align="center"
+                        header-align="center"
+                        label="序号"
+                        type="index"
+                        width="80px"
+                    ></el-table-column>
+                    <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        header-align="center"
+                        min-width="100px"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
+                        <template scope="{row}" v-if="column.prop=='dbtName'">
+                            <el-link @click="openView(row)" type="primary">{{row.dbtName}}</el-link>
+                        </template>
+                    </el-table-column>
+                    <el-table-column header-align="center" label="受理率" prop="caseRate">
+                        <template scope="{row}">
+                            <span v-if="row.SUBMIT_COUNT && !isNaN(row.CONFIRM_FILING) && !isNaN(row.SUBMIT_COUNT)">
+                                {{ ((row.CONFIRM_FILING / row.SUBMIT_COUNT) * 100).toFixed(2) }}%
+                            </span>
+                            <span v-else>0.00%</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-card>
+        </template>
+    </guava>
+
+    <el-dialog :title="dialogTitle" :visible.sync="delegationVisible" width="70%" :close-on-click-modal="false">
+        <proposal-table
+            :delegation-id="delegationId"
+            :session-id="sessionId"
+            @view-single-proposal="viewSingleProposal"
+            ref="proposalTable"
+        ></proposal-table>
+    </el-dialog>
+
+    <el-dialog title="意见详情" :visible.sync="proposalInfoVisible" width="1200px" append-to-body top="5vh">
+        <div style="max-height: 80vh; overflow-y: auto">
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </div>
+    </el-dialog>
+</div>
+<script>
+    <!--#include("proposalTable.js"){}#-->
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        data() {
+            return {
+                sessionId: "",
+                sessionOptions: [],
+                tableColumns: [
+                    { label: "代表团名称", prop: "dbtName" },
+                    { label: "意见总数", prop: "TOTAL" },
+                    { label: "已提交意见数", prop: "SUBMIT_COUNT" }
+                ],
+                delegationId: "",
+                dialogTitle: "",
+                delegationVisible: false,
+                proposalInfoVisible: false
+            }
+        },
+        components: {
+            "proposal-table": PROPOSAL_TABLE,
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        methods: {
+            openView(row) {
+                this.delegationId = row.id
+                this.dialogTitle = row.dbtName + "所属意见"
+                this.delegationVisible = true
+                this.$nextTick(() => {
+                    this.$refs.proposalTable.pageData()
+                })
+            },
+            viewSingleProposal(row) {
+                this.proposalInfoVisible = true
+                this.$nextTick(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            setTableColumnsByProposalResult() {
+                this.$businessTool.getDictOptions("SUGGESTION_CASE_FILING_RESULT").then((data) => {
+                    data.forEach((item) => {
+                        this.tableColumns.push({
+                            label: item.name,
+                            prop: item.code
+                        })
+                    })
+                })
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        sessionId: this.sessionId
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.setTableColumnsByProposalResult()
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/delegation/proposalTable.js b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/delegation/proposalTable.js
new file mode 100644
index 00000000..28a65338
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/delegation/proposalTable.js
@@ -0,0 +1,51 @@
+const PROPOSAL_TABLE = {
+    template: `
+        <div>
+            <el-table :data="tableData" ref="tableRef" header-align="center" style="width: 100%" row-key="id" @sort-change="pageOrder">
+                <el-table-column label="序号" width="50px" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" width="200px"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name"></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="$emit('view-single-proposal',row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+             <!--#include("/layouts/pagination.html"){}#-->
+        </div>
+    `,
+    props: {
+        sessionId: {
+            type: String,
+            required: true
+        },
+        delegationId: {
+            type: String,
+            required: true
+        }
+    },
+    mixins: [initTableMixins],
+    data() {
+        return {
+            pageForm: {}
+        }
+    },
+    methods: {
+        pageData() {
+            this.pageForm.sessionId = this.sessionId
+            this.pageForm.delegationId = this.delegationId
+            this.$axios.post("/platform/suggestion/wc/query/delegation/getProposalsByDelegation", this.pageForm).then((res) => {
+                if (res.code === 0) {
+                    this.tableData = res.data.list
+                    this.pageForm.totalCount = res.data.totalCount
+                }
+            })
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/history/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/history/index.html
new file mode 100644
index 00000000..eaf994f7
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/history/index.html
@@ -0,0 +1,259 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">意见类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">受理结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.SUGGESTION_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <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="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_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="当前节点" 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 size="mini" type="primary" @click="exportDocx(row.id)">导出</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportDocx(id) {
+                this.$downLoad("/platform/suggestion/wc/common/exportSuggestionAsDocx", { id })
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/underTakeReply/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/underTakeReply/index.html
new file mode 100644
index 00000000..d27ac0f6
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/underTakeReply/index.html
@@ -0,0 +1,96 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <el-card shadow="never">
+        <search @search="doSearch">
+            <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>
+            </search-item>
+            <search-item label="承办单位">
+                <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                    <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>
+                </el-select>
+            </search-item>
+        </search>
+    </el-card>
+
+    <el-card shadow="never">
+        <el-table :data="tableData">
+            <el-table-column label="序号" type="index" width="50"></el-table-column>
+            <el-table-column label="单位名称" prop="name" width="400" sortable show-overflow-tooltip></el-table-column>
+            <el-table-column label="意见总数" prop="sum" sortable></el-table-column>
+            <el-table-column label="主办意见">
+                <el-table-column label="意见数量" prop="hostSum" sortable></el-table-column>
+                <el-table-column label="已答复" prop="hostReplySum" sortable></el-table-column>
+                <el-table-column label="未答复" prop="hostNoReplySum" sortable></el-table-column>
+            </el-table-column>
+            <el-table-column label="协办意见">
+                <el-table-column label="意见数量" prop="helpSum" sortable></el-table-column>
+                <el-table-column label="已答复" prop="hostReplySum" sortable v-if="slaveNeedReply"></el-table-column>
+                <el-table-column label="未答复" prop="hostNoReplySum" sortable v-if="slaveNeedReply"></el-table-column>
+            </el-table-column>
+        </el-table>
+    </el-card>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                underTakeOptions: [],
+                slaveNeedReply: false
+            }
+        },
+        methods: {
+            meetingChange() {
+                this.doSearch()
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+            pageData() {
+                this.$axios.post(loc() + "/data", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        this.tableData = res.data.tableData
+                        this.slaveNeedReply = res.data.slaveNeedReply
+                    }
+                })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/yearReport/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/yearReport/index.html
new file mode 100644
index 00000000..b427b04d
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/query/yearReport/index.html
@@ -0,0 +1,259 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .el-tag {
+        cursor: pointer;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编码">
+                    <el-input
+                        @keyup.enter.native="doSearch"
+                        clearable
+                        placeholder="请输入意见编码"
+                        v-model="pageForm.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="撰写人单位">
+                    <el-select clearable filterable placeholder="撰写人单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">意见类别</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in typeOptions"
+                        :key="item.code"
+                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                        @click="tagToggle('typeIds',item.id)"
+                    >
+                        {{ item.name }}
+                    </el-tag>
+                </div>
+            </div>
+            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
+                <div style="width: 90px">受理结果</div>
+                <div style="flex: auto">
+                    <el-tag
+                        v-for="item in dict.type.SUGGESTION_CASE_FILING_RESULT"
+                        :key="item.code"
+                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                        @click="tagToggle('caseFilingResults',item.code)"
+                    >
+                        {{ item.label }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-button type="primary" size="small" @click="exportYearReport">导出意见报告</el-button>
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" size="small" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" width="200px"></el-table-column>
+                <el-table-column label="意见名称" prop="name"></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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="masterUnderTakeName"></el-table-column>
+                <el-table-column label="协办单位" prop="slaveUnderTakeNames" show-overflow-tooltip></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <proposal-info ref="infoRef"></proposal-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["PROPOSAL_TYPE", "SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    typeIds: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            exportYearReport() {
+                this.$downLoad(loc() + "/exportYearReport", this.pageForm)
+            },
+            tagToggle(key, val) {
+                if (this.pageForm[key].includes(val)) {
+                    this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
+                } else {
+                    this.pageForm[key].push(val)
+                }
+                this.doSearch()
+            },
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            },
+            pageData() {
+                this.$axios
+                    .post(loc() + "/pageData", {
+                        pageForm: JSON.stringify(this.pageForm)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.tableData = res.data.list
+                            this.pageForm.totalCount = res.data.totalCount
+                        }
+                    })
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/senior/basic/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/senior/basic/index.html
new file mode 100644
index 00000000..4d1bbf5e
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/senior/basic/index.html
@@ -0,0 +1,286 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="意见分工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="意见单位">
+                    <el-select clearable filterable placeholder="意见单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" width="200px"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name">-->
+<!--                    <template scope="{row}">-->
+<!--                        <el-link type="primary" @click="onOpen(row)">{{row.name}}</el-link>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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"></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 size="mini" type="primary" @click="onOpenEdit(row)">修改</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+        <template #edit>
+            <el-form :model="formData" ref="form" label-width="120px">
+                <el-row :gutter="20" type="flex">
+                    <el-col :span="12">
+                        <el-form-item label="代表姓名" prop="createUserName">
+                            <el-input readonly v-model="formData.createUserName" disabled></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="意见时间" prop="createTime">
+                            <el-input readonly v-model="formData.createTime" disabled></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+<!--                <el-row :gutter="20" type="flex">-->
+<!--                    <el-col :span="12">-->
+<!--                        <el-form-item label="意见名称" prop="name">-->
+<!--                            <el-input maxlength="100" placeholder="意见名称" v-model="formData.name"></el-input>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
+<!--                    <el-col :span="12">-->
+<!--                        <el-form-item label="意见方式" prop="source">-->
+<!--                            <el-input :value="dict.type.PROPOSAL_SOURCE.find(v=>v.code === formData.source)?.name" disabled></el-input>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
+<!--                </el-row>-->
+                <el-form-item prop="typeId" label="意见类别" :rules="[{required:true,message:'请选择类型',trigger:'blur'}]">
+                    <el-select v-model="formData.typeId">
+                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in typeOptions"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="意见摘要" prop="excerpt">
+                    <el-input
+                        v-model="formData.excerpt"
+                        type="textarea"
+                        autosize
+                        :autosize="{ minRows: 4, maxRows: 4}"
+                        placeholder="意见摘要"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item label="意见内容" prop="brief">
+                    <text-editor v-model="formData.brief" key="brief" placeholder="意见内容"></text-editor>
+                </el-form-item>
+                <!--                <el-form-item label="改进建议和措施" prop="measures">-->
+                <!--                    <text-editor v-model="formData.measures" key="measures" placeholder="改进建议和措施"></text-editor>-->
+                <!--                </el-form-item>-->
+            </el-form>
+            <el-row type="flex" justify="end">
+                <el-button @click="$refs.guava.index()">取 消</el-button>
+                <el-button type="primary" @click="doUpdateBasic">确 定</el-button>
+            </el-row>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("/platform/zhgh/democratic/suggestion/tc/common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT", "PROPOSAL_SOURCE"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    types: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                },
+                typeDialog: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            onOpenEdit(row) {
+                this.$refs.guava.edit()
+                this.$nextTick(() => {
+                    this.formData = { ...row }
+                })
+            },
+            doUpdateBasic() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要修改吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning"
+                        }).then(() => {
+                            this.$axios.post(loc() + "/update", this.formData).then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.$refs.guava.index()
+                                    this.doSearch()
+                                }
+                            })
+                        })
+                    }
+                })
+            },
+
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/senior/delete/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/senior/delete/index.html
new file mode 100644
index 00000000..1794bcb1
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/senior/delete/index.html
@@ -0,0 +1,209 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="意见分工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="意见单位">
+                    <el-select clearable filterable placeholder="意见单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" width="200px"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name"></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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"></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 size="mini" type="danger" @click="del(row.id)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                typeOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                pageForm: {
+                    types: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                }
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            del(id) {
+                this.$confirm("您确定删除该意见建议吗？", "提示", {
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post(loc() + "/delete", { id: id }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/senior/type/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/senior/type/index.html
new file mode 100644
index 00000000..2b11216d
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/senior/type/index.html
@@ -0,0 +1,259 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <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>
+                </search-item>
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        placeholder="请输入意见名称"-->
+<!--                        v-model="pageForm.name"-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" 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.code"
+                        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%"
+                    ></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-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="意见分工会">
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="意见单位">
+                    <el-select clearable filterable placeholder="意见单位" v-model="pageForm.unitId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="承办单位">
+                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
+                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" width="200px"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name">-->
+<!--                    <template scope="{row}">-->
+<!--                        <el-link type="primary" @click="onOpen(row)">{{row.name}}</el-link>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="200px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="onOpen(row)">查看</el-button>
+                        <el-button size="mini" type="primary" @click="onOpenEdit(row)">修改</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+
+    <el-dialog title="修改意见建议类别" :close-on-click-modal="false" width="40%" :visible.sync="typeDialog">
+        <el-form :model="formData" ref="form" label-width="120px">
+            <el-form-item prop="oldTypeName" label="原类型">
+                <el-input disabled :value="formData.oldTypeName" type="text"></el-input>
+            </el-form-item>
+            <el-form-item prop="typeId" label="更改类型" :rules="[{required:true,message:'请选择类型',trigger:'blur'}]">
+                <el-select v-model="formData.typeId" style="width: 100%">
+                    <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in typeOptions"></el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="typeDialog=false">取 消</el-button>
+            <el-button type="primary" @click="doUpdateType">确 定</el-button>
+        </span>
+    </el-dialog>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                typeOptions: [],
+                sessionOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                unionOptions: [],
+                unitOptions: [],
+                businessNo: "",
+                tabActive: "0",
+                pageForm: {
+                    types: [],
+                    caseFilingResults: [],
+                    unionId: null,
+                    unitId: null
+                },
+                typeDialog: false
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            onOpenEdit(row) {
+                this.typeDialog = true
+                this.$nextTick(() => {
+                    this.formData = {
+                        id: row.id,
+                        oldTypeName: this.typeOptions.find((item) => item.id === row.typeId)?.name,
+                        typeId: null
+                    }
+                })
+            },
+            doUpdateType() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要修改吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning"
+                        }).then(() => {
+                            this.$axios.post(loc() + "/update", this.formData).then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.typeDialog = false
+                                    this.doSearch()
+                                }
+                            })
+                        })
+                    }
+                })
+            },
+            listProposalType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            async meetingChange(val) {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()
+                            this.pageData()
+                        }
+                    }
+                })
+            },
+            listUnderTake() {
+                this.$axios.post("/platform/suggestion/tc/common/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            },
+
+            listUnion() {
+                this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            },
+            listUnit() {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
+            }
+        },
+        created() {
+            this.listSession()
+            this.listUnderTake()
+            this.listUnion()
+            this.listUnit()
+            this.listProposalType()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFiling/index.html
new file mode 100644
index 00000000..fb5193b8
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFiling/index.html
@@ -0,0 +1,435 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+
+        <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="$refs.tableRef.clearSelection();doSearch()" 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}"
+            >
+                <el-table-column type="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="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></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.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否合并" prop="isConsolidation" width="100">
+                    <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>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
+                            @click="openRevoke(row.processInstanceTaskId)"
+                            size="mini"
+                            type="danger"
+                        >
+                            撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-info>
+            <div v-if="showApprovalForm">
+                <div class="process-title">{{formData.processInstanceNodeName}}</div>
+                <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.SUGGESTION_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" clearable filterable 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" clearable filterable 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="danger" @click="doApproval('BACK')">退回重新填写</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">提交</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.SUGGESTION_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>
+
+            <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.SUGGESTION_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>
+        </template>
+
+        <el-dialog title="意见详情" :visible.sync="viewDialogVisible" width="1200px" top="50px" append-to-body>
+            <div style="max-height: 75vh; overflow-y: auto">
+                <proposal-info ref="infoDialogRef"></proposal-info>
+            </div>
+        </el-dialog>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    const vue = new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                formData: {
+                    hostUnitIds: null,
+                    helpUnitId: []
+                },
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false,
+
+                //合并的意见列表
+                consolidationProposalTableData: [],
+                consolidationFormData: {},
+
+                viewDialogVisible: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.$set(this.formData, "caseFilingResult", null)
+                    this.$set(this.formData, "hostUnitId", null)
+                    this.$set(this.formData, "helpUnitIds", [])
+                    this.$set(this.formData, "helpUnitIds", [])
+                    this.$set(this.formData, "approvalOpinion", null)
+                    this.$set(this.formData, "proposalIds", [])
+                    this.showApprovalForm = true
+                })
+            },
+            doApproval(approvalType) {
+                if (approvalType === "PASS") {
+                    this.formData.bpmTaskApprovalType = "DYNAMIC"
+                    this.formData.proposalIds = [this.formData.processInstanceBusinessId]
+                    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()
+                                    }
+                                })
+                        }
+                    })
+                } else if (approvalType === "BACK") {
+                    if (!this.formData.approvalOpinion) {
+                        this.$message.warning("请填写退回的审核意见")
+                        return
+                    }
+
+                    this.formData.bpmTaskApprovalType = "DYNAMIC"
+                    this.$confirm("您确定要退回到撰写人吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "info"
+                    }).then(() => {
+                        this.$axios.post(loc() + "/approvalBack", this.formData).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.guava.index()
+                                this.$message.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    })
+                }
+            },
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            //打开合并审核
+            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/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            listUnderTake() {
+                this.$axios.post(loc() + "/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            }
+        },
+        created() {
+            // this.pageData()
+            this.listUnderTake()
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFilingUnit/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFilingUnit/index.html
new file mode 100644
index 00000000..c625607d
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFilingUnit/index.html
@@ -0,0 +1,434 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+
+        <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-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}"
+            >
+                <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="brief" 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.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-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>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
+                            @click="openRevoke(row.processInstanceTaskId)"
+                            size="mini"
+                            type="danger"
+                        >
+                            撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-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.SUGGESTION_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.SUGGESTION_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>
+
+            <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.SUGGESTION_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>
+        </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"){}#-->
+    const vue = new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                underTakeOptions: [],
+                formData: {
+                    hostUnitIds: null,
+                    helpUnitId: []
+                },
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false,
+                //合并的意见列表
+                consolidationProposalTableData: [],
+                consolidationFormData: {},
+
+                viewDialogVisible: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            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])
+                            }
+                        })
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            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/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            listUnderTake() {
+                this.$axios.post(loc() + "/listUnderTake").then((res) => {
+                    if (res.code === 0) {
+                        this.underTakeOptions = res.data
+                    }
+                })
+            }
+        },
+        created() {
+            this.listOpenSession()
+            this.listUnderTake()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/delegation/index.html
new file mode 100644
index 00000000..e198edaf
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/delegation/index.html
@@ -0,0 +1,220 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.approval" @change="doSearch" 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"
+                @sort-change="pageOrder"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></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>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
+                            @click="openRevoke(row.processInstanceTaskId)"
+                            size="mini"
+                            type="danger"
+                        >
+                            撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-info>
+            <div v-if="showApprovalForm">
+                <div class="process-title">{{formData.processInstanceNodeName}}</div>
+                <el-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
+                    <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="danger" @click="doApproval('BACK')">退回重新填写</el-button>
+                    <el-button type="danger" @click="doApproval('REJECT')">建议撤销</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">同意</el-button>
+                </el-row>
+            </div>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                formValidSuccess: false,
+                businessNo: null,
+                sessionOptions: [],
+                delegationOptions: [],
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.showApprovalForm = true
+                })
+            },
+            doApproval(approvalType) {
+                this.formData.bpmTaskApprovalType = approvalType
+                this.$refs.approvalFormRef.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要提交吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "info"
+                        }).then(() => {
+                            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()
+                                    }
+                                })
+                        })
+                    }
+                })
+            },
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            //工代会change
+            async meetingChange(val) {
+                this.formData.delegationId = null
+                this.listDelegation()
+            },
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            }
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/mine/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/mine/index.html
new file mode 100644
index 00000000..d26580fb
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/mine/index.html
@@ -0,0 +1,175 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见内容">
+                    <el-input v-model="pageForm.brief" placeholder="意见内容" @keyup.enter.native="doSearch" clearable 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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作" fixed="right" width="400px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                        <el-button v-if="[10,40,61].includes(row.processInstanceNodeCode)" size="mini" type="primary" @click="openEdit(row)">
+                            编辑
+                        </el-button>
+                        <el-button
+                            size="mini"
+                            type="primary"
+                            @click="onOpenInviteSeconder(row)"
+                            v-if="[10,20,40,61].includes(row.processInstanceNodeCode)"
+                        >
+                            邀请附议人
+                        </el-button>
+                        <el-button
+                            v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
+                            size="mini"
+                            type="danger"
+                            @click="openRevoke(row)"
+                        >
+                            撤销
+                        </el-button>
+                        <el-button v-if="[10,40,50,61].includes(row.processInstanceNodeCode)" size="mini" type="danger" @click="del(row.id)">
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <invite-seconder ref="inviteSeconderRef" @refresh="doSearch"></invite-seconder>
+        </template>
+        <template #view>
+            <suggestion-info ref="infoRef"></suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    <!--#include("inviteSeconder.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT,
+            "invite-seconder": SUGGESTION_INVITE_SECONDER_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                businessNo: null
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                })
+            },
+            openEdit(row) {
+                this.$store.dispatch("pjaxRoute", "/platform/suggestion/wc/write?id=" + row.id)
+            },
+            openRevoke(row) {
+                this.$confirm("您确定要撤销申请吗?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/proposal/mine/revokeApply", { id: row.id }).then((resp) => {
+                        this.$message.success(resp.msg)
+                        this.doSearch()
+                    })
+                })
+            },
+            onOpenInviteSeconder(row) {
+                this.$axios.post(loc() + "/inviteCheck", { id: row.id }).then((res) => {
+                    if (res.code === 0) {
+                        this.$refs.guava.public(() => {
+                            this.$refs.inviteSeconderRef.onOpen(row)
+                        })
+                    }
+                })
+            },
+
+            //工代会change
+            async meetingChange(val) {
+                this.formData.delegationId = null
+                this.formData.committeeId = null
+                this.delegationOptions = await proposal.getDelegation(val)
+                this.committeeOptions = await this.getInstitutions(val)
+            },
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                    }
+                })
+            },
+            withdraw({ processInstId }) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/withdraw", { processInstId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            del(id) {
+                this.$confirm("您确定要删除吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/delete", { id }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            }
+        },
+        created() {
+            this.listSession()
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/mine/inviteSeconder.js b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/mine/inviteSeconder.js
new file mode 100644
index 00000000..a09f65fb
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/mine/inviteSeconder.js
@@ -0,0 +1,150 @@
+const SUGGESTION_INVITE_SECONDER_COMPONENT = {
+    /*language=HTML*/
+    template: `
+        <div>
+            <el-row type="flex" style="column-gap: 10px;">
+                <el-col :span="6">
+                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询"
+                              clearable></el-input>
+                </el-col>
+                <el-col :span="6">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id"
+                                   v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </el-col>
+                <el-col :span="4">
+                    <el-button icon="el-icon-search" type="primary" @click="doSearch">查询</el-button>
+                </el-col>
+            </el-row>
+            <el-divider class="mt10 mb10"></el-divider>
+            <table-tool>
+                <el-button size="small" @click="invite" type="primary" icon="el-icon-plus"
+                           :disabled="pageForm.isInvite">邀请
+                </el-button>
+                <el-radio-group v-model="pageForm.isInvite" @change="doSearch" size="small" style="margin-left: 5px;">
+                    <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" size="small" header-align="center"
+                      style="width: 100%" :row-key="getRowKey">
+                <el-table-column type="selection" reserve-selection v-if="!pageForm.isInvite"></el-table-column>
+                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="工号" prop="loginName"></el-table-column>
+                <el-table-column label="姓名" prop="userName"></el-table-column>
+                <el-table-column label="性别" prop="sex"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <!--                        <el-table-column label="操作" width="150px">-->
+                <!--                            <template scope="{row}">-->
+                <!--                                <el-button size="mini" type="primary" @click="invite(row)">邀请</el-button>-->
+                <!--                            </template>-->
+                <!--                        </el-table-column>-->
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </div>
+    `,
+    mixins: [initTableMixins],
+    data() {
+        return {
+            visible: false,
+            secondedNum: 0,
+            record: {},
+            pageForm: {
+                isInvite: false
+            },
+            config: {},
+            delegationOptions: []
+        }
+    },
+    methods: {
+        getRowKey(val) {
+            return val.loginName + this.pageForm.isInvite
+        },
+
+        async onOpen(record) {
+            this.visible = true
+            this.record = record
+            await this.getConfig()
+            this.listDelegation()
+            this.pageData()
+
+            const { seconderNum } = this.config
+            this.$alert(
+                "（1）请至少选择<span style='color: orange;font-weight: bold'>" +
+                    seconderNum +
+                    "</span>位以上（含" +
+                    seconderNum +
+                    "位）代表附议。<br>\n" +
+                    "（2）邀请附议人后将不能再编辑,请确认内容后再邀请附议人。<br>",
+                {
+                    title: "温馨提醒",
+                    type: "warning",
+                    dangerouslyUseHTMLString: true,
+                    confirmButtonText: "确定",
+                    callback: () => {}
+                }
+            )
+        },
+        detail(id) {},
+        invite() {
+            const selection = this.$refs.tableRef.selection
+            if (selection.length === 0) {
+                this.$message.warning("请先选择附议人后在点击邀请")
+                return
+            }
+            const loginNames = selection.map((s) => s.loginName)
+            const userName = selection.map((s) => s.userName)
+            this.$confirm("您确定要邀请" + userName.join("、") + "代表附议吗？", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "info"
+            }).then(() => {
+                this.$axios
+                    .post(loc() + "/inviteSeconder", {
+                        proposalId: this.record.id,
+                        seconders: JSON.stringify(loginNames)
+                    })
+                    .then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.$refs.tableRef.clearSelection()
+                            this.pageData()
+                            this.visible = false
+                            this.$emit("refresh", null)
+                        }
+                    })
+            })
+        },
+        pageData() {
+            this.$axios
+                .post(loc() + "/listSeconder", {
+                    ...this.pageForm,
+                    sessionId: this.record.sessionId,
+                    proposalId: this.record.id
+                })
+                .then((res) => {
+                    if (res.code === 0) {
+                        this.tableData = res.data.list
+                        this.pageForm.totalCount = res.data.totalCount
+                    }
+                })
+        },
+
+        //查询代表团
+        listDelegation() {
+            this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.record.sessionId }).then((res) => {
+                if (res.code === 0) {
+                    this.delegationOptions = res.data
+                }
+            })
+        },
+
+        async getConfig() {
+            const { code, data } = await this.$axios.post("/platform/suggestion/tc/common/config")
+            if (code === 0) {
+                this.config = data
+            }
+        }
+    }
+}
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/schoolLeaderApproval/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/schoolLeaderApproval/index.html
new file mode 100644
index 00000000..e3c6a31e
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/schoolLeaderApproval/index.html
@@ -0,0 +1,251 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input-->
+<!--                        v-model="pageForm.searchKeyword"-->
+<!--                        placeholder="意见名称"-->
+<!--                        @keyup.enter.native="doSearch"-->
+<!--                        clearable-->
+<!--                        style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.approval" @change="doSearch" 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"
+                @sort-change="pageOrder"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <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="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否合并" prop="isConsolidation" width="100">
+                    <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="isMasterUnderTake">
+                    <template scope="{row}">
+                        <el-tag v-if="row.isMasterUnderTake" size="mini" type="success">是</el-tag>
+                        <el-tag v-else size="mini" type="info">否</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="承办单位" prop="underTakeName" show-overflow-tooltip></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="onOpen(row)">查看</el-button>
+                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(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>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <suggestion-info ref="infoRef" :hide_slave="true"></suggestion-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="承办单位">
+                        <el-input :value="formData.underTakeName" disabled></el-input>
+                    </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="danger" @click="doApproval('BACK_OTHER_NODE')">退回重新答复</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">同意</el-button>
+                </el-row>
+            </div>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    const vue = new Vue({
+        el: "#app",
+        store,
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                showApprovalForm: false,
+                pageForm: {
+                    approval: false
+                }
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.$set(this.formData, "implementState", null)
+                    this.$set(this.formData, "approvalOpinion", null)
+                    this.formData.isConsolidation = row.isConsolidation
+                    this.formData.underTakeName = row.underTakeName
+                    this.formData.underTakeId = row.underTakeId
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            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/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            del() {},
+            openView(id) {}
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/seconded/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/seconded/index.html
new file mode 100644
index 00000000..0eee69e1
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/seconded/index.html
@@ -0,0 +1,192 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+                <search-item label="代表团">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.approval" @change="doSearch" 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"
+                @sort-change="pageOrder"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code"></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="意见类别" prop="typeName"></el-table-column>
+                <el-table-column label="附议人" prop="seconderName"></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>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-info>
+            <div v-if="showApprovalForm">
+                <div class="process-title">{{formData.processInstanceNodeName}}</div>
+                <el-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
+                    <!--                    <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:false,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']}]" v-if="formData.processInstanceTaskId !== 'd3a53d97c2ce441083c973fdb798352b' && formData.processInstanceTaskId !== '70989be6710c4a599db297d85dd82928'">-->
+                    <!--                        <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="danger" @click="doApproval('REJECT')">拒绝</el-button>
+                    <el-button type="primary" @click="doApproval('PASS')">同意</el-button>
+                </el-row>
+            </div>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    const vue = new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.showApprovalForm = true
+                })
+            },
+            doApproval(approvalType) {
+                this.formData.bpmTaskApprovalType = approvalType
+                this.$refs.approvalFormRef.validate((valid) => {
+                    if (valid || this.formData.processInstanceBusinessId === "d230b43dc00c433e9b69651e11282676") {
+                        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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            //工代会change
+            async meetingChange() {
+                this.pageForm.delegationId = null
+                this.listDelegation()
+            },
+            //查询工代会
+            listSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.pageForm.sessionId = this.sessionOptions[0].id
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+            //查询代表团
+            listDelegation() {
+                this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            }
+        },
+        created() {
+            this.listSession()
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitRead/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitRead/index.html
new file mode 100644
index 00000000..ce25bb55
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitRead/index.html
@@ -0,0 +1,260 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <!--                <el-radio-group v-model="pageForm.approval" @change="doSearch" size="small" v-if="!pageForm.transfer" class="ml5">-->
+                <!--                    <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"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="意见编号" prop="code" sortable></el-table-column>
+<!--                <el-table-column label="意见名称" prop="name" show-overflow-tooltip></el-table-column>-->
+                <el-table-column label="意见内容" prop="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否合并" prop="isConsolidation" width="100">
+                    <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="isMasterUnderTake" width="100">
+                    <template scope="{row}">
+                        <el-tag v-if="row.isMasterUnderTake" size="mini" type="success">是</el-tag>
+                        <el-tag v-else size="mini" type="info">否</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="承办单位" prop="underTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作" fixed="right" width="100px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="onOpen(row)">查看</el-button>
+                        <!--                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(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>-->
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-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="承办单位">
+                        <el-input :value="formData.underTakeName" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item label="能否承办" prop="canTake" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <el-radio-group v-model="formData.canTake" size="small">
+                            <el-radio label="可以承办" border>可以承办</el-radio>
+                            <el-radio label="无法承办" border>无法承办</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="初步阅览意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <el-input
+                            v-model="formData.approvalOpinion"
+                            autosize
+                            :autosize="{ minRows: 4}"
+                            type="textarea"
+                            placeholder="请输入初步阅览意见"
+                        ></el-input>
+                    </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>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                pageForm: {
+                    approval: false,
+                    transfer: false
+                },
+                showApprovalForm: false,
+                transferFormData: {},
+                transferDialogVisible: false,
+                transferUserOptions: []
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+
+            openApproval(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.formData = row.approvalParam
+                    this.$set(this.formData, "implementState", null)
+                    this.$set(this.formData, "approvalOpinion", null)
+                    this.formData.isConsolidation = row.isConsolidation
+                    this.formData.underTakeName = row.underTakeName
+                    this.formData.underTakeId = row.underTakeId
+                    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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            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/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            del() {},
+            openView(id) {}
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitReply/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitReply/index.html
new file mode 100644
index 00000000..7a5e0e2c
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitReply/index.html
@@ -0,0 +1,418 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+<!--                <search-item label="意见名称">-->
+<!--                    <el-input v-model="pageForm.name" placeholder="意见名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>-->
+<!--                </search-item>-->
+                <search-item label="意见编号">
+                    <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.brief" 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%"
+                    ></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-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>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.transfer" @change="doSearch" size="small" v-if="$auth.hasRole('PROPOSAL_UNIT_LEADER')">
+                    <el-radio-button :label="true">已转办</el-radio-button>
+                    <el-radio-button :label="false">未转办</el-radio-button>
+                </el-radio-group>
+
+                <el-radio-group v-model="pageForm.approval" @change="doSearch" size="small" v-if="!pageForm.transfer" class="ml5">
+                    <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"
+                header-align="center"
+                style="width: 100%"
+                :row-key="(val)=>{val.id + val.processInstanceTaskId}"
+            >
+                <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="brief" show-overflow-tooltip></el-table-column>
+                <el-table-column label="撰写人" prop="createUserName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="受理结果" prop="caseFilingResult">
+                    <template scope="{row}">
+                        <dict-tag :options="dict.type.SUGGESTION_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="承办单位" prop="underTakeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="是否主办" prop="isMasterUnderTake" width="100px">
+                    <template scope="{row}">
+                        <el-tag v-if="row.isMasterUnderTake" size="mini" type="success">是</el-tag>
+                        <el-tag v-else size="mini" type="info">否</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="转办答复人" prop="underTakeTransferUserName" v-if="$auth.hasRole('PROPOSAL_UNIT_LEADER')">
+                    <template scope="{row}">
+                        <span v-if="row.underTakeReplyIsTransfer">{{row.underTakeTransferUserName?.join('，') || '-'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作" fixed="right" width="300px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="onOpen(row)">查看</el-button>
+                        <el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(row)" size="mini" type="primary">
+                            答复
+                        </el-button>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='ACTIVE' && $auth.hasRole('PROPOSAL_UNIT_LEADER')"
+                            @click="openTransfer(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>
+                        <el-button
+                            v-if="row.processInstanceTaskStatus==='TRANSFER' && !row.nextTransferTaskIsComplete"
+                            @click="openRevokeTransfer(row.processInstanceTaskId)"
+                            size="mini"
+                            type="danger"
+                        >
+                            撤回转办
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #public>
+            <suggestion-info ref="infoRef"></suggestion-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="承办单位">
+                        <el-input :value="formData.underTakeName" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item label="落实情况" prop="implementState" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <dict-select v-model="formData.implementState" code="PROPOSAL_REPLY_IMPLEMENT"></dict-select>
+                    </el-form-item>
+                    <el-form-item label="答复内容" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                        <text-editor v-model="formData.approvalOpinion"></text-editor>
+                    </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>
+
+        <el-dialog title="转办答复" :visible.sync="transferDialogVisible" width="50%">
+            <el-form :model="transferFormData" ref="transferFormRef" label-position="left" label-width="80px">
+<!--                <el-form-item label="意见名称">-->
+<!--                    <el-input :value="transferFormData.name" disabled></el-input>-->
+<!--                </el-form-item>-->
+                <el-form-item label="转办人" prop="transferUserLoginName" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                    <el-select
+                        v-model="transferFormData.transferUserLoginName"
+                        remote
+                        :remote-method="queryTransferUser"
+                        filterable
+                        placeholder="可按姓名或工号搜索需要转办的用户"
+                        style="width: 100%"
+                    >
+                        <el-option :key="item.id" :label="item.label" :value="item.loginname" v-for="item in transferUserOptions"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button plain @click="transferDialogVisible=false">取消</el-button>
+                <el-button type="primary" @click="doTransfer">提交</el-button>
+            </div>
+        </el-dialog>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    new Vue({
+        el: "#app",
+        dicts: ["SUGGESTION_CASE_FILING_RESULT"],
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO_COMPONENT
+        },
+        data() {
+            return {
+                sessionOptions: [],
+                delegationOptions: [],
+                pageForm: {
+                    approval: false,
+                    transfer: false
+                },
+                showApprovalForm: false,
+                transferFormData: {},
+                transferDialogVisible: false,
+                transferUserOptions: []
+            }
+        },
+        methods: {
+            onOpen(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row.id)
+                    this.showApprovalForm = false
+                })
+            },
+
+            //检查能否答复
+            checkCanReply(taskId) {
+                return this.$axios.post(loc() + "/checkCanReply", { taskId })
+            },
+
+            openApproval(row) {
+                this.checkCanReply(row.processInstanceTaskId).then((res) => {
+                    if (res.code === 0) {
+                        if (res.data && res.data.errMsg) {
+                            this.$alert(res.data.errMsg, "提示", {
+                                type: "warning",
+                                dangerouslyUseHTMLString: true,
+                                confirmButtonText: "已线下沟通，开始答复",
+                                cancelButtonText: "关闭",
+                                showCancelButton: true
+                            })
+                                .then(()=>{
+                                    this.$refs.guava.public(() => {
+                                        this.$refs.infoRef.onOpen(row.id)
+                                        this.formData = row.approvalParam
+                                        this.$set(this.formData, "implementState", null)
+                                        this.formData.isConsolidation = row.isConsolidation
+                                        this.formData.underTakeName = row.underTakeName
+                                        this.formData.underTakeId = row.underTakeId
+                                        this.showApprovalForm = true
+                                    })
+                                })
+                                .catch()
+                        } else {
+                            this.$refs.guava.public(() => {
+                                this.$refs.infoRef.onOpen(row.id)
+                                this.formData = row.approvalParam
+                                this.$set(this.formData, "implementState", null)
+                                if(row.isMasterUnderTake){
+                                    this.$set(this.formData, "approvalOpinion", res.data.allSlaveApprovalOpinion)
+                                }else{
+                                    this.$set(this.formData, "approvalOpinion", null)
+                                }
+                                if(res.data?.task?.endOn){
+                                    this.$set(this.formData, "approvalOpinion", res.data?.task?.extVariable?.approvalOpinion)
+                                    this.$set(this.formData, "implementState", res.data?.task?.extVariable?.implementState)
+                                }
+                                this.formData.isConsolidation = row.isConsolidation
+                                this.formData.underTakeName = row.underTakeName
+                                this.formData.underTakeId = row.underTakeId
+                                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()
+                                }
+                            })
+                    }
+                })
+            },
+
+            openRevoke(taskId) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            openRevokeTransfer(taskId) {
+                this.$confirm("您确定要撤回转办吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/revokeTransfer", { taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            //打开转办答复
+            openTransfer(row) {
+                // this.checkCanReply(row.processInstanceTaskId).then((res) => {
+                //     if (res.code === 0) {
+                //         if (res.data && res.data.errMsg) {
+                //             this.$alert(res.data.errMsg, "提示", {
+                //                 type: "warning"
+                //             })
+                //                 .then()
+                //                 .catch()
+                //         } else {
+                //             this.transferFormData = {
+                //                 name: row.name,
+                //                 proposalId: row.id,
+                //                 underTakeId: row.underTakeId,
+                //                 processInstanceId: row.processInstanceId,
+                //                 processInstanceTaskId: row.processInstanceTaskId,
+                //                 transferUserLoginName: null
+                //             }
+                //             this.transferDialogVisible = true
+                //         }
+                //     }
+                // })
+                this.transferFormData = {
+                    name: row.name,
+                    proposalId: row.id,
+                    underTakeId: row.underTakeId,
+                    processInstanceId: row.processInstanceId,
+                    processInstanceTaskId: row.processInstanceTaskId,
+                    transferUserLoginName: null
+                }
+                this.transferDialogVisible = true
+            },
+
+            //搜索转办人
+            queryTransferUser(keyword) {
+                if (keyword) {
+                    this.$axios.post(loc() + "/queryTransferUser", { keyword }).then((res) => {
+                        if (res.code === 0) {
+                            this.transferUserOptions = res.data
+                        }
+                    })
+                }
+            },
+
+            doTransfer() {
+                this.$refs.transferFormRef.validate((valid) => {
+                    if (valid) {
+                        this.$axios
+                            .post(loc() + "/transfer", {
+                                transfer: JSON.stringify(this.transferFormData)
+                            })
+                            .then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.transferDialogVisible = false
+                                    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/suggestion/wc/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+            listOpenSession() {
+                this.$axios.post("/platform/suggestion/wc/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
+            },
+
+            del() {},
+            openView(id) {}
+        },
+        created() {
+            this.listOpenSession()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/write/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/write/index.html
new file mode 100644
index 00000000..39b663f5
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/write/index.html
@@ -0,0 +1,299 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style></style>
+
+<div id="app" v-cloak>
+    <template>
+        <el-card shadow="never">
+            <template #header>
+                <el-row type="flex" justify="space-between" align="center">
+                    <h3 style="color: var(--color-primary)">撰写意见建议</h3>
+                    <el-button @click="noticeDialogVisible = true" type="text">意见建议撰写须知</el-button>
+                </el-row>
+            </template>
+            <template>
+                <el-form :model="formData" :rules="formRules" label-width="120px" ref="addForm">
+                    <el-row :gutter="20" type="flex">
+                        <el-col :span="12">
+                            <el-form-item label="代表姓名" prop="createUserName">
+                                <el-input readonly v-model="formData.createUserName" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="意见建议时间" prop="createTime">
+                                <el-input readonly v-model="formData.createTime" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-row :gutter="20" type="flex">
+                        <el-col :span="12">
+                            <el-form-item label="所属工代会" prop="sessionId">
+                                <el-select
+                                    @change="meetingChange"
+                                    clearable
+                                    filterable
+                                    placeholder="所属工代会"
+                                    v-model="formData.sessionId"
+                                    style="width: 100%"
+                                >
+                                    <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="所属代表团" prop="delegationId">
+                                <el-select clearable filterable placeholder="所属代表团" v-model="formData.delegationId" style="width: 100%" disabled>
+                                    <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-row :gutter="20">
+                        <el-col :span="12">
+                            <el-form-item label="单位" prop="unitName">
+                                <el-input v-model="formData.unitName" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="联系电话" prop="mobile">
+                                <el-input v-model="formData.mobile" clearable placeholder="联系电话"></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+<!--                    <el-row :gutter="20" type="flex">-->
+<!--                        <el-col :span="24">-->
+<!--                            <el-form-item label="意见建议名称" prop="name">-->
+<!--                                <el-input maxlength="100" placeholder="意见建议名称" v-model="formData.name"></el-input>-->
+<!--                            </el-form-item>-->
+<!--                        </el-col>-->
+<!--                    </el-row>-->
+
+                    <el-row :gutter="20" type="flex">
+                        <el-col :span="12">
+                            <el-form-item label="意见建议类别" prop="typeId">
+                                <el-select v-model="formData.typeId" style="width: 100%">
+                                    <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in typeOptions"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+<!--                    <el-form-item label="意见建议摘要" prop="excerpt">-->
+<!--                        <span slot="label">-->
+<!--                            意见建议摘要-->
+<!--                            <el-tooltip content="请简述意见建议内容摘要" placement="right">-->
+<!--                                <i class="el-icon-question"></i>-->
+<!--                            </el-tooltip>-->
+<!--                        </span>-->
+<!--                        <el-input-->
+<!--                            v-model="formData.excerpt"-->
+<!--                            type="textarea"-->
+<!--                            autosize-->
+<!--                            :autosize="{ minRows: 4, maxRows: 4}"-->
+<!--                            placeholder="意见建议摘要"-->
+<!--                        ></el-input>-->
+<!--                    </el-form-item>-->
+                    <el-form-item label="意见内容" prop="brief">
+                        <text-editor v-model="formData.brief" key="brief" placeholder="意见内容"></text-editor>
+                    </el-form-item>
+                    <!--                    <el-form-item label="改进建议和措施" prop="measures">-->
+                    <!--                        <text-editor v-model="formData.measures" key="measures" placeholder="改进建议和措施"></text-editor>-->
+                    <!--                    </el-form-item>-->
+                    <el-form-item label="附件上传" prop="files">
+                        <file-upload
+                            :value.sync="formData.files"
+                            :upload_number="5"
+                            upload_result_category="array"
+                            upload_mode="drag"
+                            complete_result
+                        ></file-upload>
+                    </el-form-item>
+                </el-form>
+                <el-row justify="end" type="flex">
+                    <el-button @click="doSave" type="primary">保存到我的意见建议</el-button>
+                </el-row>
+            </template>
+        </el-card>
+    </template>
+
+<!--    <el-dialog title="意见建议撰写须知" :visible.sync="noticeDialogVisible" :show-close="false" width="50%">-->
+<!--        <div v-html="suggestionConfig.writeRemind" style="max-height: 50vh; overflow-y: auto"></div>-->
+<!--        <div slot="footer">-->
+<!--            <el-button type="primary" @click="noticeDialogVisible = false">我已知晓</el-button>-->
+<!--        </div>-->
+<!--    </el-dialog>-->
+</div>
+
+<script>
+    const vue = new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        data() {
+            return {
+                formData: {},
+                sessionOptions: [],
+                delegationOptions: [],
+                committeeOptions: [],
+                typeOptions: [],
+                formRules: {
+                    mode: [{ required: true, message: "请选择", trigger: ["blur", "change"] }],
+                    createUserName: [{ required: true, message: "请填写意见建议人", trigger: ["blur", "change"] }],
+                    createTime: [{ required: true, message: "请填写意见建议时间", trigger: ["blur", "change"] }],
+                    name: [{ required: true, message: "请填写意见建议名称", trigger: ["blur", "change"] }],
+                    source: [{ required: true, message: "请选择意见建议方式", trigger: ["blur", "change"] }],
+                    delegationId: [{ required: true, message: "请选择所属代表团", trigger: ["blur", "change"] }],
+                    sessionId: [{ required: true, message: "请选择所属工代会", trigger: ["blur", "change"] }],
+                    typeId: [{ required: true, message: "请选择意见建议类别", trigger: ["blur", "change"] }],
+                    implementUnitId: [{ required: false, message: "请选择建以落实部门", trigger: ["blur", "change"] }],
+                    sign: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }],
+                    excerpt: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    brief: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    measures: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    unitName: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    mobile: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
+                    signature: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }]
+                },
+                suggestionConfig: {},
+                noticeDialogVisible: false
+            }
+        },
+        methods: {
+            async doSave() {
+                const valid = await this.$refs["addForm"].validate()
+                if (valid) {
+                    // if (!this.formData.name || this.formData.name.trim().length < 1) {
+                    //     this.$message.warning("请填写意见建议名称")
+                    //     return
+                    // }
+                    if (this.formData.brief.length < this.suggestionConfig.briefMinLength) {
+                        this.$message.warning("意见内容最少为" + this.suggestionConfig.briefMinLength + "字")
+                        return
+                    }
+
+                    this.$axios.post(loc() + "/save", { info: JSON.stringify(this.formData) }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.formData = res.data
+                            this.$store.dispatch("pjaxRoute", "/platform/suggestion/wc/mine")
+                        }
+                    })
+                }
+            },
+            async doSubmit() {
+                const valid = await this.$refs["addForm"].validate()
+                if (valid) {
+                    const confirm = await this.$confirm("确定要提交此意见建议吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "info"
+                    })
+                    if ("confirm" === confirm) {
+                        let data = clone(this.formData)
+                        if (data.files) {
+                            data.files = JSON.stringify(data.files)
+                        }
+                        const resp = await this.$axios.post(loc() + "/doSubmit", {
+                            data: JSON.stringify(data)
+                        })
+                        if (resp.code === 0) {
+                            this.$message.success(resp.msg)
+                            // location.href = "/platform/proposal/transact/compose"
+                        } else {
+                            this.notifyWarning(resp.msg)
+                        }
+                    }
+                }
+            },
+
+            listSuggestionType() {
+                this.$axios.post("/platform/suggestion/tc/common/listProposalType").then((res) => {
+                    if (res.code === 0) {
+                        this.typeOptions = res.data
+                    }
+                })
+            },
+
+            getSuggestionConfig() {
+                return this.$axios.post("/platform/suggestion/tc/common/config").then((res) => {
+                    if (res.code === 0) {
+                        this.suggestionConfig = res.data
+                    }
+                })
+            },
+
+            //工代会change
+            async meetingChange(val) {
+                this.$set(this.formData, "delegationId", null)
+                this.formData.delegationOptions = []
+                this.listDelegation()
+                this.searchSelfDelegation()
+            },
+            listDelegation() {
+                return this.$axios.post("/platform/suggestion/wc/common/listDelegation", { sessionId: this.formData.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+
+            listOpenSession(isModify = false) {
+                this.$axios.post("/platform/suggestion/wc/common/listOpenSession").then(async (res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (!isModify && this.sessionOptions) {
+                            this.$set(this.formData, "sessionId", this.sessionOptions[0].id)
+                            await this.searchSelfDelegation()
+                        }
+                        await this.listDelegation()
+                        await this.listSource()
+                    }
+                })
+            },
+
+            //查询自己有权限的代表团
+            searchSelfDelegation() {
+                return this.$axios.post(loc() + "/selfDelegation", { sessionId: this.formData.sessionId }).then((res) => {
+                    if (res.code === 0) {
+                        this.$set(this.formData, "delegationId", res.data)
+                    }
+                })
+            },
+
+            init() {
+                const id = GetQueryString("id")
+                if (id) {
+                    this.$axios.post(loc() + "/detail", { id }).then((res) => {
+                        if (res.code === 0) {
+                            this.formData = res.data
+                            this.listOpenSession(true)
+                        }
+                    })
+                } else {
+                    this.noticeDialogVisible = true
+                    this.listOpenSession(false)
+                    this.$set(this.formData, "createUserId", this.$store.state.user.id)
+                    this.$set(this.formData, "createUserName", this.$store.state.user.username)
+                    this.$set(this.formData, "createUserLoginName", this.$store.state.user.loginname)
+                    this.$set(this.formData, "createTime", this.$moment().format("YYYY-MM-DD"))
+                    this.$set(this.formData, "mobile", this.$store.state.user.mobile)
+                    this.$set(this.formData, "unitName", this.$store.state.user.unit?.name)
+                }
+            }
+        },
+        created() {
+            this.init()
+            this.listSuggestionType()
+            this.getSuggestionConfig()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestionBox/apply.html b/src/main/resources/views/platform/zhgh/democratic/suggestionBox/apply.html
deleted file mode 100644
index 705b396b..00000000
--- a/src/main/resources/views/platform/zhgh/democratic/suggestionBox/apply.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--#
-layout("/layouts/platform.html"){
-#-->
-
-<div id="app" v-cloak></div>
-
-<script>
-    new Vue({
-        el: "#app",
-        data() {
-            return {}
-        }
-    })
-</script>
-
-<!--#
-}
-#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestionBox/mine/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestionBox/mine/index.html
new file mode 100644
index 00000000..f7553685
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestionBox/mine/index.html
@@ -0,0 +1,115 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
+                                    style="width: 100%"></el-date-picker>
+                </search-item>
+                <search-item label="标题">
+                    <el-input v-model="pageForm.title" placeholder="标题" clearable></el-input>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+                <el-table-column prop="title" label="投稿标题"></el-table-column>
+                <el-table-column prop="loginName" label="投稿人工号"></el-table-column>
+                <el-table-column prop="userName" label="投稿人姓名"></el-table-column>
+                <el-table-column prop="unitName" label="投稿人单位"></el-table-column>
+                <el-table-column prop="unionName" label="投稿人工会"></el-table-column>
+<!--                <el-table-column prop="submitTime" label="投稿时间"></el-table-column>-->
+                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <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.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">
+                            编辑
+                        </el-button>
+                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
+                        </el-button>
+                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #edit>
+            <suggestion-info ref="suggestionInfoRef">
+            </suggestion-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include('../info.js'){}#-->
+
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO
+        },
+        data() {
+            return {}
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.edit(()=>{
+                    this.$refs.suggestionInfoRef.onOpen(row)
+                })
+            },
+            onEdit(row) {
+                window.location.href = '/platform/suggestionBox/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+
+            onDelete(id) {
+                this.$confirm("您确定要删除吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/suggestionBox/mine/delete", {id}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            }
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestionBox/write/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestionBox/write/index.html
new file mode 100644
index 00000000..52b538e8
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestionBox/write/index.html
@@ -0,0 +1,141 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <el-card shadow="never">
+        <snaker-start slot="header" label="意见箱" define_key="JYXC"></snaker-start>
+        <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
+                 class="flow-task-form">
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="姓名">{{formData.userName}}</el-descriptions-item>
+                <el-descriptions-item label="工号">{{formData.loginName}}</el-descriptions-item>
+                <el-descriptions-item label="单位">{{formData.unitName}}</el-descriptions-item>
+                <el-descriptions-item label="工会">{{formData.unionName}}</el-descriptions-item>
+                <el-descriptions-item label="标题" :span="2">
+                    <el-form-item prop="title" label="标题">
+                        <el-input v-model="formData.title" maxlength="100" show-word-limit
+                                  placeholder="请输入标题"></el-input>
+                    </el-form-item>
+                </el-descriptions-item>
+                <el-descriptions-item label="填写意见建议内容" :span="2">
+                    <el-form-item prop="content" label="填写意见建议内容">
+                        <el-input v-model="formData.content" type="textarea" maxlength="500" show-word-limit
+                                  placeholder="请输入内容"></el-input>
+                    </el-form-item>
+                </el-descriptions-item>
+            </el-descriptions>
+        </el-form>
+        <el-row type="flex" justify="end" class="mt20">
+            <el-button type="primary" plain @click="onSave">保存</el-button>
+            <el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
+            <el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+        </el-row>
+    </el-card>
+</div>
+
+<script>
+    new Vue({
+        el: "#app",
+        store,
+        data() {
+            return {
+                bizId: GetQueryString("bizId"),
+                taskId: GetQueryString("taskId"),
+                formData: {},
+                formRules: {
+                    title: [{required: true, message: "必填", trigger: ["change", "blur"]}],
+                    content: [{required: true, message: "必填", trigger: ["change", "blur"]}]
+                }
+            }
+        },
+        methods: {
+            // 保存
+            onSave() {
+                this.$confirm("您确定保存吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post('/platform/suggestionBox/write/save', {data: JSON.stringify(this.formData)}).then(res => {
+                        if (res.code === 0) {
+                            this.$message.success("保存成功")
+                            window.location.href = '/platform/suggestionBox/mine'
+                        }
+                    })
+                })
+            },
+
+            // 提交
+            onSubmit() {
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post('/platform/suggestionBox/write/submit', {
+                        data: JSON.stringify(this.formData),
+                        taskId: GetQueryString("taskId")
+                    }).then(res => {
+                        if (res.code === 0) {
+                            this.$message.success("提交成功")
+                            window.location.href = '/platform/suggestionBox/mine'
+                        }
+                    })
+                })
+            },
+
+            onFinishTask() {
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post('/flow/common/executeTask', {
+                        data: JSON.stringify({
+                            processTaskId: GetQueryString("taskId"),
+                            submitType: 5
+                        })
+                    }).then(res => {
+                        if (res.code === 0) {
+                            this.$message.success("提交成功")
+                            window.location.href = '/platform/suggestionBox/mine'
+                        }
+                    })
+                })
+            },
+
+
+            // 初始化
+            init() {
+                if (this.bizId) {
+                    this.$axios.post("/platform/suggestionBox/write/info", {id: this.bizId}).then((res) => {
+                        if (res.code === 0) {
+                            this.formData = res.data
+                        }
+                    })
+                } else {
+                    const {username, loginname, id, unit, union, mobile} = this.$store.state.user
+                    this.formData = {
+                        userName: username,
+                        loginName: loginname,
+                        submitterId: id,
+                        unitId: unit?.id,
+                        unitName: unit?.name,
+                        unionId: union?.id,
+                        unionName: union?.name,
+                        concat: mobile
+                    }
+                }
+            }
+        },
+        created() {
+            this.init()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
+
diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestionBox/xgh/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestionBox/xgh/index.html
new file mode 100644
index 00000000..c515167c
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/suggestionBox/xgh/index.html
@@ -0,0 +1,159 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
+                                    style="width: 100%"></el-date-picker>
+                </search-item>
+                <search-item label="标题">
+                    <el-input v-model="pageForm.title" placeholder="标题" clearable></el-input>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <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-group>
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+                <el-table-column prop="title" label="投稿标题"></el-table-column>
+                <el-table-column prop="loginName" label="投稿人工号"></el-table-column>
+                <el-table-column prop="userName" label="投稿人姓名"></el-table-column>
+                <el-table-column prop="unitName" label="投稿人单位"></el-table-column>
+                <el-table-column prop="unionName" label="投稿人工会"></el-table-column>
+<!--                <el-table-column prop="submitTime" label="投稿时间"></el-table-column>-->
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="200px">
+                    <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>
+                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #edit>
+            <suggestion-info ref="suggestionInfoRef">
+                <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        {{formData.taskName}}
+                    </div>
+                    <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
+                             class="flow-task-form">
+                        <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(2)" size="small" type="danger">拒绝申请</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
+                    </el-row>
+                </div>
+            </suggestion-info>
+        </template>
+    </guava>
+</div>
+
+
+<script>
+    <!--#include('../info.js'){}#-->
+
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "suggestion-info": SUGGESTION_INFO
+        },
+        data() {
+            return {
+                pageForm: {
+                    approval: false
+                },
+                formData: {},
+                showApprovalForm: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.edit(()=>{
+                    this.showApprovalForm = false
+                    this.$refs.suggestionInfoRef.onOpen(row)
+                })
+            },
+            openAudit(row) {
+                this.$refs.guava.edit(()=>{
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.suggestionInfoRef.onOpen(row)
+                })
+            },
+
+            handleTaskAction(val) {
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/executeTask", {
+                        data: JSON.stringify({
+                            ...this.formData,
+                            submitType: val
+                        })
+                    }).then((res) => {
+                        if (res.code === 0) {
+                            this.$refs.guava.index()
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            }
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->