Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/zhgh_hgu
This commit is contained in:
+142
@@ -1,7 +1,12 @@
|
||||
package com.budwk.app.zhgh.democratic.teachercongress.delegate.controller;
|
||||
|
||||
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.convert.Convert;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.lang.Dict;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
@@ -11,6 +16,9 @@ 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.service.BaseService;
|
||||
import com.budwk.app.base.utils.CommonDownloadUtil;
|
||||
import com.budwk.app.base.utils.PageUtil;
|
||||
import com.budwk.app.base.utils.SysOfficeTemplateUtil;
|
||||
import com.budwk.app.flow.constant.FlowConst;
|
||||
import com.budwk.app.flow.engine.FlowEngine;
|
||||
import com.budwk.app.flow.entity.ProcessInstance;
|
||||
@@ -18,14 +26,19 @@ 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.enums.ProcessTaskStateEnum;
|
||||
import com.budwk.app.flow.vo.ProcessTaskVO;
|
||||
import com.budwk.app.sys.views.View_user;
|
||||
import com.budwk.app.web.commons.auth.utils.AuthUtil;
|
||||
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
|
||||
import com.budwk.app.web.commons.base.Globals;
|
||||
import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.TeacherCongressDelegatePush;
|
||||
import com.budwk.app.zhgh.democratic.teachercongress.delegate.service.TeacherCongressDelegatePushService;
|
||||
import com.budwk.app.zhgh.democratic.teachercongress.prepare.models.Teacher_congress_quota_allocation;
|
||||
import com.deepoove.poi.XWPFTemplate;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.nutz.aop.interceptor.ioc.TransAop;
|
||||
import org.nutz.dao.Cnd;
|
||||
import org.nutz.dao.Dao;
|
||||
@@ -40,11 +53,17 @@ import org.nutz.mvc.annotation.At;
|
||||
import org.nutz.mvc.annotation.Ok;
|
||||
import org.nutz.mvc.annotation.Param;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.Valid;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.time.Period;
|
||||
import java.time.ZoneId;
|
||||
import java.util.*;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipOutputStream;
|
||||
|
||||
/**
|
||||
* @author zhf
|
||||
@@ -529,5 +548,128 @@ public class TeacherCongressDelegatePushController {
|
||||
return Result.success(hashMap);
|
||||
}
|
||||
|
||||
@Ok("void")
|
||||
@At("/exportExcel")
|
||||
@ApiOperation("导出各分工会审核已完成的代表汇总表")
|
||||
@SaCheckPermission("tc.delegate.push")
|
||||
public void exportExcel(PageForm pageForm,
|
||||
@Param(value = "sessionId") String sessionId,
|
||||
@Param(value = "unionId") String unionId,
|
||||
@Param(value = "isFormalOrAttendance") String isFormalOrAttendance, HttpServletResponse response) {
|
||||
|
||||
Sql sql;
|
||||
if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())){
|
||||
sql = getSql(pageForm, sessionId, unionId, isFormalOrAttendance);
|
||||
} else {
|
||||
sql = getSql(pageForm, sessionId, SecurityUtil.getUnitId(), isFormalOrAttendance);
|
||||
}
|
||||
|
||||
List<NutMap> exportList = baseService.listMap(sql);
|
||||
|
||||
exportList.forEach(item -> {
|
||||
item.put("isJdh", item.getBoolean("isJdh") ? "是" : "否");
|
||||
item.put("isGdh", item.getBoolean("isGdh") ? "是" : "否");
|
||||
item.put("cadre", item.getBoolean("cadre") ? "是" : "否");
|
||||
item.put("worker", item.getBoolean("worker") ? "是" : "否");
|
||||
item.put("intermediateBelow", item.getBoolean("intermediateBelow") ? "是" : "否");
|
||||
item.put("seniorTeacher", item.getBoolean("seniorTeacher") ? "是" : "否");
|
||||
|
||||
});
|
||||
|
||||
List<ExcelExportEntity> entityList = new ArrayList<>();
|
||||
entityList.add(new ExcelExportEntity("姓名", "userName", 20));
|
||||
entityList.add(new ExcelExportEntity("工号", "loginName", 20));
|
||||
entityList.add(new ExcelExportEntity("性别", "sex", 20));
|
||||
entityList.add(new ExcelExportEntity("联系电话", "mobile", 20));
|
||||
entityList.add(new ExcelExportEntity("分工会", "unionName", 20));
|
||||
entityList.add(new ExcelExportEntity("职务", "position", 20));
|
||||
entityList.add(new ExcelExportEntity("职称", "professionalTitle", 20));
|
||||
entityList.add(new ExcelExportEntity("文化程度", "education", 20));
|
||||
entityList.add(new ExcelExportEntity("政治面貌", "political", 20));
|
||||
entityList.add(new ExcelExportEntity("是否高级职称", "seniorTeacher", 20));
|
||||
entityList.add(new ExcelExportEntity("是否中级职称及以下", "intermediateBelow", 20));
|
||||
entityList.add(new ExcelExportEntity("是否干部", "cadre", 20));
|
||||
entityList.add(new ExcelExportEntity("是否工人", "worker", 20));
|
||||
entityList.add(new ExcelExportEntity("教代会代表", "isJdh", 20));
|
||||
entityList.add(new ExcelExportEntity("工代会代表", "isGdh", 20));
|
||||
entityList.add(new ExcelExportEntity("代表类型", "representativeType", 20));
|
||||
|
||||
ExportParams exportParams = new ExportParams();
|
||||
exportParams.setType(ExcelType.XSSF);
|
||||
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, exportList);
|
||||
CommonDownloadUtil.download("推选代表汇总表.xlsx", workbook, response);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 公共sql
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
private Sql getSql(PageForm pageForm,
|
||||
String sessionId,
|
||||
String unionId,
|
||||
String isFormalOrAttendance) {
|
||||
Sql sql = Sqls.create("""
|
||||
SELECT
|
||||
info.*,
|
||||
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 teacher_congress_delegate_push 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
|
||||
$condition
|
||||
""");
|
||||
Cnd cnd = Cnd.NEW();
|
||||
cnd.and("t.taskName", "=", "900217e4-4332-4a21-90dd-363b8be17801");
|
||||
// cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
|
||||
if (!"全部".equals(isFormalOrAttendance)) {
|
||||
cnd.and("info.representativeType", "=", isFormalOrAttendance);
|
||||
}
|
||||
cnd.andEX("info.sessionId", "=", sessionId);
|
||||
cnd.andEX("info.unionId", "=", unionId);
|
||||
cnd.and("ins.state", "=", 20);
|
||||
// if (approval) {
|
||||
// cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
|
||||
// } else {
|
||||
// cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
|
||||
// }
|
||||
|
||||
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
|
||||
SqlExpressionGroup group = new SqlExpressionGroup();
|
||||
group.orLike("info.userName", pageForm.getSearchKeyword());
|
||||
group.orLike("info.loginName", pageForm.getSearchKeyword());
|
||||
cnd.and(group);
|
||||
}
|
||||
|
||||
cnd.groupBy("t.id");
|
||||
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
|
||||
cnd.desc("t.createdAt");
|
||||
} else {
|
||||
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
|
||||
}
|
||||
sql.setCondition(cnd);
|
||||
return sql;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+123
-3
@@ -5,6 +5,7 @@ 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.lang.Dict;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
@@ -16,8 +17,12 @@ import com.budwk.app.base.result.Result;
|
||||
import com.budwk.app.base.service.BaseService;
|
||||
import com.budwk.app.base.utils.CommonDownloadUtil;
|
||||
import com.budwk.app.base.utils.PageUtil;
|
||||
import com.budwk.app.base.utils.SysOfficeTemplateUtil;
|
||||
import com.budwk.app.flow.engine.FlowEngine;
|
||||
import com.budwk.app.flow.entity.ProcessTask;
|
||||
import com.budwk.app.flow.enums.ProcessTaskStateEnum;
|
||||
import com.budwk.app.flow.service.FlowCommonService;
|
||||
import com.budwk.app.flow.vo.ProcessTaskVO;
|
||||
import com.budwk.app.sys.models.Sys_role;
|
||||
import com.budwk.app.sys.models.Sys_user_role;
|
||||
import com.budwk.app.sys.views.View_user;
|
||||
@@ -25,11 +30,14 @@ import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.TeacherCong
|
||||
import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate;
|
||||
import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_union;
|
||||
import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_unit;
|
||||
import com.deepoove.poi.XWPFTemplate;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
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;
|
||||
@@ -44,8 +52,12 @@ import org.nutz.mvc.annotation.Param;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.Valid;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipOutputStream;
|
||||
|
||||
/**
|
||||
* @author zhf
|
||||
@@ -55,15 +67,25 @@ import java.util.List;
|
||||
@IocBean
|
||||
@At("/platform/teacherCongress/delegate/push/zcAudit")
|
||||
@Ok("json:full")
|
||||
@Slf4j
|
||||
@Api(value = "/platform/teacherCongress/delegate/push/zcAudit", tags = "代表推选资格审查")
|
||||
public class TeacherCongressDelegatePushZgAuditController {
|
||||
|
||||
@Inject
|
||||
private Dao dao;
|
||||
|
||||
@Inject
|
||||
private BaseService baseService;
|
||||
|
||||
@Inject
|
||||
private FlowCommonService flowCommonService;
|
||||
|
||||
@Inject
|
||||
private FlowEngine flowEngine;
|
||||
|
||||
@Inject
|
||||
private SysOfficeTemplateUtil sysOfficeTemplateUtil;
|
||||
|
||||
@At("")
|
||||
@Ok("beetl:/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html")
|
||||
@SaCheckPermission("tc.delegate.push.zcAudit")
|
||||
@@ -113,8 +135,10 @@ public class TeacherCongressDelegatePushZgAuditController {
|
||||
entityList.add(new ExcelExportEntity("性别", "sex", 20));
|
||||
entityList.add(new ExcelExportEntity("联系电话", "mobile", 20));
|
||||
entityList.add(new ExcelExportEntity("分工会", "unionName", 20));
|
||||
entityList.add(new ExcelExportEntity("职务", "position", 20));
|
||||
entityList.add(new ExcelExportEntity("职称", "professionalTitle", 20));
|
||||
entityList.add(new ExcelExportEntity("职级", "professionalLevel", 20));
|
||||
entityList.add(new ExcelExportEntity("文化程度", "education", 20));
|
||||
entityList.add(new ExcelExportEntity("政治面貌", "political", 20));
|
||||
entityList.add(new ExcelExportEntity("是否高级职称", "seniorTeacher", 20));
|
||||
entityList.add(new ExcelExportEntity("是否中级职称及以下", "intermediateBelow", 20));
|
||||
entityList.add(new ExcelExportEntity("是否干部", "cadre", 20));
|
||||
@@ -260,5 +284,101 @@ public class TeacherCongressDelegatePushZgAuditController {
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
@At
|
||||
@Ok("void")
|
||||
@SaCheckPermission("tc.delegate.push.zcAudit")
|
||||
@SLog(tag = "代表推荐表", msg = "导出代表推荐表ZIP包")
|
||||
public void doExportApplyZip(
|
||||
PageForm pageForm,
|
||||
@Param(value = "sessionId") String sessionId,
|
||||
@Param(value = "unionId") String unionId,
|
||||
@Param(value = "approval") Boolean approval,
|
||||
@Param(value = "isFormalOrAttendance") String isFormalOrAttendance,
|
||||
HttpServletResponse response) {
|
||||
try {
|
||||
response.setContentType("application/octet-stream");
|
||||
response.setHeader("Content-Disposition", "attachment;filename=" +
|
||||
java.net.URLEncoder.encode("教代会代表推荐表.zip", "UTF-8"));
|
||||
|
||||
ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream());
|
||||
Sql sql = getSql(pageForm, sessionId, unionId, approval, isFormalOrAttendance);
|
||||
List<NutMap> dataList = baseService.listMap(sql);
|
||||
|
||||
for (NutMap info : dataList) {
|
||||
byte[] wordBytes = generateWordDocument(info);
|
||||
|
||||
// 添加到ZIP文件
|
||||
String fileName = "代表推荐表_" + info.getString("userName") + ".docx";
|
||||
zipOut.putNextEntry(new ZipEntry(fileName));
|
||||
zipOut.write(wordBytes);
|
||||
zipOut.closeEntry();
|
||||
}
|
||||
|
||||
zipOut.finish();
|
||||
zipOut.close();
|
||||
} catch (Exception e) {
|
||||
log.error("导出代表推荐表ZIP包失败, 错误信息:{}", e.getMessage(), e);
|
||||
try {
|
||||
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "导出失败");
|
||||
} catch (IOException ioException) {
|
||||
log.error("发送错误响应失败", ioException);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成单个代表推荐表Word文档
|
||||
*/
|
||||
private byte[] generateWordDocument(NutMap info) throws IOException {
|
||||
HashMap<String, Object> docData = new HashMap<>();
|
||||
|
||||
// 格式化日期字段
|
||||
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM");
|
||||
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月dd日");
|
||||
|
||||
if (info.get("birthday") != null && info.get("birthday") instanceof Date) {
|
||||
info.put("birthday", sdf1.format((Date) info.get("birthday")));
|
||||
}
|
||||
if (info.get("pushTime") != null && info.get("pushTime") instanceof Date) {
|
||||
info.put("pushTime", sdf2.format((Date) info.get("pushTime")));
|
||||
}
|
||||
|
||||
docData.put("schoolName", "河北地质大学");
|
||||
docData.put("info", info);
|
||||
|
||||
// 处理审批信息
|
||||
Long instanceId = info.getLong("instanceId");
|
||||
if (instanceId != null) {
|
||||
List<ProcessTaskVO> doneTaskVos = new ArrayList<>();
|
||||
List<ProcessTask> doneTaskList = flowEngine.processTaskService().getDoneTaskList(instanceId, null);
|
||||
for (ProcessTask doneTask : doneTaskList) {
|
||||
ProcessTaskVO taskVO = flowEngine.processTaskService().findById(doneTask.getId());
|
||||
doneTaskVos.add(taskVO);
|
||||
}
|
||||
|
||||
doneTaskVos.stream().filter(task -> "代表资格审查".equals(task.getDisplayName()))
|
||||
.max(Comparator.comparing(ProcessTaskVO::getCreatedAt))
|
||||
.ifPresent(v -> {
|
||||
Dict taskFormData = v.getTaskFormData();
|
||||
HashMap<String, Object> approval = new HashMap<>();
|
||||
|
||||
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
|
||||
approval.put("user", taskFormData.getStr("tf_userName"));
|
||||
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) {
|
||||
// approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign")));
|
||||
}
|
||||
approval.put("opinion", taskFormData.getStr("tf_opinion"));
|
||||
docData.put("wyh", approval);
|
||||
});
|
||||
}
|
||||
|
||||
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
|
||||
XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate("representative_election"))
|
||||
.render(docData)
|
||||
.writeAndClose(byteArrayOutputStream);
|
||||
return byteArrayOutputStream.toByteArray();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+15
@@ -88,11 +88,26 @@ public class TeacherCongressDelegatePush extends BaseModel {
|
||||
@ColDefine(type = ColType.VARCHAR, width = 50)
|
||||
private String professionalTitle;
|
||||
|
||||
@Column
|
||||
@Comment("职务")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 50)
|
||||
private String position;
|
||||
|
||||
@Column
|
||||
@Comment("职级")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 50)
|
||||
private String professionalLevel;
|
||||
|
||||
@Column
|
||||
@Comment("主要工作简历")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 500)
|
||||
private String resume;
|
||||
|
||||
@Column
|
||||
@Comment("现实表现")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 500)
|
||||
private String performance;
|
||||
|
||||
@Column
|
||||
@Comment("是否专任教师")
|
||||
@ColDefine(type = ColType.BOOLEAN)
|
||||
|
||||
+11
-10
@@ -48,7 +48,7 @@ layout("/layouts/platform.html"){
|
||||
<el-button icon="el-icon-check" size="small" type="primary" @click="onBatchSubmit">正式代表提交上报
|
||||
</el-button>
|
||||
</template>
|
||||
<el-button icon="el-icon-download" size="small" type="primary" @click="doExport">导出</el-button>
|
||||
<el-button icon="el-icon-download" size="small" type="primary" @click="exportExcel">导出</el-button>
|
||||
<el-radio-group v-model="pageForm.isFormalOrAttendance" size="small" class="ml10"
|
||||
@change="doSearch">
|
||||
<el-radio-button label="全部"></el-radio-button>
|
||||
@@ -69,8 +69,8 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column label="年龄" prop="age" width="80"></el-table-column>
|
||||
<el-table-column label="性别" prop="sex" width="80" fixed="left"></el-table-column>
|
||||
<!-- <el-table-column label="民族" prop="nation" min-width="100"></el-table-column>-->
|
||||
<el-table-column label="职称" prop="professionalTitle" min-width="150"></el-table-column>
|
||||
<el-table-column label="职级" prop="professionalLevel" min-width="100"></el-table-column>
|
||||
<el-table-column label="职务" prop="position" min-width="100"></el-table-column>
|
||||
<el-table-column label="职称" prop="professionalTitle" min-width="100"></el-table-column>
|
||||
<!-- :style="{'pointer-events':(row.taskKey === 'startTask' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || !row.instanceId)?'auto':'none'}"-->
|
||||
<!-- <el-table-column label="校级领导" prop="schoolLeader" min-width="100">
|
||||
<template v-slot="{row}">
|
||||
@@ -166,12 +166,12 @@ layout("/layouts/platform.html"){
|
||||
<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.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || !row.instanceId)
|
||||
<el-button
|
||||
v-if="(row.taskKey === 'startTask' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || !row.instanceId)
|
||||
&& $auth.hasRoleOr(['SYSADMIN'])"
|
||||
@click="onEdit(row)" size="mini"
|
||||
type="primary">编辑
|
||||
</el-button>
|
||||
@click="onEdit(row)" size="mini"
|
||||
type="primary">编辑
|
||||
</el-button>
|
||||
<template>
|
||||
<el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)"
|
||||
size="mini" type="danger">
|
||||
@@ -270,8 +270,9 @@ layout("/layouts/platform.html"){
|
||||
})
|
||||
})
|
||||
},
|
||||
doExport() {
|
||||
},
|
||||
exportExcel() {
|
||||
this.$downLoad("/platform/teacherCongress/delegate/push/exportExcel", this.pageForm)
|
||||
},
|
||||
onBatchSubmit() {
|
||||
const selection = this.$refs.tableRef.selection
|
||||
/*if (selection.length === 0){
|
||||
|
||||
+27
-5
@@ -120,11 +120,23 @@ const write = {
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="文化程度" prop="education">
|
||||
<el-input maxlength="100" placeholder="文化程度"
|
||||
v-model="formData.education"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="职务" prop="position">
|
||||
<el-input maxlength="100" placeholder="职务"
|
||||
v-model="formData.position"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="职称" prop="professionalTitle">
|
||||
<dict-select v-model="formData.professionalTitle" style="width: 100%"
|
||||
placeholder="请选择职称"
|
||||
code="technical_title_level"></dict-select>
|
||||
<el-input maxlength="100" v-model="formData.professionalTitle"
|
||||
placeholder="职称"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
@@ -199,6 +211,14 @@ const write = {
|
||||
<el-input v-model="formData.mobile" maxlength="11"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="主要工作简历" prop="resume">
|
||||
<el-input v-model="formData.resume" type="textarea"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="现实表现" prop="performance">
|
||||
<el-input v-model="formData.performance" type="textarea"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<!--<el-form-item label="电子邮箱" prop="email">
|
||||
<el-input v-model="formData.email" maxlength="255"></el-input>
|
||||
</el-form-item>-->
|
||||
@@ -257,11 +277,13 @@ const write = {
|
||||
mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
position: [{required: false, message: '必填', trigger: ['blur', 'change']}],
|
||||
political: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
education: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
// education: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
academicDegree: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
jobTitle: [{required: false, message: '必填', trigger: ['blur', 'change']}],
|
||||
email: [{required: false, message: '必填', trigger: ['blur', 'change']}],
|
||||
vita: [{required: true, message: '必填', trigger: ['blur', 'change']}]
|
||||
vita: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
resume: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
performance: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
},
|
||||
sessionOptions: [],
|
||||
representativeTypeList: ['正式代表', '列席代表'],
|
||||
|
||||
+7
-4
@@ -23,6 +23,8 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<el-card shadow="never">
|
||||
<table-tool>
|
||||
<el-button type="primary" size="small" @click="doExport" class="ml5">导出代表推荐表</el-button>
|
||||
<el-button type="primary" size="small" @click="exportExcel" class="ml5">导出汇总表</el-button>
|
||||
<el-radio-group @change="doSearch" v-model="pageForm.isFormalOrAttendance" size="small">
|
||||
<el-radio-button label="全部"></el-radio-button>
|
||||
<el-radio-button label="正式代表"></el-radio-button>
|
||||
@@ -33,8 +35,6 @@ layout("/layouts/platform.html"){
|
||||
<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"
|
||||
@@ -52,8 +52,8 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column label="政治面貌" prop="political"
|
||||
show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="学历" prop="education"></el-table-column>-->
|
||||
<el-table-column label="职称" prop="professionalTitle"></el-table-column>
|
||||
<el-table-column label="职级" prop="professionalLevel"></el-table-column>
|
||||
<el-table-column label="职务" prop="position" ></el-table-column>
|
||||
<el-table-column label="职称" prop="professionalTitle" ></el-table-column>
|
||||
<el-table-column label="是否高级职称" prop="seniorTeacher">
|
||||
<template v-slot="{row}">
|
||||
<span v-if="row.seniorTeacher" style="color:#0037ff;">是</span>
|
||||
@@ -160,6 +160,9 @@ layout("/layouts/platform.html"){
|
||||
exportExcel() {
|
||||
this.$downLoad("/platform/teacherCongress/delegate/push/zcAudit/exportExcel", this.pageForm)
|
||||
},
|
||||
doExport() {
|
||||
this.$downLoad("/platform/teacherCongress/delegate/push/zcAudit/doExportApplyZip", this.pageForm)
|
||||
},
|
||||
onView(row) {
|
||||
this.writeDialog = true
|
||||
this.userId = row.userId
|
||||
|
||||
Reference in New Issue
Block a user