feat: 同步职工慰问和困难帮扶

src/main/java/com/budwk/app/base/constant/RoleConstant.java

@@ -20,6 +20,7 @@ RoleConstant {
     SCHOOL_UNION_CHAIRMAN("校工会主席"),
     SCHOOL_UNION_VICE_CHAIRMAN("校工会副主席"),
     SCHOOL_UNION_WELFARE_ADMIN("校工会福利管理员"),
+    SCHOOL_UNION_WELFARE_COMMITTEE("校福利委员会"),
     SCHOOL_UNION_MEMBER_ADMIN("校工会会员管理员"),
     SCHOOL_UNION_TC_ADMIN("校工会教代会管理员"),
     SCHOOL_UNION_WC_ADMIN("校工会工代会管理员"),

src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionWelfareCommitteeHandler.java

@@ -0,0 +1,47 @@
+package com.budwk.app.flow.handler;
+
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.exception.BaseException;
+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 com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.models.Sys_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+
+import java.util.List;
+
+public class FlowSchoolUnionWelfareCommitteeHandler implements AssignmentHandler {
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        SysRoleService sysRoleService = ServiceContext.find(SysRoleService.class);
+        Sys_role role = sysRoleService.getByCode(RoleConstant.SCHOOL_UNION_WELFARE_COMMITTEE);
+        if (role == null || role.isDisabled()) {
+            throw new BaseException("校福利委员会角色未配置或已禁用，请联系校工会！");
+        }
+        List<Sys_user_role> relations = dao.query(Sys_user_role.class,
+                Cnd.where(Sys_user_role::getRoleId, "=", role.getId())
+                        .and(Sys_user_role::getEnable, "=", true));
+        List<String> userIds = relations.stream().map(Sys_user_role::getUserId)
+                .filter(StrUtil::isNotBlank).distinct().toList();
+        if (userIds.isEmpty()) {
+            throw new BaseException("校福利委员没有设置，请联系校工会！");
+        }
+        return userIds;
+    }
+
+    @Override
+    public String getMessage() {
+        return "获取校福利委员";
+    }
+
+    @Override
+    public int getOrder() {
+        return 14;
+    }
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFirstApprovalController.java

@@ -27,34 +27,34 @@ import org.nutz.mvc.annotation.Param;
 import java.util.List;
 
 /**
- * @ClassName CondolenceBranchUnionApprovalController
+ * @ClassName CondolenceFirstApprovalController
  * @Author JyuHsin
  * @Date 2025/7/28 11:33
  * @Version 1.0
  * @Description TODO
  */
 @IocBean
-@At("/platform/condolence/branchUnionApproval")
-@Api("职工慰问分工会审核")
+@At("/platform/condolence/firstApproval")
+@Api("职工慰问一级审核")
 @Ok("json:full")
-public class CondolenceBranchUnionApprovalController {
+public class CondolenceFirstApprovalController {
 
 	@Inject
 	private CondolenceService condolenceService;
 
 	@At("/")
-	@Ok("beetl:/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html")
-	@SaCheckPermission("condolence.branchUnionApproval")
+	@Ok("beetl:/platform/zhgh/staffbenefit/condolence/firstApproval/index.html")
+	@SaCheckPermission("condolence.firstApproval")
 	public void index() {}
 
 	@At("/h5")
-	@Ok("beetl:/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html")
-	@SaCheckPermission("h5.condolence.branchUnionApproval")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/condolence/firstApproval/index.html")
+	@SaCheckPermission("h5.condolence.firstApproval")
 	public void h5Index() {}
 
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission(value = {"condolence.branchUnionApproval", "h5.condolence.branchUnionApproval"}, mode = SaMode.OR)
+	@SaCheckPermission(value = {"condolence.firstApproval", "h5.condolence.firstApproval"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "type") String type,

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSecondApprovalController.java

@@ -29,30 +29,30 @@ import java.util.List;
 /**
  * @author zhf
  * @date 2025/12/23 14:13
- * @description 校工会预审
+ * @description 二级审核
  */
 @IocBean
-@At("/platform/condolence/schoolPrincipalApproval")
-@Api("职工慰问校工会预审")
+@At("/platform/condolence/secondApproval")
+@Api("职工慰问二级审核")
 @Ok("json:full")
-public class CondolenceSchoolPrincipalApprovalController {
+public class CondolenceSecondApprovalController {
 
     @Inject
     private CondolenceService condolenceService;
 
     @At("/")
-    @Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html")
-    @SaCheckPermission("condolence.schoolPrincipalApproval")
+    @Ok("beetl:/platform/zhgh/staffbenefit/condolence/secondApproval/index.html")
+    @SaCheckPermission("condolence.secondApproval")
     public void index() {}
 
     @At("/h5")
-    @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html")
-    @SaCheckPermission("h5.condolence.schoolPrincipalApproval")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/secondApproval/index.html")
+    @SaCheckPermission("h5.condolence.secondApproval")
     public void h5Index() {}
 
     @At
     @ApiOperation("分页查询")
-    @SaCheckPermission(value = {"condolence.schoolPrincipalApproval", "h5.condolence.schoolPrincipalApproval"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"condolence.secondApproval", "h5.condolence.secondApproval"}, mode = SaMode.OR)
     public Result pageData(PageForm pageForm,
                            @Param(value = "year") Integer year,
                            @Param(value = "type") String type,

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceThirdApprovalController.java

@@ -27,34 +27,34 @@ import org.nutz.mvc.annotation.Param;
 import java.util.List;
 
 /**
- * @ClassName CondolenceSchoolUnionApprovalController
+ * @ClassName CondolenceThirdApprovalController
  * @Author JyuHsin
  * @Date 2025/7/29 16:23
  * @Version 1.0
  * @Description TODO
  */
 @IocBean
-@At("/platform/condolence/schoolUnionApproval")
-@Api("职工慰问校工会审核")
+@At("/platform/condolence/thirdApproval")
+@Api("职工慰问三级审核")
 @Ok("json:full")
-public class CondolenceSchoolUnionApprovalController {
+public class CondolenceThirdApprovalController {
 
 	@Inject
 	private CondolenceService condolenceService;
 
 	@At("/")
-	@Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html")
-	@SaCheckPermission("condolence.schoolUnionApproval")
+	@Ok("beetl:/platform/zhgh/staffbenefit/condolence/thirdApproval/index.html")
+	@SaCheckPermission("condolence.thirdApproval")
 	public void index() {}
 
 	@At("/h5")
-	@Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html")
-	@SaCheckPermission("h5.condolence.schoolUnionApproval")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/condolence/thirdApproval/index.html")
+	@SaCheckPermission("h5.condolence.thirdApproval")
 	public void h5Index() {}
 
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission(value = {"condolence.schoolUnionApproval", "h5.condolence.schoolUnionApproval"}, mode = SaMode.OR)
+	@SaCheckPermission(value = {"condolence.thirdApproval", "h5.condolence.thirdApproval"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "type") String type,

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpFirstApprovalController.java

@@ -25,15 +25,15 @@ import java.util.List;
 /**
  * @version 1.0
  * @Author zzr
- * @name：DifficultHelpBranchUnionApprovalController
+ * @name：DifficultHelpFirstApprovalController
  * @Date 2025/7/31 11:47
  * @注释
  */
 @IocBean
 @Ok("json")
-@ApiOperation("困难补助分工会审核")
-@At("/platform/difficultHelp/branchUnionApproval")
-public class DifficultHelpBranchUnionApprovalController {
+@ApiOperation("困难补助一级审核")
+@At("/platform/difficultHelp/firstApproval")
+public class DifficultHelpFirstApprovalController {
 
     @Inject
     private Dao dao;
@@ -41,27 +41,27 @@ public class DifficultHelpBranchUnionApprovalController {
     private DifficultHelpCommonService difficultHelpCommonService;
 
     @At("")
-    @SaCheckPermission("difficultHelp.branchUnionApproval")
-    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html")
+    @SaCheckPermission("difficultHelp.firstApproval")
+    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/firstApproval/index.html")
     public void index() {
     }
 
     @At
-    @SaCheckPermission("difficultHelp.branchUnionApproval")
-    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/form.html")
+    @SaCheckPermission("difficultHelp.firstApproval")
+    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/firstApproval/form.html")
     public void form() {
     }
 
     @At
-    @SaCheckPermission("h5.difficultHelp.branchUnionApproval")
-    @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/branchunionapproval/index.html")
+    @SaCheckPermission("h5.difficultHelp.firstApproval")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/firstApproval/index.html")
     public void h5() {
     }
 
 
     @At
-    @ApiOperation("困难补助分工会审核列表")
-    @SaCheckPermission("difficultHelp.branchUnionApproval")
+    @ApiOperation("困难补助一级审核列表")
+    @SaCheckPermission("difficultHelp.firstApproval")
     public Result pageData(DifficultHelpPageParam pageParam) {
         Sql sql = Sqls.create("""
                 SELECT

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSecondApprovalController.java

@@ -26,15 +26,15 @@ import java.util.List;
 /**
  * @version 1.0
  * @Author zzr
- * @name：DifficultHelpBranchUnionApprovalController
+ * @name：DifficultHelpSecondApprovalController
  * @Date 2025/7/31 11:47
  * @注释
  */
 @IocBean
 @Ok("json")
-@ApiOperation("困难补助二级党组织审核")
-@At("/platform/difficultHelp/unionLeaderApproval")
-public class DifficultHelpBranchUnionLeaderApprovalController {
+@ApiOperation("困难补助二级审核")
+@At("/platform/difficultHelp/secondApproval")
+public class DifficultHelpSecondApprovalController {
 
     @Inject
     private Dao dao;
@@ -42,27 +42,27 @@ public class DifficultHelpBranchUnionLeaderApprovalController {
     private DifficultHelpCommonService difficultHelpCommonService;
 
     @At("")
-    @SaCheckPermission("difficultHelp.unionLeaderApproval")
-    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html")
+    @SaCheckPermission("difficultHelp.secondApproval")
+    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/secondApproval/index.html")
     public void index() {
     }
 
     @At
-    @SaCheckPermission("difficultHelp.unionLeaderApproval")
-    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/form.html")
+    @SaCheckPermission("difficultHelp.secondApproval")
+    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/secondApproval/form.html")
     public void form() {
     }
 
     @At
-    @SaCheckPermission("h5.difficultHelp.unionLeaderApproval")
-    @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/unionLeaderApproval/index.html")
+    @SaCheckPermission("h5.difficultHelp.secondApproval")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/secondApproval/index.html")
     public void h5() {
     }
 
 
     @At
-    @ApiOperation("困难补助分工会审核列表")
-    @SaCheckPermission("difficultHelp.unionLeaderApproval")
+    @ApiOperation("困难补助二级审核列表")
+    @SaCheckPermission("difficultHelp.secondApproval")
     public Result pageData(DifficultHelpPageParam pageParam) {
         Sql sql = Sqls.create("""
                 SELECT

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpThirdApprovalController.java

@@ -30,15 +30,15 @@ import java.util.List;
 /**
  * @version 1.0
  * @Author zzr
- * @name：DifficultHelpSchoolUnionApprovalController
+ * @name：DifficultHelpThirdApprovalController
  * @Date 2025/7/31 11:47
  * @注释
  */
 @IocBean
 @Ok("json")
-@ApiOperation("困难补助校工会审核")
-@At("/platform/difficultHelp/schoolUnionApproval")
-public class DifficultHelpSchoolUnionApprovalController {
+@ApiOperation("困难补助三级审核")
+@At("/platform/difficultHelp/thirdApproval")
+public class DifficultHelpThirdApprovalController {
 
     @Inject
     private Dao dao;
@@ -46,26 +46,26 @@ public class DifficultHelpSchoolUnionApprovalController {
     private DifficultHelpCommonService difficultHelpCommonService;
 
     @At("")
-    @SaCheckPermission("difficultHelp.schoolUnionApproval")
-    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html")
+    @SaCheckPermission("difficultHelp.thirdApproval")
+    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/thirdApproval/index.html")
     public void index() {
     }
 
     @At
-    @SaCheckPermission("difficultHelp.schoolUnionApproval")
-    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/form.html")
+    @SaCheckPermission("difficultHelp.thirdApproval")
+    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/thirdApproval/form.html")
     public void form() {
     }
 
     @At
-    @SaCheckPermission("h5.difficultHelp.schoolUnionApproval")
-    @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html")
+    @SaCheckPermission("h5.difficultHelp.thirdApproval")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/thirdApproval/index.html")
     public void h5() {
     }
 
     @At
-    @ApiOperation("困难补助校工会审核列表")
-    @SaCheckPermission("difficultHelp.schoolUnionApproval")
+    @ApiOperation("困难补助三级审核列表")
+    @SaCheckPermission("difficultHelp.thirdApproval")
     public Result pageData(DifficultHelpPageParam pageParam) {
         Sql sql = Sqls.create("""
                 SELECT
@@ -131,7 +131,7 @@ public class DifficultHelpSchoolUnionApprovalController {
 
     @At
     @ApiOperation("保存补助金额、级别")
-    @SaCheckPermission("difficultHelp.schoolUnionApproval")
+    @SaCheckPermission("difficultHelp.thirdApproval")
     @SLog(tag = "困难补助申请", msg = "保存申请,填写人: ${args[0].proxyUserName}")
     public Result save(@Param("data") DifficultHelpInfo difficultHelpInfo) {
         dao.updateIgnoreNull(difficultHelpInfo);

src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js

@@ -43,7 +43,7 @@ const condolenceInfo = {
 
             <template v-for="task in doneTasks">
                 <div class="mt10">
-                    <div class="process-title">{{ task.displayName }}</div>
+                    <div class="process-title">{{ ({'分工会审核':'一级审核','校工会预审':'二级审核','校工会审核':'三级审核'}[task.displayName] || task.displayName) }}</div>
                     <el-descriptions border class="flow-task-form" :column="3" :key="task.id"
                                      v-if="task.ext.isFirstTaskNode">
                         <el-descriptions-item label="申请用户">{{ task.ext.initiatorName

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/common/info.js

@@ -70,7 +70,7 @@ const INFO = {
 
             <template v-for="task in doneTasks">
                 <div class="task-panel mt10">
-                    <div class="process-title">{{ task.displayName }}</div>
+                    <div class="process-title">{{ ({'分工会审核':'一级审核','二级党组织审核':'二级审核','校工会审核':'三级审核'}[task.displayName] || task.displayName) }}</div>
                     <el-descriptions border class="flow-task-form" :column="3" :key="task.id"
                                      v-if="task.ext.isFirstTaskNode">
                         <el-descriptions-item label="申请用户">{{ task.ext.initiatorName

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/firstApproval/form.html

@@ -1,4 +1,4 @@
-<div id="difficult_help_branch_union_approval_form">
+<div id="difficult_help_first_approval_form">
 	<el-form :model="formData" ref="formRef" 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>
@@ -9,7 +9,7 @@
 
 <script nonce="${cspNonce!}">
 	new Vue({
-		el: "#difficult_help_branch_union_approval_form",
+		el: "#difficult_help_first_approval_form",
 		data() {
 			return {
 				businessId: GetQueryString("businessId"),

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/secondApproval/form.html

@@ -1,4 +1,4 @@
-<div id="difficult_help_branch_union_approval_form">
+<div id="difficult_help_second_approval_form">
 	<el-form :model="formData" ref="formRef" 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>
@@ -9,7 +9,7 @@
 
 <script nonce="${cspNonce!}">
 	new Vue({
-		el: "#difficult_help_branch_union_approval_form",
+		el: "#difficult_help_second_approval_form",
 		data() {
 			return {
 				businessId: GetQueryString("businessId"),

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/thirdApproval/form.html

@@ -1,4 +1,4 @@
-<div id="difficult_help_school_union_approval_form">
+<div id="difficult_help_third_approval_form">
 	<el-form :model="formData" ref="formRef" label-width="0" label-suffix="：" class="flow-task-form">
 		<el-form-item label="审核金额" prop="tf_money" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
 			<el-input-number placeholder="请输入金额" v-model="formData.tf_money"></el-input-number>
@@ -12,7 +12,7 @@
 
 <script nonce="${cspNonce!}">
 	new Vue({
-		el: "#difficult_help_school_union_approval_form",
+		el: "#difficult_help_third_approval_form",
 		data() {
 			return {
 				businessId: GetQueryString("businessId"),

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/thirdApproval/index.html

@@ -256,7 +256,7 @@ layout("/layouts/platform.html"){
 
 			approveSingleItem(item) {
 				return new Promise((resolve, reject) => {
-					this.$axios.post("/platform/difficultHelp/schoolUnionApproval/save", {
+					this.$axios.post("/platform/difficultHelp/thirdApproval/save", {
 						data: JSON.stringify({
 							...this.formData,
 							id: item.id
@@ -301,7 +301,7 @@ layout("/layouts/platform.html"){
 						cancelButtonText: "取消",
 						type: "warning"
 					}).then(() => {
-						this.$axios.post("/platform/difficultHelp/schoolUnionApproval/save", {
+						this.$axios.post("/platform/difficultHelp/thirdApproval/save", {
 							data: JSON.stringify({
 								...this.formData,
 							})

src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js

@@ -62,7 +62,7 @@ const condolenceInfo = {
                             :key="task.id || index"
                             class="condolence-info-card"
                         >
-                            <h2 class="condolence-info-card__title">{{ task.displayName || '办理记录' }}</h2>
+                            <h2 class="condolence-info-card__title">{{ ({'分工会审核':'一级审核','校工会预审':'二级审核','校工会审核':'三级审核'}[task.displayName] || task.displayName) || '办理记录' }}</h2>
                             <van-cell-group :border="false" v-if="task.ext && task.ext.isFirstTaskNode">
                                 <van-cell title="申请用户">
                                     {{ task.ext.initiatorName || '--' }}（{{ task.ext.initiatorAccount || '--' }}）

src/main/resources/views/platform/zhghh5/staffbenefit/condolence/firstApproval/index.html

@@ -55,7 +55,7 @@ layout("/layouts/platform_h5.html"){
 
 <div id="app">
     <div class="condolence-list-page">
-    <van-nav-bar title="分工会审核" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
+    <van-nav-bar title="一级审核" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
 
     <van-sticky offset-top="46px">
         <div class="condolence-list-sticky">
@@ -84,7 +84,7 @@ layout("/layouts/platform_h5.html"){
             <van-skeleton title :row="5" animated></van-skeleton>
         </div>
     </div>
-    <table-list api="/platform/condolence/branchUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef"
+    <table-list api="/platform/condolence/firstApproval/pageData" :page_form.sync="pageForm" ref="tableListRef"
                 v-show="!skeletonLoading" :show_loading_overlay="false" @ready="onReady"
                 @loading-change="handleListLoadingChange">
         <template #header="{index,row}">

src/main/resources/views/platform/zhghh5/staffbenefit/condolence/secondApproval/index.html

@@ -55,7 +55,7 @@ layout("/layouts/platform_h5.html"){
 
 <div id="app">
     <div class="condolence-list-page">
-    <van-nav-bar title="校工会预审" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
+    <van-nav-bar title="二级审核" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
 
     <van-sticky offset-top="46px">
         <div class="condolence-list-sticky">
@@ -84,7 +84,7 @@ layout("/layouts/platform_h5.html"){
             <van-skeleton title :row="5" animated></van-skeleton>
         </div>
     </div>
-    <table-list api="/platform/condolence/schoolPrincipalApproval/pageData" :page_form.sync="pageForm" ref="tableListRef"
+    <table-list api="/platform/condolence/secondApproval/pageData" :page_form.sync="pageForm" ref="tableListRef"
                 v-show="!skeletonLoading" :show_loading_overlay="false" @ready="onReady"
                 @loading-change="handleListLoadingChange">
         <template #header="{index,row}">

src/main/resources/views/platform/zhghh5/staffbenefit/condolence/thirdApproval/index.html

@@ -55,7 +55,7 @@ layout("/layouts/platform_h5.html"){
 
 <div id="app">
     <div class="condolence-list-page">
-    <van-nav-bar title="校工会审核" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
+    <van-nav-bar title="三级审核" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
 
     <van-sticky offset-top="46px">
         <div class="condolence-list-sticky">
@@ -84,7 +84,7 @@ layout("/layouts/platform_h5.html"){
             <van-skeleton title :row="5" animated></van-skeleton>
         </div>
     </div>
-    <table-list api="/platform/condolence/schoolUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef"
+    <table-list api="/platform/condolence/thirdApproval/pageData" :page_form.sync="pageForm" ref="tableListRef"
                 v-show="!skeletonLoading" :show_loading_overlay="false" @ready="onReady"
                 @loading-change="handleListLoadingChange">
         <template #header="{index,row}">

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/common/info.js

@@ -165,11 +165,11 @@ const INFO = {
                             :class="{'difficult-help-info-card': fullScreen}"
                         >
                             <h2 v-if="fullScreen" class="difficult-help-info-card__title">
-                                {{ task.displayName || '办理记录' }}
+                                {{ ({'分工会审核':'一级审核','二级党组织审核':'二级审核','校工会审核':'三级审核'}[task.displayName] || task.displayName) || '办理记录' }}
                             </h2>
                             <van-cell-group
                                 v-if="task.ext && task.ext.isFirstTaskNode"
-                                :title="fullScreen ? '' : task.displayName"
+                                :title="fullScreen ? '' : ({'分工会审核':'一级审核','二级党组织审核':'二级审核','校工会审核':'三级审核'}[task.displayName] || task.displayName)"
                                 :border="!fullScreen"
                             >
                                 <van-cell title="申请用户">
@@ -183,7 +183,7 @@ const INFO = {
                                     ></dict-tag>
                                 </van-cell>
                             </van-cell-group>
-                            <van-cell-group v-else :title="fullScreen ? '' : task.displayName" :border="!fullScreen">
+                            <van-cell-group v-else :title="fullScreen ? '' : ({'分工会审核':'一级审核','二级党组织审核':'二级审核','校工会审核':'三级审核'}[task.displayName] || task.displayName)" :border="!fullScreen">
                                 <van-cell title="办理用户">
                                     {{ task.taskFormData && task.taskFormData.userName || '--' }}{{ task.taskFormData && task.taskFormData.loginName ? '（' + task.taskFormData.loginName + '）' : '' }}
                                 </van-cell>

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/firstApproval/index.html

@@ -9,7 +9,7 @@ layout("/layouts/platform_h5.html"){
 </style>
 <div id="app">
 	<div class="difficult-help-approval-page">
-		<van-nav-bar title="帮扶分工会审核" left-text="返回" left-arrow @click-left="historyBack" placeholder fixed></van-nav-bar>
+		<van-nav-bar title="一级审核" left-text="返回" left-arrow @click-left="historyBack" placeholder fixed></van-nav-bar>
 	<van-sticky offset-top="46px">
 		<div class="difficult-help-approval-sticky">
 		<van-search
@@ -61,7 +61,7 @@ layout("/layouts/platform_h5.html"){
 			<van-skeleton title :row="5" animated></van-skeleton>
 		</div>
 	</div>
-	<table-list api="/platform/difficultHelp/branchUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" title="userName"
+	<table-list api="/platform/difficultHelp/firstApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" title="userName"
 				v-show="!skeletonLoading" :show_loading_overlay="false" @ready="onReady"
 				@loading-change="handleListLoadingChange">
 		<template #header="{index,row}">

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/secondApproval/index.html

@@ -9,7 +9,7 @@ layout("/layouts/platform_h5.html"){
 </style>
 <div id="app">
 	<div class="difficult-help-approval-page">
-		<van-nav-bar title="帮扶二级党组织审核" left-text="返回" left-arrow @click-left="historyBack" placeholder fixed></van-nav-bar>
+		<van-nav-bar title="二级审核" left-text="返回" left-arrow @click-left="historyBack" placeholder fixed></van-nav-bar>
 	<van-sticky offset-top="46px">
 		<div class="difficult-help-approval-sticky">
 		<van-search
@@ -61,7 +61,7 @@ layout("/layouts/platform_h5.html"){
 			<van-skeleton title :row="5" animated></van-skeleton>
 		</div>
 	</div>
-	<table-list api="/platform/difficultHelp/unionLeaderApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" title="userName"
+	<table-list api="/platform/difficultHelp/secondApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" title="userName"
 				v-show="!skeletonLoading" :show_loading_overlay="false" @ready="onReady"
 				@loading-change="handleListLoadingChange">
 		<template #header="{index,row}">

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/thirdApproval/index.html

@@ -9,7 +9,7 @@ layout("/layouts/platform_h5.html"){
 </style>
 <div id="app">
 	<div class="difficult-help-approval-page">
-		<van-nav-bar title="帮扶校工会审核" left-text="返回" left-arrow @click-left="historyBack" placeholder fixed></van-nav-bar>
+		<van-nav-bar title="三级审核" left-text="返回" left-arrow @click-left="historyBack" placeholder fixed></van-nav-bar>
 	<van-sticky offset-top="46px">
 		<div class="difficult-help-approval-sticky">
 		<van-search
@@ -61,7 +61,7 @@ layout("/layouts/platform_h5.html"){
 			<van-skeleton title :row="5" animated></van-skeleton>
 		</div>
 	</div>
-	<table-list api="/platform/difficultHelp/schoolUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" title="userName"
+	<table-list api="/platform/difficultHelp/thirdApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" title="userName"
 				v-show="!skeletonLoading" :show_loading_overlay="false" @ready="onReady"
 				@loading-change="handleListLoadingChange">
 		<template #header="{index,row}">
@@ -328,7 +328,7 @@ layout("/layouts/platform_h5.html"){
 			// 先保存级别和金额，再提交 processTaskId、审批意见及流程提交类型。
 			submitTaskAction() {
 				this.$set(this, "formLoading", true)
-				this.$axios.post("/platform/difficultHelp/schoolUnionApproval/save", {
+				this.$axios.post("/platform/difficultHelp/thirdApproval/save", {
 					data: JSON.stringify({...this.formData})
 				})
 					.then((saveRes) => {