commit

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpActivityApplyController.java

@@ -50,12 +50,18 @@ public class TrainSignUpActivityApplyController {
 	@Inject
 	private TrainSignUpActivityStatisticsService statisticsService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("trainSingUp.manage.apply")
 	@Ok("beetl:/platform/zhgh/activity/trainSingUp/apply/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.trainSingUp.manage.apply")
+	@Ok("beetl:/platform/zhghh5/activity/trainSingUp/apply/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("活动查询")
 	@SaCheckPermission("trainSingUp.manage.apply")

src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java

@@ -169,7 +169,7 @@ public class ClubInfoManageController {
     @SaCheckPermission("club.infoManage.manage")
 	@SLog(tag = "协会管理系统-信息管理", msg = "修改身份")
     public Result updateRoleCode(@Param("id") String id, @Valid String[] roleCodes, @Valid String clubId) {
-        List<String> roleCodeList = Arrays.asList(roleCodes);
+		List<String> roleCodeList = Arrays.asList(roleCodes);
         //查询社团是否存在会长或者秘书长
         if(Arrays.asList(roleCodes).contains(RoleConstant.CLUB_PRESIDENT.name())) {
             int count = dao.count(ClubUser.class, Cnd.where("clubId", "=", clubId)
@@ -268,7 +268,7 @@ public class ClubInfoManageController {
             ClubUser clubUser = dao.fetch(ClubUser.class, Cnd.where("clubId", "=", clubId).and("userId", "=", user));
             if(clubUser != null) {
                 List<String> roleCodeList = clubUser.getRoleCode();
-                if (List.of(RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_VICE_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name(), RoleConstant.CLUB_VICE_SECRETARY.name()).contains(roleCode)) {
+                if (List.of(RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_VICE_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name(), RoleConstant.CLUB_VICE_SECRETARY.name(), RoleConstant.CLUB_OPERATOR.name()).contains(roleCode)) {
                     roleCodeList.remove(RoleConstant.CLUB_MEMBER.name());
                 }
                 if(!roleCodeList.contains(roleCode)) {

src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java

@@ -117,7 +117,11 @@ public class ClubRefreshReportController {
 	@SLog(tag = "协会管理系统-信息管理", msg = "提交换届报告")
     public Object submit(@Param("data") SysClubRefresh clubRefresh) {
 
-        List<SysClubRefresh> list = dao.query(SysClubRefresh.class, Cnd.NEW());
+		Cnd cnd = Cnd.NEW();
+		if(StrUtil.isNotBlank(clubRefresh.getId())) {
+			cnd.and(SysClubRefresh::getId, "!=", clubRefresh.getId());
+		}
+        List<SysClubRefresh> list = dao.query(SysClubRefresh.class, cnd);
         List<String> idList = list.stream().map(SysClubRefresh::getId).toList();
         int count = dao.count(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", idList).and(ProcessInstance::getState, "!=", ProcessInstanceStateEnum.FINISHED.getCode()));
         if (count > 0) {

src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java

@@ -118,7 +118,11 @@ public class ClubRuleUpdateController {
 	@SLog(tag = "协会管理系统-信息管理", msg = "提交章程备案")
     public Object submit(@Param("data")SysClubRule clubRule) {
 
-        List<SysClubRule> list = dao.query(SysClubRule.class, Cnd.NEW());
+		Cnd cnd = Cnd.NEW();
+		if(StrUtil.isNotBlank(clubRule.getId())) {
+			cnd.and(SysClubRule::getId, "!=", clubRule.getId());
+		}
+        List<SysClubRule> list = dao.query(SysClubRule.class, cnd);
         List<String> idList = list.stream().map(SysClubRule::getId).toList();
         int count = dao.count(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", idList).and(ProcessInstance::getState, "!=", ProcessInstanceStateEnum.FINISHED.getCode()));
         if (count > 0) {

src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java

@@ -135,7 +135,8 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl<ClubCommonPage
                             WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_VICE_PRESIDENT"') THEN 2
                             WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_SECRETARY"') THEN 3
                             WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_VICE_SECRETARY"') THEN 4
-                            WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_MEMBER"') THEN 5
+                            WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_OPERATOR"') THEN 5
+                            WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_MEMBER"') THEN 6
                             ELSE 99
                         END
                 """);
@@ -270,7 +271,8 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl<ClubCommonPage
                             WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_VICE_PRESIDENT"') THEN 2
                             WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_SECRETARY"') THEN 3
                             WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_VICE_SECRETARY"') THEN 4
-                            WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_MEMBER"') THEN 5
+                            WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_OPERATOR"') THEN 5
+                            WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_MEMBER"') THEN 6
                             ELSE 99
                         END
                 """);

src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java

@@ -73,7 +73,8 @@ public class SysClubUserServiceImpl extends BaseServiceImpl<ClubUser> implements
 				        WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_VICE_PRESIDENT"') THEN 2
 				        WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_SECRETARY"') THEN 3
 				        WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_VICE_SECRETARY"') THEN 4
-				        WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_MEMBER"') THEN 5
+				        WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_OPERATOR"') THEN 5
+				        WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_MEMBER"') THEN 6
 				        ELSE 99
 				     END
 				""").setParam("clubId", clubId);

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingDelegationApproval.java

@@ -0,0 +1,140 @@
+package com.budwk.app.zhgh.dayofficework.meeting.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.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.dayofficework.meeting.service.MeetingInfoService;
+import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
+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 org.nutz.mvc.annotation.Param;
+
+import java.util.List;
+
+/**
+ * @ClassName MeetingDelegationApproval
+ * @Author JyuHsin
+ * @Date 2025/9/11 17:13
+ * @Version 1.0
+ * @Description TODO
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@Api(tags = "会议请假团长审核")
+@At("/platform/meeting/delegationApproval")
+public class MeetingDelegationApproval {
+
+	@Inject
+	private Dao dao;
+	@Inject
+	private MeetingInfoService infoService;
+
+	@At("/")
+	@SaCheckPermission("meeting.delegationApproval")
+	@Ok("beetl:/platform/zhgh/dayofficework/meeting/delegationApproval/index.html")
+	public void index() {}
+
+	@At("/h5")
+	@SaCheckPermission("h5.meeting.delegationApproval")
+	@Ok("beetl:/platform/zhghh5/dayofficework/meeting/delegationApproval/index.html")
+	public void h5Index() {}
+
+	@At
+	@ApiOperation("分页查询")
+	@SaCheckPermission(value = {"meeting.delegationApproval", "h5.meeting.delegationApproval"}, mode = SaMode.OR)
+	public Result pageData(PageForm pageForm,
+						   @Param(value = "year") Integer year,
+						   @Param(value = "type") String type,
+						   @Param(value = "approval") Boolean approval) {
+		Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  mi.name as meetingName,
+                  mtp.periodName,
+                  mtp.startTime,
+                  mtp.endTime,
+                  mtp.canLeave,
+                  type.name as typeName,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                FROM
+                  wf_process_task t
+                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  LEFT JOIN meeting_time_period_user info ON info.id = ins.businessNo
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                  LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
+                  LEFT JOIN meeting_time_period mtp ON mtp.id = info.timePeriodId
+                  LEFT JOin meeting_info mi ON mi.id = info.meetingId
+                  LEFT JOIN meeting_type type ON type.id = mi.typeId
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or("mi.name", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("mi.address", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("info.periodName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		if(year != null) {
+			long startTime = DateUtil.parse(year + "-01-01").getTime();
+			long endTime = DateUtil.parse(year + "-12-31").getTime();
+			cnd.and("ins.createdAt", ">=", startTime);
+			cnd.and("ins.createdAt", "<=", endTime);
+		}
+		cnd.andEX("mi.type", "=", type);
+
+		cnd.and("t.taskName", "=", "e0ef2404-7468-480a-97b6-b918e0a9232f");
+		cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+		if (approval) {
+			cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+		} else {
+			cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+		}
+
+		if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+			cnd.desc("t.createdAt");
+		} else {
+			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+		}
+		cnd.groupBy("t.id");
+		sql.setCondition(cnd);
+		Pagination<NutMap> pageVO = infoService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		return Result.success(pageVO);
+	}
+}

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingLeaveController.java

@@ -0,0 +1,154 @@
+package com.budwk.app.zhgh.dayofficework.meeting.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.base.utils.PageUtil;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.dayofficework.meeting.model.MeetingTimePeriodUser;
+import com.budwk.app.zhgh.dayofficework.meeting.service.MeetingInfoService;
+import com.budwk.app.zhgh.dayofficework.meeting.service.MeetingUserService;
+import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.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.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+/**
+ * @ClassName MeetingLeaveController
+ * @Author JyuHsin
+ * @Date 2025/9/11 16:20
+ * @Version 1.0
+ * @Description TODO
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@Api(tags = "我的请假")
+@At("/platform/meeting/leave")
+public class MeetingLeaveController {
+
+	@Inject
+	private Dao dao;
+	@Inject
+	private MeetingInfoService infoService;
+	@Inject
+	private FlowEngine flowEngine;
+	@Inject
+	private MeetingUserService meetingUserService;
+
+	@At("/")
+	@SaCheckPermission("meeting.leave")
+	@Ok("beetl:/platform/zhgh/dayofficework/meeting/leave/index.html")
+	public void index() {}
+
+	@At("/h5")
+	@SaCheckPermission("h5.meeting.leave")
+	@Ok("beetl:/platform/zhghh5/dayofficework/meeting/leave/index.html")
+	public void h5Index() {}
+
+	@At
+	@ApiOperation("分页查询")
+	@SaCheckPermission(value = {"meeting.leave", "h5.meeting.leave"}, mode = SaMode.OR)
+	public Result pageData(PageForm pageForm,
+						   @Param(value = "year") Integer year,
+						   @Param(value = "type") String type) {
+		Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  mi.name as meetingName,
+                  mtp.periodName,
+                  mtp.startTime,
+                  mtp.endTime,
+                  mtp.canLeave,
+                  type.name as typeName,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
+                  (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
+                FROM
+                  meeting_time_period_user info
+                  LEFT JOIN meeting_time_period mtp ON mtp.id = info.timePeriodId
+                  LEFT JOin meeting_info mi ON mi.id = info.meetingId
+                  LEFT JOIN meeting_type type ON type.id = mi.typeId
+                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or("mi.name", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("mi.address", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("info.periodName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		cnd.and("info.userId", "=", SecurityUtil.getUserId());
+		cnd.and("ins.id", "is not", null);
+		cnd.andEX("mi.type", "=", type);
+		cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
+		if(year != null) {
+			long startTime = DateUtil.parse(year + "-01-01").getTime();
+			long endTime = DateUtil.parse(year + "-12-31").getTime();
+			cnd.and("ins.createdAt", ">=", startTime);
+			cnd.and("ins.createdAt", "<=", endTime);
+		}
+
+		if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) {
+			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+		} else {
+			cnd.desc("t.createdAt");
+		}
+
+		sql.setCondition(cnd);
+		Pagination<NutMap> pagination = infoService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		return Result.success(pagination);
+	}
+
+	@At
+	@ApiOperation("删除")
+	@Aop(TransAop.READ_COMMITTED)
+	@SaCheckPermission(value = {"meeting.leave", "h5.meeting.leave"}, mode = SaMode.OR)
+	@SLog(tag = "会务管理-我的请假-删除", msg = "删除请假")
+	public Result delete(@Param("id") String id) {
+		MeetingTimePeriodUser periodUser = dao.fetch(MeetingTimePeriodUser.class, id);
+		periodUser.setJoinStatus(true);
+		periodUser.setLeaveTime(null);
+		periodUser.setLeaveReason(null);
+		dao.update(periodUser);
+
+		flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+		return Result.success();
+	}
+}

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingMineController.java

@@ -0,0 +1,221 @@
+package com.budwk.app.zhgh.dayofficework.meeting.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Dict;
+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.base.utils.PageUtil;
+import com.budwk.app.bpm.models.BpmProcessInstance;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
+import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.dayofficework.meeting.model.MeetingInfo;
+import com.budwk.app.zhgh.dayofficework.meeting.model.MeetingTimePeriod;
+import com.budwk.app.zhgh.dayofficework.meeting.model.MeetingTimePeriodUser;
+import com.budwk.app.zhgh.dayofficework.meeting.model.MeetingType;
+import com.budwk.app.zhgh.dayofficework.meeting.service.MeetingInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.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.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName MeetingMineController
+ * @Author JyuHsin
+ * @Date 2025/9/11 14:53
+ * @Version 1.0
+ * @Description TODO
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@Api(tags = "我的会议")
+@At("/platform/meeting/mine")
+public class MeetingMineController {
+
+	@Inject
+	private Dao dao;
+	@Inject
+	private MeetingInfoService infoService;
+	@Inject
+	private FlowEngine flowEngine;
+	@Inject
+	private FlowCommonService flowCommonService;
+
+	@At("/")
+	@SaCheckPermission("meeting.mine")
+	@Ok("beetl:/platform/zhgh/dayofficework/meeting/mine/index.html")
+	public void index() {}
+
+	@At("/h5")
+	@SaCheckPermission("h5.meeting.mine")
+	@Ok("beetl:/platform/zhghh5/dayofficework/meeting/mine/index.html")
+	public void h5Index() {}
+
+	@At
+	@ApiOperation("分页查询")
+	@SaCheckPermission(value = {"meeting.mine", "h5.meeting.mine"}, mode = SaMode.OR)
+	public Result pageData(PageForm pageForm,
+						   @Param("year") Integer year,
+						   @Param("type") String type) {
+		Cnd cnd = Cnd.NEW();
+
+		List<MeetingTimePeriodUser> periodUsers = dao.query(MeetingTimePeriodUser.class, Cnd.where(MeetingTimePeriodUser::getUserId, "=", SecurityUtil.getUserId()));
+		List<String> idList = periodUsers.stream().map(MeetingTimePeriodUser::getMeetingId).toList();
+
+		cnd.and("id", "in", idList);
+		cnd.andEX("typeId", "=", type);
+		cnd.andEX("year(createTime)", "=", year);
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or("name", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("name", "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) {
+			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+		} else {
+			cnd.desc("createTime");
+		}
+		Pagination<MeetingInfo> pagination = infoService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), MeetingInfo.class, cnd);
+		List<MeetingInfo> list = pagination.getList();
+
+		List<MeetingType> typeList = dao.query(MeetingType.class, null);
+		Map<String, String> typeMap = typeList.stream().collect(Collectors.toMap(MeetingType::getId, MeetingType::getName));
+
+		for (MeetingInfo info : list) {
+			Sql sql = Sqls.create("""
+					select
+						mtp.*,
+						(select joinStatus from meeting_time_period_user where timePeriodId = mtp.id and userId = @userId) as joinStatus,
+						(select signStatus from meeting_time_period_user where timePeriodId = mtp.id and userId = @userId) as signStatus
+					from
+						meeting_time_period mtp
+						where meetingId = @meetingId
+					order by startTime asc
+					""");
+			sql.setParam("userId", SecurityUtil.getUserId());
+			sql.setParam("meetingId", info.getId());
+			List<MeetingTimePeriod> listVO = infoService.listVO(sql, MeetingTimePeriod.class);
+			info.setTimePeriods(listVO);
+			info.setTypeName(typeMap.getOrDefault(info.getTypeId(), ""));
+		}
+		return Result.success(pagination);
+	}
+
+	@At
+	@SaCheckPermission(value = {"meeting.mine", "h5.meeting.mine"}, mode = SaMode.OR)
+	@ApiOperation("会议请假")
+	@Aop(TransAop.READ_COMMITTED)
+	@SLog(tag = "会务管理-我的会议-请假", msg = "会议请假")
+	public Result leave(@Valid String periodId, String leaveReason) {
+		MeetingTimePeriodUser user = dao.fetch(
+				MeetingTimePeriodUser.class,
+				Cnd.where(MeetingTimePeriodUser::getTimePeriodId, "=", periodId)
+						.and(MeetingTimePeriodUser::getUserId, "=", SecurityUtil.getUserId())
+		);
+		if(user.getSignStatus()) {
+			return Result.error("您已签到，不能请假！");
+		}
+		if(!user.getJoinStatus()) {
+			return Result.error("请勿重复申请！");
+		}
+		int count = dao.count(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", user.getId()).and(ProcessInstance::getState, "!=", ProcessInstanceStateEnum.FINISHED.getCode()));
+		if (count > 0) {
+			return Result.error("您有申请记录尚未完成，请核对！");
+		}
+
+		MeetingInfo info = dao.fetch(MeetingInfo.class, user.getMeetingId());
+		MeetingType meetingType = dao.fetch(MeetingType.class, info.getTypeId());
+
+		// 开启流程实例
+		Dict args = Dict.create();
+		args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
+		NutMap nutMap = Lang.obj2nutmap(user);
+		nutMap.put("leaveReason", leaveReason);
+		args.set(FlowConst.FORM_DATA, nutMap);
+		ProcessInstance instance = flowEngine.startProcessInstanceByKey(meetingType.getDesignId(), user.getId(), SecurityUtil.getUserId(), args);
+
+		// 自动完成第一个申请任务
+		List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
+		for (ProcessTask task : doingTaskList) {
+			flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
+		}
+		return Result.success();
+	}
+
+	@At
+	@SaCheckPermission(value = {"meeting.mine", "h5.meeting.mine"}, mode = SaMode.OR)
+	@ApiOperation("会议请假重新提交")
+	@Aop(TransAop.READ_COMMITTED)
+	@SLog(tag = "会务管理-我的会议-重新提交", msg = "会议请假重新提交")
+	public Result submitAgain(String id, String leaveReason, String taskId) {
+		MeetingTimePeriodUser periodUser = dao.fetch(MeetingTimePeriodUser.class, id);
+
+		if(periodUser.getSignStatus()) {
+			return Result.error("您已签到，不能请假！");
+		}
+		if(!periodUser.getJoinStatus()) {
+			return Result.error("请勿重复申请！");
+		}
+
+		Dict dict = Dict.create();
+		dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
+		dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
+		NutMap nutMap = Lang.obj2nutmap(periodUser);
+		nutMap.put("leaveReason", leaveReason);
+		dict.set(FlowConst.FORM_DATA, nutMap);
+		flowCommonService.executeTask(dict);
+		return Result.success();
+	}
+
+	@At
+	@SaCheckPermission(value = {"meeting.mine", "h5.meeting.mine"}, mode = SaMode.OR)
+	@ApiOperation("会议签到")
+	@Aop(TransAop.READ_COMMITTED)
+	@SLog(tag = "会务管理-我的会议-签到", msg = "会议签到")
+	public Result sign(@Valid String periodId) {
+		MeetingTimePeriodUser user = dao.fetch(
+				MeetingTimePeriodUser.class,
+				Cnd.where(MeetingTimePeriodUser::getTimePeriodId, "=", periodId)
+						.and(MeetingTimePeriodUser::getUserId, "=", SecurityUtil.getUserId())
+		);
+		int count = dao.count(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", user.getId()));
+		if(!user.getJoinStatus() || count > 0) {
+			return Result.error("您已请假，不能签到！");
+		}
+
+		user.setSignStatus(true);
+		user.setSignTime(DateUtil.date());
+		dao.update(user);
+		return Result.success();
+	}
+}

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingSchoolUnionApproval.java

@@ -0,0 +1,139 @@
+package com.budwk.app.zhgh.dayofficework.meeting.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.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.dayofficework.meeting.service.MeetingInfoService;
+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 org.nutz.mvc.annotation.Param;
+
+import java.util.List;
+
+/**
+ * @ClassName MeetingSchoolUnionApproval
+ * @Author JyuHsin
+ * @Date 2025/9/11 17:29
+ * @Version 1.0
+ * @Description TODO
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@Api(tags = "会议请假团长审核")
+@At("/platform/meeting/schoolUnionApproval")
+public class MeetingSchoolUnionApproval {
+
+	@Inject
+	private Dao dao;
+	@Inject
+	private MeetingInfoService infoService;
+
+	@At("/")
+	@SaCheckPermission("meeting.schoolUnionApproval")
+	@Ok("beetl:/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html")
+	public void index() {}
+
+	@At("/h5")
+	@SaCheckPermission("h5.meeting.schoolUnionApproval")
+	@Ok("beetl:/platform/zhghh5/dayofficework/meeting/schoolUnionApproval/index.html")
+	public void h5Index() {}
+
+	@At
+	@ApiOperation("分页查询")
+	@SaCheckPermission(value = {"meeting.schoolUnionApproval", "h5.meeting.schoolUnionApproval"}, mode = SaMode.OR)
+	public Result pageData(PageForm pageForm,
+						   @Param(value = "year") Integer year,
+						   @Param(value = "type") String type,
+						   @Param(value = "approval") Boolean approval) {
+		Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  mi.name as meetingName,
+                  mtp.periodName,
+                  mtp.startTime,
+                  mtp.endTime,
+                  mtp.canLeave,
+                  type.name as typeName,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                FROM
+                  wf_process_task t
+                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  LEFT JOIN meeting_time_period_user info ON info.id = ins.businessNo
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                  LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
+                  LEFT JOIN meeting_time_period mtp ON mtp.id = info.timePeriodId
+                  LEFT JOin meeting_info mi ON mi.id = info.meetingId
+                  LEFT JOIN meeting_type type ON type.id = mi.typeId
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or("mi.name", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("mi.address", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("info.periodName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		if(year != null) {
+			long startTime = DateUtil.parse(year + "-01-01").getTime();
+			long endTime = DateUtil.parse(year + "-12-31").getTime();
+			cnd.and("ins.createdAt", ">=", startTime);
+			cnd.and("ins.createdAt", "<=", endTime);
+		}
+		cnd.andEX("mi.type", "=", type);
+
+		cnd.and("t.taskName", "=", "e28e9ab0-5546-4d97-9939-47df088f38ab");
+		cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+		if (approval) {
+			cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+		} else {
+			cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+		}
+
+		if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+			cnd.desc("t.createdAt");
+		} else {
+			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+		}
+		cnd.groupBy("t.id");
+		sql.setCondition(cnd);
+		Pagination<NutMap> pageVO = infoService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		return Result.success(pageVO);
+	}
+}

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/interceptor/MeetingLeaveInterceptor.java

@@ -0,0 +1,38 @@
+package com.budwk.app.zhgh.dayofficework.meeting.interceptor;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowInterceptor;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.zhgh.club.model.ClubUser;
+import com.budwk.app.zhgh.club.model.ClubUserApply;
+import com.budwk.app.zhgh.dayofficework.meeting.model.MeetingTimePeriodUser;
+import org.nutz.dao.Dao;
+import org.nutz.json.Json;
+
+/**
+ * @ClassName MeetingLeave
+ * @Author JyuHsin
+ * @Date 2025/9/11 16:06
+ * @Version 1.0
+ * @Description TODO
+ */
+public class MeetingLeaveInterceptor implements FlowInterceptor {
+
+	@Override
+	public void intercept(Execution execution) {
+
+		String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA);
+		ProcessInstance processInstance = execution.getProcessInstance();
+		MeetingTimePeriodUser periodUser = Json.fromJson(MeetingTimePeriodUser.class, formDataStr);
+
+		Dao dao = ServiceContext.find(Dao.class);
+
+		periodUser.setJoinStatus(false);
+		periodUser.setLeaveTime(DateUtil.date(processInstance.getCreatedAt()));
+		dao.update(periodUser);
+	}
+}

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/model/MeetingTimePeriod.java

@@ -54,4 +54,7 @@ public class MeetingTimePeriod extends BaseModel {
 	@ColDefine(type = ColType.BOOLEAN)
 	@Default("0")
 	private Boolean canLeave;
+
+	private Boolean joinStatus;
+	private Boolean signStatus;
 }

src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteApplyController.java

@@ -170,18 +170,19 @@ public class SiteApplyController {
 	@At
 	@ApiOperation("查询可以预约的日期")
 	@SaCheckPermission(value = {"site.apply", "h5.site.apply"}, mode = SaMode.OR)
-	public Result queryAllowDay(String siteId, String startTime, String endTime) {
+	public Result queryAllowDay(String siteId) {
 		if(StrUtil.isBlank(siteId)) {
 			return Result.success(new ArrayList<>());
 		}
+		// 查询场地
+		SiteInfo siteInfo = infoService.fetch(siteId);
+
 		// 转化对象
-		DateTime startDate = DateUtil.parseDate(startTime);
-		Date endDate = DateUtil.parseDate(endTime);
+		DateTime startDate = DateUtil.date();
+		Date endDate = DateUtil.offsetDay(startDate, siteInfo.getOpenDayNum() != null ? siteInfo.getOpenDayNum() : 7);
 		// 获取区间内的每一天
 		List<DateTime> fullDateList = DateUtil.rangeToList(startDate, endDate, DateField.DAY_OF_MONTH);
 
-		// 查询场地
-		SiteInfo siteInfo = infoService.fetch(siteId);
 		List<NutMap> openHours = siteInfo.getOpenHours();
 		List<Integer> weekNumList = openHours.stream().map(o -> o.getInt("weekNum")).distinct().toList();
 

src/main/java/com/budwk/app/zhgh/dayofficework/site/model/SiteInfo.java

@@ -115,4 +115,10 @@ public class SiteInfo extends BaseModel {
 	@ColDefine(type = ColType.BOOLEAN)
 	@Default(value = "0")
 	private Boolean filterHolidays;
+
+	@Column
+	@Comment("开放天数段")
+	@ColDefine(type = ColType.INT)
+	@Default("7")
+	private Integer openDayNum;
 }

src/main/resources/static/assets/platform/js/util/commonUtil.js

@@ -19,7 +19,7 @@ const commonUtil = {
                 }
                 if (response.data && response.data.code !== 0 && response.data.code !== 99) {
                     if (isMobile) {
-                        vant.Toast(response.data.msg)
+                        vant.Toast.fail(response.data.msg)
                     } else {
                         ELEMENT.Message.error(response.data.msg)
                     }

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

@@ -9,27 +9,25 @@ layout("/layouts/platform.html"){
 <div id="app" v-cloak>
     <guava ref="guava">
         <el-card shadow="never">
-            <el-card shadow="never">
-                <search @search="doSearch">
-                    <search-item label="年度：">
-                        <el-date-picker
-                                placeholder="选择年度"
-                                type="year"
-                                style="width: 100%"
-                                v-model="pageForm.year"
-                                value-format="yyyy"
-                                @change="doSearch"
-                        ></el-date-picker>
-                    </search-item>
-                    <search-item label="活动状态：" style="width: 340px">
-                        <el-radio-group v-model="pageForm.activityType" @change="doSearch">
-                            <el-radio-button :label="1">全部</el-radio-button>
-                            <el-radio-button :label="2">报名中</el-radio-button>
-                            <el-radio-button :label="3">已结束</el-radio-button>
-                        </el-radio-group>
-                    </search-item>
-                </search>
-            </el-card>
+            <search @search="doSearch">
+                <search-item label="年度：">
+                    <el-date-picker
+                        placeholder="选择年度"
+                        type="year"
+                        style="width: 100%"
+                        v-model="pageForm.year"
+                        value-format="yyyy"
+                        @change="doSearch"
+                    ></el-date-picker>
+                </search-item>
+                <search-item label="活动状态：" style="width: 340px">
+                    <el-radio-group v-model="pageForm.activityType" @change="doSearch">
+                        <el-radio-button :label="1">全部</el-radio-button>
+                        <el-radio-button :label="2">报名中</el-radio-button>
+                        <el-radio-button :label="3">已结束</el-radio-button>
+                    </el-radio-group>
+                </search-item>
+            </search>
         </el-card>
 
         <el-card class="mt10" shadow="never">

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

@@ -257,43 +257,43 @@ const info = {
 
     },
     style: /*language=CSS*/ `
-        .glow-box {
+        ::v-deep .glow-box {
             min-height: calc(100vh - 56px - 40px - 50px - 80px);
             max-height: calc(100vh - 56px - 40px - 50px - 80px);
             overflow-y: auto;
             background: #F0F2F5;
         }
-        img {
+        ::v-deep img {
             width: 100%;
             height: 180px;
         }
-        .title {
+        ::v-deep .title {
             background: white;
             height: 20px;
         }
-        .query-row {
+        ::v-deep .query-row {
             display: flex;
             align-items: center;
             padding: 6px 0;
         }
-        .query-row:not(:last-child) {
+        ::v-deep .query-row:not(:last-child) {
             border-bottom: 1px dashed rgb(230, 230, 230);
         }
-        .query-row > .query-title {
+        ::v-deep .query-row > .query-title {
             width: 100px;
             max-width: 100px;
             min-width: 100px;
             overflow: hidden;
         }
-        .query-row > .query-content {
+        ::v-deep .query-row > .query-content {
             min-width: 200px;
             overflow: hidden;
         }
-        .query-row > .query-content > .el-tag {
+        ::v-deep .query-row > .query-content > .el-tag {
             margin-bottom: 5px;
             margin-top: 5px;
         }
-        @media screen and (max-width: 992px) {
+        ::v-deep @media screen and (max-width: 992px) {
             .query-row:nth-child(4) .query-content .el-col:not(:last-child) {
                 margin-bottom: 5px;
             }

src/main/resources/views/platform/zhgh/dayofficework/meeting/common/leaveInfo.js

@@ -0,0 +1,96 @@
+const leaveInfo = {
+    template: /*language=HTML*/ `
+        <div>
+            <div class="process-title">
+                申请信息
+                <el-link type="primary" @click="openChart">点击查看流程图</el-link>
+            </div>
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="请假人姓名">{{ viewData.userName }}</el-descriptions-item>
+                <el-descriptions-item label="请假人工号">{{ viewData.loginName }}</el-descriptions-item>
+                <el-descriptions-item label="所属单位">{{ viewData.unitName }}</el-descriptions-item>
+                <el-descriptions-item label="所属工会">{{ viewData.unionName }}</el-descriptions-item>
+                <el-descriptions-item label="会议名称">{{ viewData.periodName }}</el-descriptions-item>
+                <el-descriptions-item label="开始时间">{{ viewData.startTime }}</el-descriptions-item>
+                <el-descriptions-item label="结束时间">{{ viewData.endTime }}</el-descriptions-item>
+                <el-descriptions-item label="请假事由">{{ viewData.leaveReason }}</el-descriptions-item>
+                <el-descriptions-item label="所属会议">{{ viewData.meetingName }}</el-descriptions-item>
+                <el-descriptions-item label="会议类型">{{ viewData.typeName }}</el-descriptions-item>
+            </el-descriptions>
+
+            <template v-for="task in doneTasks">
+                <div class="mt10">
+                    <div class="process-title">{{ task.displayName }}</div>
+                    <el-descriptions border class="flow-task-form" :column="3" :key="task.id"
+                                     v-if="task.ext.isFirstTaskNode">
+                        <el-descriptions-item label="申请用户">{{ task.ext.initiatorName
+                            }}({{task.ext.initiatorAccount}})
+                        </el-descriptions-item>
+                        <el-descriptions-item label="申请时间">{{ task.finishTime }}</el-descriptions-item>
+                        <el-descriptions-item label="办理结果">
+                            <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
+                                      :value="task.ext.submitType"></dict-tag>
+                        </el-descriptions-item>
+                    </el-descriptions>
+
+                    <el-descriptions border class="flow-task-form" :column="3" :key="task.id" v-else>
+                        <el-descriptions-item label="办理用户">{{ task.taskFormData.userName
+                            }}({{task.taskFormData.loginName}})
+                        </el-descriptions-item>
+                        <el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
+                        <el-descriptions-item label="办理结果">
+                            <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
+                                      :value="task.ext.submitType"></dict-tag>
+                        </el-descriptions-item>
+                        <el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
+                            task.taskFormData.opinion }}
+                        </el-descriptions-item>
+                    </el-descriptions>
+                </div>
+            </template>
+            <slot></slot>
+            <snaker-chart ref="snakerChartRef"></snaker-chart>
+        </div>
+    `,
+    store,
+    dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
+    data() {
+        return {
+            visible: false,
+            viewData: {},
+            doneTasks: [],
+            row: null
+        }
+    },
+    methods: {
+        onOpen(row) {
+            row.leaveReason = JSON.parse(row.instanceVariable).f_data.leaveReason || ''
+            this.row = row
+            this.visible = true
+            this.viewData = clone(row)
+            this.getDoneTasks()
+        },
+        // 获取已办任务审批记录
+        getDoneTasks() {
+            this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
+                if (res.code === 0) {
+                    this.doneTasks = res.data
+                }
+            })
+        },
+        // 查看流程图
+        openChart(){
+            this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
+        }
+    },
+    style: /*language=CSS*/ `
+        .el-descriptions-item__label {
+            width: 200px;
+            min-width: 200px;
+            max-width: 200px;
+        }
+        .el-tabs__header {
+            margin: 0;
+        }
+    `
+}

src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html

@@ -0,0 +1,199 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app">
+    <guava ref="guava">
+
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度：">
+                    <el-date-picker
+                        v-model="pageForm.year"
+                        type="year"
+                        value-format="yyyy"
+                        placeholder="请选择年度"
+                        @change="doSearch"
+                        style="width: 100%"
+                    ></el-date-picker>
+                </search-item>
+                <search-item label="名称/地点：">
+                    <el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
+                              @keyup.enter.native="doSearch">
+                    </el-input>
+                </search-item>
+                <search-item label="会议类型：">
+                    <el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
+                               placeholder="请选择慰问类型" filterable clearable>
+                        <el-option v-for="item in typeOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+
+        <el-card shadow="never">
+            <table-tool label="申请列表">
+                <el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
+                    <el-radio-button :label="true">已审核</el-radio-button>
+                    <el-radio-button :label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+                <el-table-column
+                    :label="column.label"
+                    :prop="column.prop"
+                    :key="column.prop"
+                    :width="column.width"
+                    :sortable="column.sortable"
+                    align="center"
+                    header-align="center"
+                    show-overflow-tooltip
+                    v-for="column in tableColumns"
+                >
+                    <template v-slot="{ row }" v-if="column.prop === 'instanceState'">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
+                    </template>
+                    <template v-slot="{ row }" v-else-if="column.prop === 'leaveReason'">
+                        {{ JSON.parse(row.instanceVariable).f_data.leaveReason || '' }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="300px">
+                    <template slot-scope="{row}">
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="onAudit(row)" size="mini" type="primary">审核</el-button>
+                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #edit>
+            <leave-info ref="leaveInfoRef">
+                <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        {{formData.taskName}}
+                    </div>
+                    <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
+                             class="flow-task-form">
+                        <el-form-item label="审批意见" prop="tf_opinion"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
+                        </el-form-item>
+                    </el-form>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
+                        <el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
+                    </el-row>
+                </div>
+            </leave-info>
+        </template>
+
+    </guava>
+</div>
+
+<script>
+    <!--#include('../common/leaveInfo.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "leave-info": leaveInfo
+        },
+        data() {
+            return {
+                pageForm: {
+                    approval: false
+                },
+                typeOptions: [],
+                tableColumns: [
+                    {prop: 'periodName', label: '会议名称'},
+                    {prop: 'startTime', label: '开始时间'},
+                    {prop: 'endTime', label: '结束时间'},
+                    {prop: 'userName', label: '请假人'},
+                    {prop: 'leaveReason', label: '请假事由'},
+                    {prop: 'meetingName', label: '所属会议'},
+                    {prop: 'typeName', label: '会议类型'},
+                    {prop: 'curTaskName', label: '当前节点'},
+                    {prop: 'instanceState', label: '流程状态'},
+                ],
+                formData: {},
+                showApprovalForm: false
+            }
+        },
+        methods: {
+            onView(row) {
+                this.$refs.guava.edit(()=>{
+                    this.showApprovalForm = false
+                    this.$refs.leaveInfoRef.onOpen(row)
+                })
+            },
+            onAudit(row) {
+                this.$refs.guava.edit(()=>{
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.leaveInfoRef.onOpen(row)
+                })
+            },
+            handleTaskAction(val) {
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/executeTask", {
+                        data: JSON.stringify({
+                            ...this.formData,
+                            submitType: val
+                        })
+                    }).then((res) => {
+                        if (res.code === 0) {
+                            this.$refs.guava.index()
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            queryMeetingType() {
+                this.$axios.post('/platform/meeting/type/queryMeetingType')
+                    .then((resp) => {
+                        this.typeOptions = resp.data
+                    })
+            },
+        },
+        async created() {
+            this.queryMeetingType()
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html

@@ -0,0 +1,183 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度：">
+                    <el-date-picker
+                        v-model="pageForm.year"
+                        type="year"
+                        value-format="yyyy"
+                        placeholder="请选择年度"
+                        @change="doSearch"
+                        style="width: 100%"
+                    ></el-date-picker>
+                </search-item>
+                <search-item label="名称/地点：">
+                    <el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
+                              @keyup.enter.native="doSearch">
+                    </el-input>
+                </search-item>
+                <search-item label="会议类型：">
+                    <el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
+                               placeholder="请选择慰问类型" filterable clearable>
+                        <el-option v-for="item in typeOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+
+        <el-card shadow="never">
+            <table-tool label="申请列表"></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+                <el-table-column
+                    :label="column.label"
+                    :prop="column.prop"
+                    :key="column.prop"
+                    :width="column.width"
+                    :sortable="column.sortable"
+                    align="center"
+                    header-align="center"
+                    show-overflow-tooltip
+                    v-for="column in tableColumns"
+                >
+                    <template v-slot="{ row }" v-if="column.prop === 'instanceState'">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
+                    </template>
+                    <template v-slot="{ row }" v-else-if="column.prop === 'leaveReason'">
+                        {{ JSON.parse(row.instanceVariable).f_data.leaveReason || '' }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="300">
+                    <template slot-scope="{row}">
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
+                        <el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
+                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #view>
+            <leave-info ref="leaveInfoRef"></leave-info>
+        </template>
+    </guava>
+</div>
+<script>
+    <!--#include('../common/leaveInfo.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "leave-info": leaveInfo
+        },
+        data() {
+            return {
+                typeOptions: [],
+                tableColumns: [
+                    {prop: 'periodName', label: '会议名称'},
+                    {prop: 'startTime', label: '开始时间'},
+                    {prop: 'endTime', label: '结束时间'},
+                    {prop: 'userName', label: '请假人'},
+                    {prop: 'leaveReason', label: '请假事由'},
+                    {prop: 'meetingName', label: '所属会议'},
+                    {prop: 'typeName', label: '会议类型'},
+                    {prop: 'taskName', label: '当前节点'},
+                    {prop: 'instanceState', label: '流程状态'},
+                ],
+            }
+        },
+        methods: {
+            onView(row) {
+                this.$refs.guava.view(()=>{
+                    this.$refs.leaveInfoRef.onOpen(row)
+                })
+            },
+            onEdit(row) {
+                if(!row.canLeave) {
+                    this.$message.warning('该场次不能请假')
+                    return
+                }
+                this.$prompt('请输入请假事由', '温馨提醒', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    inputValidator: (value) => {
+                        if (!value) {
+                            return '请假事由不能为空';
+                        }
+                        return true;
+                    }
+                }).then(({ value }) => {
+                    this.$axios.post("/platform/meeting/mine/submitAgain", {
+                        id: row.id,
+                        leaveReason: value,
+                        taskId: row.taskId
+                    })
+                        .then((resp) => {
+                            if (resp.code === 0) {
+                                this.$message.success(resp.msg)
+                                this.pageData()
+                            } else {
+                                this.$message.error(resp.msg)
+                            }
+                        })
+                }).catch(() => {})
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", { taskId: row.startTaskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+            onDelete(id) {
+                this.$confirm("您确定要删除吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/meeting/leave/delete", { id }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+            queryMeetingType() {
+                this.$axios.post('/platform/meeting/type/queryMeetingType')
+                    .then((resp) => {
+                        this.typeOptions = resp.data
+                    })
+            },
+        },
+        created() {
+            this.queryMeetingType()
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

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

@@ -0,0 +1,205 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .timePeriod_card {
+        border-top: 5px solid #106898;
+        border-left: 1px solid #ebeef5;
+        border-bottom: 1px solid #ebeef5;
+        border-right: 1px solid #ebeef5;
+    }
+    .timePeriod_card .el-form-item {
+        margin-bottom: 0 !important;
+    }
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <template>
+            <el-card shadow="never">
+                <search @search="doSearch">
+                    <search-item label="年度：">
+                        <el-date-picker
+                            v-model="pageForm.year"
+                            type="year"
+                            value-format="yyyy"
+                            placeholder="请选择年度"
+                            @change="doSearch"
+                            style="width: 100%"
+                        ></el-date-picker>
+                    </search-item>
+                    <search-item label="名称/地点：">
+                        <el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
+                                  @keyup.enter.native="doSearch">
+                        </el-input>
+                    </search-item>
+                    <search-item label="会议类型：">
+                        <el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
+                                   placeholder="请选择慰问类型" filterable clearable>
+                            <el-option v-for="item in typeOptions"
+                                       :value="item.id"
+                                       :key="item.id"
+                                       :label="item.name"
+                            ></el-option>
+                        </el-select>
+                    </search-item>
+                </search>
+            </el-card>
+
+            <el-card shadow="never" class="mt20">
+                <table-tool label="会议列表"></table-tool>
+                <el-table :data="tableData" @sort-change="pageOrder" :size="tableSize" ref="meetingTable">
+                    <el-table-column type="expand">
+                        <template slot-scope="{ row }">
+                            <el-row :gutter="20" justify="start" style="flex-wrap: wrap" type="flex"
+                                    v-if="row.timePeriods && row.timePeriods.length > 0">
+                                <el-col :xl="5" v-for="tp,index in row.timePeriods" :key="index">
+                                    <el-card class="mb10 timePeriod_card" shadow="hover">
+                                        <el-form label-width="80px">
+                                            <el-form-item label="名称">{{tp.periodName}}</el-form-item>
+                                            <el-form-item label="会议时间">{{tp.startTime}}</el-form-item>
+                                            <el-form-item label="结束时间">{{tp.endTime}}</el-form-item>
+                                        </el-form>
+                                        <el-row justify="space-around" style="border-top: 1px solid #ebeef5;padding: 10px 0 0 0" type="flex">
+                                            <el-button v-if="tp.joinStatus === true" @click="onLeave(tp)" size="medium" type="text">请假</el-button>
+                                            <el-button v-if="tp.joinStatus === false" size="medium" type="text" disabled>您已请假</el-button>
+                                            <el-button v-if="tp.signStatus === false" @click="onSign(tp)" size="medium" type="text">签到</el-button>
+                                            <el-button v-if="tp.signStatus === true" size="medium" type="text" disabled>您已签到</el-button>
+                                        </el-row>
+                                    </el-card>
+                                </el-col>
+                            </el-row>
+                            <el-row v-else>
+                                <el-empty description="没有时间段"></el-empty>
+                            </el-row>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="序号" type="index" :index="indexMethod" width="60"></el-table-column>
+                    <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :key="column.prop"
+                        :width="column.width"
+                        :sortable="column.sortable"
+                        align="center"
+                        header-align="center"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
+                        <template v-slot="{ row }" v-if="column.prop === 'createdAt'">
+                            <span>{{ $moment(row.createdAt).format('YYYY-MM-DD') }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="230">
+                        <template v-slot="{ row }">
+                            <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                            <el-button @click="toggleRowTimePeriod(row)" size="mini" type="primary">展开</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <!--#include("/layouts/pagination.html"){}#-->
+            </el-card>
+        </template>
+
+        <template #view>
+            <meeting-info ref="infoRef"></meeting-info>
+        </template>
+    </guava>
+</div>
+<script>
+    <!--#include('../common/meetingInfo.js'){}#-->
+    const vue = new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        components: {
+            "meeting-info": meetingInfo,
+        },
+        data() {
+            return {
+                tableColumns: [
+                    {prop: 'name', label: '会议名称'},
+                    {prop: 'typeName', label: '会议类型'},
+                    {prop: 'address', label: '会议地点'},
+                    {prop: 'createdAt', label: '创建时间'},
+                ],
+                typeOptions: [],
+            }
+        },
+        methods: {
+            onLeave(row) {
+                if(!row.canLeave) {
+                    this.$message.warning('该场次不能请假')
+                    return
+                }
+                this.$prompt('请输入请假事由', '温馨提醒', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    inputValidator: (value) => {
+                        if (!value) {
+                            return '请假事由不能为空';
+                        }
+                        return true;
+                    }
+                }).then(({ value }) => {
+                    this.$axios.post("/platform/meeting/mine/leave", { periodId: row.id, leaveReason: value })
+                        .then((resp) => {
+                            if (resp.code === 0) {
+                                this.$message.success(resp.msg)
+                                this.pageData()
+                            } else {
+                                this.$message.error(resp.msg)
+                            }
+                        })
+                }).catch(() => {})
+            },
+            onSign(row) {
+                this.$confirm('您确定要签到吗？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(()=>{
+                    this.$axios.post("/platform/meeting/mine/sign", { periodId: row.id })
+                        .then((resp) => {
+                            if (resp.code === 0) {
+                                this.$message.success(resp.msg)
+                                this.pageData()
+                            } else {
+                                this.$message.error(resp.msg)
+                            }
+                        })
+                })
+            },
+            toggleRowTimePeriod(row) {
+                this.$refs['meetingTable'].toggleRowExpansion(row)
+            },
+            onView(row) {
+                this.$refs.guava.view(() => {
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+            queryMeetingType() {
+                this.$axios.post('/platform/meeting/type/queryMeetingType')
+                    .then((resp) => {
+                        this.typeOptions = resp.data
+                    })
+            },
+            pageData() {
+                this.$axios.post(loc() + "/pageData", this.pageForm).then((res) => {
+                    if (res.code === 0) {
+                        this.tableData = res.data.list
+                        this.pageForm.totalCount = res.data.totalCount
+                    }
+                })
+            },
+        },
+        async created() {
+            this.queryMeetingType()
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html

@@ -106,10 +106,10 @@ layout("/layouts/platform.html"){
                 <table-tool label="会议列表"></table-tool>
                 <el-table :data="tableData" @sort-change="pageOrder" :size="tableSize" ref="meetingTable">
                     <el-table-column type="expand">
-                        <template slot-scope="scope">
+                        <template slot-scope="{ row }">
                             <el-row :gutter="20" justify="start" style="flex-wrap: wrap" type="flex"
-                                    v-if="scope.row.timePeriods && scope.row.timePeriods.length > 0">
-                                <el-col :xl="5" v-for="tp,index in scope.row.timePeriods" :key="index">
+                                    v-if="row.timePeriods && row.timePeriods.length > 0">
+                                <el-col :xl="5" v-for="tp,index in row.timePeriods" :key="index">
                                     <el-card class="mb10 timePeriod_card" shadow="hover">
                                         <el-form label-width="80px">
                                             <el-form-item label="名称">{{tp.periodName}}</el-form-item>
@@ -120,7 +120,7 @@ layout("/layouts/platform.html"){
                                             <el-button @click="exportSignature(tp.id)" size="medium" type="text">
                                                 导出签字表
                                             </el-button>
-                                            <el-button @click="openOnline(tp.id,scope.row.id)" size="medium" type="text">
+                                            <el-button @click="openOnline(tp.id, row.id)" size="medium" type="text">
                                                 扫描二维码
                                             </el-button>
                                         </el-row>

src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html

@@ -0,0 +1,199 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app">
+    <guava ref="guava">
+
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度：">
+                    <el-date-picker
+                        v-model="pageForm.year"
+                        type="year"
+                        value-format="yyyy"
+                        placeholder="请选择年度"
+                        @change="doSearch"
+                        style="width: 100%"
+                    ></el-date-picker>
+                </search-item>
+                <search-item label="名称/地点：">
+                    <el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
+                              @keyup.enter.native="doSearch">
+                    </el-input>
+                </search-item>
+                <search-item label="会议类型：">
+                    <el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
+                               placeholder="请选择慰问类型" filterable clearable>
+                        <el-option v-for="item in typeOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+
+        <el-card shadow="never">
+            <table-tool label="申请列表">
+                <el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
+                    <el-radio-button :label="true">已审核</el-radio-button>
+                    <el-radio-button :label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+                <el-table-column
+                    :label="column.label"
+                    :prop="column.prop"
+                    :key="column.prop"
+                    :width="column.width"
+                    :sortable="column.sortable"
+                    align="center"
+                    header-align="center"
+                    show-overflow-tooltip
+                    v-for="column in tableColumns"
+                >
+                    <template v-slot="{ row }" v-if="column.prop === 'instanceState'">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
+                    </template>
+                    <template v-slot="{ row }" v-else-if="column.prop === 'leaveReason'">
+                        {{ JSON.parse(row.instanceVariable).f_data.leaveReason || '' }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="300px">
+                    <template slot-scope="{row}">
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="onAudit(row)" size="mini" type="primary">审核</el-button>
+                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #edit>
+            <leave-info ref="leaveInfoRef">
+                <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        {{formData.taskName}}
+                    </div>
+                    <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
+                             class="flow-task-form">
+                        <el-form-item label="审批意见" prop="tf_opinion"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
+                        </el-form-item>
+                    </el-form>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
+                        <el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
+                    </el-row>
+                </div>
+            </leave-info>
+        </template>
+
+    </guava>
+</div>
+
+<script>
+    <!--#include('../common/leaveInfo.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            "leave-info": leaveInfo
+        },
+        data() {
+            return {
+                pageForm: {
+                    approval: false
+                },
+                typeOptions: [],
+                tableColumns: [
+                    {prop: 'periodName', label: '会议名称'},
+                    {prop: 'startTime', label: '开始时间'},
+                    {prop: 'endTime', label: '结束时间'},
+                    {prop: 'userName', label: '请假人'},
+                    {prop: 'leaveReason', label: '请假事由'},
+                    {prop: 'meetingName', label: '所属会议'},
+                    {prop: 'typeName', label: '会议类型'},
+                    {prop: 'curTaskName', label: '当前节点'},
+                    {prop: 'instanceState', label: '流程状态'},
+                ],
+                formData: {},
+                showApprovalForm: false
+            }
+        },
+        methods: {
+            onView(row) {
+                this.$refs.guava.edit(()=>{
+                    this.showApprovalForm = false
+                    this.$refs.leaveInfoRef.onOpen(row)
+                })
+            },
+            onAudit(row) {
+                this.$refs.guava.edit(()=>{
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.leaveInfoRef.onOpen(row)
+                })
+            },
+            handleTaskAction(val) {
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/executeTask", {
+                        data: JSON.stringify({
+                            ...this.formData,
+                            submitType: val
+                        })
+                    }).then((res) => {
+                        if (res.code === 0) {
+                            this.$refs.guava.index()
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            queryMeetingType() {
+                this.$axios.post('/platform/meeting/type/queryMeetingType')
+                    .then((resp) => {
+                        this.typeOptions = resp.data
+                    })
+            },
+        },
+        async created() {
+            this.queryMeetingType()
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

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

@@ -232,13 +232,8 @@ const apply = {
         },
         // 查询哪些天是开放的
         async queryAllowDay() {
-            const days = Array.from(document.querySelectorAll('.div-Calendar'))
-                .map(el => el.getAttribute('data-day'))
-                .sort()
             const {data} = await this.$axios.post("/platform/site/apply/queryAllowDay", {
-                siteId: this.row.id,
-                startTime: days[0],
-                endTime: days[days.length - 1],
+                siteId: this.row.id
             })
             this.allowDayList = data
         },

src/main/resources/views/platform/zhgh/dayofficework/site/manage/basicForm.js

@@ -9,10 +9,15 @@ const basicForm = {
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
+                        <el-form-item prop="sortNum" label="排序编号">
+                            <el-input v-model="formData.sortNum" placeholder="请输入排序编号" type="number"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <!--<el-col :span="12">
                         <el-form-item label="创建时间" prop="createTime">
                             <el-input disabled type="text" v-model="formData.createTime" maxlength="20" placeholder="请输入创建时间"></el-input>
                         </el-form-item>
-                    </el-col>
+                    </el-col>-->
                 </el-row>
                 
                 <el-row :gutter="20" type="flex">
@@ -43,8 +48,8 @@ const basicForm = {
 
                 <el-row :gutter="20" type="flex">
                     <el-col :span="12">
-                        <el-form-item prop="sortNum" label="排序编号">
-                            <el-input v-model="formData.sortNum" placeholder="请输入排序编号" type="number"></el-input>
+                        <el-form-item label="开放天数" prop="openDayNum">
+                            <el-input v-model="formData.openDayNum" placeholder="请输入开放天数" type="number"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -283,6 +288,7 @@ const basicForm = {
                 createUserId: this.$store.state.user.id,
                 createTime: this.$moment().format('YYYY-MM-DD'),
                 openHours: [],
+                openDayNum: 7,
             },
             formRules: {
                 createUserName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
@@ -298,6 +304,7 @@ const basicForm = {
                 sexLimit: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                 state: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                 filterHolidays: [{required: true, message: '必填', trigger: ['blur', 'change']}],
+                openDayNum: [{required: true, message: '必填', trigger: ['blur', 'change']}],
             },
             setUpTimeDialog: false,
             timeOneKeySet: {

src/main/resources/views/platform/zhghh5/club/mine/index.html

@@ -89,13 +89,13 @@ layout("/layouts/platform_h5.html"){
             onEdit(row) {
                 this.$pjaxReplace("/platform/club/join/apply/h5?taskId=" + (row.startTaskId || "") + "&bizId=" + row.id)
             },
-            onDelete(id) {
+            onDelete(row) {
                 this.$dialog.confirm({
                     title: "提示",
                     message: "确定要删除此申请吗？"
                 })
                     .then(() => {
-                        this.$axios.post("/platform/club/join/mine/delete", { id: id }).then((res) => {
+                        this.$axios.post("/platform/club/join/mine/delete", { id: row.id }).then((res) => {
                             if (res.code === 0) {
                                 this.$toast.success(res.msg)
                                 this.doSearch()

src/main/resources/views/platform/zhghh5/dayofficework/meeting/common/leaveInfo.js

@@ -0,0 +1,77 @@
+const leaveInfo = {
+    template:
+    /*language=HTML*/
+        `
+            <van-action-sheet v-model="visible" title="查看详情">
+                <div class="detail-container">
+                    <van-cell-group title="基本信息">
+                        <van-cell title="请假人姓名">{{ viewData.userName }}</van-cell>
+                        <van-cell title="请假人工号">{{ viewData.loginName }}</van-cell>
+                        <van-cell title="所属单位">{{ viewData.unitName }}</van-cell>
+                        <van-cell title="所属工会">{{ viewData.unionName }}</van-cell>
+                        <van-cell title="会议名称">{{ viewData.periodName }}</van-cell>
+                        <van-cell title="开始时间">{{ viewData.startTime }}</van-cell>
+                        <van-cell title="结束时间">{{ viewData.endTime }}</van-cell>
+                        <van-cell title="请假事由" class="direction-column-cell">{{ viewData.leaveReason }}</van-cell>
+                        <van-cell title="所属会议">{{ viewData.meetingName }}</van-cell>
+                        <van-cell title="会议类型">{{ viewData.typeName }}</van-cell>
+                    </van-cell-group>
+                    <template v-for="task in doneTasks">
+                        <van-cell-group :title="task.displayName" v-if="task.ext.isFirstTaskNode">
+                            <van-cell title="申请用户">{{ task.ext.initiatorName }}({{task.ext.initiatorAccount}})
+                            </van-cell>
+                            <van-cell title="申请时间">{{ task.finishTime }}</van-cell>
+                            <van-cell title="办理结果">
+                                <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
+                                          :value="task.ext.submitType"></dict-tag>
+                            </van-cell>
+                        </van-cell-group>
+                        <van-cell-group :title="task.displayName" v-else>
+                            <van-cell title="办理用户">{{ task.taskFormData.userName }}({{task.taskFormData.loginName}})
+                            </van-cell>
+                            <van-cell title="办理时间">{{ task.finishTime }}</van-cell>
+                            <van-cell title="办理结果">
+                                <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
+                                          :value="task.ext.submitType"></dict-tag>
+                            </van-cell>
+                            <van-cell title="办理意见" v-if="!task.ext.isFirstTaskNode" class="direction-column-cell">
+                                <div v-html="task.taskFormData.tf_opinion"></div>
+                            </van-cell>
+                        </van-cell-group>
+                    </template>
+                </div>
+                <slot></slot>
+            </van-action-sheet>
+        `,
+    dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
+    data() {
+        return {
+            visible:false,
+            viewData: {},
+            doneTasks: [],
+            row: null,
+        }
+    },
+    methods: {
+        onOpen(row) {
+            row.leaveReason = JSON.parse(row.instanceVariable).f_data.leaveReason || ''
+            this.row = row
+            this.visible = true
+            this.viewData = clone(row)
+            this.getDoneTasks()
+        },
+        onClose(){
+            this.visible = false
+        },
+        getDoneTasks() {
+            this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
+                if (res.code === 0) {
+                    this.doneTasks = res.data
+                }
+            })
+        },
+    },
+    style: /*language=CSS*/ `
+           
+    `
+}

src/main/resources/views/platform/zhghh5/dayofficework/meeting/common/meetingInfo.js

@@ -0,0 +1,96 @@
+const meetingInfo = {
+    template: /*language=HTML*/ `
+        <div>
+            <van-action-sheet v-model="visible" title="会议信息">
+                <div class="detail-container">
+                    <van-cell-group title="基本信息">
+                        <van-cell title="会议名称">{{ viewData.name }}</van-cell>
+                        <van-cell title="会议地点">{{ viewData.address }}</van-cell>
+                        <van-cell title="会议类型">{{ viewData.typeName }}</van-cell>
+                        <van-cell title="会议描述" class="direction-column-cell">
+                            <span v-html="viewData.description"></span>
+                        </van-cell>
+                    </van-cell-group>
+                    <van-cell-group title="场次信息" v-if="viewData.timePeriods && viewData.timePeriods.length > 0">
+                        <table class="table-class">
+                            <thead>
+                                <tr>
+                                    <th>场次名称</th>
+                                    <th>开始时间</th>
+                                    <th>结束时间</th>
+                                    <th>是否可以请假</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            <tr v-for="(item,index) in viewData.timePeriods" :key="index">
+                                <td>{{ item.periodName }}</td>
+                                <td>{{ item.startTime }}</td>
+                                <td>{{ item.endTime }}</td>
+                                <td>{{ item.canLeave ? '是' : '否' }}</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </van-cell-group>
+                    <van-cell-group title="会议参与人员" v-if="viewData.users && viewData.users.length > 0">
+                        <table class="table-class">
+                            <thead>
+                            <tr>
+                                <th>工号</th>
+                                <th>姓名</th>
+                                <th>性别</th>
+                                <th>所属单位</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr v-for="(item,index) in viewData.users" :key="index">
+                                <td>{{ item.loginName }}</td>
+                                <td>{{ item.userName }}</td>
+                                <td>{{ item.sex }}</td>
+                                <td>{{ item.unitName }}</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </van-cell-group>
+                </div>
+            </van-action-sheet>
+        </div>
+    `,
+    data() {
+        return {
+            viewData: {},
+            visible: false
+        }
+    },
+    methods: {
+        onOpen(row) {
+            this.$axios.post('/platform/meeting/manage/info', {id: row.id}).then((res) => {
+                if (res.code === 0) {
+                    this.viewData = res.data
+                }
+            })
+            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;
+        }
+    `
+}

src/main/resources/views/platform/zhghh5/dayofficework/meeting/delegationApproval/index.html

@@ -0,0 +1,190 @@
+<!--#
+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-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">
+            <year-van-dropdown-item :num="5" @change="doSearch" v-model="pageForm.year"></year-van-dropdown-item>
+            <van-dropdown-item v-model="pageForm.type" :options="typeOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
+        </van-dropdown-menu>
+        <van-tabs v-model="pageForm.approvalText"
+                  @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
+            <van-tab title="已审核" name="1"></van-tab>
+            <van-tab title="未审核" name="0"></van-tab>
+        </van-tabs>
+    </van-sticky>
+
+    <table-list api="/platform/meeting/delegationApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" title="periodName" @ready="onReady">
+        <template v-slot="{index,row}">
+            <table-column label="开始时间">{{row.startTime}}</table-column>
+            <table-column label="结束时间">{{row.endTime}}</table-column>
+            <table-column label="请假人">{{row.userName}}</table-column>
+            <table-column label="请假事由">{{JSON.parse(row.instanceVariable).f_data.leaveReason || ''}}</table-column>
+            <table-column label="所属会议">{{row.meetingName}}</table-column>
+            <table-column label="会议类型">{{row.typeName}}</table-column>
+            <table-column label="当前节点">{{row.curTaskName}}</table-column>
+        </template>
+        <template #actions="{index,row}">
+            <div class="action-btn" @click="onView(row)">
+                <i class="fa fa-eye"></i>
+                <span>查看</span>
+            </div>
+            <div class="action-btn" v-if="row.taskState === 10" @click="onApproval(row)">
+                <i class="fa fa-edit"></i>
+                <span>审核</span>
+            </div>
+            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+                <i class="fa fa-reply"></i>
+                <span>撤回</span>
+            </div>
+        </template>
+    </table-list>
+
+    <leave-info ref="infoRef">
+        <div v-if="showApprovalForm">
+            <div class="process-title">{{formData.taskName}}</div>
+            <van-form ref="formRef">
+                <van-field
+                    v-model="formData.tf_opinion"
+                    name="tf_opinion"
+                    label="审批意见"
+                    placeholder="请输入审批意见"
+                    :rules="[{ required: true, message: '请填写审批意见' }]"
+                    required
+                    maxlength="100"
+                    show-word-limit
+                ></van-field>
+            </van-form>
+            <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
+                <van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
+                <van-button type="danger" block @click="handleTaskAction(20)">不同意</van-button>
+                <van-button type="primary" block @click="handleTaskAction(1)">同意</van-button>
+            </div>
+        </div>
+    </leave-info>
+</div>
+
+<script>
+    <!--#include('../common/leaveInfo.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        components: {
+            'leave-info': leaveInfo,
+        },
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    searchKeyword: '',
+                    approvalText: "0",
+                    approval: false,
+                    year: new Date().getFullYear(),
+                    type: null,
+                },
+                typeOptions: [],
+                formData: {},
+                showApprovalForm: false
+            }
+        },
+        methods: {
+            async onReady() {
+                const typeList = await this.queryMeetingType()
+                this.typeOptions = [
+                    {
+                        text: "全部类型",
+                        value: null
+                    }
+                ].concat(typeList.map((v) => ({ text: v.name, value: v.id })))
+                if (this.typeOptions.length > 0) {
+                    this.pageForm.type = this.typeOptions[0].value
+                    this.doSearch()
+                }
+            },
+            onView(row) {
+                this.showApprovalForm = false
+                this.$refs.infoRef.onOpen(row)
+            },
+            onApproval(row) {
+                this.showApprovalForm = true
+                this.$refs.infoRef.onOpen(row)
+                this.formData = {
+                    processTaskId: row.taskId,
+                    taskName: row.curTaskName
+                }
+            },
+            async handleTaskAction(val) {
+                try {
+                    await this.$refs.formRef.validate();
+                    this.$dialog.confirm({
+                        title: "提示",
+                        message: "您确定要提交吗？"
+                    }).then(() => {
+                        this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.infoRef.onClose()
+                                this.$toast.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    }).catch(() => {
+
+                    })
+                } catch (error) {
+
+                }
+            },
+            onRevoke(row){
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要撤回吗？"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$toast.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            async queryMeetingType() {
+                const res = await  this.$axios.post('/platform/meeting/type/queryMeetingType')
+                return res.data
+            },
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            }
+        },
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/dayofficework/meeting/leave/index.html

@@ -0,0 +1,197 @@
+<!--#
+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-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">
+            <year-van-dropdown-item :num="5" @change="doSearch" v-model="pageForm.year"></year-van-dropdown-item>
+            <van-dropdown-item v-model="pageForm.type" :options="typeOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
+        </van-dropdown-menu>
+    </van-sticky>
+
+    <table-list api="/platform/meeting/leave/pageData" :page_form.sync="pageForm" ref="tableListRef" title="periodName" @ready="onReady">
+        <template v-slot="{index,row}">
+            <table-column label="开始时间">{{row.startTime}}</table-column>
+            <table-column label="结束时间">{{row.endTime}}</table-column>
+            <table-column label="请假人">{{row.userName}}</table-column>
+            <table-column label="请假事由">{{JSON.parse(row.instanceVariable).f_data.leaveReason || ''}}</table-column>
+            <table-column label="所属会议">{{row.meetingName}}</table-column>
+            <table-column label="会议类型">{{row.typeName}}</table-column>
+            <table-column label="当前节点">{{row.taskName}}</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)"
+                 v-if="row.taskKey === 'startTask' || !row.instanceId">
+                <i class="fa fa-edit"></i>
+                <span>编辑</span>
+            </div>
+            <div class="action-btn delete" @click="onRevoke(row)"
+                 v-if="row.canRevoke">
+                <i class="fa fa-undo"></i>
+                <span>撤回</span>
+            </div>
+            <div class="action-btn delete" @click="onDelete(row)"
+                 v-if="row.taskKey === 'startTask' || !row.instanceId">
+                <i class="fa fa-trash"></i>
+                <span>删除</span>
+            </div>
+        </template>
+    </table-list>
+
+    <van-dialog v-model="visible" title="请假事由" show-cancel-button
+                :before-close="handleBeforeClose">
+        <van-field
+            style="padding: 20px 16px"
+            v-model="leaveReason"
+            label="请假事由"
+            placeholder="请输入请假事由"
+            required
+            rows="1"
+            autosize
+            type="textarea"
+        ></van-field>
+    </van-dialog>
+
+    <leave-info ref="infoRef"></leave-info>
+</div>
+
+<script>
+    <!--#include('../common/leaveInfo.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        components: {
+            'leave-info': leaveInfo,
+        },
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    year: new Date().getFullYear(),
+                    type: null
+                },
+                typeOptions: [],
+                visible: false,
+                leaveReason: '',
+                editRow: {},
+            }
+        },
+        methods: {
+            async onReady() {
+                const typeList = await this.queryMeetingType()
+                this.typeOptions = [
+                    {
+                        text: "全部类型",
+                        value: null
+                    }
+                ].concat(typeList.map((v) => ({ text: v.name, value: v.id })))
+                if (this.typeOptions.length > 0) {
+                    this.pageForm.type = this.typeOptions[0].value
+                    this.doSearch()
+                }
+            },
+            handleBeforeClose(action, done) {
+                if (action === 'confirm') {
+                    if(!this.leaveReason) {
+                        this.$toast('请输入请假事由')
+                        done(false)
+                    } else {
+                        this.$axios.post("/platform/meeting/mine/submitAgain", {
+                            id: this.editRow.id,
+                            leaveReason: this.leaveReason,
+                            taskId: this.editRow.taskId
+                        })
+                            .then((res) => {
+                                done()
+                                this.$toast(res.msg)
+                                if (res.code === 0) {
+                                    this.doSearch()
+                                    this.reasonVisible = false
+                                }
+                            }).catch(() => { done() })
+                    }
+                } else {
+                    done()
+                }
+            },
+            onRevoke(row) {
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要撤回吗？"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", { taskId: row.startTaskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$toast(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            onView(row) {
+                this.$refs.infoRef.onOpen(row)
+            },
+            onEdit(row) {
+                if(!row.canLeave) {
+                    this.$toast.success('该场次不能请假')
+                    return
+                }
+                this.editRow = row
+                this.visible = true
+            },
+            onDelete(row) {
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "确定要删除此申请吗？"
+                })
+                    .then(() => {
+                        this.$axios.post("/platform/meeting/leave/delete", { id: row.id }).then((res) => {
+                            if (res.code === 0) {
+                                this.$toast.success(res.msg)
+                                this.doSearch()
+                            } else {
+                                this.$toast.fail(res.msg)
+                            }
+                        })
+                    })
+                    .catch(() => {})
+            },
+            async queryMeetingType() {
+                const res = await  this.$axios.post('/platform/meeting/type/queryMeetingType')
+                return res.data
+            },
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            }
+        },
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/dayofficework/meeting/mine/index.html

@@ -0,0 +1,194 @@
+<!--#
+layout("/layouts/platform_h5.html"){
+#-->
+
+<style scoped>
+    .sign_button .van-button{
+        width: 66px;
+        height: 30px;
+        font-size: 14px;
+        border-radius: 6px;
+    }
+</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">
+            <year-van-dropdown-item :num="5" @change="doSearch" v-model="pageForm.year"></year-van-dropdown-item>
+            <van-dropdown-item v-model="pageForm.type" :options="typeOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
+        </van-dropdown-menu>
+    </van-sticky>
+
+    <table-list api="/platform/meeting/mine/pageData" :page_form.sync="pageForm" ref="tableListRef" title="name" @ready="onReady">
+        <template v-slot="{index,row}">
+            <table-column label="会议类型">{{row.typeName}}</table-column>
+            <table-column label="会议地点">{{row.address}}</table-column>
+            <table-column label="创建时间">{{row.createTime}}</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="leaveRow = row; leaveVisible = true">
+                <i class="fa fa-edit"></i>
+                <span>展开</span>
+            </div>
+        </template>
+    </table-list>
+
+    <van-action-sheet title="会议信息" v-model="leaveVisible" cancel-text="取消" close-on-click-action>
+        <button v-for="(item,index) in leaveRow.timePeriods" type="button" class="van-action-sheet__item">
+            <div style="display: flex; justify-content: space-between; align-items: center">
+                <div>
+                    <div class="van-action-sheet__name">{{item.periodName}}</div>
+                    <div class="van-action-sheet__subname">
+                        {{$moment(item.startTime).format('MM-DD HH:mm') + ' 至 ' + $moment(item.endTime).format('MM-DD HH:mm')}}
+                    </div>
+                </div>
+                <div class="sign_button">
+                    <van-button v-if="item.joinStatus === true" @click.stop="onLeave(item)" size="mini" type="info">请假</van-button>
+                    <van-button v-if="item.joinStatus === false" size="mini" type="info" disabled>您已请假</van-button>
+                    <van-button v-if="item.signStatus === false" @click.stop="onSign(item)" size="mini" type="info">签到</van-button>
+                    <van-button v-if="item.signStatus === true" size="mini" type="info" disabled>您已签到</van-button>
+                </div>
+            </div>
+        </button>
+    </van-action-sheet>
+
+    <van-dialog v-model="reasonVisible" title="请假事由" show-cancel-button
+                :before-close="handleBeforeClose">
+        <van-field
+            style="padding: 20px 16px"
+            v-model="leaveReason"
+            label="请假事由"
+            placeholder="请输入请假事由"
+            required
+            rows="1"
+            autosize
+            type="textarea"
+        ></van-field>
+    </van-dialog>
+
+    <meeting-info ref="infoRef"></meeting-info>
+</div>
+
+<script>
+    <!--#include('../common/meetingInfo.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        components: {
+            'meeting-info': meetingInfo,
+        },
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    year: new Date().getFullYear(),
+                    type: null
+                },
+                typeOptions: [],
+
+                leaveRow: {},
+                leaveVisible: false,
+
+                reasonVisible: false,
+                leaveReason: '',
+                periodRow: {},
+            }
+        },
+        methods: {
+            async onReady() {
+                const typeList = await this.queryMeetingType()
+                this.typeOptions = [
+                    {
+                        text: "全部类型",
+                        value: null
+                    }
+                ].concat(typeList.map((v) => ({ text: v.name, value: v.id })))
+                if (this.typeOptions.length > 0) {
+                    this.pageForm.siteType = this.typeOptions[0].value
+                    this.doSearch()
+                }
+            },
+            handleBeforeClose(action, done) {
+                if (action === 'confirm') {
+                    if(!this.leaveReason) {
+                        this.$toast('请输入请假事由')
+                        done(false)
+                    } else {
+                        this.$axios.post("/platform/meeting/mine/leave", {
+                            periodId: this.periodRow.id,
+                            leaveReason: this.leaveReason,
+                        })
+                            .then((res) => {
+                                done()
+                                this.$toast(res.msg)
+                                if (res.code === 0) {
+                                    this.doSearch()
+                                    this.reasonVisible = false
+                                }
+                            }).catch(() => { done() })
+                    }
+                } else {
+                    done()
+                }
+            },
+            onLeave(row) {
+                if(!row.canLeave) {
+                    this.$toast('该场次不能请假')
+                    return
+                }
+                this.periodRow = row
+                this.reasonVisible = true
+            },
+            onSign(row) {
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要签到吗？"
+                }).then(() => {
+                    this.$axios.post("/platform/meeting/mine/sign", { periodId: row.id })
+                        .then((res) => {
+                            this.$toast(res.msg)
+                            if (res.code === 0) {
+                                this.doSearch()
+                                this.leaveVisible = false
+                            }
+                        })
+                })
+            },
+            onView(row) {
+                this.$refs.infoRef.onOpen(row)
+            },
+            async queryMeetingType() {
+                const res = await  this.$axios.post('/platform/meeting/type/queryMeetingType')
+                return res.data
+            },
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            }
+        },
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/dayofficework/meeting/schoolUnionApproval/index.html

@@ -0,0 +1,190 @@
+<!--#
+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-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">
+            <year-van-dropdown-item :num="5" @change="doSearch" v-model="pageForm.year"></year-van-dropdown-item>
+            <van-dropdown-item v-model="pageForm.type" :options="typeOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
+        </van-dropdown-menu>
+        <van-tabs v-model="pageForm.approvalText"
+                  @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
+            <van-tab title="已审核" name="1"></van-tab>
+            <van-tab title="未审核" name="0"></van-tab>
+        </van-tabs>
+    </van-sticky>
+
+    <table-list api="/platform/meeting/schoolUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" title="periodName" @ready="onReady">
+        <template v-slot="{index,row}">
+            <table-column label="开始时间">{{row.startTime}}</table-column>
+            <table-column label="结束时间">{{row.endTime}}</table-column>
+            <table-column label="请假人">{{row.userName}}</table-column>
+            <table-column label="请假事由">{{JSON.parse(row.instanceVariable).f_data.leaveReason || ''}}</table-column>
+            <table-column label="所属会议">{{row.meetingName}}</table-column>
+            <table-column label="会议类型">{{row.typeName}}</table-column>
+            <table-column label="当前节点">{{row.curTaskName}}</table-column>
+        </template>
+        <template #actions="{index,row}">
+            <div class="action-btn" @click="onView(row)">
+                <i class="fa fa-eye"></i>
+                <span>查看</span>
+            </div>
+            <div class="action-btn" v-if="row.taskState === 10" @click="onApproval(row)">
+                <i class="fa fa-edit"></i>
+                <span>审核</span>
+            </div>
+            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+                <i class="fa fa-reply"></i>
+                <span>撤回</span>
+            </div>
+        </template>
+    </table-list>
+
+    <leave-info ref="infoRef">
+        <div v-if="showApprovalForm">
+            <div class="process-title">{{formData.taskName}}</div>
+            <van-form ref="formRef">
+                <van-field
+                    v-model="formData.tf_opinion"
+                    name="tf_opinion"
+                    label="审批意见"
+                    placeholder="请输入审批意见"
+                    :rules="[{ required: true, message: '请填写审批意见' }]"
+                    required
+                    maxlength="100"
+                    show-word-limit
+                ></van-field>
+            </van-form>
+            <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
+                <van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
+                <van-button type="danger" block @click="handleTaskAction(20)">不同意</van-button>
+                <van-button type="primary" block @click="handleTaskAction(1)">同意</van-button>
+            </div>
+        </div>
+    </leave-info>
+</div>
+
+<script>
+    <!--#include('../common/leaveInfo.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        components: {
+            'leave-info': leaveInfo,
+        },
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    searchKeyword: '',
+                    approvalText: "0",
+                    approval: false,
+                    year: new Date().getFullYear(),
+                    type: null,
+                },
+                typeOptions: [],
+                formData: {},
+                showApprovalForm: false
+            }
+        },
+        methods: {
+            async onReady() {
+                const typeList = await this.queryMeetingType()
+                this.typeOptions = [
+                    {
+                        text: "全部类型",
+                        value: null
+                    }
+                ].concat(typeList.map((v) => ({ text: v.name, value: v.id })))
+                if (this.typeOptions.length > 0) {
+                    this.pageForm.type = this.typeOptions[0].value
+                    this.doSearch()
+                }
+            },
+            onView(row) {
+                this.showApprovalForm = false
+                this.$refs.infoRef.onOpen(row)
+            },
+            onApproval(row) {
+                this.showApprovalForm = true
+                this.$refs.infoRef.onOpen(row)
+                this.formData = {
+                    processTaskId: row.taskId,
+                    taskName: row.curTaskName
+                }
+            },
+            async handleTaskAction(val) {
+                try {
+                    await this.$refs.formRef.validate();
+                    this.$dialog.confirm({
+                        title: "提示",
+                        message: "您确定要提交吗？"
+                    }).then(() => {
+                        this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.infoRef.onClose()
+                                this.$toast.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    }).catch(() => {
+
+                    })
+                } catch (error) {
+
+                }
+            },
+            onRevoke(row){
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要撤回吗？"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$toast.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            async queryMeetingType() {
+                const res = await  this.$axios.post('/platform/meeting/type/queryMeetingType')
+                return res.data
+            },
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            }
+        },
+    })
+</script>
+
+<!--#
+}
+#-->

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

@@ -15,6 +15,14 @@ const apply = {
                             </div>
                         </div>
                     </div>
+                    <div class="calendar-right">
+                        <van-icon size="16" color="white" name="arrow-down" @click="calendarVisible = true"></van-icon>
+                        <van-calendar class="calendar-popup" v-model="calendarVisible" color="#246fb4" position="top" @confirm="calendarConfirm"
+                                      :default-date="new Date(selectDate)"
+                                      :formatter="calendarFormatter"
+                                      :first-day-of-week="1"
+                                      title="选择开始日期"></van-calendar>
+                    </div>
                 </div>
 
                 <div class="container">
@@ -105,10 +113,19 @@ const apply = {
 
             formVisible: false,
             formData: {},
+
+            calendarVisible: false,
         }
     },
-    watch: {
-
+    computed: {
+        calendarFormatter(day) {
+            return (day) => {
+                if(!this.allowDayList.includes(this.$moment(day.date).format('YYYY-MM-DD'))) {
+                    day.type = 'disabled'
+                }
+                return day
+            }
+        }
     },
     methods: {
         async onOpen(row, applyRow = null) {
@@ -141,6 +158,12 @@ const apply = {
             await this.queryTimesByDay()
             this.setWeekList(this.selectDate)
         },
+        async calendarConfirm(date) {
+            this.selectDate = this.$moment(date).format('YYYY-MM-DD')
+            this.setWeekList(date)
+            await this.queryTimesByDay()
+            this.calendarVisible = false
+        },
         onApply() {
             if(Object.keys(this.selected).length === 0) {
                 this.$toast('请选择要预约的时间')
@@ -246,12 +269,8 @@ const apply = {
         },
         // 查询哪些天是开放的
         async queryAllowDay() {
-            const startTime = this.weekList.length === 0 ? this.$moment().format('YYYY-MM-DD') : this.weekList[0].dateStr
-            const endTime = this.weekList.length === 0 ? this.$moment().add(8, 'd').format('YYYY-MM-DD') : this.weekList[this.weekList.length - 1].dateStr
             const {data} = await this.$axios.post("/platform/site/apply/queryAllowDay", {
                 siteId: this.row.id,
-                startTime: startTime,
-                endTime: endTime,
             })
             this.allowDayList = data
         },
@@ -323,5 +342,20 @@ const apply = {
         ::v-deep table {
             border-collapse: collapse;
         }
+        ::v-deep  .calendar-right {
+            width: 30px;
+            max-width: 30px;
+            text-align: center;
+            height: 60%;
+            border-left: 1px solid #fff3f3;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-left: 5px;
+        }
+
+        ::v-deep .calendar-popup {
+            top: 46px;
+        }
     `
 }

src/main/resources/views/platform/zhghh5/dayofficework/site/apply/index.html

@@ -49,7 +49,7 @@ layout("/layouts/platform_h5.html"){
 
 <script>
     <!--#include('../common/siteInfo.js'){}#-->
-    <!--#include('../common/apply.js'){}#-->
+    <!--#include('apply.js'){}#-->
     new Vue({
         el: "#app",
         store,
@@ -75,6 +75,17 @@ layout("/layouts/platform_h5.html"){
                 this.$refs.infoRef.onOpen(row)
             },
             onApply(row) {
+                if(row.reserveTarget === 1 && !this.$auth.hasRoleOr('BRANCH_UNION_ADMIN, BRANCH_UNION_CHAIRMAN') && !this.$auth.hasRole('SYSADMIN')) {
+                    this.$message.warning('该场地只能分工会预约')
+                    return
+                }
+                if (row.sexLimit === 1 || row.sexLimit === 2) {
+                    const sex = row.sexLimit === 1 ? '男' : '女'
+                    if(!this.$store.state.user.sex.includes(sex)) {
+                        this.$toast('抱歉，该场地仅限' + sex + '性会员预约')
+                        return
+                    }
+                }
                 this.$refs.applyRef.onOpen(row)
             },
             async onReady() {

src/main/resources/views/platform/zhghh5/dayofficework/site/mine/index.html

@@ -62,7 +62,7 @@ layout("/layouts/platform_h5.html"){
 </div>
 
 <script>
-    <!--#include('../common/apply.js'){}#-->
+    <!--#include('../apply/apply.js'){}#-->
     <!--#include('../common/info.js'){}#-->
     new Vue({
         el: "#app",
@@ -117,13 +117,13 @@ layout("/layouts/platform_h5.html"){
                 const res = await this.$axios.post('/platform/site/manage/info', { id: row.siteId })
                 this.$refs.applyRef.onOpen(res.data, row)
             },
-            onDelete(id) {
+            onDelete(row) {
                 this.$dialog.confirm({
                     title: "提示",
                     message: "确定要删除此申请吗？"
                 })
                     .then(() => {
-                        this.$axios.post("/platform/site/mine/delete", { id: id }).then((res) => {
+                        this.$axios.post("/platform/site/mine/delete", { id: row.id }).then((res) => {
                             if (res.code === 0) {
                                 this.$toast.success(res.msg)
                                 this.doSearch()

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

@@ -114,13 +114,13 @@ layout("/layouts/platform_h5.html"){
             onEdit(row) {
                 this.$pjaxReplace("/platform/condolence/apply/h5?taskId=" + (row.startTaskId || "") + "&bizId=" + row.id)
             },
-            onDelete(id) {
+            onDelete(row) {
                 this.$dialog.confirm({
                     title: "提示",
                     message: "确定要删除此申请吗？"
                 })
                     .then(() => {
-                        this.$axios.post("/platform/condolence/mine/delete", { id: id }).then((res) => {
+                        this.$axios.post("/platform/condolence/mine/delete", { id: row.id }).then((res) => {
                             if (res.code === 0) {
                                 this.$toast.success(res.msg)
                                 this.doSearch()