commit

2025-09-24 09:49:52 +08:00
parent 6243a033eb
commit e6cf2df937
19 changed files with 1235 additions and 142 deletions
@@ -180,4 +180,23 @@ public class View_user {

    @Column
    private String professionalLevel;
+
+    @Column
+    private String jobCategory;
+
+    @Column
+    private String employeeSource;
+
+    @Column
+    private String administrativeLevel;
+
+    @Column
+    private String positionSeries;
+
+    @Column
+    private String administrativePositionLevel;
+
+    @Column
+    private String expectedLeaveSchoolDate;
+
 }
@@ -0,0 +1,223 @@
+package com.budwk.app.zhgh.staffmanage.member.controller.info;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.DesensitizedUtil;
+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;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.CommonDownloadUtil;
+import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.sys.models.Sys_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffmanage.member.param.MemberBatchMakeParam;
+import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm;
+import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberStatisticsPageForm;
+import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Chain;
+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 javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：MemberBatchMakeController
+ * @Date 2025/9/23 16:51
+ * @注释 批量设置会员
+ */
+@IocBean
+@Ok("json:full")
+@At("/platform/member/info/batchMake")
+public class MemberBatchMakeController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private SysRoleService sysRoleService;
+    @Inject
+    private MemberCommonService memberCommonService;
+
+    @At("")
+    @SaCheckPermission("member.info.batchMake")
+    @Ok("beetl:/platform/zhgh/staffmanage/member/info/batchmake/index.html")
+    public void index() {}
+
+    @At
+    @ApiOperation("查询非会员列表")
+    @SaCheckPermission("member.info.batchMake")
+    public Result pageData(MemberInfoPageForm pageForm){
+        Sql sql = Sqls.create("""
+                SELECT
+                    id,
+                    loginname,
+                    username,
+                    sex,
+                    userState,
+                    personType,
+                    preparedBy,
+                    unionName,
+                    unitName,
+                    mobile
+                from
+                    `user`
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("member", "=", false);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike("username", pageForm.getSearchKeyword());
+            seg.orLike("loginname", pageForm.getSearchKeyword());
+            cnd.and(seg);
+        }
+
+        // 权限判断
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.or("unionId", "=", SecurityUtil.getUnionId());
+            seg.or("unionId", "is", null);
+            seg.or("unionId", "=", "");
+            cnd.and(seg);
+        } else {
+            cnd.andEX("unionId", "=", pageForm.getUnionId());
+            cnd.andEX("unitId", "=", pageForm.getUnitId());
+        }
+
+        cnd.andEX("userState", "in", pageForm.getUserStates());
+        cnd.andEX("preparedBy", "in", pageForm.getPreparedBys());
+        cnd.andEX("personType", "in", pageForm.getPersonTypes());
+
+        sql.setCondition(cnd);
+
+        Pagination pagination = memberCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @ApiOperation("批量设置会员")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "会员信息", msg = "批量设置会员")
+    @SaCheckPermission("member.info.batchMake")
+    public Result batchMake(MemberBatchMakeParam param){
+        List<String> userIds = param.getUserIds();
+        // 查询会员角色
+        Sys_role role = sysRoleService.getByCode(RoleConstant.MEMBER);
+        if (role == null) {
+            throw new BaseException("会员角色不存在");
+        }
+
+        dao.update(Sys_user.class, Chain.make("member", true)
+                .addSpecial("memberTime", DateUtil.now()),
+                Cnd.where("id", "in", userIds));
+
+        // 添加会员角色
+        List<Sys_user_role> roleList = userIds.stream().map(v -> {
+            Sys_user_role userRole = new Sys_user_role();
+            userRole.setUserId(v);
+            userRole.setRoleId(role.getId());
+            return userRole;
+        }).toList();
+        dao.insert(roleList);
+
+        return Result.success();
+    }
+
+
+    @At
+    @Ok("void")
+    @SaCheckPermission("member.statistics.comprehensive")
+    public void doExport(MemberStatisticsPageForm pageForm, HttpServletResponse response){
+        Sql sql = Sqls.create("""
+                SELECT
+                    id,
+                    loginname,
+                    username,
+                    sex,
+                    userState,
+                    personType,
+                    preparedBy,
+                    unionName,
+                    unitName,
+                    mobile
+                from
+                    `user`
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("member", "=", false);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike("username", pageForm.getSearchKeyword());
+            seg.orLike("loginname", pageForm.getSearchKeyword());
+            cnd.and(seg);
+        }
+
+        // 权限判断
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.or("unionId", "=", SecurityUtil.getUnionId());
+            seg.or("unionId", "is", null);
+            seg.or("unionId", "=", "");
+            cnd.and(seg);
+        } else {
+            cnd.andEX("unionId", "=", pageForm.getUnionId());
+            cnd.andEX("unitId", "=", pageForm.getUnitId());
+        }
+
+        cnd.andEX("userState", "in", pageForm.getUserStates());
+        cnd.andEX("preparedBy", "in", pageForm.getPreparedBys());
+        cnd.andEX("personType", "in", pageForm.getPersonTypes());
+
+        sql.setCondition(cnd);
+        List<NutMap> list = memberCommonService.listMap(sql);
+        for (NutMap row : list) {
+            row.put("mobile", DesensitizedUtil.mobilePhone(row.getString("mobile")));
+        }
+        try {
+            List<ExcelExportEntity> exportEntities = new ArrayList<>();
+            exportEntities.add(new ExcelExportEntity("工号", "loginname", 20));
+            exportEntities.add(new ExcelExportEntity("姓名", "username", 20));
+            exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
+            exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20));
+            exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
+            exportEntities.add(new ExcelExportEntity("聘用方式", "preparedBy", 20));
+            exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20));
+            exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20));
+            exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30));
+
+            ExportParams exportParams = new ExportParams();
+            exportParams.setType(ExcelType.XSSF);
+            Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list);
+            CommonDownloadUtil.download("非会员列表.xlsx", workbook, response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
@@ -0,0 +1,90 @@
+package com.budwk.app.zhgh.staffmanage.member.controller.info;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：MemberDataManageController
+ * @Date 2025/9/23 17:55
+ * @注释 数据管理工具
+ */
+@IocBean
+@Ok("json:full")
+@At("/platform/member/info/dataManage")
+public class MemberDataManageController {
+
+    @At("")
+    @SaCheckPermission("member.info.dataManage")
+    @Ok("beetl:/platform/zhgh/staffmanage/member/info/datamanage/index.html")
+    public void index() {}
+
+
+    @At
+    @ApiOperation("数据管理工具")
+    @SaCheckPermission("member.info.dataManage")
+    public Result pageData(MemberInfoPageForm pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    id,
+                    loginname,
+                    username,
+                    sex,
+                    userState,
+                    personType,
+                    preparedBy,
+                    unionName,
+                    unitName,
+                    mobile
+                from
+                    `user`
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike("username", pageForm.getSearchKeyword());
+            seg.orLike("loginname", pageForm.getSearchKeyword());
+            cnd.and(seg);
+        }
+
+        // 权限判断
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.or("unionId", "=", SecurityUtil.getUnionId());
+            seg.or("unionId", "is", null);
+            seg.or("unionId", "=", "");
+            cnd.and(seg);
+        } else {
+            cnd.andEX("unionId", "=", pageForm.getUnionId());
+            cnd.andEX("unitId", "=", pageForm.getUnitId());
+        }
+
+        cnd.andEX("userState", "in", pageForm.getUserStates());
+        cnd.andEX("preparedBy", "in", pageForm.getPreparedBys());
+        cnd.andEX("personType", "in", pageForm.getPersonTypes());
+
+        if (StrUtil.isAllNotBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        } else {
+            cnd.asc("unitcode").asc("loginname");
+        }
+        sql.setCondition(cnd);
+        return Result.success();
+    }
+}
@@ -8,7 +8,7 @@ import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.zhgh.staffmanage.member.models.MemberHistory;
-import com.budwk.app.zhgh.staffmanage.member.param.MemberInfoPageForm;
+import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm;
 import com.budwk.app.zhgh.staffmanage.member.service.MemberInfoService;
 import com.budwk.app.zhgh.staffmanage.member.vo.MemberImportVo;
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +23,6 @@ import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.AdaptBy;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
-import org.nutz.mvc.annotation.Param;
 import org.nutz.mvc.upload.TempFile;
 import org.nutz.mvc.upload.UploadAdaptor;

@@ -31,7 +30,6 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.List;

 /**
 * @version 1.0
@@ -6,7 +6,7 @@ import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.utils.CommonDownloadUtil;
 import com.budwk.app.sys.models.Sys_union;
-import com.budwk.app.zhgh.staffmanage.member.param.MemberInfoPageForm;
+import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm;
 import com.budwk.app.zhgh.staffmanage.member.service.MemberInfoService;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.nutz.dao.Cnd;
@@ -0,0 +1,20 @@
+package com.budwk.app.zhgh.staffmanage.member.param;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：MemberBatchMakeParam
+ * @Date 2025/9/23 17:10
+ * @注释
+ */
+@Data
+public class MemberBatchMakeParam {
+
+    @NotEmpty(message = "设置人员不能为空")
+    private List<String> userIds;
+}
@@ -1,59 +0,0 @@
-package com.budwk.app.zhgh.staffmanage.member.param;
-
-import com.budwk.app.base.param.PageForm;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * @version 1.0
- * @Author zzr
- * @name：MemberInfoPageForm
- * @Date 2024/8/8 10:08
- * @注释 会员信息page
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class MemberInfoPageForm extends PageForm {
-
-    private Integer year;
-
-    private String unionId;
-
-    private String unitId;
-
-    private String threeUnitId;
-
-    private String unionGroupId;
-
-    private String userState;
-
-    private String preparedBy;
-
-    private String personType;
-
-    private List<String> personTypes;
-
-    private List<String> preparedBys;
-
-    private List<String> userStates;
-
-    private String sex;
-
-    private List<String> sexTypes;
-
-    private Integer memberStatus;
-
-    private String position;
-
-    private String jobTitle;
-
-    private String memberSearchName;
-
-    private String memberSearchKeyWord;
-
-    private Integer pageNumber = 1;
-
-    private Integer pageSize = 10;
-}
@@ -0,0 +1,82 @@
+package com.budwk.app.zhgh.staffmanage.member.param.pageform;
+
+import com.budwk.app.base.param.PageForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：MemberInfoPageForm
+ * @Date 2024/8/8 10:08
+ * @注释 会员信息page
+ */
+@Data
+@ApiModel("信息管理参数")
+@EqualsAndHashCode(callSuper = true)
+public class MemberInfoPageForm extends PageForm {
+
+    @ApiModelProperty("年份")
+    private Integer year;
+
+    @ApiModelProperty("性别")
+    private String sex;
+
+    @ApiModelProperty("性别数组")
+    private List<String> sexTypes;
+
+    @ApiModelProperty("工会Id")
+    private String unionId;
+
+    @ApiModelProperty("部门Id")
+    private String unitId;
+
+    @ApiModelProperty("三级单位Id")
+    private String threeUnitId;
+
+    @ApiModelProperty("工会小组Id")
+    private String unionGroupId;
+
+    @ApiModelProperty("在职状态")
+    private String userState;
+
+    @ApiModelProperty("编制类型")
+    private String preparedBy;
+
+    @ApiModelProperty("人员类型")
+    private String personType;
+
+    @ApiModelProperty("人员类型数组")
+    private List<String> personTypes;
+
+    @ApiModelProperty("编制类型数组")
+    private List<String> preparedBys;
+
+    @ApiModelProperty("在职状态数组")
+    private List<String> userStates;
+
+    @ApiModelProperty("会员状态")
+    private Integer memberStatus;
+
+    @ApiModelProperty("职位")
+    private String position;
+
+    @ApiModelProperty("职位")
+    private String jobTitle;
+
+    @ApiModelProperty("会员搜索名称")
+    private String memberSearchName;
+
+    @ApiModelProperty("会员搜索关键字")
+    private String memberSearchKeyWord;
+
+    @ApiModelProperty("工号开头")
+    private String startLoginNames;
+
+    @ApiModelProperty("工号结尾")
+    private String endLoginNames;
+}
@@ -2,7 +2,7 @@ package com.budwk.app.zhgh.staffmanage.member.service;

 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.sys.models.Sys_user;
-import com.budwk.app.zhgh.staffmanage.member.param.MemberInfoPageForm;
+import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.nutz.dao.sql.Sql;
 import org.nutz.lang.util.NutMap;
@@ -17,7 +17,7 @@ import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.sys.models.Sys_user;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.staffmanage.member.models.MemberHistory;
-import com.budwk.app.zhgh.staffmanage.member.param.MemberInfoPageForm;
+import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm;
 import com.budwk.app.zhgh.staffmanage.member.service.MemberInfoService;
 import com.budwk.app.zhgh.staffmanage.member.vo.MemberImportVo;
 import org.apache.poi.ss.formula.functions.T;
@@ -40,7 +40,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.*;
 import java.util.stream.Collectors;

 /**
@@ -18,8 +18,7 @@ layout("/layouts/platform.html"){
 				</el-descriptions-item>
 				<el-descriptions-item label="申请模式">
 					<el-form-item prop="mode">
-						<el-select v-model="formData.mode" placeholder="申请模式">
-						           @change="modeChange" style="width: 100%">
+						<el-select v-model="formData.mode" placeholder="申请模式" @change="modeChange" style="width: 100%">
 							<el-option label="本人申请" value="1"></el-option>
 							<el-option v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_CHAIRMAN, BRANCH_UNION_OPERATOR')"
 							           label="替他人申请" value="2"></el-option>
@@ -0,0 +1,466 @@
+<div id="member_apply">
+	<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="：" class="flow-task-form">
+		<el-descriptions :column="3" border>
+			<el-descriptions-item label="工号">
+				<el-form-item prop="loginname">
+					<el-input v-model="formData.loginname" readonly size="small"></el-input>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item label="姓名">
+				<el-form-item prop="username">
+					<el-input v-model="formData.username" readonly size="small"></el-input>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item label="性别">
+				<el-form-item prop="sex">
+					<el-radio-group v-model="formData.sex" size="small">
+						<el-radio border label="男">男</el-radio>
+						<el-radio border label="女">女</el-radio>
+					</el-radio-group>
+				</el-form-item>
+			</el-descriptions-item>
+			
+			<el-descriptions-item label="民族">
+				<el-form-item prop="nation">
+					<dict-select style="width: 100%" placeholder="请选择民族" v-model="formData.nation"
+					             code="USER_NATION"></dict-select>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item label="出生日期">
+				<el-form-item prop="birthday">
+					<el-date-picker v-model="formData.birthday" type="date"
+					                placeholder="请选择出生日期"
+					                value-format="yyyy-MM-dd"
+					                style="width: 100%"></el-date-picker>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item label="政治面貌">
+				<el-form-item prop="political">
+					<dict-select style="width: 100%" placeholder="请选择政治面貌" v-model="formData.political"
+					             code="USER_POLITICAL"></dict-select>
+				</el-form-item>
+			</el-descriptions-item>
+			
+			
+			<el-descriptions-item label="学历">
+				<el-form-item prop="education">
+					<dict-select style="width: 100%" placeholder="请选择学历" v-model="formData.education"
+					             code="USER_EDUCATION"></dict-select>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item label="学位">
+				<el-form-item prop="academicDegree">
+					<dict-select style="width: 100%" placeholder="请选择学位" v-model="formData.academicDegree"
+					             code="USER_ACADEMIC_DEGREE"></dict-select>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item label="党政职务">
+				<el-form-item prop="position">
+					<el-input v-model="formData.position" placeholder="请输入党政职务"
+					          maxlength="50"></el-input>
+				</el-form-item>
+			</el-descriptions-item>
+			
+			<el-descriptions-item label="工作单位">
+				<el-form-item prop="unitId">
+					<el-select clearable filterable placeholder="请选择工作单位" style="width: 100%"
+					           disabled @change="getUnionName(formData.unitId)"
+					           v-model="formData.unitId">
+						<el-option :key="item.id" :label="item.name" :value="item.id"
+						           v-for="item in units"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item label="所属工会">
+				<el-form-item prop="unionName">
+					<el-input v-model="formData.unionName" disabled placeholder="请输入所属工会"></el-input>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item label="所属校区">
+				<el-form-item prop="campus">
+					<dict-select style="width: 100%" placeholder="请选择所属校区" v-model="formData.campus"
+					             code="USER_CAMPUS"></dict-select>
+				</el-form-item>
+			</el-descriptions-item>
+			
+			
+			<el-descriptions-item label="在职状态">
+				<el-form-item prop="userState">
+					<dict-select v-model="formData.userState" code="USER_STATE"
+					             disabled style="width: 100%"></dict-select>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item label="人员类型">
+				<el-form-item prop="personType">
+					<dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
+					             disabled style="width: 100%"></dict-select>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item></el-descriptions-item>
+			
+			<el-descriptions-item label="身份证号码">
+				<el-form-item prop="idCard">
+					<el-input v-model="formData.idCard" disabled placeholder="请输入身份证号码" maxlength="18"></el-input>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item label="联系电话">
+				<el-form-item prop="mobile">
+					<el-input v-model="formData.mobile" disabled placeholder="请输入联系电话" maxlength="32"></el-input>
+				</el-form-item>
+			</el-descriptions-item>
+			<el-descriptions-item label="电子邮箱">
+				<el-form-item prop="email">
+					<el-input v-model="formData.email" placeholder="请输入电子邮箱" maxlength="50"></el-input>
+				</el-form-item>
+			</el-descriptions-item>
+			
+			
+			<el-descriptions-item label="家庭主要成员" :span="3">
+				<el-form-item prop="families">
+					<el-table :data="formData.families" border size="small">
+						<el-table-column label="关系" prop="relation">
+							<template slot-scope="{row}">
+								<el-input v-model="row.relation" maxlength="50"
+								          placeholder="请输入与本人关系"></el-input>
+							</template>
+						</el-table-column>
+						<el-table-column label="姓名" prop="name">
+							<template slot-scope="{row}">
+								<el-input v-model="row.name" maxlength="50" placeholder="请输入姓名"></el-input>
+							</template>
+						</el-table-column>
+						<el-table-column label="工作单位" prop="unit">
+							<template slot-scope="{row}">
+								<el-input v-model="row.unit" maxlength="100"
+								          placeholder="请输入工作单位"></el-input>
+							</template>
+						</el-table-column>
+						<el-table-column label="备注" prop="remark">
+							<template slot-scope="{row}">
+								<el-input v-model="row.remark" maxlength="100" placeholder="请输入备注"></el-input>
+							</template>
+						</el-table-column>
+						<el-table-column width="100px">
+							<template slot="header" slot-scope="scope">
+								<el-button type="primary" size="mini"
+								           @click="formData.families.push({})">添加
+								</el-button>
+							</template>
+							<template slot-scope="scope">
+								<el-button
+										type="danger"
+										icon="el-icon-delete"
+										size="mini"
+										:disabled="formData.families.length===0"
+										@click="formData.families.splice(scope.$index,1)"
+								></el-button>
+							</template>
+						</el-table-column>
+					</el-table>
+				</el-form-item>
+			</el-descriptions-item>
+			
+			<el-descriptions-item label="个人简况" :span="3">
+				<el-form-item prop="personalData">
+					<text-editor v-model="formData.personalData"></text-editor>
+				</el-form-item>
+			</el-descriptions-item>
+			
+			<el-descriptions-item label="入会意愿" :span="3">
+				<el-form-item prop="isVoluntary">
+					<el-checkbox
+							size="medium"
+							style="width: 95%; color: #F56C6C; display: flex; align-items: center;"
+							v-model="formData.isVoluntary">
+						<div>
+                                <span style="flex: 1; word-wrap: break-word; word-break: break-all; white-space: normal;">
+                                    我自愿申请加入学校工会，并委托学校按规定代为扣缴工会会员会费。
+                                </span>
+						</div>
+						<div>
+                                <span style="flex: 1; word-wrap: break-word; word-break: break-all; white-space: normal;">
+                                    我将严格遵守工会章程，认真执行工会决议，积极参与工会活动，主动融入“学校健康幸福家”建设，为营造温暖、和谐、奋进的校园氛围贡献力量，以实际行动助力学校各项事业发展。
+                                </span>
+						</div>
+					</el-checkbox>
+				</el-form-item>
+			</el-descriptions-item>
+			
+			<el-descriptions-item label="签字" :span="3">
+				<el-form-item prop="sign">
+					<pc-signature v-model="formData.sign"></pc-signature>
+				</el-form-item>
+			</el-descriptions-item>
+		</el-descriptions>
+	</el-form>
+	
+	<snaker-flow-task-form-action @task-action="handleTaskAction" @save-draft="handleSaveDraft"></snaker-flow-task-form-action>
+</div>
+
+<script>
+	new Vue({
+		el: "#member_apply",
+		store,
+		data() {
+			return {
+				businessId: GetQueryString("businessId"),
+				instanceId: GetQueryString("instanceId"),
+				units: [],
+				formData: {
+					families: []
+				},
+				formRules: {
+					username: [{required: false, message: "必填", trigger: ["change", "blur"]}],
+					sex: [{required: false, message: "必填", trigger: ["change", "blur"]}],
+					isVoluntary: [{required: true, message: "必填", trigger: ["change", "blur"]}],
+					sign: [{required: true, message: "必填", trigger: ["change", "blur"]}],
+					email: [
+						{
+							validator: (rule, value, callback) => {
+								if (!value) {
+									callback();
+								} else if (/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/.test(value)) {
+									callback();
+								} else {
+									callback(new Error("邮箱格式错误"));
+								}
+							},
+							trigger: ["change", "blur"]
+						}
+					],
+					idCard: [
+						{
+							validator: (rule, value, callback) => {
+								if (!value) {
+									// 如果值为空，直接通过校验
+									callback();
+								} else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}(\d|[Xx])$/.test(value)) {
+									// 18位身份证号码格式正确
+									callback();
+								} else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
+									// 15位身份证号码格式正确
+									callback();
+								} else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
+									// 外国人身份证号码格式正确（18位）
+									callback();
+								} else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
+									// 外国人身份证号码格式正确（15位）
+									callback();
+								} else {
+									// 格式错误，返回错误信息
+									callback(new Error("身份证号码格式错误"));
+								}
+							},
+							trigger: ["change", "blur"]
+						}
+					],
+					mobile: [
+						{
+							validator: (rule, value, callback) => {
+								if (!value) {
+									// 如果值为空，直接通过校验
+									callback();
+								} else if (/^[1][345789][0-9]{9}$/.test(value)) {
+									// 手机号格式正确
+									callback();
+								} else if (/^\d+-\d+$/.test(value) && value.length <= 16) {
+									// 座机号格式正确
+									callback();
+								} else {
+									// 格式错误，返回错误信息
+									callback(new Error(value.includes('-') ? '座机号码格式错误' : '手机号码格式错误'));
+								}
+							},
+							trigger: ["change", "blur"]
+						}
+					]
+				},
+			}
+		},
+		methods: {
+			// 提交
+			handleTaskAction(val) {
+				this.$refs.formRef.validate((valid) => {
+					if (valid) {
+						if (!this.instanceId) {
+							this.handleApply(val)
+						} else {
+							this.handleReApply(val)
+						}
+					}
+				})
+			},
+			
+			// 提交申请
+			handleApply(val) {
+				this.$confirm("您确定要提交吗？", "提示", { type: "warning" })
+						.then(() => {
+							this.$refs.formRef.validate((valid) => {
+								if (valid) {
+									this.$axios
+											.post("/flow/common/startInstanceAndExecute", {
+												...val,
+												bizData: JSON.stringify(this.formData)
+											})
+											.then((res) => {
+												if (res.code === 0) {
+													this.$message.success("操作成功")
+													// 发送完成消息
+													window.GlobalBroadcastChannel.postMessage({
+														type: "task-complete"
+													})
+												}
+											})
+								}
+							})
+						})
+			},
+			
+			// 重新提交申请
+			handleReApply(val) {
+				this.$confirm("您确定要提交吗？", "提示", { type: "warning" })
+						.then(() => {
+							this.$axios
+									.post("/flow/common/executeTask", {
+										data: JSON.stringify({
+											processTaskId: val.taskId,
+											processInstanceId: val.instanceId,
+											submitType: val.submitType,
+											f_data: JSON.stringify(this.formData)
+										})
+									})
+									.then((res) => {
+										if (res.code === 0) {
+											this.$message.success(res.msg)
+											window.GlobalBroadcastChannel.postMessage({
+												type: "task-complete"
+											})
+										}
+									})
+						})
+			},
+			
+			// 保存
+			handleSaveDraft(val) {
+				this.$confirm("您确定要保存吗？", "提示", { type: "warning" })
+						.then(() => {
+							this.$axios
+									.post("/flow/common/startInstance", {
+										...val,
+										bizData: JSON.stringify(this.formData)
+									})
+									.then((res) => {
+										if (res.code === 0) {
+											this.$message.success("操作成功")
+											// 发送完成消息
+											window.parent.postMessage(
+													{
+														type: "task-complete"
+													},
+													"*"
+											)
+										}
+									})
+						})
+			},
+			// 取消
+			handleCancel() {
+			
+			},
+			async validateApply() {
+				if (this.formData.id) {
+					return
+				}
+				// const resp = await $.post('/platform/member/apply/submit/validateApply')
+				// if (resp.code === 0 && resp.data > 0) {
+				// 	this.$confirm("您有其他入会流程正在进行中，请勿重复申请，如需查看详情，可前往我的申请界面，是否前往？", "提示", { type: "warning" })
+				// 			.then(() => {
+				// 				this.member = true
+				// 				this.$store.dispatch("pjaxRoute", "/platform/member/apply/mine")
+				// 			})
+				// 			.catch(() => {
+				// 				this.member = true
+				// 			})
+				// }
+			},
+			async init() {
+				let user
+				const resp = await $.post('/platform/member/apply/submit/getSelfUserInfo')
+				if (resp.code === 0) {
+					if (!resp.data) {
+						user = this.$store.state.user
+					} else {
+						user = resp.data
+					}
+				} else {
+					user = this.$store.state.user
+				}
+				this.member = user.member
+				
+				if (this.id) {
+					this.$axios.post("/platform/member/apply/submit/findApplyById", { id: this.id }).then((res) => {
+						if (res.code === 0) {
+							this.formData = res.data
+						}
+					})
+				} else {
+					const {
+						id,
+						username,
+						loginname,
+						sex,
+						nation,
+						birthday,
+						political,
+						education,
+						academicDegree,
+						position,
+						unitId,
+						unitName,
+						unit,
+						unionId,
+						unionName,
+						union,
+						campus,
+						userState,
+						personType,
+						idCard,
+						mobile,
+						email,
+						families,
+						personalData
+					} = user
+					
+					this.$set(this.formData, "userId", id)
+					this.$set(this.formData, "username", username)
+					this.$set(this.formData, "loginname", loginname)
+					this.$set(this.formData, "birthday", birthday)
+					this.$set(this.formData, "sex", sex)
+					this.$set(this.formData, "idCard", idCard)
+					this.$set(this.formData, "nation", nation)
+					this.$set(this.formData, "political", political)
+					this.$set(this.formData, "position", position)
+					this.$set(this.formData, "education", education)
+					this.$set(this.formData, "academicDegree", academicDegree)
+					this.$set(this.formData, "campus", campus)
+					this.$set(this.formData, "userState", userState)
+					this.$set(this.formData, "personType", personType)
+					this.$set(this.formData, "unitName", unit ? unit.name : unitName)
+					this.$set(this.formData, "unitId", unit ? unit.id : unitId)
+					this.$set(this.formData, "unionName", union ? union.name : unionName)
+					this.$set(this.formData, "unionId", union ? union.id : unionId)
+					
+					this.$set(this.formData, "mobile", mobile)
+					this.$set(this.formData, "email", email)
+					this.$set(this.formData, "families", families ? families : [])
+					this.$set(this.formData, "personalData", personalData)
+				}
+			},
+		},
+		async created() {
+			this.init()
+			this.units = await this.$businessTool.listUnit()
+			await this.validateApply()
+		}
+	})
+</script>
@@ -139,13 +139,18 @@ const MEMBER_CHANGE = {
 					                     :disabled="allowFields('userState')" style="width: 100%"></dict-select>
 				        </el-form-item>
 			        </el-descriptions-item>
+			        <el-descriptions-item label="编制类型">
+				        <el-form-item prop="preparedBy">
+					        <dict-select v-model="formData.preparedBy" code="USER_PREPARED_BY_TYPE"
+					                     :disabled="allowFields('preparedBy')" style="width: 100%"></dict-select>
+				        </el-form-item>
+			        </el-descriptions-item>
 			        <el-descriptions-item label="人员类型">
 				        <el-form-item prop="personType">
 					        <dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
 					                     :disabled="allowFields('personType')" style="width: 100%"></dict-select>
 				        </el-form-item>
 			        </el-descriptions-item>
-			        <el-descriptions-item></el-descriptions-item>
 			        
 			        <template v-if="formData.userState == '退休'">
 				        <el-descriptions-item label="退休日期">
@@ -1,68 +1,83 @@
 const MEMBER_INFO = {
    template: /*language=html*/ `
        <div>
-            <div class="process-title">基本信息</div>
-            <el-descriptions :column="3" border class="descriptions-form">
-                <el-descriptions-item label="工号">{{ viewData.loginname }}</el-descriptions-item>
-                <el-descriptions-item label="姓名">{{ viewData.username }}</el-descriptions-item>
-                <el-descriptions-item label="性别">{{ viewData.sex }}</el-descriptions-item>
-	            
-	            <el-descriptions-item label="民族">{{ viewData.nation }}</el-descriptions-item>
-	            <el-descriptions-item label="出生日期">{{ viewData.birthday ? $moment(viewData.birthday).format('YYYY-MM-DD') : null }}</el-descriptions-item>
-	            <el-descriptions-item label="政治面貌">{{ viewData.political }}</el-descriptions-item>
-	            
-	            <el-descriptions-item label="学历">{{ viewData.education }}</el-descriptions-item>
-	            <el-descriptions-item label="学位">{{ viewData.academicDegree }}</el-descriptions-item>
-	            <el-descriptions-item label="党政职务">{{ viewData.position }}</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.campus }}</el-descriptions-item>
-	            
-	            <el-descriptions-item label="身份证号码">{{ viewData.idcard }}</el-descriptions-item>
-	            <el-descriptions-item label="联系电话">{{ viewData.mobile }}</el-descriptions-item>
-	            <el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>
-	            
-	            <el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
-	            <el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
-                <el-descriptions-item label="进校时间">{{ viewData.arrivalAtSchoolDate ? $moment(viewData.arrivalAtSchoolDate).format('YYYY-MM-DD') : null}}</el-descriptions-item>
-	            
-	            <template v-if="viewData.userState == '退休'">
-		            <el-descriptions-item label="退休日期">{{ viewData.retireDate ? moment(viewData.retireDate).format("YYYY-MM-DD") : '暂无' }}</el-descriptions-item>
-		            <el-descriptions-item label="福利享受截止日期">{{ moment(viewData.welfareStopDate).format("YYYY-MM-DD") }}</el-descriptions-item>
-		            <el-descriptions-item></el-descriptions-item>
-	            </template>
-	            
-	            <el-descriptions-item label="会员状态">{{ viewData.member ? '会员' : '非会员' }}</el-descriptions-item>
-	            <el-descriptions-item label="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</el-descriptions-item>
-	            <el-descriptions-item></el-descriptions-item>
-	            
-                <template v-if="viewData.loginname === $store.state.user.loginname">
-	                <el-descriptions-item label="家庭主要成员" :span="3">
-		                <el-table v-if="viewData.families && viewData.families.length"
-		                          :data="viewData.families" size="mini" border
-		                          :header-cell-style="{background:'#eff3f6'}"
-		                          style="width: 100%">
-			                <el-table-column prop="relation" label="与本人关系" align="center" header-align="center">
-			                </el-table-column>
-			                <el-table-column prop="name" label="姓名" align="center" header-align="center">
-			                </el-table-column>
-			                <el-table-column prop="unit" label="单位" align="center" header-align="center">
-			                </el-table-column>
-			                <el-table-column prop="remark" label="备注" align="center" header-align="center">
-			                </el-table-column>
-		                </el-table>
-		                <el-empty v-else :image-size="50" description="暂无家庭成员信息"></el-empty>
-	                </el-descriptions-item>
-	                
-	                <el-descriptions-item label="个人简况" :span="3">
-		                <template slot="label">个人简况</template>
-		                <div v-if="viewData.personalData" class="text-left" v-html="viewData.personalData"></div>
-		                <span v-else>无数据</span>
-	                </el-descriptions-item>
-                </template>
-            </el-descriptions>
-            
+	        <!-- 基本信息 -->
+	        <div class="process-title">基本信息</div>
+	        <el-descriptions :column="3" border class="descriptions-form">
+		        <!-- 第 1 行 -->
+		        <el-descriptions-item label="姓名工号">{{ viewData.username + '(' + viewData.loginname + ')' }}</el-descriptions-item>
+		        <el-descriptions-item label="性别">{{ viewData.sex }}</el-descriptions-item>
+		        <el-descriptions-item label="出生日期">{{ viewData.birthday ? $moment(viewData.birthday).format('YYYY-MM-DD') : null }}</el-descriptions-item>
+		        
+		        <!-- 第 2 行 -->
+		        <el-descriptions-item label="国籍">{{ viewData.nationality }}</el-descriptions-item>
+		        <el-descriptions-item label="民族">{{ viewData.nation }}</el-descriptions-item>
+		        <el-descriptions-item label="政治面貌">{{ viewData.political }}</el-descriptions-item>
+		        
+		        <!-- 第 3 行 -->
+		        <el-descriptions-item label="证件类型">{{ viewData.idCardType }}</el-descriptions-item>
+		        <el-descriptions-item label="身份证号码">{{ viewData.idcard }}</el-descriptions-item>
+		        <el-descriptions-item label="联系电话">{{ viewData.mobile }}</el-descriptions-item>
+		        
+		        <!-- 第 4 行 -->
+		        <el-descriptions-item label="学历">{{ viewData.education }}</el-descriptions-item>
+		        <el-descriptions-item label="学位">{{ viewData.academicDegree }}</el-descriptions-item>
+		        <el-descriptions-item label="婚姻状况">{{ viewData.marriage }}</el-descriptions-item>
+		        
+		        <!-- 第 5 行 -->
+		        <el-descriptions-item label="会员状态">{{ viewData.member ? '会员' : '非会员' }}</el-descriptions-item>
+		        <el-descriptions-item label="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</el-descriptions-item>
+		        <el-descriptions-item></el-descriptions-item>
+		        
+		        <!-- 退休补充 -->
+		        <template v-if="viewData.userState == '退休'">
+			        <el-descriptions-item label="退休日期">{{ viewData.retireDate ? moment(viewData.retireDate).format("YYYY-MM-DD") : '暂无' }}</el-descriptions-item>
+			        <el-descriptions-item label="福利享受截止日期">{{ moment(viewData.welfareStopDate).format("YYYY-MM-DD") }}</el-descriptions-item>
+			        <el-descriptions-item></el-descriptions-item>
+		        </template>
+		        
+		        <!-- 仅本人可见 -->
+		        <template v-if="viewData.loginname === $store.state.user.loginname">
+			        <el-descriptions-item label="家庭主要成员" :span="3">
+				        <el-table v-if="viewData.families && viewData.families.length" :data="viewData.families" size="mini" border :header-cell-style="{background:'#eff3f6'}" style="width: 100%">
+					        <el-table-column prop="relation" label="与本人关系" align="center" header-align="center"/>
+					        <el-table-column prop="name" label="姓名" align="center" header-align="center"/>
+					        <el-table-column prop="unit" label="单位" align="center" header-align="center"/>
+					        <el-table-column prop="remark" label="备注" align="center" header-align="center"/>
+				        </el-table>
+				        <el-empty v-else :image-size="50" description="暂无家庭成员信息"/>
+			        </el-descriptions-item>
+			        
+			        <el-descriptions-item label="个人简况" :span="3">
+				        <div v-if="viewData.personalData" class="text-left" v-html="viewData.personalData"/>
+				        <span v-else>无数据</span>
+			        </el-descriptions-item>
+		        </template>
+	        </el-descriptions>
+	        
+	        <!-- 工作信息 -->
+	        <div class="process-title">工作信息</div>
+	        <el-descriptions :column="3" border>
+		        <!-- 第 1 行 -->
+		        <el-descriptions-item label="工作单位">{{ viewData.unitName }}</el-descriptions-item>
+		        <el-descriptions-item label="所属工会">{{ viewData.unionName }}</el-descriptions-item>
+		        <el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
+		        
+		        <!-- 第 2 行 -->
+		        <el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
+		        <el-descriptions-item label="所属校区">{{ viewData.campus }}</el-descriptions-item>
+		        <el-descriptions-item label="进校时间">{{ viewData.arrivalAtSchoolDate ? $moment(viewData.arrivalAtSchoolDate).format('YYYY-MM-DD') : null }}</el-descriptions-item>
+		        
+		        <!-- 第 3 行 -->
+		        <el-descriptions-item label="职称">{{ viewData.professionalTitle }}</el-descriptions-item>
+		        <el-descriptions-item label="职级">{{ viewData.professionalLevel }}</el-descriptions-item>
+		        <el-descriptions-item label="岗位系列">{{ viewData.positionSeries }}</el-descriptions-item>
+		        
+		        <!-- 第 4 行 -->
+		        <el-descriptions-item label="行政级别(管理岗位)">{{ viewData.administrativeLevel }}</el-descriptions-item>
+		        <el-descriptions-item label="岗级">{{ viewData.positionLevel }}</el-descriptions-item>
+		        <el-descriptions-item label="行政岗级">{{ viewData.administrativePositionLevel }}</el-descriptions-item>
+	        </el-descriptions>
        </div>
    `,
    store,
@@ -0,0 +1,85 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+	<guava ref="guaga">
+		<el-card shadow="never">
+			<common-query ref="commonQueryRef" @search="search"></common-query>
+		</el-card>
+		
+		<el-card shadow="never" class="mt10">
+			<table-tool label="非会员列表"></table-tool>
+			<el-table :data="tableData"  :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
+				<el-table-column :index="indexMethod" align="center" header-align="center"
+				                 label="序号" type="index" width="80px"></el-table-column>
+				<el-table-column :label="column.label"
+				                 :prop="column.prop"
+				                 :sortable="column.sortable"
+				                 :width="column.width"
+				                 header-align="center"
+				                 min-width="100px"
+				                 show-overflow-tooltip
+				                 v-for="column in tableColumns">
+				</el-table-column>
+				<el-table-column label="操作" fixed="right" width="200px">
+					<template slot-scope="{row}">
+						<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
+						<el-button @click="singleMake(row)" size="mini" type="primary">设置为会员</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<!--#include("/layouts/pagination.html"){}#-->
+		</el-card>
+	</guava>
+</div>
+<script>
+	<!--#include("../../common/info/memberInfo.js"){}#-->
+	<!--#include("../common/commonQuery.js"){}#-->
+	
+	new Vue({
+		el: "#app",
+		store,
+		mixins: [initTableMixins],
+		data() {
+			return {
+				pageForm: {},
+				tableColumns: [
+					{ prop: "loginName", label: "工号", sortable: true },
+					{ prop: "userName", label: "姓名", sortable: true },
+					{ prop: "sex", label: "性别", sortable: true },
+					{ prop: "userState", label: "在职状态", sortable: true },
+					{ prop: "personType", label: "人员类型", sortable: true },
+					{ prop: "preparedBy", label: "编制类型", sortable: true },
+					{ prop: "unionName", label: "所属工会", sortable: true },
+					{ prop: "unitName", label: "所属单位", sortable: true },
+				]
+			}
+		},
+		methods: {
+			// 查看会员
+			openView() {
+			
+			},
+			// 单个设置会员
+			singleMake(row) {
+			
+			},
+			// 批量设置会员
+			batchMake() {
+			
+			},
+			search(pageForm) {
+				if (pageForm) {
+					this.pageForm = {...this.pageForm, ...pageForm}
+				}
+				this.doSearch()
+			},
+		},
+		created() {
+			this.pageData()
+		}
+	})
+</script>
+<!--#
+}
+#-->
@@ -0,0 +1,88 @@
+const COMMON_QUERY = {
+    template: /*language=HTML*/ `
+	    <search @search="doSearch">
+		    <search-item label="姓名/工号">
+			    <el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
+		    </search-item>
+		    <search-item label="所属工会">
+			    <el-select @change="flushUnits" @clear="flushUnits" clearable filterable
+			               placeholder="所属工会" style="width: 100%;" v-model="pageForm.unionId">
+				    <el-option :key="item.id" :label="item.name" :value="item.id"
+				               v-for="item in unions"></el-option>
+			    </el-select>
+		    </search-item>
+		    <search-item label="所属单位">
+			    <el-select clearable filterable placeholder="请选择" style="width: 100%"
+			               v-model="pageForm.unitId">
+				    <el-option :key="item.id" :label="item.name" :value="item.id"
+				               v-for="item in units"></el-option>
+			    </el-select>
+		    </search-item>
+		    <search-item label="在职状态">
+			    <dict-select v-model="pageForm.userStates" placeholder="在职状态" @change="doSearch"
+			                 code="USER_STATE" multiple collapse-tags></dict-select>
+		    </search-item>
+		    <search-item label="人事编制">
+			    <dict-select v-model="pageForm.preparedBys" placeholder="人事编制" @change="doSearch"
+			                 code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
+		    </search-item>
+		    <search-item label="人员类型">
+			    <dict-select v-model="pageForm.personTypes" placeholder="人员类型" @change="doSearch"
+			                 code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
+		    </search-item>
+	    </search>
+    `,
+    mixins: [initTableMixins],
+    data() {
+        return{
+            unions: [],
+            units: [],
+            pageForm: {
+                searchKeyword: '',
+                unionId: '',
+                unitId: '',
+                userStates: [],
+                personTypes: [],
+                preparedBys: [],
+            }
+        }
+    },
+    methods: {
+        doSearch(){
+            const pageForm = clone(this.pageForm)
+            pageForm.userStates = JSON.stringify(this.pageForm.userStates)
+            pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
+            pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
+            this.$emit('search', pageForm)
+        },
+        async initData(){
+            if (this.$auth.hasRoleOr("SYSADMIN, SCHOOL_UNION_ADMIN, SCHOOL_UNION_MEMBER_ADMIN")) {
+                this.$businessTool.listUnion(this.pageForm.unionId).then((data) => {
+                    this.unions = data
+                })
+                this.$businessTool.listUnit().then((data) => {
+                    this.units = data
+                })
+            } else {
+                this.$businessTool.listUnion(this.$store.state.user.union.id).then((data) => {
+                    this.unions = data
+                })
+                this.$businessTool.listUnit(this.$store.state.user.union.id).then((data) => {
+                    this.units = data
+                })
+            }
+        },
+        async flushUnits(){
+            this.$set(this.pageForm, "unitId", null)
+            this.units = []
+            if (this.pageForm.unionId) {
+                this.$businessTool.listUnit(this.pageForm.unionId).then((data) => {
+                    this.units = data
+                })
+            }
+        }
+    },
+    async created() {
+        this.initData()
+    }
+}
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
@@ -0,0 +1,73 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+	<guava ref="guava">
+		<el-card shadow="never">
+			<common-query ref="commonQueryRef" @search="search"></common-query>
+		</el-card>
+		
+		<el-card shadow="never" class="mt10">
+			<table-tool label="数据列表"></table-tool>
+			<el-table :data="tableData"  :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
+				<el-table-column :index="indexMethod" align="center" header-align="center"
+				                 label="序号" type="index" width="80px"></el-table-column>
+				<el-table-column :label="column.label"
+				                 :prop="column.prop"
+				                 :sortable="column.sortable"
+				                 :width="column.width"
+				                 header-align="center"
+				                 min-width="100px"
+				                 show-overflow-tooltip
+				                 v-for="column in tableColumns">
+				</el-table-column>
+				<el-table-column label="操作" fixed="right" width="200px">
+					<template slot-scope="{row}">
+						<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
+						<el-button @click="singleMake(row)" size="mini" type="primary">设置为会员</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<!--#include("/layouts/pagination.html"){}#-->
+		</el-card>
+	</guava>
+</div>
+<script>
+	<!--#include("../../common/info/memberInfo.js"){}#-->
+	<!--#include("../common/commonQuery.js"){}#-->
+	
+	new Vue({
+		el: "#app",
+		store,
+		mixins: [initTableMixins],
+		data() {
+			return {
+				pageForm: {},
+				tableColumns: [
+					{ prop: "loginName", label: "工号", sortable: true },
+					{ prop: "userName", label: "姓名", sortable: true },
+					{ prop: "sex", label: "性别", sortable: true },
+					{ prop: "userState", label: "在职状态", sortable: true },
+					{ prop: "personType", label: "人员类型", sortable: true },
+					{ prop: "preparedBy", label: "编制类型", sortable: true },
+					{ prop: "unionName", label: "所属工会", sortable: true },
+					{ prop: "unitName", label: "所属单位", sortable: true },
+				]
+			}
+		},
+		methods: {
+			search(pageForm) {
+				if (pageForm) {
+					this.pageForm = {...this.pageForm, ...pageForm}
+				}
+				this.doSearch()
+			},
+		},
+		created() {
+			this.pageData()
+		}
+	})
+</script>
+<!--#
+}
+#-->
@@ -47,7 +47,7 @@ layout("/layouts/platform.html"){
 						<el-option label="无工会" value="false"></el-option>
 					</el-select>
 					
-					<el-button icon="el-icon-printer" class="m10" type="primary" style="float: right" size="small" @click="doExport">导出</el-button>
+					<el-button icon="el-icon-printer" type="primary" style="float: right" size="small" @click="doExport">导出</el-button>
 				</table-tool>
 				<el-table
 						:data="tableData"