pref#ncu_commit

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

@@ -0,0 +1,68 @@
+package com.budwk.app.flow.handler;
+
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.flow.engine.AssignmentHandler;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.model.TaskModel;
+import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.models.Sys_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.lang.Lang;
+
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @Author FKY
+ * @name：FlowGeneralViceDelegationByArgsAssignmentHandler
+ * @Date 2025/12/17 10:08
+ * @注释  获取副团长(通用版本，根据args中的sessionId和delegationId)
+ */
+public class FlowGeneralViceDelegationByArgsAssignmentHandler implements AssignmentHandler {
+
+
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        String sessionId = execution.getArgs().getStr("sessionId");
+        String delegationId = execution.getArgs().getStr("delegationId");
+
+        if (StrUtil.isBlank(sessionId)) {
+            throw new BaseException("参数 sessionId 不能为空");
+        }
+        if (StrUtil.isBlank(delegationId)) {
+            throw new BaseException("参数 delegationId 不能为空");
+        }
+
+        SysRoleService sysRoleService = ServiceContext.find(SysRoleService.class);
+        Sys_role role = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_VICE_DELEGATION_HEAD);
+
+        List<Sys_user_role> roles = ServiceContext.find(Dao.class).query(
+                Sys_user_role.class,
+                Cnd.where(Sys_user_role::getRoleId, "=", role.getId())
+                        .and(Sys_user_role::getTcDelegationId, "=", delegationId)
+                        .and(Sys_user_role::getTcSessionId, "=", sessionId)
+        );
+
+        if (Lang.isEmpty(roles)) {
+            throw new RuntimeException("您所在的代表团没有设置副团长，无法流转到下一步，请联系校工会进行设置。");
+        }
+        return roles.stream().map(Sys_user_role::getUserId).toList();
+    }
+
+
+    @Override
+    public String getMessage() {
+        return "获取代表团副团长(通用版本，根据args中的sessionId和delegationId)";
+    }
+
+    @Override
+    public int getOrder() {
+        return AssignmentHandler.super.getOrder();
+    }
+
+}

src/main/java/com/budwk/app/sys/controller/SysLoginController.java

@@ -1,5 +1,6 @@
 package com.budwk.app.sys.controller;
 
+import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.codec.Base64Encoder;
 import cn.hutool.core.convert.Convert;
@@ -67,6 +68,7 @@ public class SysLoginController {
     @Ok("re")
     @ApiOperation("用户本地登录页面")
     @Filters
+//    @SaCheckLogin
     public String login(HttpServletRequest req, HttpSession session) {
         return "beetl:/platform/sys/login.html";
     }
@@ -74,6 +76,7 @@ public class SysLoginController {
     @At
     @Ok("re")
     @Filters
+//    @SaCheckLogin
     public String h5() {
         return "beetl:/platform/sys/login.html";
     }
@@ -89,6 +92,7 @@ public class SysLoginController {
     @At("/doLogin")
     @Ok("json")
     @ApiOperation("用户本地账号密码登录")
+//    @SaCheckLogin
     public Object doLogin(@Param("username") String username,
 						  @Param("password") String password,
 						  @Param("platformKey") String captchaKey,

src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java

@@ -94,7 +94,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
     @CacheResult(cacheKey = "${user.id}_getRoleCodeList")
     public List<String> getRoleCodeList(Sys_user user) {
         dao().fetchLinks(user, "roles");
-        List<String> roleNameList = new ArrayList<String>();
+        List<String> roleNameList = new ArrayList<>();
         for (Sys_role role : user.getRoles()) {
             if (!role.isDisabled()) roleNameList.add(role.getCode());
         }

src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java

@@ -283,8 +283,8 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
         }
         sysHomeActivity.setH5Url("/platform/h5/activity/culture/signUp?id=" + this.getId());
         if (Lang.isNotEmpty(this.getApplyStartTime())) {
-            sysHomeActivity.setStartDate(DateUtil.parseDate(this.getApplyStartTime()));
+            sysHomeActivity.setStartDate(DateUtil.parseDateTime(this.getApplyStartTime()));
-            sysHomeActivity.setEndDate(DateUtil.parseDate(this.getApplyEndTime()));
+            sysHomeActivity.setEndDate(DateUtil.parseDateTime(this.getApplyEndTime()));
         }
         sysHomeActivity.setAllowUserGroupId(this.getGroupId());
         sysHomeActivity.setEnable(this.getIsUnseal());

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

@@ -0,0 +1,95 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.validation.Valid;
+
+/**
+ * @version 1.0
+ * @Author FKY
+ * @name：ProposalViceDelegationReviewController
+ * @Date 2025/12/17 15:00
+ * @注释  副团长审核
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@Api(tags = "提案-办理-副团长审核")
+@At("/platform/proposal/vice/delegation/review")
+public class ProposalViceDelegationReviewController {
+
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/viceDelegationReview/index.html")
+    @SaCheckPermission("proposal.vice.delegation.review")
+    public void index() {
+    }
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/viceDelegationReview/index.html")
+    @SaCheckPermission("proposal.vice.delegation.review")
+    public void h5Index() {
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.vice.delegation")
+    @ApiOperation("分页列表")
+    public Result pageData(@Valid ProposalSearchParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                    type.NAME AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.id taskId,
+                    t.taskName AS taskKey,
+                    t.displayName taskName,
+                    t.taskType,
+                    t.performType taskPerformType,
+                    t.taskState,
+                    t.finishTime,
+                    t.taskParentId
+                FROM
+                    proposal_info info
+                    LEFT JOIN proposal_type type ON type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
+                    LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                    LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+            cnd.and("info.delegationId", "in", proposalCommonService.getSelfManageDelegationIds());
+        }
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java

@@ -7,6 +7,7 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -45,6 +46,9 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @author zhf
@@ -265,4 +269,93 @@ public class TeacherCongressDelegatePushZgAuditController {
     }
 
 
+
+    @At
+    @ApiOperation("批量审查")
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission("tc.delegate.push.zcAudit")
+    @SLog(tag = "代表管理-代表资格批量审查", msg = "批量审查")
+    public Result submitBatch(@Param("data") String param) {
+        List<NutMap> list = JSONUtil.parseArray(param).toList(NutMap.class);
+
+        // 审核的 id 列表 Map
+        Map<String, NutMap> dataMap = list.stream().collect(Collectors.toMap(v -> v.getString("id"), v -> v));
+        Set<String> idKeySet = dataMap.keySet();
+
+        List<TeacherCongressDelegatePush> pushList = baseService.dao().query(
+                TeacherCongressDelegatePush.class,
+                Cnd.where(TeacherCongressDelegatePush::getId, "in", idKeySet)
+        );
+
+        List<String> userIdList = pushList.stream().map(TeacherCongressDelegatePush::getUserId).toList();
+
+        Map<String, View_user> userMap = baseService.dao().query(View_user.class, Cnd.where("id", "in", userIdList))
+                .stream().collect(Collectors.toMap(View_user::getId, v -> v));
+
+        // 去循环审核数据
+        for (TeacherCongressDelegatePush delegatePush : pushList) {
+            View_user user = userMap.get(delegatePush.getUserId());
+
+            if (delegatePush.getIsJdh()) {
+                Teacher_congress_delegate delegate = new Teacher_congress_delegate();
+                Sys_user_role userRole = new Sys_user_role();
+
+                delegate.setUserId(user.getId());
+                delegate.setLoginName(user.getLoginname());
+                delegate.setUserName(user.getUsername());
+                delegate.setSex(user.getSex());
+                delegate.setAge(delegatePush.getAge());
+                delegate.setMobile(user.getMobile());
+                delegate.setUnitId(user.getUnitId());
+                delegate.setUnitName(user.getUnitName());
+                delegate.setUnionId(user.getUnionId());
+                delegate.setUnionName(user.getUnionName());
+
+                delegate.setSessionId(delegatePush.getSessionId());
+
+                /*Teacher_congress_delegation_unit delegation_unit = baseService.dao().fetch(Teacher_congress_delegation_unit.class,
+                        Cnd.where(Teacher_congress_delegation_unit::getUnitId, "=", user.getUnitId())
+                                .and(Teacher_congress_delegation_union::getSessionId, "=", delegatePush.getSessionId()));
+
+                if (ObjectUtil.isNotEmpty(delegation_unit)) {
+                    delegate.setDelegationId(delegation_unit.getDelegationId());
+                    userRole.setTcDelegationId(delegation_unit.getDelegationId());
+                } else {
+                    return Result.error(user.getUnitName() + "没有设置到代表团,请先在代表团管理里设置。");
+                }*/
+                if ("正式代表".equals(delegatePush.getRepresentativeType())) {
+                    Sys_role sys_role = baseService.dao().fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name()));
+                    delegate.setRoleId(sys_role.getId());
+                    userRole.setRoleId(sys_role.getId());
+                }
+                if ("列席代表".equals(delegatePush.getRepresentativeType())) {
+                    Sys_role sys_role = baseService.dao().fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_ATTENDANCE.name()));
+                    delegate.setRoleId(sys_role.getId());
+                    userRole.setRoleId(sys_role.getId());
+                }
+                userRole.setUserId(user.getId());
+                userRole.setTcSessionId(delegatePush.getSessionId());
+
+                baseService.dao().insert(delegate);
+
+                // 去改改用户表的手机号
+                baseService.dao().update(
+                        Sys_user.class,
+                        Chain.make("mobile", delegatePush.getMobile()),
+                        Cnd.where(Sys_user::getId, "=", user.getId())
+                );
+
+                NutMap nutMap = dataMap.get(delegatePush.getId());
+
+                Dict args = Dict.create();
+                args.set("processTaskId", nutMap.getString("processTaskId"));
+                args.set("taskName", nutMap.getString("taskName"));
+                args.set("submitType", nutMap.getString("submitType"));
+                flowCommonService.executeTask(args);
+            }
+        }
+
+        return Result.success();
+    }
+
 }

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java

@@ -5,7 +5,9 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNode;
 import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.page.Pagination;
@@ -127,21 +129,37 @@ public class TeacherCongressDelegationController {
 
 
     @At
-    @Aop(TransAop.READ_COMMITTED)
+    @ApiOperation("新增代表团")
     @SaCheckPermission("tc.delegation")
+    @SLog(tag = "教代会代表团管理", msg = "新增")
     public Result insert(Teacher_congress_delegation delegation) {
         dao.insert(delegation);
         return Result.success();
     }
 
     @At
-    @Aop(TransAop.READ_COMMITTED)
+    @ApiOperation("修改代表团")
     @SaCheckPermission("tc.delegation")
+    @SLog(tag = "教代会代表团管理", msg = "修改")
     public Result update(Teacher_congress_delegation delegation) {
         dao.updateIgnoreNull(delegation);
         return Result.success();
     }
 
+    @At
+    @ApiOperation("修改联合代表团")
+    @SaCheckPermission("tc.delegation")
+    @SLog(tag = "教代会代表团管理", msg = "设置开启或者关闭联合代表团")
+    public Result unite(String id, Boolean unite) {
+        dao.update(
+                Teacher_congress_delegation.class,
+                Chain.make("unite", unite),
+                Cnd.where("id", "=", id)
+        );
+        return Result.success();
+    }
+
+
     @At
     @Aop(TransAop.READ_COMMITTED)
     @SaCheckPermission("tc.delegation")

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/models/Teacher_congress_delegation.java

@@ -29,6 +29,11 @@ public class Teacher_congress_delegation extends BaseModel {
     @ColDefine(type = ColType.VARCHAR, width = 50)
     private String code;
 
+    @Column
+    @Comment("是否联合组团")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean unite;
+
     @Column
     @Comment("教代会ID")
     @ColDefine(type = ColType.VARCHAR, width = 32)

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

@@ -91,7 +91,12 @@ const singleSignUp = {
                     <el-table-column prop="loginName" label="工号"></el-table-column>
                     <el-table-column prop="sex" label="性别"></el-table-column>
                     <el-table-column prop="unitName" label="单位"></el-table-column>
-                    <el-table-column prop="mobile" label="手机号"></el-table-column>
+                    <el-table-column prop="mobile" label="手机号">
+                        <template slot-scope="{row}">
+                            <el-input :disabled="isSignUp && inApplyTime" v-model="row.mobile" maxlength="11" 
+                                      show-word-limit clearable placeholder="请输入手机号" style="width: 100%"></el-input>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="applyUserId" label="标识">
                         <template slot-scope="{row}">
                             <el-tag size="mini" v-if="row.applyUserId==row.userId">
@@ -132,7 +137,12 @@ const singleSignUp = {
                     <el-table-column prop="loginName" label="工号"></el-table-column>
                     <el-table-column prop="sex" label="性别"></el-table-column>
                     <el-table-column prop="unitName" label="单位"></el-table-column>
-                    <el-table-column prop="mobile" label="手机号"></el-table-column>
+                    <el-table-column prop="mobile" label="手机号">
+	                    <template slot-scope="{row}">
+		                    <el-input :disabled="isSignUp && inApplyTime" v-model="row.mobile" maxlength="11" 
+                                      show-word-limit clearable placeholder="请输入手机号" style="width: 100%"></el-input>
+	                    </template>
+                    </el-table-column>
                     <el-table-column prop="applyUserId" label="标识">
                         <template slot-scope="{row}">
                             <!--                            v-if="scope.row.applyUserId===scope.row.userId"-->
@@ -181,7 +191,12 @@ const singleSignUp = {
                     <el-table-column prop="loginName" label="工号"></el-table-column>
                     <el-table-column prop="sex" label="性别"></el-table-column>
                     <el-table-column prop="unitName" label="单位"></el-table-column>
-                    <el-table-column prop="mobile" label="手机号"></el-table-column>
+                    <el-table-column prop="mobile" label="手机号">
+	                    <template slot-scope="{row}">
+		                    <el-input :disabled="isSignUp && inApplyTime" v-model="row.mobile" maxlength="11" 
+                                      show-word-limit clearable placeholder="请输入手机号" style="width: 100%"></el-input>
+	                    </template>
+                    </el-table-column>
                     <el-table-column label="操作" width="100px"
                                      v-if="inApplyTime">
                         <template slot-scope="scope">
@@ -329,6 +344,17 @@ const singleSignUp = {
                 if (!formValid) return
             }
 
+
+            // 校验手机号是否填写
+            const incompleteUser = this.teamUsers.find(user => {
+                return !user.mobile || user.mobile.trim() === '';
+            });
+
+            if (incompleteUser) {
+                this.$message.error('请填写完整手机号');
+                return;
+            }
+
             //组队
             if (this.viewData.signUpMethod === 2) {
                 //组队人数判断

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

@@ -104,6 +104,7 @@ layout("/layouts/platform.html"){
         },
         data() {
             return {
+	            sessionOptions: [],
                 tableColumns: [
                     {label: "提案编号", prop: "code"},
                     {label: "提案名称", prop: "name", width: "200px"},
@@ -191,7 +192,6 @@ layout("/layouts/platform.html"){
                         if (this.sessionOptions) {
                             this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
                             this.pageData()
-                            this.listDelegation()
                         }
                     }
                 })

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

@@ -126,6 +126,9 @@ layout("/layouts/platform.html"){
                 })
             },
             openAudit(row) {
+				// 找这个代表团的副团长
+				
+				
                 this.$refs.guava.edit(() => {
                     this.showApprovalForm = true
                     this.formData = {

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

@@ -0,0 +1,32 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+	<guava ref="guava">
+		<el-card shadow="never">
+			<search @search="doSearch">
+				<search-item label="教代会">
+					<el-select @change="meetingChange" clearable filterable placeholder="所属教代会"
+					           v-model="pageForm.sessionId">
+						<el-option :key="item.id" :label="item.fullName" :value="item.id"
+						           v-for="item in sessionOptions"></el-option>
+					</el-select>
+				</search-item>
+				<search-item label="提案名称">
+					<el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
+					          style="width: 100%"></el-input>
+				</search-item>
+				<search-item label="姓名/工号">
+					<el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
+				</search-item>
+			</search>
+		</el-card>
+		
+		<el-card shadow="never" class="mt10">
+		
+		</el-card>
+	</guava>
+</div>
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html

@@ -24,26 +24,38 @@ layout("/layouts/platform.html"){
 
     <el-card shadow="never">
         <table-tool>
-            <el-radio-group @change="doSearch" v-model="pageForm.isFormalOrAttendance" size="small">
+	        <el-radio-group v-model="pageForm.approval" size="small" class="ml10"
+	                        @change="doSearch">
+		        <el-radio-button :label="true">已审核</el-radio-button>
+		        <el-radio-button :label="false">未审核</el-radio-button>
+	        </el-radio-group>
+	        
+	        <template v-if="!pageForm.approval">
+		        <el-button type="primary" size="small" @click="doBatchApproval(1)"
+		                   :disabled="!selectDataList || selectDataList.length <= 0"
+		                   class="ml10">批量通过</el-button>
+		        
+		        <el-button type="danger" size="small" @click="doBatchApproval(2)"
+		                   :disabled="!selectDataList || selectDataList.length <= 0"
+		                   class="ml10">批量拒绝</el-button>
+	        </template>
+	        
+            <el-radio-group @change="doSearch" v-model="pageForm.isFormalOrAttendance" size="small" style="margin-left: 10px">
                 <el-radio-button label="全部"></el-radio-button>
                 <el-radio-button label="正式代表"></el-radio-button>
                 <el-radio-button label="列席代表"></el-radio-button>
             </el-radio-group>
-            <el-radio-group v-model="pageForm.approval" size="small" class="ml10"
+            <el-button type="primary" size="small" @click="exportExcel" class="ml10">导出</el-button>
-                            @change="doSearch">
-                <el-radio-button :label="true">已审核</el-radio-button>
-                <el-radio-button :label="false">未审核</el-radio-button>
-            </el-radio-group>
-            <el-button type="primary" size="small" @click="exportExcel" class="ml5">导出</el-button>
 
         </table-tool>
         <el-table
                 ref="tableRef"
                 :data="tableData"
                 row-key="id"
+                @selection-change="tableHandleSelectionChange"
                 @sort-change="pageOrder"
         >
-            <!--            <el-table-column type="selection" width="55" reserve-selection></el-table-column>-->
+            <el-table-column type="selection" width="55" reserve-selection></el-table-column>
             <el-table-column type="index" width="55" label="序号" :index="indexMethod"></el-table-column>
             <el-table-column label="姓名" prop="userName" width="100"></el-table-column>
             <el-table-column label="工号" prop="loginName"></el-table-column>
@@ -161,10 +173,55 @@ layout("/layouts/platform.html"){
 
                 writeDialog: false,
                 isRead: false,
-                userId: null
+                userId: null,
+	            
+	            selectDataList: [],
             }
         },
         methods: {
+	        /**
+	         * 批量审核
+	         */
+	        tableHandleSelectionChange(val) {
+				this.selectDataList = val
+	        },
+	        
+	        /**
+	         * 批量审核
+	         */
+	        doBatchApproval(submitType) {
+		        this.$confirm("您确定要提交吗？", "提示", {
+			        confirmButtonText: "确定",
+			        cancelButtonText: "取消",
+			        type: "warning"
+		        }).then(() => {
+					
+			        const loading = createLoading()
+			        const data = this.selectDataList.map(v => {
+						return {
+							processTaskId: v.taskId,
+							taskName: v.curTaskName,
+							submitType: submitType,
+							id: v.id
+						}
+			        })
+			        
+			        this.$axios.post("/platform/teacherCongress/delegate/push/zcAudit/submitBatch", {
+						data: JSON.stringify(data)
+			        }).then(res => {
+				        loading.close()
+				        if (res.code === 0) {
+					        this.$message.success(res.msg)
+					        this.$refs.tableRef.clearSelection()
+					        this.doSearch()
+				        } else {
+							this.$message.error(res.msg)
+				        }
+			        })
+			        
+		        })
+	        },
+	        
             exportExcel() {
                 this.$downLoad("/platform/teacherCongress/delegate/push/zcAudit/exportExcel", this.pageForm)
             },
@@ -188,7 +245,8 @@ layout("/layouts/platform.html"){
                         data: JSON.stringify({
                             ...this.formData,
                             submitType: submitType
-                        }), id: row.id
+                        }),
+	                    id: row.id
                     }).then((res) => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/auForm.js

@@ -1,5 +1,5 @@
 const AU_FORM_TEMPLATE = {
-    template: `
+    template: /*language=HTML*/ `
             <el-dialog :title="formData.id ? '编辑':'新增'" :visible.sync="dialogFormVisible" width="700px" :close-on-click-modal="false">
                 <el-form :model="formData" ref="formRef" size="small" label-width="120px" :rules="formRules">
                     <el-form-item prop="sessionId" label="教代会">
@@ -13,6 +13,12 @@ const AU_FORM_TEMPLATE = {
                     <el-form-item prop="code" label="代表团编码">
                         <el-input placeholder="请输入代表团编码" v-model="formData.code" maxlength="50"></el-input>
                     </el-form-item>
+                    <el-form-item prop="code" label="联合组团">
+	                    <el-radio-group v-model="formData.unite" size="small">
+		                    <el-radio :label="true" border>是</el-radio>
+		                    <el-radio :label="false" border>否</el-radio>
+	                    </el-radio-group>
+                    </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
                     <el-button @click="dialogFormVisible = false">取 消</el-button>

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/index.html

@@ -23,21 +23,27 @@ layout("/layouts/platform.html"){
                         <el-table :data="tableData" @sort-change="pageOrder" border header-align="center" height="100%" style="width: 100%">
                             <el-table-column :index="indexMethod" label="序号" type="index" width="100px"></el-table-column>
                             <el-table-column label="名称" prop="name"></el-table-column>
-                            <el-table-column label="编码" prop="code" width="150px"></el-table-column>
+                            <el-table-column label="编码" prop="code" width="100px"></el-table-column>
+                            <el-table-column label="联合组团" prop="unite">
+	                            <template slot-scope="{row}">
+                                    <el-switch v-model="row.unite" size="small"
+                                               @change="doUniteChange(row.id, row.unite)"></el-switch>
+                                </template>
+                            </el-table-column>
                             <el-table-column label="教代会" prop="sessionName"></el-table-column>
                             <el-table-column label="团长" prop="delegationHead"></el-table-column>
                             <el-table-column label="副团长" prop="viceDelegationHead"></el-table-column>
                             <el-table-column label="联络人" prop="delegationContact"></el-table-column>
-                            <el-table-column label="操作" width="300">
+                            <el-table-column label="操作" width="315">
                                 <template slot-scope="scope">
-                                    <el-link @click="$refs.auFormRef.onOpen(scope.row.id)" size="mini" type="primary">编辑</el-link>
+                                    <el-button style="margin-left: 2px" @click="$refs.auFormRef.onOpen(scope.row.id)" size="mini" type="primary">编辑</el-button>
-                                    <el-link @click="$refs.headFormRef.onOpen(scope.row.id,scope.row.sessionId)" size="mini" type="primary">
+                                    <el-button style="margin-left: 2px" @click="$refs.headFormRef.onOpen(scope.row.id,scope.row.sessionId)" size="mini" type="primary">
-                                        设置团长
+                                        团长
-                                    </el-link>
+                                    </el-button>
-                                    <el-link @click="$refs.partUnitRef.onOpen(scope.row.id,scope.row.sessionId)" size="mini" type="primary">
+                                    <el-button style="margin-left: 2px" @click="$refs.partUnitRef.onOpen(scope.row.id,scope.row.sessionId)" size="mini" type="primary">
-                                        设置组成单位
+                                        组成单位
-                                    </el-link>
+                                    </el-button>
-                                    <el-link @click="doDelete(scope.row.id)" size="mini" type="danger">删除</el-link>
+                                    <el-button style="margin-left: 2px" @click="doDelete(scope.row.id)" size="mini" type="danger">删除</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -117,7 +123,22 @@ layout("/layouts/platform.html"){
                 }
                 this.pageData()
             },
-
+	        
+	        doUniteChange(id, unite) {
+		        this.$confirm("您确定要修改吗？", "提示", {
+				        confirmButtonText: "确定",
+				        cancelButtonText: "取消",
+				        type: "info"
+			        }).then(() => {
+			            this.$axios.post("/platform/teacherCongress/delegation/unite", { id, unite })
+					            .then((res) => {
+						            if (res.code === 0) {
+							            this.$message.success(res.msg)
+						            }
+					            })
+			        })
+	        },
+	        
             sessionChange(id) {
                 this.pageForm.sessionId = id
                 this.pageData()