commit

src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java

@@ -48,6 +48,7 @@ public class FlowTodoCenterController {
                   t.displayName AS taskName,
                   t.taskState,
                   t.formKey,
+                  t.h5FormKey,
                   t.createdAt,
                   t.finishTime,
                   t.variable,
@@ -92,6 +93,7 @@ public class FlowTodoCenterController {
                   t.displayName AS taskName,
                   t.taskState,
                   t.formKey,
+                  t.h5FormKey,
                   t.createdAt,
                   t.finishTime,
                   t.variable,
@@ -115,6 +117,7 @@ public class FlowTodoCenterController {
         if (StrUtil.isNotBlank(searchKeyword)) {
             cnd.where().andLike("ins.variable ->> '$.instanceName'", searchKeyword);
         }
+        cnd.and("t.taskName", "!=", "startTask");
         cnd.desc("t.createdAt");
         sql.setCondition(cnd);
         Pagination pagination = sysUserService.listPageMap(pageNumber, pageSize, sql);
@@ -140,10 +143,12 @@ public class FlowTodoCenterController {
                   ins.createdAt,
                   ins.variable ->> '$.instanceName' AS instanceName,
                   GROUP_CONCAT(DISTINCT t.displayName) as taskName,
-                  cat.`name` categoryName
+                  cat.`name` categoryName,
+                  t.formKey,
+                  t.h5FormKey
                 FROM
                   wf_process_instance ins
-                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskState = 10
+                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskName = 'startTask'
                   LEFT JOIN wf_process_define def ON def.id = ins.processDefineId
                   LEFT JOIN wf_process_category cat ON cat.id = def.category
                 $condition
@@ -179,7 +184,7 @@ public class FlowTodoCenterController {
                   ins.variable,
                   ins.createdAt,
                   ins.variable ->> '$.instanceName' AS instanceName,
-                   cat.`name` categoryName
+                  cat.`name` categoryName
                 FROM
                   wf_process_instance ins
                   LEFT JOIN wf_process_define def ON def.id = ins.processDefineId

src/main/java/com/budwk/app/flow/engine/model/TaskModel.java

@@ -41,6 +41,8 @@ public class TaskModel extends NodeModel {
      */
     private String countersignCompletionCondition;
 
+    private String h5form;
+
     @Override
     public void exec(Execution execution) {
         // 执行任务节点自定义执行逻辑

src/main/java/com/budwk/app/flow/entity/ProcessTask.java

@@ -8,7 +8,6 @@ import org.nutz.dao.entity.annotation.Comment;
 import org.nutz.dao.entity.annotation.Id;
 import org.nutz.dao.entity.annotation.Table;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -66,6 +65,10 @@ public class ProcessTask extends BaseModel {
     @Column
     private String formKey;
 
+    @Comment("h5任务处理表单KEY")
+    @Column
+    private String h5FormKey;
+
     @Comment("父任务ID")
     @Column
     private Long taskParentId;

src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java

@@ -8,7 +8,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.base.vo.LabelValueVO;
@@ -31,7 +30,6 @@ import com.budwk.app.flow.service.ProcessDefineService;
 import com.budwk.app.flow.service.ProcessInstanceService;
 import com.budwk.app.flow.service.ProcessTaskService;
 import com.budwk.app.flow.vo.ProcessTaskVO;
-import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
@@ -176,6 +174,7 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
         processTask.setTaskState(ProcessTaskStateEnum.DOING.getCode());
         processTask.setTaskType(taskModel.getTaskType().getCode());
         processTask.setFormKey(taskModel.getForm());
+        processTask.setH5FormKey(taskModel.getH5form());
         processTask.setProcessInstanceId(execution.getProcessInstanceId());
 
         // 增加是否为第一个任务节点标识
@@ -283,7 +282,7 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
     @Override
     public boolean isAllowed(ProcessTask task, String operator) {
         // 执行者为超级管理员或自动执行用户
-        if (AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) || FlowConst.ADMIN_ID.equalsIgnoreCase(operator) || FlowConst.AUTO_ID.equalsIgnoreCase(operator)) {
+        if (FlowConst.ADMIN_ID.equalsIgnoreCase(operator) || FlowConst.AUTO_ID.equalsIgnoreCase(operator)) {
             return true;
         }
         // 任务操作者==执行者
@@ -392,6 +391,7 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
             processTask.setTaskState(ProcessTaskStateEnum.DOING.getCode());
             processTask.setTaskType(taskModel.getTaskType().getCode());
             processTask.setProcessInstanceId(execution.getProcessInstanceId());
+            processTask.setH5FormKey(taskModel.getH5form());
 
             // 增加是否为第一个任务节点标识
             execution.getArgs().put(FlowConst.IS_FIRST_TASK_NODE, FlowUtil.isFistTaskName(execution.getProcessModel(), taskModel.getName()));

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPersonnelOfficeController.java

@@ -0,0 +1,121 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+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.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.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalDelegationService;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author zhf
+ * @date 2026/3/12 09:36
+ * @description 人事处审核
+ */
+@IocBean
+@At("/platform/proposal/personnelOffice")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案-办理-人事处审核")
+public class ProposalPersonnelOfficeController {
+
+    @Inject
+    private BaseService baseService;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private ProposalDelegationService proposalDelegationService;
+    @Inject
+    private BpmService bpmService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/personnelOffice/index.html")
+    @SaCheckPermission("proposal.personnelOffice")
+    public void index() {
+    }
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/personnelOffice/index.html")
+    @SaCheckPermission("h5.proposal.personnelOffice")
+    public void h5Index() {
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.personnelOffice")
+    @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 instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.id taskId,
+                    t.taskName AS taskKey,
+                    t.displayName taskName,
+                    t.taskType,
+                    t.performType taskPerformType,
+                    t.taskState,
+                    t.finishTime,
+                    t.taskParentId,
+                    t.variable taskVariable,
+                    IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                    IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                FROM
+                	wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                    LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                    LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
+                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "personnelOffice");
+
+        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("t.id");
+        cnd.desc("t.createdAt");
+        sql.setCondition(cnd);
+        Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(),pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+}

src/main/resources/views/platform/flow/design/designer.html

@@ -1,187 +1,191 @@
 <!doctype html>
 <html>
-    <head>
+<head>
-        <meta charset="utf-8" />
+    <meta charset="utf-8" />
-        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-        <title>流程设计器</title>
+    <title>流程设计器</title>
-        <script src="/assets/platform/plugins/vue/vue.js"></script>
+    <script src="/assets/platform/plugins/vue/vue.js"></script>
-        <script src="/assets/platform/plugins/jquery/jquery.js"></script>
+    <script src="/assets/platform/plugins/jquery/jquery.js"></script>
-        <script src="/assets/platform/plugins/element-ui/lib/index.js"></script>
+    <script src="/assets/platform/plugins/element-ui/lib/index.js"></script>
-        <link rel="stylesheet" href="${base!}/assets/platform/plugins/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="${base!}/assets/platform/plugins/element-ui/lib/theme-chalk/index.css" />
-        <link rel="stylesheet" href="${base!}/assets/platform/plugins/element-ui/lib/theme-chalk/index_custom.css" />
+    <link rel="stylesheet" href="${base!}/assets/platform/plugins/element-ui/lib/theme-chalk/index_custom.css" />
-        <link rel="stylesheet" href="${base!}/assets/platform/plugins/element-ui/lib/theme-chalk/override.css" />
+    <link rel="stylesheet" href="${base!}/assets/platform/plugins/element-ui/lib/theme-chalk/override.css" />
-        <link rel="stylesheet" href="${base!}/assets/platform/css/root.css" />
+    <link rel="stylesheet" href="${base!}/assets/platform/css/root.css" />
-        <!-- 引入 core 包和对应 css-->
+    <!-- 引入 core 包和对应 css-->
-        <script src="/assets/platform/plugins/logicflow/logic-flow.js"></script>
+    <script src="/assets/platform/plugins/logicflow/logic-flow.js"></script>
-        <link rel="stylesheet" href="/assets/platform/plugins/logicflow/index.css" />
+    <link rel="stylesheet" href="/assets/platform/plugins/logicflow/index.css" />
-<!--        <script src="https://cdn.jsdelivr.net/npm/@logicflow/core@1.2.12/dist/logic-flow.js"></script>-->
+    <!--        <script src="https://cdn.jsdelivr.net/npm/@logicflow/core@1.2.12/dist/logic-flow.js"></script>-->
-<!--        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@logicflow/core@1.2.12/dist/style/index.css" />-->
+    <!--        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@logicflow/core@1.2.12/dist/style/index.css" />-->
-        <script src="/assets/platform/plugins/snaker/SnakerflowDesigner.umd.js"></script>
+    <script src="/assets/platform/plugins/snaker/SnakerflowDesigner.umd.js"></script>
-        <style>
+    <style>
-            #app {
+        #app {
-                height: 100vh;
+            height: 100vh;
-            }
+        }
-        </style>
+    </style>
-    </head>
+</head>
-    <body>
+<body>
-        <div id="app">
+<div id="app">
-            <snaker-flow-designer
+    <snaker-flow-designer
-                ref="designer"
+            ref="designer"
-                v-model="flowData"
+            v-model="flowData"
-                @on-save="handleSave"
+            @on-save="handleSave"
-                :show-doc="false"
+            :show-doc="false"
-                node-render-type="html"
+            node-render-type="html"
-                :extend-property-keys="[
+            :extend-property-keys="[
                             'candidateUsers',
                             'candidateGroups',
                             'candidateHandler',
                             'assigneeText',
                             'assigneeMode',
                             'buttonConfig',
-                            'enableNextOperator'
+                            'enableNextOperator',
+                            'h5form'
                           ]"
-            >
+    >
-                <!--        <template v-slot:form-item-task-form="{model,field}">-->
+        <template v-slot:form-item-task-form="{model,field}">
-                <!--            <el-form-item label="form">-->
+            <el-form-item label="pc跳转地址">
-                <!--               -->
+                <el-input placeholder="请输入pc跳转地址" clearable v-model="model[field]"></el-input>
-                <!--            </el-form-item>-->
+            </el-form-item>
-                <!--        </template>-->
+            <el-form-item label="h5跳转地址">
+                <el-input placeholder="请输入h5跳转地址" clearable v-model="model['h5form']"></el-input>
+            </el-form-item>
+        </template>
 
-                <template v-slot:form-item-task-assignee="{model,field}">
+        <template v-slot:form-item-task-assignee="{model,field}">
-                    <assignee-form :model="model" :field="field" :start_node_next_node_ids="startNodeNextNodeIds"></assignee-form>
+            <assignee-form :model="model" :field="field" :start_node_next_node_ids="startNodeNextNodeIds"></assignee-form>
-                </template>
+        </template>
 
-                <template v-slot:form-item-task-assignment-handler="{model,field}">
+        <template v-slot:form-item-task-assignment-handler="{model,field}">
-                    <el-form-item label="参与者处理类">
+            <el-form-item label="参与者处理类">
-                        <el-select v-model="model[field]" style="width: 100%" clearable :disabled="startNodeNextNodeIds.includes(model.name)">
+                <el-select v-model="model[field]" style="width: 100%" clearable :disabled="startNodeNextNodeIds.includes(model.name)">
-                            <el-option
+                    <el-option
-                                v-for="item in assignmentHandlerClassOptions"
+                            v-for="item in assignmentHandlerClassOptions"
-                                :key="item.value"
+                            :key="item.value"
-                                :value="item.value"
+                            :value="item.value"
-                                :label="item.name"
+                            :label="item.name"
-                            ></el-option>
+                    ></el-option>
-                        </el-select>
+                </el-select>
-                    </el-form-item>
+            </el-form-item>
-                </template>
+        </template>
 
-                <template v-slot:form-item-task-candidate-handler="{model,field}">
+        <template v-slot:form-item-task-candidate-handler="{model,field}">
-                    <el-form-item label="候选者处理类">
+            <el-form-item label="候选者处理类">
-                        <el-select v-model="model[field]" style="width: 100%" clearable :disabled="startNodeNextNodeIds.includes(model.name)">
+                <el-select v-model="model[field]" style="width: 100%" clearable :disabled="startNodeNextNodeIds.includes(model.name)">
-                            <el-option
+                    <el-option
-                                v-for="item in candidateHandlerClassOptions"
+                            v-for="item in candidateHandlerClassOptions"
-                                :key="item.value"
+                            :key="item.value"
-                                :value="item.value"
+                            :value="item.value"
-                                :label="item.name"
+                            :label="item.name"
-                            ></el-option>
+                    ></el-option>
-                        </el-select>
+                </el-select>
-                    </el-form-item>
+            </el-form-item>
-                </template>
+        </template>
 
-                <template v-slot="{model,field}">
+        <template v-slot="{model,field}">
-                    <el-form-item label="指定下一步处理人">
+            <el-form-item label="指定下一步处理人">
-                        <el-checkbox v-model="model['enableNextOperator']">指定下一步处理人</el-checkbox>
+                <el-checkbox v-model="model['enableNextOperator']">指定下一步处理人</el-checkbox>
-                    </el-form-item>
+            </el-form-item>
 
-                    <button-config :model="model" :field="field"></button-config>
+            <button-config :model="model" :field="field"></button-config>
-                </template>
+        </template>
 
-                <!--                <template v-slot="{model,field}">-->
+        <!--                <template v-slot="{model,field}">-->
-                <!--                    <el-form-item label="表单查看URL">-->
+        <!--                    <el-form-item label="表单查看URL">-->
-                <!--                        <el-input v-model="model[instanceViewUrl]"></el-input>-->
+        <!--                        <el-input v-model="model[instanceViewUrl]"></el-input>-->
-                <!--                    </el-form-item>-->
+        <!--                    </el-form-item>-->
-                <!--                </template>-->
+        <!--                </template>-->
-            </snaker-flow-designer>
+    </snaker-flow-designer>
-        </div>
+</div>
-    </body>
+</body>
-    <script>
+<script nonce="${cspNonce!}">
-        <!--#include('assigneeForm.js'){}#-->
+    <!--#include('assigneeForm.js'){}#-->
-        <!--#include('buttonConfig.js'){}#-->
+    <!--#include('buttonConfig.js'){}#-->
 
-        Vue.use(SnakerflowDesigner.default)
+    Vue.use(SnakerflowDesigner.default)
-        const vue = new Vue({
+    const vue = new Vue({
-            el: "#app",
+        el: "#app",
-            components: {
+        components: {
-                "assignee-form": assigneeForm,
+            "assignee-form": assigneeForm,
-                "button-config": buttonConfig
+            "button-config": buttonConfig
-            },
+        },
-            data() {
+        data() {
-                return {
+            return {
-                    id: "${id!}",
+                id: "${id!}",
-                    designerData: {},
+                designerData: {},
-                    flowData: {},
+                flowData: {},
-                    assignmentHandlerClassOptions: [],
+                assignmentHandlerClassOptions: [],
-                    candidateHandlerClassOptions: []
+                candidateHandlerClassOptions: []
-                }
-            },
-            computed: {
-                startNodeNextNodeIds() {
-                    if (this.$refs.designer && this.$refs.designer.lf) {
-                        const graphData = this.$refs.designer.lf.getGraphData()
-                        if (graphData) {
-                            const { nodes, edges } = graphData
-                            const startNode = nodes.find((v) => v.type === "snaker:start")
-                            if (startNode) {
-                                const targetNodeIds = edges.filter((v) => v.sourceNodeId === startNode.id).map((v) => v.targetNodeId)
-                                return targetNodeIds
-                            }
-                        }
-                    }
-                    return []
-                }
-            },
-            methods: {
-                handleSave(val) {
-                    const design = {
-                        ...this.designerData,
-                        content: val.json
-                    }
-                    $.post("/flow/design/updateContent", { design: JSON.stringify(design) }).then((res) => {
-                        if (res.code === 0) {
-                            window.parent.postMessage("success")
-                        } else {
-                            window.parent.postMessage("error")
-                        }
-                    })
-                },
-                getDetail() {
-                    $.get("/flow/design/detail", { id: this.id }).then((res) => {
-                        if (res.code === 0) {
-                            this.designerData = res.data
-                            if (res.data.content) {
-                                this.flowData = res.data.content
-                            } else {
-                                this.flowData = {}
-                            }
-                        }
-                    })
-                },
-
-                init() {
-                    $.get("/flow/design/assigmentHandlerClass").then((res) => {
-                        if (res.code === 0) {
-                            this.assignmentHandlerClassOptions = res.data
-                        }
-                    })
-                    $.get("/flow/design/candidateHandlerClass").then((res) => {
-                        if (res.code === 0) {
-                            this.candidateHandlerClassOptions = res.data
-                        }
-                    })
-                },
-
-                getData() {
-                    console.log(this.$refs.designer)
-                }
-            },
-            created() {
-                this.init()
-            },
-            mounted() {
-                if (this.id) {
-                    this.getDetail()
-                }
             }
-        })
+        },
-    </script>
+        computed: {
+            startNodeNextNodeIds() {
+                if (this.$refs.designer && this.$refs.designer.lf) {
+                    const graphData = this.$refs.designer.lf.getGraphData()
+                    if (graphData) {
+                        const { nodes, edges } = graphData
+                        const startNode = nodes.find((v) => v.type === "snaker:start")
+                        if (startNode) {
+                            const targetNodeIds = edges.filter((v) => v.sourceNodeId === startNode.id).map((v) => v.targetNodeId)
+                            return targetNodeIds
+                        }
+                    }
+                }
+                return []
+            }
+        },
+        methods: {
+            handleSave(val) {
+                const design = {
+                    ...this.designerData,
+                    content: val.json
+                }
+                $.post("/flow/design/updateContent", { design: JSON.stringify(design) }).then((res) => {
+                    if (res.code === 0) {
+                        window.parent.postMessage("success")
+                    } else {
+                        window.parent.postMessage("error")
+                    }
+                })
+            },
+            getDetail() {
+                $.get("/flow/design/detail", { id: this.id }).then((res) => {
+                    if (res.code === 0) {
+                        this.designerData = res.data
+                        if (res.data.content) {
+                            this.flowData = res.data.content
+                        } else {
+                            this.flowData = {}
+                        }
+                    }
+                })
+            },
+
+            init() {
+                $.get("/flow/design/assigmentHandlerClass").then((res) => {
+                    if (res.code === 0) {
+                        this.assignmentHandlerClassOptions = res.data
+                    }
+                })
+                $.get("/flow/design/candidateHandlerClass").then((res) => {
+                    if (res.code === 0) {
+                        this.candidateHandlerClassOptions = res.data
+                    }
+                })
+            },
+
+            getData() {
+                console.log(this.$refs.designer)
+            }
+        },
+        created() {
+            this.init()
+        },
+        mounted() {
+            if (this.id) {
+                this.getDetail()
+            }
+        }
+    })
+</script>
 </html>

src/main/resources/views/platform/zhgh/democratic/proposal/transact/personnelOffice/index.html

@@ -0,0 +1,210 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app">
+    <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 v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
+                              style="width: 100%"></el-input>
+                </search-item>
+                <search-item label="姓名/工号">
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
+                </search-item>
+            </search>
+        </el-card>
+
+        <el-card shadow="never">
+            <table-tool :columns.sync="tableColumns">
+                <el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
+                    <el-radio-button :label="true">已审核</el-radio-button>
+                    <el-radio-button :label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod" fixed="left"></el-table-column>
+                <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :key="column.key"
+                        :min-width="column.width"
+                        :fixed="column.fixed"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                        v-if="column.visible !== false"
+                >
+                    <template v-if="column.prop === 'caseFilingResult'" scope="{row}">
+                        <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
+                                  :value="row.caseFilingResult"></dict-tag>
+                    </template>
+                    <template v-else-if="column.prop === 'merge'" scope="{row}">
+                        <el-tag v-if="row.merge" size="small">是</el-tag>
+                    </template>
+                    <template v-else-if="column.prop === 'instanceState'" scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="300px">
+                    <template slot-scope="{row}">
+                        <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">审核
+                        </el-button>
+                        <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>
+            <proposal-info ref="proposalInfoRef">
+                <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>
+            </proposal-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include('../../common/info.js'){}#-->
+
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO
+        },
+        data() {
+            return {
+	            sessionOptions: [],
+                tableColumns: [
+                    {label: "提案编号", prop: "code"},
+                    {label: "提案名称", prop: "name", width: "200px"},
+                    {label: "提案类别", prop: "typeName"},
+                    {label: "届次", prop: "sessionName"},
+                    {label: "代表团", prop: "delegationName"},
+                    {label: "当前节点", prop: "curTaskName"},
+                    {label: "流程状态", prop: "instanceState"}
+                ],
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.proposalInfoRef.onOpen(row)
+                })
+            },
+            openAudit(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.proposalInfoRef.onOpen(row)
+                })
+            },
+
+            handleTaskAction(val) {
+                this.$refs.formRef.validate(valid => {
+                    if (!valid) return
+                    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()
+                        }
+                    })
+                })
+            },
+
+            // 教代会
+            async meetingChange(val) {
+                this.formData.delegationId = null
+                this.formData.committeeId = null
+                this.doSearch()
+            },
+
+            // 查询开启的教代会
+            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()
+                        }
+                    }
+                })
+            }
+
+        },
+        created() {
+            this.pageData()
+            this.listOpenSession()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html

@@ -48,7 +48,7 @@ layout("/layouts/platform_h5.html"){
                 <span>撤回</span>
             </div>
             <div class="action-btn delete" v-if="row.taskKey === 'startTask' || !row.instanceId"
-                 @click="onDelete(row)">
+                 @click="onDelete(row.id)">
                 <i class="fa fa-trash"></i>
                 <span>删除</span>
             </div>

src/main/resources/views/platform/zhghh5/democratic/proposal/transact/personnelOffice/index.html

@@ -0,0 +1,190 @@
+<!--#
+layout("/layouts/platform_h5.html"){
+#-->
+<div id="app" v-cloak>
+    <van-nav-bar @click-left="historyBack" left-arrow left-text="返回" title="团长审核" placeholder fixed></van-nav-bar>
+    <van-sticky offset-top="46px">
+        <van-search
+                v-model="pageForm.name"
+                :show-action="false"
+                :reverse-color="false"
+                input-align="left"
+                placeholder="请输入提案名称搜索"
+                @search="doSearch"
+        ></van-search>
+        <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
+            <van-dropdown-item v-model="pageForm.sessionId" :options="sessionOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
+        </van-dropdown-menu>
+        <van-tabs v-model="pageForm.approvalText"
+                  @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
+            <van-tab title="已审核" name="1"></van-tab>
+            <van-tab title="未审核" name="0"></van-tab>
+        </van-tabs>
+    </van-sticky>
+
+    <table-list api="/platform/proposal/personnelOffice/pageData" :page_form.sync="pageForm" @ready="onReady"
+                ref="tableListRef"
+                title="name">
+        <template v-slot="{index,row}">
+            <table-column label="提案编号">{{row.code}}</table-column>
+            <table-column label="提案类别">{{row.typeName}}</table-column>
+            <table-column label="提案人">{{row.createUserName}}</table-column>
+            <table-column label="代表团">{{row.delegationName}}</table-column>
+            <table-column label="当前节点">{{row.curTaskName}}</table-column>
+        </template>
+        <template #actions="{index,row}">
+            <div class="action-btn" @click="onView(row)">
+                <i class="fa fa-eye"></i>
+                <span>查看</span>
+            </div>
+            <div class="action-btn" v-if="row.taskState === 10" @click="onApproval(row)">
+                <i class="fa fa-edit"></i>
+                <span>审核</span>
+            </div>
+            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+                <i class="fa fa-reply"></i>
+                <span>撤回</span>
+            </div>
+        </template>
+    </table-list>
+
+    <proposal-info ref="proposalInfoRef">
+        <div v-if="showApprovalForm">
+            <div class="process-title">{{formData.taskName}}</div>
+            <van-form ref="formRef">
+                <van-field
+                        v-model="formData.tf_opinion"
+                        name="tf_opinion"
+                        label="审批意见"
+                        placeholder="请输入审批意见"
+                        :rules="[{ required: true, message: '请填写审批意见' }]"
+                        required
+                        maxlength="100"
+                        show-word-limit
+                ></van-field>
+            </van-form>
+            <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
+                <van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
+                <van-button type="danger" block @click="handleTaskAction(2)">不同意</van-button>
+                <van-button type="primary" block @click="handleTaskAction(1)">同意</van-button>
+            </div>
+        </div>
+    </proposal-info>
+
+</div>
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    const vue = new Vue({
+        el: "#app",
+        store,
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    name: null,
+                    sessionId: null,
+                    approvalText: "0",
+                    approval: false
+                },
+
+                sessionOptions: [],
+                formData: {},
+                showApprovalForm: false
+            }
+        },
+        components: {
+            "proposal-info": PROPOSAL_INFO
+        },
+        methods: {
+            onReady() {
+                this.listSession()
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = [
+                            {
+                                text: "全部届次",
+                                value: null
+                            }
+                        ].concat(res.data.map((v) => ({text: v.fullName, value: v.id})))
+                        if (this.sessionOptions.length > 0) {
+                            this.pageForm.sessionId = this.sessionOptions[0].value
+                            this.doSearch()
+                        }
+                    }
+                })
+            },
+
+            onView(row) {
+                this.showApprovalForm = false
+                this.$refs.proposalInfoRef.onOpen(row)
+            },
+
+            onApproval(row) {
+                this.showApprovalForm = true
+                this.$refs.proposalInfoRef.onOpen(row)
+                this.formData = {
+                    processTaskId: row.taskId,
+                    taskName: row.curTaskName
+                }
+            },
+
+            async handleTaskAction(val) {
+                try {
+                    await this.$refs.formRef.validate();
+                    this.$dialog.confirm({
+                        title: "提示",
+                        message: "您确定要提交吗？"
+                    }).then(() => {
+                        this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.proposalInfoRef.onClose()
+                                this.$toast.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    }).catch(() => {
+
+                    })
+                } catch (error) {
+
+                }
+            },
+
+            onRevoke(row){
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要撤回吗？"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$toast.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            },
+        }
+    })
+</script>
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/sys/home/todo.js

@@ -46,9 +46,7 @@ const todo = {
                         title="variable.instanceName">
                 <template v-slot="{index,row}">
                     <table-column label="任务节点">{{row.taskName}}</table-column>
-                    <table-column label="流程分类">{{categoryOptions.find(item => item.id === row.category)?.name ||
+                    <table-column label="流程分类">{{row.categoryName}}</table-column>
-                        '未知分类'}}
-                    </table-column>
                     <table-column label="申请人">{{row.variable?.initiatorName || '未知'}}</table-column>
                     <table-column label="状态" v-if="activeTab === 'started'">{{processStatusMap[row.state]?.text ||
                         '未知状态'}}
@@ -177,12 +175,12 @@ const todo = {
 
         // 处理任务
         onView(task) {
-            const {taskId, taskKey, instanceId, businessNo, formKey} = task;
+            const {taskId, taskKey, instanceId, businessNo, formKey, h5FormKey} = task;
-
+            if (!h5FormKey) {
-            if (!formKey) {
                 this.$toast("当前流程没有配置地址");
                 return;
             }
+            this.$pjaxReplace(h5FormKey + "?taskId=" + taskId + "bizId=" + businessNo + "taskKey=" + taskKey+ "&tab=" + this.activeTab)
         },
 
         // 获取空状态文本