commit

src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java

@@ -347,11 +347,14 @@ public class FamilyActivityApplyController {
 	public Result doSignUp(FamilyUser familyUser) {
 		try {
 			lock.lock();
+			FamilyActivity activity = dao.fetch(FamilyActivity.class, familyUser.getActivityId());
+			if(Lang.isEmpty(familyUser.getMobileColumnsValue())) {
+				return Result.error(99,"请填写" + activity.getKeyWord() + "信息");
+			}
 			boolean courseByUser = familyActivityService.isSignCourseByUser(familyUser.getCourseId(), SecurityUtil.getUserId());
 			if(courseByUser) {
 				return Result.error(99,"您已报过该活动");
 			}
-			FamilyActivity activity = familyActivityService.fetch(familyUser.getActivityId());
 			boolean validFamilyCount = familyActivityService.validFamilyCount(familyUser);
 			if(validFamilyCount) {
 				return Result.error(99,activity.getKeyWord() + "人数最多为" + activity.getFamilyMaxCount());

src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityStatisticsServiceImpl.java

@@ -98,7 +98,7 @@ public class FamilyActivityStatisticsServiceImpl extends BaseServiceImpl<FamilyU
 					family_user tsuu
 					LEFT JOIN `vw_user` u ON u.id = tsuu.userId
 				$condition
-				ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),u.unionid desc, u.unitid desc
+				ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),tsuu.signUpTime desc,u.unionid desc, u.unitid desc
 				""");
 		Cnd cnd = Cnd.NEW();
 		cnd.andEX("tsuu.courseId", "=", courseId);
@@ -150,7 +150,7 @@ public class FamilyActivityStatisticsServiceImpl extends BaseServiceImpl<FamilyU
 					family_user tsuu
 					LEFT JOIN `vw_user` u ON u.id = tsuu.userId
 				$condition
-				ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),u.unionid desc, u.unitid desc
+				ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),tsuu.signUpTime desc,u.unionid desc, u.unitid desc
 				""");
 		Cnd cnd = Cnd.NEW();
 		cnd.andEX("tsuu.courseId", "=", courseId);

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java

@@ -97,7 +97,7 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
                 	train_sign_up_user tsuu
                 	LEFT JOIN `vw_user` u ON u.id = tsuu.userId
                 $condition
-                ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),u.unionid desc, u.unitid desc
+                ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),tsuu.signUpTime desc,u.unionid desc, u.unitid desc
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.andEX("tsuu.courseId", "=", courseId);
@@ -143,7 +143,7 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
                 	train_sign_up_user tsuu
                 	LEFT JOIN `vw_user` u ON u.id = tsuu.userId
                 $condition
-                ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),u.unionid desc, u.unitid desc
+                ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),tsuu.signUpTime desc,u.unionid desc, u.unitid desc
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.andEX("tsuu.courseId", "=", courseId);

src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalApplyController.java

@@ -1,23 +1,34 @@
 package com.budwk.app.zhgh.staffbenefit.legal.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
+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.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.staffbenefit.legal.model.LegalApply;
 import com.budwk.app.zhgh.staffbenefit.legal.service.LegalApplyService;
+import com.budwk.app.zhgh.staffbenefit.psychology.model.PsychologyApply;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 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.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 java.util.List;
+
 /**
  * @ClassName LegalApplyController
  * @Author JyuHsin
@@ -37,17 +48,23 @@ public class LegalApplyController {
 	@Inject
 	private LegalApplyService applyService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("legal.apply")
 	@Ok("beetl:/platform/zhgh/staffbenefit/legal/apply/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.legal.apply")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/legal/apply/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("新增/修改法律援助预约")
-	@SaCheckPermission("legal.apply")
+	@SaCheckPermission(value = {"legal.apply", "h5.legal.apply"}, mode = SaMode.OR)
 	@SLog(tag = "法律援助系统-援助申请", msg = "新增/修改法律援助预约")
-	public Object onSubmit(LegalApply apply) {
+	public Object submit(LegalApply apply) {
 		LegalApply legalApply = applyService.fetch(apply.getId());
 		if(StrUtil.isNotBlank(legalApply.getUserId())) {
 			return Result.error("该时段已被预约");
@@ -68,4 +85,39 @@ public class LegalApplyController {
 		//TODO：这里后面要加发短信
 		return Result.success();
 	}
+
+	@At
+	@ApiOperation("移动端预约查询咨询师")
+	@SaCheckPermission(value = {"legal.apply", "h5.legal.apply"}, mode = SaMode.OR)
+	@SLog(tag = "法律援助系统-移动端预约查询咨询师", msg = "移动端预约查询咨询师")
+	public Object h5PageData(PageForm pageForm, String sex) {
+		Sql sql = Sqls.create("""
+                SELECT
+                	pd.*
+                FROM
+                	legal_doctor pd
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		cnd.and(Cnd.likeEX("pd.sex", sex));
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or("pd.userName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("pd.loginName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		sql.setCondition(cnd);
+		Pagination pagination = applyService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		List<NutMap> list = pagination.getList(NutMap.class);
+		for (NutMap nutMap : list) {
+			List<LegalApply> applyList = dao.query(
+					LegalApply.class,
+					Cnd.where(LegalApply::getDoctorUser, "=", nutMap.getString("userId"))
+							.and(LegalApply::getStartTime, ">=", DateUtil.now())
+							.and(LegalApply::getUserId, "is", null)
+			);
+			nutMap.put("times", applyList);
+		}
+		return Result.success(pagination);
+	}
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalListController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.legal.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -42,15 +43,21 @@ public class LegalListController {
 	@Inject
 	private LegalApplyService applyService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("legal.list")
 	@Ok("beetl:/platform/zhgh/staffbenefit/legal/list/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.legal.list")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/legal/list/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("legal.list")
+	@SaCheckPermission(value = {"legal.list", "h5.legal.list"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year) {
 		Sql sql = Sqls.create("""
@@ -87,9 +94,9 @@ public class LegalListController {
 
 	@At
 	@ApiOperation("删除法律援助预约")
-	@SaCheckPermission("legal.list")
+	@SaCheckPermission(value = {"legal.list", "h5.legal.list"}, mode = SaMode.OR)
 	@SLog(tag = "法律援助系统-法律援助预约", msg = "删除法律援助预约")
-	public Object onDelete(String id) {
+	public Object delete(String id) {
 		LegalApply apply = applyService.fetch(id);
 		apply.setUserId(null);
 		apply.setLoginName(null);

src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalOnlinePostController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.legal.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -50,15 +51,21 @@ public class LegalOnlinePostController {
 	@Inject
 	private BaseService baseService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("legal.onlinePost")
 	@Ok("beetl:/platform/zhgh/staffbenefit/legal/onlinePost/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.legal.onlinePost")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/legal/onlinePost/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("legal.onlinePost")
+	@SaCheckPermission(value = {"legal.onlinePost", "h5.legal.onlinePost"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "isReply") Boolean isReply) {
@@ -78,6 +85,7 @@ public class LegalOnlinePostController {
 		cnd.andEX("YEAR(pop.postingTime)", "=", year);
 		cnd.groupBy("pop.id");
 		cnd.having(Cnd.where("count(por.id)", isReply == null ? ">=" : isReply ? ">" : "=", 0));
+		cnd.desc("pop.postingTime");
 		sql.setCondition(cnd);
 		Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
 		return Result.success(pagination);
@@ -85,9 +93,9 @@ public class LegalOnlinePostController {
 
 	@At
 	@ApiOperation("新增/修改法律援助线上发帖")
-	@SaCheckPermission("legal.onlinePost")
+	@SaCheckPermission(value = {"legal.onlinePost", "h5.legal.onlinePost"}, mode = SaMode.OR)
 	@SLog(tag = "法律援助系统-线上发帖", msg = "新增/修改法律援助线上发帖")
-	public Object onSubmit(LegalOnlinePost post) {
+	public Object submit(LegalOnlinePost post) {
 		if(StrUtil.isBlank(post.getId())) {
 			View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
 			post.setPoster(user.getId());
@@ -106,16 +114,16 @@ public class LegalOnlinePostController {
 
 	@At
 	@ApiOperation("删除法律援助线上发帖")
-	@SaCheckPermission("legal.onlinePost")
+	@SaCheckPermission(value = {"legal.onlinePost", "h5.legal.onlinePost"}, mode = SaMode.OR)
 	@SLog(tag = "法律援助系统-线上发帖", msg = "删除法律援助线上发帖")
-	public Object onDelete(String id) {
+	public Object delete(String id) {
 		dao.delete(LegalOnlinePost.class, id);
 		return Result.success();
 	}
 
 	@At
 	@ApiOperation("查询法律援助线上发帖")
-	@SaCheckPermission("legal.onlinePost")
+	@SaCheckPermission(value = {"legal.onlinePost", "h5.legal.onlinePost"}, mode = SaMode.OR)
 	public Result fetchOne(String id) {
 		LegalOnlinePost onlinePost = dao.fetch(LegalOnlinePost.class, id);
 		List<LegalOnlineReply> replyList = dao.query(

src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalOnlineReplyController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.legal.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -48,15 +49,21 @@ public class LegalOnlineReplyController {
 	@Inject
 	private BaseService baseService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("legal.onlineReply")
 	@Ok("beetl:/platform/zhgh/staffbenefit/legal/onlineReply/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.legal.onlineReply")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/legal/onlineReply/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("legal.onlineReply")
+	@SaCheckPermission(value = {"legal.onlineReply", "h5.legal.onlineReply"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "isReply") Boolean isReply) {
@@ -86,9 +93,9 @@ public class LegalOnlineReplyController {
 
 	@At
 	@ApiOperation("新增/修改法律援助线上回复")
-	@SaCheckPermission("legal.onlineReply")
+	@SaCheckPermission(value = {"legal.onlineReply", "h5.legal.onlineReply"}, mode = SaMode.OR)
 	@SLog(tag = "法律援助系统-线上回复", msg = "新增/修改法律援助线上回复")
-	public Object onSubmit(LegalOnlineReply reply) {
+	public Object submit(LegalOnlineReply reply) {
 		if (StrUtil.isBlank(reply.getId())) {
 			View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
 			reply.setReplyUserId(user.getId());
@@ -107,7 +114,7 @@ public class LegalOnlineReplyController {
 
 	@At
 	@ApiOperation("查询法律援助线上回复")
-	@SaCheckPermission("legal.onlineReply")
+	@SaCheckPermission(value = {"legal.onlineReply", "h5.legal.onlineReply"}, mode = SaMode.OR)
 	public Result fetchOne(String id) {
 		LegalOnlinePost onlinePost = dao.fetch(LegalOnlinePost.class, id);
 		List<LegalOnlineReply> replyList = dao.query(

src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyApplyController.java

@@ -1,11 +1,16 @@
 package com.budwk.app.zhgh.staffbenefit.psychology.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
+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.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
 import com.budwk.app.zhgh.staffbenefit.psychology.model.PsychologyApply;
 import com.budwk.app.zhgh.staffbenefit.psychology.service.PsychologyApplyService;
 import io.swagger.annotations.Api;
@@ -13,11 +18,17 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 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.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 java.util.List;
+
 /**
  * @ClassName PsychologyApplyController
  * @Author JyuHsin
@@ -37,17 +48,23 @@ public class PsychologyApplyController {
 	@Inject
 	private PsychologyApplyService applyService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("psychology.apply")
 	@Ok("beetl:/platform/zhgh/staffbenefit/psychology/apply/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.psychology.apply")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/psychology/apply/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("新增/修改心理咨询预约")
-	@SaCheckPermission("psychology.apply")
+	@SaCheckPermission(value = {"psychology.apply", "h5.psychology.apply"}, mode = SaMode.OR)
 	@SLog(tag = "心理咨询系统-心理咨询预约", msg = "新增/修改心理咨询预约")
-	public Object onSubmit(PsychologyApply apply) {
+	public Object submit(PsychologyApply apply) {
 		PsychologyApply psychologyApply = applyService.fetch(apply.getId());
 		if(StrUtil.isNotBlank(psychologyApply.getUserId())) {
 			return Result.error("该时段已被预约");
@@ -67,4 +84,39 @@ public class PsychologyApplyController {
 		//TODO：这里后面要加发短信
 		return Result.success();
 	}
+
+	@At
+	@ApiOperation("移动端预约查询咨询师")
+	@SaCheckPermission(value = {"psychology.apply", "h5.psychology.apply"}, mode = SaMode.OR)
+	@SLog(tag = "心理咨询系统-移动端预约查询咨询师", msg = "移动端预约查询咨询师")
+	public Object h5PageData(PageForm pageForm, String sex) {
+		Sql sql = Sqls.create("""
+                SELECT
+                	pd.*
+                FROM
+                	psychology_doctor pd
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		cnd.and(Cnd.likeEX("pd.sex", sex));
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or("pd.userName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("pd.loginName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		sql.setCondition(cnd);
+		Pagination pagination = applyService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		List<NutMap> list = pagination.getList(NutMap.class);
+		for (NutMap nutMap : list) {
+			List<PsychologyApply> applyList = dao.query(
+					PsychologyApply.class,
+					Cnd.where(PsychologyApply::getDoctorUser, "=", nutMap.getString("userId"))
+							.and(PsychologyApply::getStartTime, ">=", DateUtil.now())
+							.and(PsychologyApply::getUserId, "is", null)
+			);
+			nutMap.put("times", applyList);
+		}
+		return Result.success(pagination);
+	}
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyIndexController.java

@@ -1,67 +0,0 @@
-package com.budwk.app.zhgh.staffbenefit.psychology.controller;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.budwk.app.base.page.Pagination;
-import com.budwk.app.base.result.Result;
-import com.budwk.app.zhgh.staffbenefit.psychology.model.PsychologyDoctor;
-import com.budwk.app.zhgh.staffbenefit.psychology.service.PsychologyDoctorService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.nutz.dao.Cnd;
-import org.nutz.ioc.loader.annotation.Inject;
-import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.lang.Lang;
-import org.nutz.mvc.annotation.At;
-import org.nutz.mvc.annotation.Ok;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author zzr
- * @name：PsychologyIndexController
- * @Date 2025/9/12 10:54
- * @version 1.0
- * @注释
- */
-@Slf4j
-@IocBean
-@Ok("json:full")
-@Api(tags = "心理咨询")
-@At("/platform/psychology/index")
-public class PsychologyIndexController {
-
-    @Inject
-    private PsychologyDoctorService psychologyDoctorService;
-
-    @At("")
-//    @SaCheckPermission("psychology.index")
-    @Ok("beetl:/platform/zhgh/staffbenefit/psychology/index/index.html")
-    public void index() {
-    }
-
-    @At
-//    @SaCheckPermission("psychology.index")
-    @Ok("beetl:/platform/zhghh5/staffbenefit/psychology/index/index.html")
-    public void h5() {
-    }
-
-
-    @At
-    @ApiOperation("手机端咨询师列表展示")
-//    @SaCheckPermission("psychology.index")
-    public Result listConsultantByH5(){
-        Pagination<PsychologyDoctor> pagination = psychologyDoctorService.listPage(1, 4, Cnd.NEW());
-        List<PsychologyDoctor> list = pagination.getList();
-        // 判断有没有咨询师，并且咨询师数量小于4的话，要顺序填充到4个，便于前端展示
-        if (Lang.isNotEmpty(list) && list.size() < 4) {
-            List<PsychologyDoctor> filledList = new ArrayList<>(4);
-            for (int i = 0; i < 4; i++) {
-                filledList.add(list.get(i % list.size()));
-            }
-            pagination.setList(filledList);
-        }
-        return Result.success(pagination.getList());
-    }
-}

src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyListController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.psychology.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -43,15 +44,21 @@ public class PsychologyListController {
 	@Inject
 	private PsychologyApplyService applyService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("psychology.list")
 	@Ok("beetl:/platform/zhgh/staffbenefit/psychology/list/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.psychology.list")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/psychology/list/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("psychology.list")
+	@SaCheckPermission(value = {"psychology.list", "h5.psychology.list"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year) {
 		Sql sql = Sqls.create("""
@@ -88,9 +95,9 @@ public class PsychologyListController {
 
 	@At
 	@ApiOperation("删除心理咨询预约")
-	@SaCheckPermission("psychology.list")
+	@SaCheckPermission(value = {"psychology.list", "h5.psychology.list"}, mode = SaMode.OR)
 	@SLog(tag = "心理咨询系统-心理咨询预约", msg = "删除心理咨询预约")
-	public Object onDelete(String id) {
+	public Object delete(String id) {
 		PsychologyApply apply = applyService.fetch(id);
 		apply.setUserId(null);
 		apply.setLoginName(null);

src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyOnlinePostController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.psychology.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -50,15 +51,21 @@ public class PsychologyOnlinePostController {
 	@Inject
 	private BaseService baseService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("psychology.onlinePost")
 	@Ok("beetl:/platform/zhgh/staffbenefit/psychology/onlinePost/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.psychology.onlinePost")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/psychology/onlinePost/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("psychology.onlinePost")
+	@SaCheckPermission(value = {"psychology.onlinePost", "h5.psychology.onlinePost"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "isReply") Boolean isReply) {
@@ -78,6 +85,7 @@ public class PsychologyOnlinePostController {
 		cnd.andEX("YEAR(pop.postingTime)", "=", year);
 		cnd.groupBy("pop.id");
 		cnd.having(Cnd.where("count(por.id)", isReply == null ? ">=" : isReply ? ">" : "=", 0));
+		cnd.desc("pop.postingTime");
 		sql.setCondition(cnd);
 		Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
 		return Result.success(pagination);
@@ -85,9 +93,9 @@ public class PsychologyOnlinePostController {
 
 	@At
 	@ApiOperation("新增/修改心理咨询线上发帖")
-	@SaCheckPermission("psychology.onlinePost")
+	@SaCheckPermission(value = {"psychology.onlinePost", "h5.psychology.onlinePost"}, mode = SaMode.OR)
 	@SLog(tag = "心理咨询系统-线上发帖", msg = "新增/修改心理咨询线上发帖")
-	public Object onSubmit(PsychologyOnlinePost post) {
+	public Object submit(PsychologyOnlinePost post) {
 		if(StrUtil.isBlank(post.getId())) {
 			View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
 			post.setPoster(user.getId());
@@ -106,16 +114,16 @@ public class PsychologyOnlinePostController {
 
 	@At
 	@ApiOperation("删除心理咨询线上发帖")
-	@SaCheckPermission("psychology.onlinePost")
+	@SaCheckPermission(value = {"psychology.onlinePost", "h5.psychology.onlinePost"}, mode = SaMode.OR)
 	@SLog(tag = "心理咨询系统-线上发帖", msg = "删除心理咨询线上发帖")
-	public Object onDelete(String id) {
+	public Object delete(String id) {
 		dao.delete(PsychologyOnlinePost.class, id);
 		return Result.success();
 	}
 
 	@At
 	@ApiOperation("查询心理咨询线上发帖")
-	@SaCheckPermission("psychology.onlinePost")
+	@SaCheckPermission(value = {"psychology.onlinePost", "h5.psychology.onlinePost"}, mode = SaMode.OR)
 	public Result fetchOne(String id) {
 		PsychologyOnlinePost onlinePost = dao.fetch(PsychologyOnlinePost.class, id);
 		List<PsychologyOnlineReply> replyList = dao.query(

src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyOnlineReplyController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.psychology.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -48,15 +49,21 @@ public class PsychologyOnlineReplyController {
 	@Inject
 	private BaseService baseService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("psychology.onlineReply")
 	@Ok("beetl:/platform/zhgh/staffbenefit/psychology/onlineReply/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.psychology.onlineReply")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/psychology/onlineReply/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("psychology.onlineReply")
+	@SaCheckPermission(value = {"psychology.onlineReply", "h5.psychology.onlineReply"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "isReply") Boolean isReply) {
@@ -86,9 +93,9 @@ public class PsychologyOnlineReplyController {
 
 	@At
 	@ApiOperation("新增/修改心理咨询线上回复")
-	@SaCheckPermission("psychology.onlineReply")
+	@SaCheckPermission(value = {"psychology.onlineReply", "h5.psychology.onlineReply"}, mode = SaMode.OR)
 	@SLog(tag = "心理咨询系统-线上回复", msg = "新增/修改心理咨询线上回复")
-	public Object onSubmit(PsychologyOnlineReply reply) {
+	public Object submit(PsychologyOnlineReply reply) {
 		if (StrUtil.isBlank(reply.getId())) {
 			View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
 			reply.setReplyUserId(user.getId());
@@ -107,7 +114,7 @@ public class PsychologyOnlineReplyController {
 
 	@At
 	@ApiOperation("查询心理咨询线上回复")
-	@SaCheckPermission("psychology.onlineReply")
+	@SaCheckPermission(value = {"psychology.onlineReply", "h5.psychology.onlineReply"}, mode = SaMode.OR)
 	public Result fetchOne(String id) {
 		PsychologyOnlinePost onlinePost = dao.fetch(PsychologyOnlinePost.class, id);
 		List<PsychologyOnlineReply> replyList = dao.query(

src/main/resources/static/assets/platform/css/h5.css

@@ -192,6 +192,7 @@ body {
 /*****************************申请表单CSS********************************/
 .form-container {
     padding-bottom: 80px;
+    background: #f9f9f9;
 }
 
 .form-container .form-group {

src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js

@@ -617,11 +617,11 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
                     if (res.code === 0) {
                         this.$message.success("保存成功")
                         if (this.activity_type === 40002) {
-                            window.location.href = "/platform/activity/culture/infoManage/union"
+                            commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
                         } else if (this.activity_type === 40003) {
-                            window.location.href = "/platform/activity/culture/infoManage/club"
+                            commonUtil.pjaxPush("/platform/activity/culture/infoManage/club")
                         } else {
-                            window.location.href = "/platform/activity/culture/infoManage/school"
+                            commonUtil.pjaxPush("/platform/activity/culture/infoManage/school")
                         }
                     }
                 })
@@ -658,11 +658,11 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
                     if (res.code === 0) {
                         this.$message.success("提交成功")
                         if (this.activity_type === 40002) {
-                            window.location.href = "/platform/activity/culture/infoManage/union"
+                            commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
                         } else if (this.activity_type === 40003) {
-                            window.location.href = "/platform/activity/culture/infoManage/club"
+                            commonUtil.pjaxPush("/platform/activity/culture/infoManage/club")
                         } else {
-                            window.location.href = "/platform/activity/culture/infoManage/school"
+                            commonUtil.pjaxPush("/platform/activity/culture/infoManage/school")
                         }
                     }
                 })
@@ -700,11 +700,11 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
                     if (res.code === 0) {
                         this.$message.success("提交成功")
                         if (this.activity_type === 40002) {
-                            window.location.href = "/platform/activity/culture/infoManage/union"
+                            commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
                         } else if (this.activity_type === 40003) {
-                            window.location.href = "/platform/activity/culture/infoManage/club"
+                            commonUtil.pjaxPush("/platform/activity/culture/infoManage/club")
                         } else {
-                            window.location.href = "/platform/activity/culture/infoManage/school"
+                            commonUtil.pjaxPush("/platform/activity/culture/infoManage/school")
                         }
                     }
                 })

src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js

@@ -203,7 +203,7 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
                 this.url = location.origin + "/platform/h5/activity/culture/applyUser"
                 this.codeDialogVisible = true
             } else if (type === "export") {
-                location.href = "/platform/activity/info/mange/export?id=" + row.id
+                commonUtil.pjaxPush("/platform/activity/info/mange/export?id=" + row.id)
             }
         },
         goBack() {

src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html

@@ -219,7 +219,7 @@ layout("/layouts/platform.html"){
 					this.$axios.post('/platform/activityDeclare/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("保存成功")
-							window.location.href = '/platform/activityDeclare/mine'
+                            commonUtil.pjaxPush('/platform/activityDeclare/mine')
 						}
 					})
 				})
@@ -241,7 +241,7 @@ layout("/layouts/platform.html"){
 					}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("提交成功")
-							window.location.href = '/platform/activityDeclare/mine'
+                            commonUtil.pjaxPush('/platform/activityDeclare/mine')
 						}
 					})
 				})
@@ -263,7 +263,7 @@ layout("/layouts/platform.html"){
 					}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("提交成功")
-							window.location.href = '/platform/activityDeclare/mine'
+                            commonUtil.pjaxPush('/platform/activityDeclare/mine')
 						}
 					})
 				})

src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html

@@ -147,7 +147,7 @@ layout("/layouts/platform.html"){
 				this.$downLoad('/platform/activityDeclare/mine/doExportDeclare?id=' + row.id)
 			},
 			onApply() {
-				window.location.href = '/platform/activityDeclare/apply'
+                commonUtil.pjaxPush('/platform/activityDeclare/apply')
 			},
 			openView(row) {
 				this.$refs.guava.view(() => {
@@ -155,7 +155,7 @@ layout("/layouts/platform.html"){
 				})
 			},
 			onEdit(row) {
-				window.location.href = '/platform/activityDeclare/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+			    commonUtil.pjaxPush('/platform/activityDeclare/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗?", "提示", {

src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html

@@ -259,7 +259,7 @@ layout("/layouts/platform.html"){
 					this.$axios.post('/platform/activityReimbursement/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("保存成功")
-							window.location.href = '/platform/activityReimbursement/mine'
+                            commonUtil.pjaxPush('/platform/activityReimbursement/mine')
 						}
 					})
 				})
@@ -281,7 +281,7 @@ layout("/layouts/platform.html"){
 					}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("提交成功")
-							window.location.href = '/platform/activityReimbursement/mine'
+                            commonUtil.pjaxPush('/platform/activityReimbursement/mine')
 						}
 					})
 				})
@@ -303,7 +303,7 @@ layout("/layouts/platform.html"){
 					}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("提交成功")
-							window.location.href = '/platform/activityReimbursement/mine'
+                            commonUtil.pjaxPush('/platform/activityReimbursement/mine')
 						}
 					})
 				})

src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html

@@ -152,7 +152,7 @@ layout("/layouts/platform.html"){
 				this.$downLoad('/platform/activityReimbursement/mine/doExportReimbursement?id=' + row.id)
 			},
 			onApply() {
-				window.location.href = '/platform/activityReimbursement/apply'
+                commonUtil.pjaxPush('/platform/activityReimbursement/apply')
 			},
 			openView(row) {
 				this.$refs.guava.view(() => {
@@ -160,7 +160,7 @@ layout("/layouts/platform.html"){
 				})
 			},
 			onEdit(row) {
-				window.location.href = '/platform/activityReimbursement/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/activityReimbursement/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗?", "提示", {

src/main/resources/views/platform/zhgh/activity/family/apply/signForm.js

@@ -59,13 +59,13 @@ const signForm = {
 
                     <div class="left-span-label"
                          style="display: flex; justify-content: space-between; align-items: center">
-                        <div>家属信息</div>
+                        <div>{{activity.keyWord}}信息</div>
                         <div>
                             <el-button type="danger" size="mini" @click="delFamily">
-                                删除家属
+                                删除{{activity.keyWord}}
                             </el-button>
                             <el-button type="primary" size="mini" @click="addFamily">
-                                添加家属
+                                添加{{activity.keyWord}}
                             </el-button>
                         </div>
                     </div>
@@ -74,7 +74,7 @@ const signForm = {
                         <el-tabs v-model="active" type="card">
                             <el-tab-pane v-for="(item, index) in formData.mobileColumnsValue"
                                          :name="index + ''"
-                                         :label="'家属' + (index + 1)"
+                                         :label="activity.keyWord + (index + 1)"
                                          :key="index">
                                 <el-row class="mt20">
                                     <el-col :span="24">
@@ -130,7 +130,7 @@ const signForm = {
                         </el-tabs>
                     </div>
                     <div v-if="formData.mobileColumnsValue.length === 0" style="text-align: center">
-                        <span style="font-size: 15px;color: grey">如有家属，请添加家属</span>
+                        <span style="font-size: 15px;color: grey">如有{{activity.keyWord}}，请添加{{activity.keyWord}}</span>
                     </div>
 
                 </el-form>

src/main/resources/views/platform/zhgh/activity/family/statistics/info.js

@@ -3,7 +3,7 @@ const info = {
         <div>
             <el-tabs>
                 <el-tab-pane label="报名人员">
-                    <el-table :data="registerUserTableData" class="mt20">
+                    <el-table :data="registerUserTableData" class="mt20" max-height="600">
                         <el-table-column
                                 :label="column.label"
                                 :prop="column.prop"

src/main/resources/views/platform/zhgh/activity/trainSingUp/statistics/info.js

@@ -3,7 +3,7 @@ const info = {
         <div>
             <el-tabs>
                 <el-tab-pane label="报名人员">
-                    <el-table :data="registerUserTableData" class="mt20">
+                    <el-table :data="registerUserTableData" class="mt20" max-height="600">
                         <el-table-column
                                 :label="column.label"
                                 :prop="column.prop"

src/main/resources/views/platform/zhgh/club/evaluate/apply/index.html

@@ -127,7 +127,7 @@ layout("/layouts/platform.html"){
                 this.$axios.post("/platform/club/evaluate/apply/save", { data: JSON.stringify(this.formData) }).then((res) => {
                     if (res.code === 0) {
                         this.$message.success(res.msg)
-                        location.href = '/platform/club/evaluate/mine'
+                        commonUtil.pjaxPush('/platform/club/evaluate/mine')
                     }
                 })
             },
@@ -149,7 +149,7 @@ layout("/layouts/platform.html"){
                         })
                         if (resp.code === 0) {
                             this.$message.success(resp.msg)
-                            location.href = '/platform/club/evaluate/mine'
+                            commonUtil.pjaxPush('/platform/club/evaluate/mine')
                         } else {
                             this.$message.warning(resp.msg)
                         }
@@ -170,7 +170,7 @@ layout("/layouts/platform.html"){
                         }).then(res => {
                             if (res.code === 0) {
                                 this.$message.success(res.msg)
-                                window.location.href = '/platform/club/evaluate/mine'
+                                commonUtil.pjaxPush('/platform/club/evaluate/mine')
                             }
                         })
                     })

src/main/resources/views/platform/zhgh/club/evaluate/mine/index.html

@@ -114,7 +114,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onEdit(row) {
-                window.location.href = '/platform/club/evaluate/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/club/evaluate/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             async onDelete(id) {
                 const confirm = await this.$confirm("此操作将永久删除, 是否继续?", "提示", {

src/main/resources/views/platform/zhgh/club/examine/apply/index.html

@@ -376,7 +376,7 @@ layout("/layouts/platform.html"){
                 }).then((res) => {
                     if (res.code === 0) {
                         this.$message.success(res.msg)
-                        location.href = '/platform/club/examine/mine'
+                        commonUtil.pjaxPush('/platform/club/examine/mine')
                     }
                 })
             },
@@ -394,7 +394,7 @@ layout("/layouts/platform.html"){
                     })
                     if (resp.code === 0) {
                         this.$message.success(resp.msg)
-                        location.href = '/platform/club/examine/mine'
+                        commonUtil.pjaxPush('/platform/club/examine/mine')
                     } else {
                         this.$message.warning(resp.msg)
                     }
@@ -414,7 +414,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
-                            window.location.href = '/platform/club/examine/mine'
+                            commonUtil.pjaxPush('/platform/club/examine/mine')
                         }
                     })
                 })

src/main/resources/views/platform/zhgh/club/examine/mine/index.html

@@ -106,7 +106,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onEdit(row) {
-                window.location.href = '/platform/club/examine/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/club/examine/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             async onDelete(id) {
                 const confirm = await this.$confirm("此操作将永久删除, 是否继续?", "提示", {

src/main/resources/views/platform/zhgh/club/join/apply/index.html

@@ -165,7 +165,7 @@ layout("/layouts/platform.html"){
                     this.$axios.post('/platform/club/join/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
-                            location.href = '/platform/club/join/mine'
+                            commonUtil.pjaxPush('/platform/club/join/mine')
                         }
                     })
                 })
@@ -180,7 +180,7 @@ layout("/layouts/platform.html"){
                         this.$confirm("您确定要提交申请吗？", "提示", { type: "warning" }).then(() => {
                             this.$axios.post("/platform/club/join/apply/submit", this.formData).then((res) => {
                                 if (res.code === 0) {
-                                    location.href = '/platform/club/join/mine'
+                                    commonUtil.pjaxPush('/platform/club/join/mine')
                                     this.$message.success(res.msg)
                                 }
                             })
@@ -202,7 +202,7 @@ layout("/layouts/platform.html"){
                             }).then(res => {
                                 if (res.code === 0) {
                                     this.$message.success(res.msg)
-                                    location.href = '/platform/club/join/mine'
+                                    commonUtil.pjaxPush('/platform/club/join/mine')
                                 }
                             })
                         })

src/main/resources/views/platform/zhgh/club/join/list/index.html

@@ -114,7 +114,7 @@ layout("/layouts/platform.html"){
             async doSubmit(row) {
                 this.$axios.post("/platform/club/join/apply/checkApplyClub", { clubId: row.id }).then((res) => {
                     if (res.code === 0) {
-                        location.href = '/platform/club/join/apply?clubId=' + row.id
+                        commonUtil.pjaxPush('/platform/club/join/apply?clubId=' + row.id)
                     }
                 })
             },

src/main/resources/views/platform/zhgh/club/join/mine/index.html

@@ -92,7 +92,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onEdit(row) {
-                location.href = '/platform/club/join/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/club/join/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             onDelete(id) {
                 this.$confirm("确定要删除此申请吗？", "提示", {

src/main/resources/views/platform/zhgh/club/register/apply/index.html

@@ -157,7 +157,7 @@ layout("/layouts/platform.html"){
                     })
                     if (resp.code === 0) {
                         this.$message.success(resp.msg)
-                        location.href = '/platform/club/register/clubMyApply'
+                        commonUtil.pjaxPush('/platform/club/register/clubMyApply')
                     }
                 } catch (e) {
                     console.log(e)

src/main/resources/views/platform/zhgh/club/register/mine/index.html

@@ -102,7 +102,7 @@ layout("/layouts/platform.html"){
                 })
             },
             openAdd() {
-                location.href = '/platform/club/register/clubRegisterApply'
+                commonUtil.pjaxPush('/platform/club/register/clubRegisterApply')
             },
             openView(row) {
                 this.$refs.guava.view(() => {
@@ -110,7 +110,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onEdit(row) {
-                window.location.href = '/platform/club/register/clubRegisterApply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/club/register/clubRegisterApply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             async onDelete(id) {
                 const confirm = await this.$confirm("此操作将永久删除, 是否继续?", "提示", {

src/main/resources/views/platform/zhgh/dayofficework/article/mine/index.html

@@ -78,7 +78,7 @@ layout("/layouts/platform.html"){
             },
             // 编辑
             onEdit(row) {
-                window.location.href = '/platform/article/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/article/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             // 撤回
             onRevoke(row) {

src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html

@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
                         if (res.code === 0) {
                             this.$message.success("保存成功")
                             //this.$store.dispatch("pjaxRoute", "/platform/article/mine")
-                            window.location.href = "/platform/article/mine"
+                            commonUtil.pjaxPush("/platform/article/mine")
                         }
                     })
                 })
@@ -130,7 +130,7 @@ layout("/layouts/platform.html"){
                         }).then((res) => {
                             if (res.code === 0) {
                                 this.$message.success("提交成功")
-                                window.location.href = "/platform/article/mine"
+                                commonUtil.pjaxPush("/platform/article/mine")
                             }
                         })
                     }
@@ -150,7 +150,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            window.location.href = '/platform/article/mine'
+                            commonUtil.pjaxPush('/platform/article/mine')
                         }
                     })
                 })

src/main/resources/views/platform/zhgh/dayofficework/clothing/record/index.html

@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
         })
       },
       openAdd() {
-        location.href = '/platform/clothing/apply'
+          commonUtil.pjaxPush('/platform/clothing/apply')
       },
       onDelete(row) {
         this.$confirm('此操作将永久删除, 是否继续?', '提示', {

src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/apply/index.html

@@ -239,7 +239,7 @@ layout("/layouts/platform.html"){
                             this.$axios.post('/platform/enrollmentRegistration/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
                                 if (res.code === 0) {
                                     this.$message.success("保存成功")
-                                    window.location.href = '/platform/enrollmentRegistration/applyList/index'
+                                    commonUtil.pjaxPush('/platform/enrollmentRegistration/applyList/index')
                                 }
                             })
                         })
@@ -270,7 +270,7 @@ layout("/layouts/platform.html"){
                                     }).then(res => {
                                         if (res.code === 0) {
                                             this.$message.success("提交成功")
-                                            window.location.href = '/platform/enrollmentRegistration/applyList/index'
+                                            commonUtil.pjaxPush('/platform/enrollmentRegistration/applyList/index')
                                         }
                                     })
                                 })
@@ -303,7 +303,7 @@ layout("/layouts/platform.html"){
                                     }).then(res => {
                                         if (res.code === 0) {
                                             this.$message.success("提交成功")
-                                            window.location.href = '/platform/enrollmentRegistration/applyList/index'
+                                            commonUtil.pjaxPush('/platform/enrollmentRegistration/applyList/index')
                                         }
                                     })
                                 })

src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/applyList/index.html

@@ -94,7 +94,7 @@ layout("/layouts/platform.html"){
                 })
             },
             openEdit(row) {
-                window.location.href = '/platform/enrollmentRegistration/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/enrollmentRegistration/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             onRevoke(row) {
                 this.$confirm("您确定要撤回吗？", "提示", {

src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js

@@ -222,7 +222,7 @@ const apply_component = {
                         if (this.formData.id) {
                             this.$emit('refresh')
                         } else {
-                            window.location.href = '/platform/evaluate/mine'
+                            commonUtil.pjaxPush('/platform/evaluate/mine')
                         }
                     }
                 })
@@ -243,7 +243,7 @@ const apply_component = {
                         if (this.formData.id) {
                             this.$emit('refresh')
                         } else {
-                            window.location.href = '/platform/evaluate/mine'
+                            commonUtil.pjaxPush('/platform/evaluate/mine')
                         }
                     }
                 })
@@ -264,7 +264,7 @@ const apply_component = {
                         if (this.formData.id) {
                             this.$emit('refresh')
                         } else {
-                            window.location.href = '/platform/evaluate/mine'
+                            commonUtil.pjaxPush('/platform/evaluate/mine')
                         }
                     }
                 })

src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html

@@ -283,7 +283,7 @@ layout("/layouts/platform.html"){
                     this.$axios.post('/platform/activity/budget/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
                         if (res.code === 0) {
                             this.$message.success("保存成功")
-                            window.location.href = '/platform/activity/budget/applyList'
+                            commonUtil.pjaxPush('/platform/activity/budget/applyList')
                         }
                     })
                 })
@@ -301,7 +301,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            window.location.href = '/platform/activity/budget/applyList'
+                            commonUtil.pjaxPush('/platform/activity/budget/applyList')
                         }
                     })
                 })
@@ -318,7 +318,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            window.location.href = '/platform/activity/budget/applyList'
+                            commonUtil.pjaxPush('/platform/activity/budget/applyList')
                         }
                     })
                 })

src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html

@@ -143,7 +143,7 @@ layout("/layouts/platform.html"){
         },
         methods: {
             openAdd() {
-                window.location.href = '/platform/activity/budget/apply'
+                commonUtil.pjaxPush('/platform/activity/budget/apply')
             },
             doExport() {
             },
@@ -232,7 +232,7 @@ layout("/layouts/platform.html"){
                 })
             },
             openEdit(row) {
-                window.location.href = '/platform/activity/budget/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/activity/budget/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             doDelete(id) {
                 this.$confirm('确定删除该条数据？', '提示', {

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/apply/index.html

@@ -160,7 +160,7 @@ layout("/layouts/platform.html"){
                             this.$axios.post('/platform/outlay/reimburse/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
                                 if (res.code === 0) {
                                     this.$message.success("保存成功")
-                                    window.location.href = '/platform/outlay/reimburse/applyList/index'
+                                    commonUtil.pjaxPush('/platform/outlay/reimburse/applyList/index')
                                 }
                             })
                         }
@@ -182,7 +182,7 @@ layout("/layouts/platform.html"){
                             }).then(res => {
                                 if (res.code === 0) {
                                     this.$message.success("提交成功")
-                                    window.location.href = '/platform/outlay/reimburse/applyList/index'
+                                    commonUtil.pjaxPush('/platform/outlay/reimburse/applyList/index')
                                 }
                             })
                         }
@@ -203,7 +203,7 @@ layout("/layouts/platform.html"){
                             }).then(res => {
                                 if (res.code === 0) {
                                     this.$message.success("提交成功")
-                                    window.location.href = '/platform/outlay/reimburse/applyList/index'
+                                    commonUtil.pjaxPush('/platform/outlay/reimburse/applyList/index')
                                 }
                             })
                         }

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/applyList/index.html

@@ -103,7 +103,7 @@ layout("/layouts/platform.html"){
                 })
             },
             openEdit(row) {
-                window.location.href = '/platform/outlay/reimburse/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/outlay/reimburse/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             onRevoke(row) {
                 this.$confirm("您确定要撤回吗？", "提示", {

src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js

@@ -129,7 +129,7 @@ const apply = {
                         if (resp.code === 0) {
                             this.$message.success(resp.msg)
                             this.dialogVisible = false
-                            location.href = '/platform/site/mine'
+                            commonUtil.pjaxPush('/platform/site/mine')
                         } else {
                             this.$message.warning(resp.msg)
                         }

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html

@@ -348,7 +348,7 @@ layout("/layouts/platform.html"){
                     this.$axios.post('/platform/unionReimburse/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
-                            window.location.href = '/platform/unionReimburse/mine/index'
+                            commonUtil.pjaxPush('/platform/unionReimburse/mine/index')
                         }
                     })
                 })
@@ -374,7 +374,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            window.location.href = '/platform/unionReimburse/mine/index'
+                            commonUtil.pjaxPush('/platform/unionReimburse/mine/index')
                         }
                     })
                 })
@@ -401,7 +401,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            window.location.href = '/platform/unionReimburse/mine/index'
+                            commonUtil.pjaxPush('/platform/unionReimburse/mine/index')
                         }
                     })
                 })

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html

@@ -162,7 +162,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onEdit(row) {
-                window.location.href = '/platform/unionReimburse/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/unionReimburse/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             onRevoke(row) {
                 this.$confirm("您确定要撤回吗？", "提示", {

src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/mine.html

@@ -148,7 +148,7 @@ layout("/layouts/platform.html"){
                 })
             },
             openEdit(row) {
-                window.location.href = '/platform/workershome/declaration/apply?id=' + row.id;
+                commonUtil.pjaxPush('/platform/workershome/declaration/apply?id=' + row.id;)
             },
             async flushUnits() {
                 this.$set(this.pageForm, "unitId", null)

src/main/resources/views/platform/zhgh/dayofficework/workershome/info/apply.html

@@ -244,7 +244,7 @@ layout("/layouts/platform.html"){
                 if (resp.code === 0) {
                     this.notifySuccess(resp.msg)
                     setTimeout(() => {
-                        location.href = '/platform/workershome/info/mine'
+                        commonUtil.pjaxPush('/platform/workershome/info/mine')
                     }, 500)
                 } else {
                     this.notifyWarning(resp.msg)
@@ -266,7 +266,7 @@ layout("/layouts/platform.html"){
                         if (resp.code === 0) {
                             this.notifySuccess(resp.msg)
                             setTimeout(() => {
-	                            location.href = '/platform/workershome/info/mine'
+                                commonUtil.pjaxPush('/platform/workershome/info/mine')
                             }, 500)
                         } else {
                             this.notifyWarning(resp.msg)
@@ -319,7 +319,7 @@ layout("/layouts/platform.html"){
                         type: 'warning'
                     }).then(() => {
                         setTimeout(() => {
-                            location.href = '/platform/workershome/declaration/apply'
+                            commonUtil.pjaxPush('/platform/workershome/declaration/apply')
                         }, 500)
                     })
                 }

src/main/resources/views/platform/zhgh/dayofficework/workershome/info/mine.html

@@ -134,7 +134,7 @@ layout("/layouts/platform.html"){
 
             },
             openEdit(row) {
-                location.href = '/platform/workershome/info/apply?id=' + row.id
+                commonUtil.pjaxPush('/platform/workershome/info/apply?id=' + row.id)
             },
             async flushUnits() {
                 this.$set(this.pageForm, "unitId", null)

src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/mine/index.html

@@ -76,7 +76,7 @@ layout("/layouts/platform.html"){
             },
 
             onEdit(row) {
-                window.location.href = '/platform/grassrootsCongress/material/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/grassrootsCongress/material/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
 
             onRevoke(row) {

src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/write/index.html

@@ -79,7 +79,7 @@ layout("/layouts/platform.html"){
                     this.$axios.post('/platform/grassrootsCongress/material/write/save', {data: JSON.stringify(this.formData)}).then(res => {
                         if (res.code === 0) {
                             this.$message.success("保存成功")
-                            window.location.href = '/platform/grassrootsCongress/material/mine'
+                            commonUtil.pjaxPush('/platform/grassrootsCongress/material/mine')
                         }
                     })
                 })
@@ -99,7 +99,7 @@ layout("/layouts/platform.html"){
                         }).then(res => {
                             if (res.code === 0) {
                                 this.$message.success("提交成功")
-                                window.location.href = '/platform/grassrootsCongress/material/mine'
+                                commonUtil.pjaxPush('/platform/grassrootsCongress/material/mine')
                             }
                         })
                     })
@@ -121,7 +121,7 @@ layout("/layouts/platform.html"){
                         }).then(res => {
                             if (res.code === 0) {
                                 this.$message.success("提交成功")
-                                window.location.href = '/platform/grassrootsCongress/material/mine'
+                                commonUtil.pjaxPush('/platform/grassrootsCongress/material/mine')
                             }
                         })
                     })

src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/mine/index.html

@@ -79,7 +79,7 @@ layout("/layouts/platform.html"){
             },
 
             onEdit(row) {
-                window.location.href = '/platform/grassrootsCongress/meeting/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/grassrootsCongress/meeting/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
 
             onRevoke(row) {

src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/write/index.html

@@ -150,7 +150,7 @@ layout("/layouts/platform.html"){
                     this.$axios.post('/platform/grassrootsCongress/meeting/write/save', {data: JSON.stringify(this.formData)}).then(res => {
                         if (res.code === 0) {
                             this.$message.success("保存成功")
-                            window.location.href = '/platform/grassrootsCongress/meeting/mine'
+                            commonUtil.pjaxPush('/platform/grassrootsCongress/meeting/mine')
                         }
                     })
                 })
@@ -170,7 +170,7 @@ layout("/layouts/platform.html"){
                         }).then(res => {
                             if (res.code === 0) {
                                 this.$message.success("提交成功")
-                                window.location.href = '/platform/grassrootsCongress/meeting/mine'
+                                commonUtil.pjaxPush('/platform/grassrootsCongress/meeting/mine')
                             }
                         })
                     })
@@ -192,7 +192,7 @@ layout("/layouts/platform.html"){
                         }).then(res => {
                             if (res.code === 0) {
                                 this.$message.success("提交成功")
-                                window.location.href = '/platform/grassrootsCongress/meeting/mine'
+                                commonUtil.pjaxPush('/platform/grassrootsCongress/meeting/mine')
                             }
                         })
                     })

src/main/resources/views/platform/zhgh/democratic/proposal/transact/apply/form.html

@@ -168,7 +168,7 @@
                             window.GlobalBroadcastChannel.postMessage({
                                 type: "task-complete"
                             })
-                            window.location.href = "/platform/proposal/apply/index"
+                            commonUtil.pjaxPush("/platform/proposal/apply/index")
                         }
                     })
             },
@@ -208,7 +208,7 @@
                         .then((res) => {
                             if (res.code === 0) {
                                 this.$message.success(res.msg)
-                                window.location.href = "/platform/proposal/apply/index"
+                                commonUtil.pjaxPush("/platform/proposal/apply/index")
                             }
                         })
                 })

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

@@ -95,7 +95,7 @@ layout("/layouts/platform.html"){
                 })
             },
             openEdit(row) {
-                window.location.href = '/platform/proposal/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/proposal/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             openRevoke(row) {
                 this.$confirm("您确定要撤销申请吗?", "提示", {

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

@@ -218,7 +218,7 @@ layout("/layouts/platform.html"){
                         if (res.code === 0) {
                             this.$message.success(res.msg)
                             this.formData = res.data
-                            window.location.href = '/platform/proposal/mine'
+                            commonUtil.pjaxPush('/platform/proposal/mine')
                         }
                     })
                 }
@@ -246,7 +246,7 @@ layout("/layouts/platform.html"){
                         this.$axios.post('/platform/proposal/write/submit', {info: JSON.stringify(this.formData)}).then(res => {
                             if (res.code === 0) {
                                 this.$message.success("提交成功")
-                                window.location.href = '/platform/proposal/mine'
+                                commonUtil.pjaxPush('/platform/proposal/mine')
                             }
                         })
                     })
@@ -277,7 +277,7 @@ layout("/layouts/platform.html"){
                         }).then(res => {
                             if (res.code === 0) {
                                 this.$message.success("提交成功")
-                                window.location.href = '/platform/proposal/mine'
+                                commonUtil.pjaxPush('/platform/proposal/mine')
                             }
                         })
                     })

src/main/resources/views/platform/zhgh/democratic/suggestionBox/mine/index.html

@@ -71,7 +71,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onEdit(row) {
-                window.location.href = '/platform/suggestionBox/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/suggestionBox/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             onRevoke(row) {
                 this.$confirm("您确定要撤回吗？", "提示", {

src/main/resources/views/platform/zhgh/democratic/suggestionBox/query/index.html

@@ -67,7 +67,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onEdit(row) {
-                window.location.href = '/platform/suggestionBox/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/suggestionBox/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             onRevoke(row) {
                 this.$confirm("您确定要撤回吗？", "提示", {

src/main/resources/views/platform/zhgh/democratic/suggestionBox/write/index.html

@@ -77,7 +77,7 @@ layout("/layouts/platform.html"){
                     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'
+                            commonUtil.pjaxPush('/platform/suggestionBox/mine')
                         }
                     })
                 })
@@ -95,7 +95,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            window.location.href = '/platform/suggestionBox/mine'
+                            commonUtil.pjaxPush('/platform/suggestionBox/mine')
                         }
                     })
                 })
@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            window.location.href = '/platform/suggestionBox/mine'
+                            commonUtil.pjaxPush('/platform/suggestionBox/mine')
                         }
                     })
                 })

src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html

@@ -280,7 +280,7 @@ layout("/layouts/platform.html"){
                     this.$axios.post("/platform/condolence/apply/save", { data: JSON.stringify(this.formData) }).then(res => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
-                            window.location.href = "/platform/condolence/mine"
+                            commonUtil.pjaxPush("/platform/condolence/mine")
                         }
                     })
                 })
@@ -298,7 +298,7 @@ layout("/layouts/platform.html"){
                             }).then(res => {
                                 if (res.code === 0) {
                                     this.$message.success(res.msg)
-                                    window.location.href = "/platform/condolence/mine"
+                                    commonUtil.pjaxPush("/platform/condolence/mine")
                                 }
                             })
                         })
@@ -319,7 +319,7 @@ layout("/layouts/platform.html"){
                             }).then(res => {
                                 if (res.code === 0) {
                                     this.$message.success(res.msg)
-                                    window.location.href = "/platform/condolence/mine"
+                                    commonUtil.pjaxPush("/platform/condolence/mine")
                                 }
                             })
                         })

src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html

@@ -103,7 +103,7 @@ layout("/layouts/platform.html"){
         },
         methods: {
             onAdd() {
-                window.location.href = '/platform/condolence/apply'
+                commonUtil.pjaxPush('/platform/condolence/apply')
             },
             onView(row) {
                 this.$refs.guava.view(()=>{
@@ -111,7 +111,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onEdit(row) {
-                window.location.href = '/platform/condolence/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/condolence/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             onRevoke(row) {
                 this.$confirm("您确定要撤回吗？", "提示", {

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

@@ -279,7 +279,7 @@ layout("/layouts/platform.html"){
 					this.$axios.post('/platform/difficultHelp/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("保存成功")
-							window.location.href = '/platform/difficultHelp/mine'
+                            commonUtil.pjaxPush('/platform/difficultHelp/mine')
 						}
 					})
 				})
@@ -297,7 +297,7 @@ layout("/layouts/platform.html"){
 					}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("提交成功")
-							window.location.href = '/platform/difficultHelp/mine'
+                            commonUtil.pjaxPush('/platform/difficultHelp/mine')
 						}
 					})
 				})
@@ -315,7 +315,7 @@ layout("/layouts/platform.html"){
 					}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("提交成功")
-							window.location.href = '/platform/difficultHelp/mine'
+                            commonUtil.pjaxPush('/platform/difficultHelp/mine')
 						}
 					})
 				})

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

@@ -117,7 +117,7 @@ layout("/layouts/platform.html"){
 		},
 		methods: {
 			onApply(){
-				window.location.href = '/platform/difficultHelp/apply'
+                commonUtil.pjaxPush('/platform/difficultHelp/apply')
 			},
 			openView(row) {
 				this.$refs.guava.view(() => {
@@ -125,7 +125,7 @@ layout("/layouts/platform.html"){
 				})
 			},
 			onEdit(row) {
-				window.location.href = '/platform/difficultHelp/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/difficultHelp/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗？", "提示", {

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

@@ -116,7 +116,7 @@ layout("/layouts/platform.html"){
 				})
 			},
 			onEdit(row) {
-				window.location.href = '/platform/difficultHelp/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/difficultHelp/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗？", "提示", {

src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html

@@ -194,8 +194,7 @@ layout("/layouts/platform.html"){
                     this.$axios.post('/platform/dsznfmtx/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
-                            window.location.href = '/platform/dsznfmtx/mine/index'
+                            commonUtil.pjaxPush('/platform/dsznfmtx/mine/index')
-                            //commonUtil.pjaxPush('/platform/dsznfmtx/mine/index')
                         }
                     })
                 })
@@ -214,7 +213,7 @@ layout("/layouts/platform.html"){
                             }).then(res => {
                                 if (res.code === 0) {
                                     this.$message.success("提交成功")
-                                    window.location.href = '/platform/dsznfmtx/mine/index'
+                                    commonUtil.pjaxPush('/platform/dsznfmtx/mine/index')
                                 }
                             })
                         })
@@ -239,7 +238,7 @@ layout("/layouts/platform.html"){
                             }).then(res => {
                                 if (res.code === 0) {
                                     this.$message.success("提交成功")
-                                    window.location.href = '/platform/dsznfmtx/mine/index'
+                                    commonUtil.pjaxPush('/platform/dsznfmtx/mine/index')
                                 }
                             })
                         })

src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/mine/index.html

@@ -75,8 +75,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onEdit(row) {
-                //commonUtil.pjaxPush('/platform/dsznfmtx/apply/index', {taskId: (row.startTaskId || ''), bizId: row.id})
+                commonUtil.pjaxPush('/platform/dsznfmtx/apply/index', {taskId: (row.startTaskId || ''), bizId: row.id})
-                window.location.href = '/platform/dsznfmtx/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
             },
             onRevoke(row) {
                 this.$confirm("您确定要撤回吗？", "提示", {

src/main/resources/views/platform/zhgh/staffbenefit/legal/apply/basicForm.js

@@ -102,7 +102,7 @@ const basicForm = {
                         cancelButtonText: "取消",
                         type: "warning"
                     }).then(async () => {
-                        const resp = await this.$axios.post("/platform/legal/apply/onSubmit", this.formData)
+                        const resp = await this.$axios.post("/platform/legal/apply/submit", this.formData)
                         if (resp.code === 0) {
                             this.$message.success(resp.msg)
                             this.$emit('refresh')

src/main/resources/views/platform/zhgh/staffbenefit/legal/apply/index.html

@@ -1,10 +1,6 @@
 <!--#
 layout("/layouts/platform.html"){
 #-->
-
-<link rel="stylesheet" href="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.css">
-<script src="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.min.js"></script>
-
 <style>
   #calendar {
     max-width: 1200px;

src/main/resources/views/platform/zhgh/staffbenefit/legal/appointmentSet/index.html

@@ -1,10 +1,6 @@
 <!--#
 layout("/layouts/platform.html"){
 #-->
-
-<link rel="stylesheet" href="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.css">
-<script src="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.min.js"></script>
-
 <style>
   #calendar {
     max-width: 1200px;

src/main/resources/views/platform/zhgh/staffbenefit/legal/list/index.html

@@ -88,13 +88,13 @@ layout("/layouts/platform.html"){
                 })
             },
             onDelete(row) {
-                this.$confirm("您确定要删除吗, 是否继续?", "提示", {
+                this.$confirm("您确定要删除吗？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 })
                     .then(() => {
-                        this.$axios.post("/platform/legal/list/onDelete", { id: row.id }).then((res) => {
+                        this.$axios.post("/platform/legal/list/delete", { id: row.id }).then((res) => {
                             if (res.code === 0) {
                                 this.$message.success(res.msg)
                                 this.pageData()

src/main/resources/views/platform/zhgh/staffbenefit/legal/onlinePost/basicForm.js

@@ -52,7 +52,7 @@ const basicForm = {
                         cancelButtonText: "取消",
                         type: "warning"
                     }).then(async () => {
-                        const resp = await this.$axios.post("/platform/legal/onlinePost/onSubmit", this.formData)
+                        const resp = await this.$axios.post("/platform/legal/onlinePost/submit", this.formData)
                         if (resp.code === 0) {
                             this.$message.success(resp.msg)
                             this.$emit('refresh')

src/main/resources/views/platform/zhgh/staffbenefit/legal/onlinePost/index.html

@@ -126,13 +126,13 @@ layout("/layouts/platform.html"){
                 })
             },
             onDelete(row) {
-                this.$confirm("您确定要删除吗, 是否继续?", "提示", {
+                this.$confirm("您确定要删除吗？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 })
                     .then(() => {
-                        this.$axios.post("/platform/legal/onlinePost/onDelete", { id: row.id }).then((res) => {
+                        this.$axios.post("/platform/legal/onlinePost/delete", { id: row.id }).then((res) => {
                             if (res.code === 0) {
                                 this.$message.success(res.msg)
                                 this.pageData()

src/main/resources/views/platform/zhgh/staffbenefit/legal/onlinePost/info.js

@@ -56,17 +56,17 @@ const info = {
         },
     },
     style: /*language=CSS*/ `
-        .el-timeline-item {
+        ::v-deep .el-timeline-item {
             padding-bottom: 20px;
         }
-        .el-timeline-item__wrapper {
+        ::v-deep .el-timeline-item__wrapper {
             padding-left: 28px;
             top: -3px;
         }
-        .el-timeline-item__tail {
+        ::v-deep .el-timeline-item__tail {
             left: 4px;
         }
-        .user-face{
+        ::v-deep .user-face{
             display: flex;
         }
     `

src/main/resources/views/platform/zhgh/staffbenefit/legal/onlineReply/basicForm.js

@@ -51,7 +51,7 @@ const basicForm = {
                         cancelButtonText: "取消",
                         type: "warning"
                     }).then(async () => {
-                        const resp = await this.$axios.post("/platform/legal/onlineReply/onSubmit", this.formData)
+                        const resp = await this.$axios.post("/platform/legal/onlineReply/submit", this.formData)
                         if (resp.code === 0) {
                             this.$message.success(resp.msg)
                             this.$emit('refresh')

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html

@@ -211,7 +211,7 @@ layout("/layouts/platform.html"){
                     this.$axios.post('/platform/maternityLeave/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
-                            window.location.href = '/platform/maternityLeave/mine/index'
+                            commonUtil.pjaxPush('/platform/maternityLeave/mine/index')
                         }
                     })
                 })
@@ -228,7 +228,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            window.location.href = '/platform/maternityLeave/mine/index'
+                            commonUtil.pjaxPush('/platform/maternityLeave/mine/index')
                         }
                     })
                 })
@@ -246,7 +246,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            window.location.href = '/platform/maternityLeave/mine/index'
+                            commonUtil.pjaxPush('/platform/maternityLeave/mine/index')
                         }
                     })
                 })

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html

@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onEdit(row) {
-                window.location.href = '/platform/maternityLeave/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/maternityLeave/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
             onRevoke(row) {
                 this.$confirm("您确定要撤回吗？", "提示", {

src/main/resources/views/platform/zhgh/staffbenefit/psychology/apply/basicForm.js

@@ -102,7 +102,7 @@ const basicForm = {
                         cancelButtonText: "取消",
                         type: "warning"
                     }).then(async () => {
-                        const resp = await this.$axios.post("/platform/psychology/apply/onSubmit", this.formData)
+                        const resp = await this.$axios.post("/platform/psychology/apply/submit", this.formData)
                         if (resp.code === 0) {
                             this.$message.success(resp.msg)
                             this.$emit('refresh')

src/main/resources/views/platform/zhgh/staffbenefit/psychology/apply/index.html

@@ -1,10 +1,6 @@
 <!--#
 layout("/layouts/platform.html"){
 #-->
-
-<link rel="stylesheet" href="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.css">
-<script src="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.min.js"></script>
-
 <style>
   #calendar {
     max-width: 1200px;

src/main/resources/views/platform/zhgh/staffbenefit/psychology/appointmentSet/index.html

@@ -1,10 +1,6 @@
 <!--#
 layout("/layouts/platform.html"){
 #-->
-
-<link rel="stylesheet" href="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.css">
-<script src="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.min.js"></script>
-
 <style>
   #calendar {
     max-width: 1200px;

src/main/resources/views/platform/zhgh/staffbenefit/psychology/list/index.html

@@ -88,13 +88,13 @@ layout("/layouts/platform.html"){
                 })
             },
             onDelete(row) {
-                this.$confirm("您确定要删除吗, 是否继续?", "提示", {
+                this.$confirm("您确定要删除吗？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 })
                     .then(() => {
-                        this.$axios.post("/platform/psychology/list/onDelete", { id: row.id }).then((res) => {
+                        this.$axios.post("/platform/psychology/list/delete", { id: row.id }).then((res) => {
                             if (res.code === 0) {
                                 this.$message.success(res.msg)
                                 this.pageData()

src/main/resources/views/platform/zhgh/staffbenefit/psychology/onlinePost/basicForm.js

@@ -52,7 +52,7 @@ const basicForm = {
                         cancelButtonText: "取消",
                         type: "warning"
                     }).then(async () => {
-                        const resp = await this.$axios.post("/platform/psychology/onlinePost/onSubmit", this.formData)
+                        const resp = await this.$axios.post("/platform/psychology/onlinePost/submit", this.formData)
                         if (resp.code === 0) {
                             this.$message.success(resp.msg)
                             this.$emit('refresh')

src/main/resources/views/platform/zhgh/staffbenefit/psychology/onlinePost/index.html

@@ -126,13 +126,13 @@ layout("/layouts/platform.html"){
                 })
             },
             onDelete(row) {
-                this.$confirm("您确定要删除吗, 是否继续?", "提示", {
+                this.$confirm("您确定要删除吗？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 })
                     .then(() => {
-                        this.$axios.post("/platform/psychology/onlinePost/onDelete", { id: row.id }).then((res) => {
+                        this.$axios.post("/platform/psychology/onlinePost/delete", { id: row.id }).then((res) => {
                             if (res.code === 0) {
                                 this.$message.success(res.msg)
                                 this.pageData()

src/main/resources/views/platform/zhgh/staffbenefit/psychology/onlinePost/info.js

@@ -56,17 +56,17 @@ const info = {
         },
     },
     style: /*language=CSS*/ `
-        .el-timeline-item {
+        ::v-deep .el-timeline-item {
             padding-bottom: 20px;
         }
-        .el-timeline-item__wrapper {
+        ::v-deep .el-timeline-item__wrapper {
             padding-left: 28px;
             top: -3px;
         }
-        .el-timeline-item__tail {
+        ::v-deep .el-timeline-item__tail {
             left: 4px;
         }
-        .user-face{
+        ::v-deep .user-face{
             display: flex;
         }
     `

src/main/resources/views/platform/zhgh/staffbenefit/psychology/onlineReply/basicForm.js

@@ -51,7 +51,7 @@ const basicForm = {
                         cancelButtonText: "取消",
                         type: "warning"
                     }).then(async () => {
-                        const resp = await this.$axios.post("/platform/psychology/onlineReply/onSubmit", this.formData)
+                        const resp = await this.$axios.post("/platform/psychology/onlineReply/submit", this.formData)
                         if (resp.code === 0) {
                             this.$message.success(resp.msg)
                             this.$emit('refresh')

src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html

@@ -172,7 +172,7 @@ layout("/layouts/platform.html"){
                 return age >= 0 ? age : '未出生';
             },
             openEdit(row) {
-                window.location.href = '/platform/childManage/write/index?bizId=' + row.id + '&manage=1'
+                commonUtil.pjaxPush('/platform/childManage/write/index?bizId=' + row.id + '&manage=1')
             },
             doDelete(id) {
                 this.$confirm("您确定要删除吗？", "提示", {

src/main/resources/views/platform/zhgh/staffmanage/childManage/mine/index.html

@@ -119,7 +119,7 @@ layout("/layouts/platform.html"){
                 return age >= 0 ? age : '未出生';
             },
             openEdit(row) {
-                window.location.href = '/platform/childManage/write/index?bizId=' + row.id
+                commonUtil.pjaxPush('/platform/childManage/write/index?bizId=' + row.id)
             },
             doDelete(id) {
                 this.$confirm("您确定要删除吗？", "提示", {

src/main/resources/views/platform/zhgh/staffmanage/childManage/write/index.html

@@ -309,9 +309,9 @@ layout("/layouts/platform.html"){
                         if (res.code === 0) {
                             this.$message.success(res.msg)
                             if (GetQueryString('manage') === '1') {
-                                window.location.href = '/platform/childManage/manage/index'
+                                commonUtil.pjaxPush('/platform/childManage/manage/index')
                             }else {
-                                window.location.href = '/platform/childManage/mine/index'
+                                commonUtil.pjaxPush('/platform/childManage/mine/index')
                             }
                         }
                     })

src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html

@@ -103,7 +103,7 @@ layout("/layouts/platform.html"){
 		},
 		methods: {
 			onApply() {
-				window.location.href = '/platform/member/apply/submit'
+                commonUtil.pjaxPush('/platform/member/apply/submit')
 			},
 			openView(row) {
 				this.$refs.guava.view(() => {
@@ -111,7 +111,7 @@ layout("/layouts/platform.html"){
 				})
 			},
 			onEdit(row) {
-				window.location.href = '/platform/member/apply/submit?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/member/apply/submit?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗?", "提示", {

src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html

@@ -297,7 +297,7 @@ layout("/layouts/platform.html"){
 					this.$axios.post('/platform/member/apply/submit/save', {data: JSON.stringify(this.formData)}).then(res => {
 						if (res.code === 0) {
 							this.$message.success(res.msg)
-							window.location.href = '/platform/member/apply/mine'
+                            commonUtil.pjaxPush('/platform/member/apply/mine')
 						}
 					})
 				})
@@ -315,7 +315,7 @@ layout("/layouts/platform.html"){
 							}).then(res => {
 								if (res.code === 0) {
 									this.$message.success(res.msg)
-									window.location.href = '/platform/member/apply/mine'
+                                    commonUtil.pjaxPush('/platform/member/apply/mine')
 								}
 							})
 						})
@@ -334,7 +334,7 @@ layout("/layouts/platform.html"){
 					}).then(res => {
 						if (res.code === 0) {
 							this.$message.success(res.msg)
-							window.location.href = '/platform/member/apply/mine'
+                            commonUtil.pjaxPush('/platform/member/apply/mine')
 						}
 					})
 				})

src/main/resources/views/platform/zhgh/staffmanage/member/change/mine/index.html

@@ -90,7 +90,7 @@ layout("/layouts/platform.html"){
 				})
 			},
 			onEdit(row) {
-				window.location.href = '/platform/member/change/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                commonUtil.pjaxPush('/platform/member/change/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗？", "提示", {

src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html

@@ -393,7 +393,7 @@ layout("/layouts/platform.html"){
 					this.$axios.post('/platform/member/change/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("保存成功")
-							window.location.href = '/platform/member/change/mine'
+                            commonUtil.pjaxPush('/platform/member/change/mine')
 						}
 					})
 				})
@@ -411,7 +411,7 @@ layout("/layouts/platform.html"){
 					}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("提交成功")
-							window.location.href = '/platform/member/change/mine'
+                            commonUtil.pjaxPush('/platform/member/change/mine')
 						}
 					})
 				})
@@ -429,7 +429,7 @@ layout("/layouts/platform.html"){
 					}).then(res => {
 						if (res.code === 0) {
 							this.$message.success("提交成功")
-							window.location.href = '/platform/member/change/mine'
+                            commonUtil.pjaxPush('/platform/member/change/mine')
 						}
 					})
 				})

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

@@ -117,7 +117,7 @@ layout("/layouts/platform_h5.html"){
             onDelete(row) {
                 this.$dialog.confirm({
                     title: "提示",
-                    message: "确定要删除此申请吗？"
+                    message: "您确定要删除吗？"
                 })
                     .then(() => {
                         this.$axios.post("/platform/condolence/mine/delete", { id: row.id }).then((res) => {

src/main/resources/views/platform/zhghh5/staffbenefit/legal/apply/index.html

@@ -0,0 +1,105 @@
+<!--#
+layout("/layouts/platform_h5.html"){
+#-->
+
+<style scoped>
+    img {
+        object-fit: contain !important;
+    }
+</style>
+
+<div id="app">
+    <van-nav-bar title="法律援助预约" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
+
+    <van-sticky offset-top="46px">
+        <van-search
+            v-model="pageForm.searchKeyword"
+            :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.sex" :options="sexOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
+        </van-dropdown-menu>
+    </van-sticky>
+
+    <table-list api="/platform/legal/apply/h5PageData"
+                :page_form.sync="pageForm"
+                ref="tableListRef"
+                title="userName"
+                img="avatar"
+                @ready="doSearch">
+        <template v-slot="{index,row}">
+            <table-column label="性别">{{row.sex}}</table-column>
+            <table-column label="擅长方向">{{row.specialty}}</table-column>
+            <table-column label="简介">{{row.introduce}}</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" @click="onApply(row)">
+                <i class="fa fa-edit"></i>
+                <span>预约</span>
+            </div>
+        </template>
+    </table-list>
+
+    <doctor-info ref="doctorInfoRef"></doctor-info>
+    <apply-form ref="applyFormRef"></apply-form>
+</div>
+
+<script>
+    <!--#include('../common/doctorInfo.js'){}#-->
+    <!--#include('../common/applyForm.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        components: {
+            "doctor-info": doctorInfo,
+            "apply-form": applyForm
+        },
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    sex: null,
+                },
+                sexOptions: [
+                    {text: '全部', value: null},
+                    {text: '男', value: '男'},
+                    {text: '女', value: '女'},
+                ],
+            }
+        },
+        methods: {
+            onView(row) {
+                this.$refs.doctorInfoRef.onOpen(row)
+            },
+            onApply(row) {
+                if(!row.times || row.times.length === 0) {
+                    this.$toast(row.userName + '暂无可预约时间段')
+                    return
+                }
+                this.$refs.applyFormRef.onOpen(row)
+            },
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            }
+        },
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/staffbenefit/legal/common/applyForm.js

@@ -0,0 +1,139 @@
+const applyForm = {
+    template: /*language=HTML*/ `
+        <div>
+            <van-action-sheet :close-on-click-overlay="false" title="预约信息" v-model="visible">
+                <van-form ref="formRef" class="form-container">
+                    <van-cell-group title="咨询师信息" class="form-section">
+                        <van-field label="姓名" readonly v-model="row.userName"></van-field>
+                        <van-field label="性别" readonly v-model="row.sex"></van-field>
+                        <van-field label="单位" readonly v-model="row.unitName"></van-field>
+                        <van-field label="电话" readonly v-model="row.mobile"></van-field>
+                    </van-cell-group>
+                    
+                    <van-cell-group title="预约时间段" class="form-section">
+                        <van-field required :rules="[{ required: true }]" 
+                                   label="时间段"
+                                   placeholder="请点击时间段"
+                                   v-model="formData.time"
+                                   readonly
+                                   is-link
+                                   @click="timePicker = true"
+                        ></van-field>
+                        <van-popup position="bottom" round v-model:show="timePicker">
+                            <van-picker
+                                title="请选择预约时间段"
+                                show-toolbar
+                                :columns="row.times"
+                                @confirm="timeConfirm"
+                                @cancel="timePicker = false"
+                                value-key="time"
+                            ></van-picker>
+                        </van-popup>
+                    </van-cell-group>
+                    
+                    <van-cell-group title="基本信息" class="form-section">
+                        <van-field label="姓名" readonly v-model="formData.userName"></van-field>
+                        <van-field label="工号" readonly v-model="formData.loginName"></van-field>
+                        <van-field label="单位" readonly v-model="formData.unitName"></van-field>
+                        <van-field required :rules="[{ required: true }]"
+                                   label="联系方式"
+                                   v-model="formData.mobile" 
+                                   placeholder="请输入联系方式"
+                        ></van-field>
+                        
+                        <van-field required :rules="[{ required: true }]"
+                                   label="咨询方式"
+                                   placeholder="请点击选择联系方式"
+                                   v-model="formData.askTypeName"
+                                   readonly
+                                   is-link
+                                   @click="askTypePicker = true"
+                        ></van-field>
+                        <van-popup position="bottom" round v-model:show="askTypePicker">
+                            <van-picker
+                                title="请选择咨询方式"
+                                show-toolbar
+                                :columns="askTypeColumns"
+                                @confirm="(val) => {formData.askTypeName = val.name; formData.askTypeValue = val.code; askTypePicker = false}"
+                                @cancel="askTypePicker = false"
+                                value-key="name"
+                            ></van-picker>
+                        </van-popup>
+                        
+                        <van-field
+                            v-model="formData.remark"
+                            name="remark"
+                            label="预约备注"
+                            type="textarea"
+                            rows="4"
+                            autosize
+                            placeholder="请输入预约备注"
+                        ></van-field>
+                    </van-cell-group>
+
+                    <div class="form-actions">
+                        <van-button @click="onSubmit" round type="info">提交申请</van-button>
+                    </div>
+                </van-form>
+            </van-action-sheet>
+        </div>
+    `,
+    store,
+    dicts: ["LEGAL_ASK_TYPE"],
+    data() {
+        return {
+            visible:false,
+            row: {},
+            formData: {},
+            sourceAskTypes: [],
+
+            askTypePicker: false,
+            askTypeColumns: [],
+
+            timePicker: false,
+        }
+    },
+    methods: {
+        onOpen(row) {
+            row.times.forEach(item => {
+                this.$set(item, 'time', this.$moment(item.startTime).format('YYYY-MM-DD HH:mm') + ' ~ ' + this.$moment(item.endTime).format('HH:mm'))
+            })
+            this.row = row
+            this.visible = true
+
+            this.init()
+        },
+        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, 'unitName', this.$store.state.user?.unit?.name)
+            this.$set(this.formData, 'mobile', this.$store.state.user.mobile)
+        },
+        timeConfirm(val, index) {
+            this.askTypeColumns = this.dict.type.LEGAL_ASK_TYPE.filter(o => val.askType.includes(o.code))
+            this.$set(this.formData, 'time', val.time)
+            this.$set(this.formData, 'id', val.id)
+            this.timePicker = false
+        },
+        onSubmit() {
+            this.$refs.formRef.validate().then(() => {
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要提交吗？"
+                }).then(() => {
+                    this.$axios.post("/platform/legal/apply/submit", this.formData).then(res => {
+                        if (res.code === 0) {
+                            this.$toast(res.msg)
+                            this.visible = false
+                            this.$pjaxReplace("/platform/legal/list/h5")
+                        }
+                    })
+                })
+            })
+        },
+    },
+    style: /*language=CSS*/ `
+        
+    `
+}

src/main/resources/views/platform/zhghh5/staffbenefit/legal/common/applyInfo.js

@@ -0,0 +1,49 @@
+const applyInfo = {
+    template: /*language=HTML*/ `
+        <div>
+            <van-action-sheet v-model="visible" title="详细信息" cancel-text="取消">
+                <div class="detail-container">
+                    <van-cell-group title="咨询师信息">
+                        <van-cell title="姓名">{{ row.doctorUserName }}</van-cell>
+                        <van-cell title="工号">{{ row.doctorUnitName }}</van-cell>
+                        <van-cell title="联系方式">{{ row.doctorMobile }}</van-cell>
+                        <van-cell title="职称">{{ row.doctorJobTitle }}</van-cell>
+                        <van-cell title="个人简介" class="direction-column-cell">
+                            {{ row.doctorIntroduce }}
+                        </van-cell>
+                    </van-cell-group>
+                    <van-cell-group title="预约时间段">
+                        <van-cell title="开始时间">{{ row.startTime }}</van-cell>
+                        <van-cell title="结束时间">{{ row.endTime }}</van-cell>
+                    </van-cell-group>
+                    <van-cell-group title="预约人信息">
+                        <van-cell title="姓名">{{ row.appointmentUserName }}</van-cell>
+                        <van-cell title="工号">{{ row.appointmentLoginName }}</van-cell>
+                        <van-cell title="单位">{{ row.appointmentUnitName }}</van-cell>
+                        <van-cell title="联系方式">{{ row.appointmentMobile }}</van-cell>
+                        <van-cell title="预约咨询方式">
+                            <dict-tag :options="dict.type.PSYCHOLOGY_ASK_TYPE" :value="row.askTypeValue"></dict-tag>
+                        </van-cell>
+                        <van-cell title="预约人备注"  class="direction-column-cell">{{ row.remark }}</van-cell>
+                    </van-cell-group>
+                </div>
+            </van-action-sheet>
+        </div>
+    `,
+    dicts:["LEGAL_ASK_TYPE"],
+    data() {
+        return {
+            visible:false,
+            row: {},
+        }
+    },
+    methods: {
+        onOpen(row) {
+            this.row = row
+            this.visible = true
+        },
+    },
+    style: /*language=CSS*/ `
+        
+    `
+}

src/main/resources/views/platform/zhghh5/staffbenefit/legal/common/doctorInfo.js

@@ -0,0 +1,77 @@
+const doctorInfo = {
+    template: /*language=HTML*/ `
+        <div>
+            <van-action-sheet v-model="visible" title="详细信息" cancel-text="取消">
+                <div class="detail-container">
+                    <van-cell-group title="基本信息">
+                        <van-cell title="姓名">{{ row?.userName }}</van-cell>
+                        <van-cell title="性别">{{ row?.sex }}</van-cell>
+                        <van-cell title="职称">{{ row?.jobTitle }}</van-cell>
+                        <van-cell title="单位">{{ row?.unitName }}</van-cell>
+                        <van-cell title="联系方式">{{ row?.mobile }}</van-cell>
+                        <van-cell title="擅长方向" class="direction-column-cell">{{ row?.specialty }}</van-cell>
+                        <van-cell title="个人简介" class="direction-column-cell">{{ row?.introduce }}</van-cell>
+                    </van-cell-group>
+                    <van-cell-group title="可预约时段">
+                        <table v-if="row?.times && row?.times.length > 0" class="table-class">
+                            <thead>
+                            <tr>
+                                <th>日期</th>
+                                <th>开始时间</th>
+                                <th>结束时间</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr v-for="(item,index) in row?.times" :key="index">
+                                <td>{{ $moment(item.startTime).format('YYYY-MM-DD') }}</td>
+                                <td>{{ $moment(item.startTime).format('HH:mm') }}</td>
+                                <td>{{ $moment(item.endTime).format('HH:mm') }}</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <div v-else class="empty-text">暂无可预约时段</div>
+                    </van-cell-group>
+                </div>
+            </van-action-sheet>
+        </div>
+    `,
+    data() {
+        return {
+            visible:false,
+            row: null,
+        }
+    },
+    methods: {
+        onOpen(row) {
+            this.row = row
+            this.visible = true
+        },
+    },
+    style: /*language=CSS*/ `
+        ::v-deep .table-class{
+            width: 100%;
+            border-radius: 5px;
+            overflow: hidden;
+            line-height: 1.5rem;
+            font-size: 13px;
+            table-layout: fixed;
+            border-collapse: collapse;
+        }
+        ::v-deep .table-class th {
+            background-color: #f2f2f2;
+            border: 1px solid #dddddd;
+        }
+        ::v-deep .table-class tr {
+            text-align: center;
+            border-bottom: 1px solid #dddddd;
+        }
+        ::v-deep .table-class td {
+            border: 1px solid #dddddd;
+        }
+        ::v-deep .empty-text {
+            font-size: 14px;
+            text-align: center;
+            padding: 10px 0;
+        }
+    `
+}

src/main/resources/views/platform/zhghh5/staffbenefit/legal/list/index.html

@@ -0,0 +1,98 @@
+<!--#
+layout("/layouts/platform_h5.html"){
+#-->
+
+<style scoped>
+
+</style>
+
+<div id="app">
+    <van-nav-bar title="预约记录" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
+
+    <van-sticky offset-top="46px">
+        <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
+            <year-van-dropdown-item :num="5" @change="doSearch" v-model="pageForm.year"></year-van-dropdown-item>
+        </van-dropdown-menu>
+    </van-sticky>
+
+    <table-list api="/platform/legal/list/pageData"
+                :page_form.sync="pageForm"
+                ref="tableListRef"
+                title="doctorUserName"
+                @ready="doSearch">
+        <template v-slot="{index,row}">
+            <table-column label="姓名">{{row.appointmentUserName}}</table-column>
+            <table-column label="工号">{{row.appointmentLoginName}}</table-column>
+            <table-column label="单位">{{row.appointmentUnitName}}</table-column>
+            <table-column label="开始时间">{{row.startTime}}</table-column>
+            <table-column label="结束时间">{{row.endTime}}</table-column>
+        </template>
+        <template #actions="{index,row}">
+            <div class="action-btn" @click="onView(row)">
+                <i class="fa fa-eye"></i>
+                <span>查看</span>
+            </div>
+            <div v-if="$moment().unix() < $moment(row.startTime).unix()"
+                 class="action-btn delete" @click="onDelete(row)">
+                <i class="fa fa-trash"></i>
+                <span>删除</span>
+            </div>
+        </template>
+    </table-list>
+
+    <info ref="infoRef"></info>
+</div>
+
+<script>
+    <!--#include('../common/applyInfo.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        components: {
+            "info": applyInfo,
+        },
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    year: new Date().getFullYear(),
+                },
+            }
+        },
+        methods: {
+            onView(row) {
+                this.$refs.infoRef.onOpen(row)
+            },
+            onDelete(row) {
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要删除吗？"
+                })
+                    .then(() => {
+                        this.$axios.post("/platform/legal/list/delete", { id: row.id }).then((res) => {
+                            if (res.code === 0) {
+                                this.$toast.success(res.msg)
+                                this.doSearch()
+                            } else {
+                                this.$toast.fail(res.msg)
+                            }
+                        })
+                    })
+                    .catch(() => {})
+            },
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            }
+        },
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/staffbenefit/legal/onlinePost/applyForm.js

@@ -0,0 +1,87 @@
+const applyForm = {
+    template: /*language=HTML*/ `
+        <div>
+            <van-action-sheet :close-on-click-overlay="false" title="咨询信息" v-model="visible">
+                <van-notice-bar
+                    left-icon="volume-o"
+                    text="温馨提示：不会发布您的个人隐私信息，您咨询的内容只有心理咨询师可查看并回复。"
+                ></van-notice-bar>
+                <van-form ref="formRef" class="form-container">
+                    <van-cell-group title="基本信息" class="form-section">
+                        <van-field label="咨询人姓名" :rules="[{ required: true }]"
+                                   :value="$store.state.user.username"
+                                   readonly
+                                   required
+                                   name="username"></van-field>
+                        <van-field label="咨询人工号" :rules="[{ required: true }]"
+                                   :value="$store.state.user.loginname"
+                                   readonly
+                                   required
+                                   name="loginname"></van-field>
+                        <van-field
+                            v-model="formData.postTitle"
+                            name="postTitle"
+                            label="咨询主题"
+                            type="textarea"
+                            rows="4"
+                            autosize
+                            placeholder="请简约填写咨询主题，不超过20个字"
+                            :rules="[{ required: true }]"
+                            required
+                        ></van-field>
+                        <van-field
+                            v-model="formData.postContent"
+                            name="postContent"
+                            label="主要内容"
+                            type="textarea"
+                            rows="4"
+                            autosize
+                            placeholder="请输入主要内容"
+                            :rules="[{ required: true }]"
+                            required
+                        ></van-field>
+                    </van-cell-group>
+
+                    <div class="form-actions">
+                        <van-button @click="onSubmit" round type="info">提交申请</van-button>
+                    </div>
+                </van-form>
+            </van-action-sheet>
+        </div>
+    `,
+    store,
+    data() {
+        return {
+            visible:false,
+            formData: {},
+        }
+    },
+    methods: {
+        onOpen(row) {
+            if(row && row.id) {
+                this.formData = clone(row)
+            }
+            this.visible = true
+        },
+        onSubmit() {
+            this.$refs.formRef.validate().then(() => {
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要提交吗？"
+                }).then(() => {
+                    this.$axios.post("/platform/legal/onlinePost/submit", this.formData).then(res => {
+                        if (res.code === 0) {
+                            this.$toast(res.msg)
+                            this.visible = false
+                            this.$emit('refresh')
+                        }
+                    })
+                })
+            })
+        },
+    },
+    style: /*language=CSS*/ `
+        
+    `
+}
+

src/main/resources/views/platform/zhghh5/staffbenefit/legal/onlinePost/index.html

@@ -0,0 +1,123 @@
+<!--#
+layout("/layouts/platform_h5.html"){
+#-->
+
+<style scoped>
+
+</style>
+
+<div id="app">
+    <van-nav-bar title="发帖咨询" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder
+                 right-text="我要咨询" @click-right="onAdd"></van-nav-bar>
+
+    <van-sticky offset-top="46px">
+        <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
+            <year-van-dropdown-item :num="5" @change="doSearch" v-model="pageForm.year"></year-van-dropdown-item>
+            <van-dropdown-item v-model="pageForm.isReply" :options="replyOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
+        </van-dropdown-menu>
+    </van-sticky>
+
+    <table-list api="/platform/legal/onlinePost/pageData"
+                :page_form.sync="pageForm"
+                ref="tableListRef"
+                title="postTitle"
+                @ready="doSearch">
+        <template v-slot="{index,row}">
+            <table-column label="工号">{{row.loginName}}</table-column>
+            <table-column label="姓名">{{row.userName}}</table-column>
+            <table-column label="咨询时间">{{row.postingTime}}</table-column>
+            <table-column label="回复情况">
+                <van-tag color="#67c23a" v-if="row.isReply">已回复</van-tag>
+                <van-tag type="primary" v-else>未回复</van-tag>
+            </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" @click="onEdit(row)">
+                <i class="fa fa-edit"></i>
+                <span>编辑</span>
+            </div>
+            <div v-if="!row.isReply"
+                 class="action-btn delete" @click="onDelete(row)">
+                <i class="fa fa-trash"></i>
+                <span>删除</span>
+            </div>
+        </template>
+    </table-list>
+
+    <info ref="infoRef"></info>
+    <apply-form ref="applyFormRef" @refresh="doSearch"></apply-form>
+</div>
+
+<script>
+    <!--#include('applyForm.js'){}#-->
+    <!--#include('info.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        components: {
+            "apply-form": applyForm,
+            "info": info,
+        },
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    year: new Date().getFullYear(),
+                    isReply: null,
+                },
+                replyOptions: [
+                    {text: '全部', value: null},
+                    {text: '已回复', value: true},
+                    {text: '未回复', value: false},
+                ],
+            }
+        },
+        methods: {
+            onView(row) {
+                const url = '/platform/legal/onlinePost/fetchOne'
+                this.$refs.infoRef.onOpen(row, url)
+            },
+            onAdd() {
+                this.$refs.applyFormRef.onOpen()
+            },
+            onEdit(row) {
+                this.$refs.applyFormRef.onOpen(row)
+            },
+            onDelete(row) {
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要删除吗？"
+                })
+                    .then(() => {
+                        this.$axios.post("/platform/legal/onlinePost/delete", { id: row.id }).then((res) => {
+                            if (res.code === 0) {
+                                this.$toast.success(res.msg)
+                                this.doSearch()
+                            } else {
+                                this.$toast.fail(res.msg)
+                            }
+                        })
+                    })
+                    .catch(() => {})
+            },
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            }
+        },
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/staffbenefit/legal/onlinePost/info.js

@@ -0,0 +1,73 @@
+const info = {
+    template: /*language=HTML*/ `
+        <div>
+            <van-action-sheet v-model="visible" title="详细信息" cancel-text="取消">
+                <div class="detail-container">
+                    <van-cell-group title="基础信息">
+                        <van-cell title="咨询人">{{ viewData.userName }}</van-cell>
+                        <van-cell title="咨询时间">{{ viewData.postingTime }}</van-cell>
+                        <van-cell title="咨询主题">{{ viewData.postTitle }}</van-cell>
+                        <van-cell title="主要内容" class="direction-column-cell">
+                            {{ viewData.postContent }}
+                        </van-cell>
+                    </van-cell-group>
+                    <van-cell-group title="回复信息">
+                        <van-steps v-if="viewData.replyList && viewData.replyList.length > 0" direction="vertical" active-icon="setting">
+                            <van-step v-for="(item, index) in viewData.replyList">
+                                <div class="user-face">
+                                    <svg t="1639966214107" class="icon" viewBox="0 0 3208 1024" version="1.1"
+                                         xmlns="http://www.w3.org/2000/svg" p-id="6251" width="80" height="30">
+                                        <path d="M343.496334 367.185736m-225.049322 0a225.049322 225.049322 0 1 0 450.098644 0 225.049322 225.049322 0 1 0-450.098644 0Z"
+                                              fill="#FFFFFF" p-id="6252"></path>
+                                        <path d="M1879.043392 0H355.341035c-3.079622 0-20.846674 23.689402-23.689402 23.689402 14.687429 3.079622 23.689402-11.370913 33.638951 0C400.350899 58.512824 450.098644 99.49549 497.477449 94.757609h23.689402c37.903044 0 58.512824 5.685457 57.565248 41.693348a155.639373 155.639373 0 0 0 71.068207 118.447012 76.51677 76.51677 0 0 1 10.186443 6.869927 64.19828 64.19828 0 0 1 9.001973 93.573139 152.796645 152.796645 0 0 0-23.689403 134.318911 58.27593 58.27593 0 0 1 3.553411 12.555383A66.567221 66.567221 0 0 1 592.235058 578.495205a161.087936 161.087936 0 0 0-108.260569 87.650788 77.227452 77.227452 0 0 1-6.159244 12.555384c-14.924323 23.689402-19.42531 11.370913-47.378805 6.869926L426.409242 686.992667h9.001973l11.370913 23.689403h1432.261264C2071.164445 710.68207 2226.803818 562.149517 2226.803818 379.030437v-47.378804c0-183.11908-155.639373-331.651633-347.760426-331.651633z"
+                                              fill="#EDF5FE" p-id="6253"></path>
+                                        <path d="M688.650926 261.767896a74.147829 74.147829 0 0 0-9.949549-6.869927 156.586949 156.586949 0 0 1-67.514797-118.447012 65.619644 65.619644 0 0 0-63.961386-66.804114 61.355552 61.355552 0 0 0-13.266066 1.18447 154.218009 154.218009 0 0 1-126.975196-47.378805 65.145856 65.145856 0 0 0-36.718574-21.557356 21.320462 21.320462 0 0 0-12.318489 12.081595 324.544812 324.544812 0 0 0-58.039036 23.689403 334.020573 334.020573 0 0 1 58.27593-23.689403 21.79425 21.79425 0 0 1 12.555383-12.081595 64.19828 64.19828 0 0 0-54.722519 12.318489 78.88571 78.88571 0 0 0-10.423337 9.475761 154.691797 154.691797 0 0 1-126.975196 47.378805 65.619644 65.619644 0 0 0-76.51677 52.116685 61.355552 61.355552 0 0 0 0 13.266065 157.060737 157.060737 0 0 1-67.514797 118.447012 66.567221 66.567221 0 0 0-23.689402 90.967305 55.433201 55.433201 0 0 0 4.974775 9.475761 158.95589 158.95589 0 0 1 23.689402 134.555805 65.856538 65.856538 0 0 0 37.903044 85.281848 56.617672 56.617672 0 0 0 12.792277 3.553411 156.586949 156.586949 0 0 1 103.522688 87.650788 65.145856 65.145856 0 0 0 82.43912 40.982666 86.466318 86.466318 0 0 0 12.555383-5.92235 154.218009 154.218009 0 0 1 135.266488 0 66.567221 66.567221 0 0 0 22.268038 8.054397 64.672068 64.672068 0 0 0 66.330326-30.559329 59.934188 59.934188 0 0 0 5.685457-12.555384 156.586949 156.586949 0 0 1 103.522688-87.650788 66.330327 66.330327 0 0 0 54.248731-76.279876 58.27593 58.27593 0 0 0-3.55341-12.555383 158.482102 158.482102 0 0 1 23.689402-134.318911 66.330327 66.330327 0 0 0-7.580608-93.810033zM355.341035 564.281563v17.530158a129.107243 129.107243 0 0 0 99.258596 125.316938A129.107243 129.107243 0 0 1 355.341035 581.811721v-17.530158L194.016205 240.684328h81.017756L355.341035 416.933481V25.110766 416.933481l81.017756-176.486047h81.017756zM921.51775 298.249575a584.891343 584.891343 0 0 1-98.074125 96.415868l-20.60978-22.504932a501.978435 501.978435 0 0 0 94.757609-92.151776z m-86.703212-120.10527a415.275223 415.275223 0 0 1 71.068207 54.959414l-21.79425 21.320462a450.098644 450.098644 0 0 0-70.594419-55.433201z m295.643741 227.181369v154.691797h-29.848647v-20.846674h-218.890078v20.846674H852.818484v-154.691797z m-248.738725 104.944052h218.890078v-76.042981h-218.890078z m101.153748-275.507749a260.583426 260.583426 0 0 1-47.378804 62.303128l-19.188416-23.689402a225.996898 225.996898 0 0 0 60.171082-108.260569l30.559329 3.790305c-3.079622 11.607807-6.869927 23.689402-11.370913 36.718573H1160.780714v24.400085a351.55073 351.55073 0 0 1-41.930242 71.068207l-22.504932-18.003946a268.874716 268.874716 0 0 0 30.559329-47.378805h-68.462373c0 16.819476-2.36894 29.374859-3.553411 37.429256 18.003946 47.378805 61.118658 78.648816 129.581031 94.757609l-12.792277 29.137965c-65.619644-18.003946-108.023675-47.378805-127.448985-91.441093-20.372886 40.745772-62.540022 71.068207-126.264514 89.309047l-13.029171-27.716601c68.699267-18.003946 108.734357-48.800169 118.447011-92.151775a298.486469 298.486469 0 0 0 4.027199-38.85062zM1221.18869 299.197151h92.151775v189.515219c11.370913-9.949549 26.058343-23.689402 43.825394-41.693348l8.528185 32.454481A544.856253 544.856253 0 0 1 1286.334546 544.856253l-11.844701-27.242812a25.821449 25.821449 0 0 0 9.475761-18.951522v-170.089909h-62.776916z m51.169109-126.264514a502.926011 502.926011 0 0 1 71.068207 65.619644l-20.846674 21.320462a458.153041 458.153041 0 0 0-72.489571-66.093432z m170.089908 0a395.139231 395.139231 0 0 1-13.502959 42.640924h167.957863q0 231.445461-5.922351 288.53692a54.485625 54.485625 0 0 1-60.64487 53.301156l-40.508878-1.18447-7.343715-27.716601c23.689402 0 37.429256 1.658258 44.062289 1.658258 19.662204 0 31.033117-12.555383 34.586527-37.903044s4.500986-108.260569 5.448563-247.791148h-150.901493a310.33117 310.33117 0 0 1-56.617672 76.279875l-19.42531-23.689402a260.583426 260.583426 0 0 0 72.252677-129.581031z m-58.749717 121.526634h130.528607v195.200675h-130.528607z m29.848647 83.860484h71.068207v-58.749718h-71.068207z m71.068207 84.80806V402.71984h-71.068207v59.223505zM1741.881753 170.800591h29.848647v203.018178q-1.895152 126.975196-86.940107 185.961808l-23.689402-20.135992c52.827367-34.586527 79.359498-90.019729 80.307074-165.825816z m-75.095405 55.906989h29.848646V450.098644h-29.848646z m131.002394-40.508878H2037.2886v29.848647h-104.707158v52.353579h87.650788v208.940529c0 23.689402-10.660231 35.534103-32.217587 35.534103h-29.137965l-8.054397-29.848647 27.242813 1.658259c8.528185 0 12.792277-4.500986 12.792277-13.739854v-173.880213h-58.275929v260.583426h-30.085541v-260.583426h-58.27593v218.653184h-29.374859V268.400928h87.650789V216.047349h-104.707159z"
+                                              fill="#4492F4" p-id="6254"></path>
+                                    </svg>
+                                    <span style="position: relative; top: 2px">{{ item.userName }}</span>
+                                </div>
+                                <div>回复时间：{{ item.replyTime }}</div>
+                                <div>回复内容：{{ item.replyContent }}</div>
+                            </van-step>
+                        </van-steps>
+                        <div v-else class="empty-text">暂无回复信息</div>
+                    </van-cell-group>
+                </div>
+            </van-action-sheet>
+        </div>
+    `,
+    data() {
+        return {
+            visible:false,
+            row: {},
+            viewData: {},
+        }
+    },
+    methods: {
+        onOpen(row, url) {
+            this.row = row
+            this.visible = true
+            this.fetchOne(url)
+        },
+        fetchOne(url) {
+            this.$axios.post(url, {id: this.row.id})
+                .then((resp) => {
+                    this.viewData = resp.data
+                    this.visible = true
+                })
+        }
+    },
+    style: /*language=CSS*/ `
+        ::v-deep .empty-text {
+            font-size: 14px;
+            text-align: center;
+            padding: 10px 0;
+        }
+        ::v-deep .user-face{
+            display: flex;
+        }
+        ::v-deep .van-step__title {
+            font-size: 13px;
+        }
+    `
+}

src/main/resources/views/platform/zhghh5/staffbenefit/legal/onlineReply/applyForm.js

@@ -0,0 +1,68 @@
+const applyForm = {
+    template: /*language=HTML*/ `
+        <div>
+            <van-action-sheet :close-on-click-overlay="false" title="回复信息" v-model="visible">
+                <van-form ref="formRef" class="form-container">
+                    <van-cell-group title="基本情况" class="form-section">
+                        <van-field label="咨询人" readonly :value="viewData.posterUserName"></van-field>
+                        <van-field label="咨询时间" readonly :value="viewData.postingTime"></van-field>
+                        <van-field label="咨询主题" readonly :value="viewData.postTitle"></van-field>
+                        <van-field label="主要内容" readonly :value="viewData.postContent"></van-field>
+                    </van-cell-group>
+                    <van-cell-group title="我来回复" class="form-section">
+                        <van-field
+                            v-model="formData.replyContent"
+                            name="replyContent"
+                            label="回复内容"
+                            type="textarea"
+                            rows="4"
+                            autosize
+                            placeholder="请输入回复内容"
+                            :rules="[{ required: true }]"
+                            required
+                        ></van-field>
+                    </van-cell-group>
+
+                    <div class="form-actions">
+                        <van-button @click="onSubmit" round type="info">提交</van-button>
+                    </div>
+                </van-form>
+            </van-action-sheet>
+        </div>
+    `,
+    store,
+    data() {
+        return {
+            visible:false,
+            formData: {},
+            viewData: {},
+        }
+    },
+    methods: {
+        onOpen(row) {
+            this.viewData = clone({ ...row })
+            this.$set(this.formData, 'postId', row.id)
+            this.visible = true
+        },
+        onSubmit() {
+            this.$refs.formRef.validate().then(() => {
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要提交吗？"
+                }).then(() => {
+                    this.$axios.post("/platform/legal/onlineReply/submit", this.formData).then(res => {
+                        if (res.code === 0) {
+                            this.$toast(res.msg)
+                            this.visible = false
+                            this.$emit('refresh')
+                        }
+                    })
+                })
+            })
+        },
+    },
+    style: /*language=CSS*/ `
+        
+    `
+}
+

src/main/resources/views/platform/zhghh5/staffbenefit/legal/onlineReply/index.html

@@ -0,0 +1,96 @@
+<!--#
+layout("/layouts/platform_h5.html"){
+#-->
+
+<style scoped>
+
+</style>
+
+<div id="app">
+    <van-nav-bar title="咨询回复" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
+
+    <van-sticky offset-top="46px">
+        <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
+            <year-van-dropdown-item :num="5" @change="doSearch" v-model="pageForm.year"></year-van-dropdown-item>
+            <van-dropdown-item v-model="pageForm.isReply" :options="replyOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
+        </van-dropdown-menu>
+    </van-sticky>
+
+    <table-list api="/platform/legal/onlineReply/pageData"
+                :page_form.sync="pageForm"
+                ref="tableListRef"
+                title="postTitle"
+                @ready="doSearch">
+        <template v-slot="{index,row}">
+            <table-column label="姓名">{{row.posterUserName}}</table-column>
+            <table-column label="咨询时间">{{row.postingTime}}</table-column>
+            <table-column label="回复情况">
+                <van-tag color="#67c23a" v-if="row.replyCount > 0">已回复</van-tag>
+                <van-tag type="primary" v-else>未回复</van-tag>
+            </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" @click="onReply(row)">
+                <i class="fa fa-edit"></i>
+                <span>回复</span>
+            </div>
+        </template>
+    </table-list>
+
+    <info ref="infoRef"></info>
+    <apply-form ref="applyFormRef" @refresh="doSearch"></apply-form>
+</div>
+
+<script>
+    <!--#include('applyForm.js'){}#-->
+    <!--#include('../onlinePost/info.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        components: {
+            "apply-form": applyForm,
+            "info": info,
+        },
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    year: new Date().getFullYear(),
+                    isReply: null,
+                },
+                replyOptions: [
+                    {text: '全部', value: null},
+                    {text: '已回复', value: true},
+                    {text: '未回复', value: false},
+                ],
+            }
+        },
+        methods: {
+            onView(row) {
+                const url = '/platform/legal/onlineReply/fetchOne'
+                this.$refs.infoRef.onOpen(row, url)
+            },
+            onReply(row) {
+                this.$refs.applyFormRef.onOpen(row)
+            },
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            }
+        },
+    })
+</script>
+
+<!--#
+}
+#-->