c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-10-19 18:46:49 +08:00
parent 908c8d4d76
commit 71860af928
17 changed files with 316 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java
+5 -4
View File
@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.activity.basic.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams; 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.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
@@ -312,10 +313,10 @@ public class ActivityBasicScopeController {
propMap.forEach((k, v) -> { propMap.forEach((k, v) -> {
entityList.add(new ExcelExportEntity(v, k, 40)); entityList.add(new ExcelExportEntity(v, k, 40));
}); });
response.setContentType("application/octet-stream"); ExportParams exportParams = new ExportParams();
response.setHeader("Content-Disposition", "attachment;filename=" + new String(("人员名单.xls").getBytes("utf-8"), "ISO8859-1")); exportParams.setType(ExcelType.XSSF);
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entityList, map); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, map);
workbook.write(response.getOutputStream()); CommonDownloadUtil.download("人员名单.xlsx", workbook, response);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeUserDataController.java
+59 -2
View File
@@ -1,5 +1,9 @@
package com.budwk.app.zhgh.activity.basic.controller; package com.budwk.app.zhgh.activity.basic.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.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
@@ -11,16 +15,19 @@ import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.param.PageForm; import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result; import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService; import com.budwk.app.base.service.BaseService;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.EasyExcelUtil; import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope; import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope;
import com.budwk.app.zhgh.activity.basic.template.UserTemp; import com.budwk.app.zhgh.activity.basic.template.UserTemp;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
import org.apache.poi.ss.usermodel.Workbook;
import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.dao.util.cri.Static; import org.nutz.dao.util.cri.Static;
import org.nutz.integration.jedis.RedisService; import org.nutz.integration.jedis.RedisService;
import org.nutz.ioc.aop.Aop; import org.nutz.ioc.aop.Aop;
@@ -35,6 +42,7 @@ import org.nutz.mvc.annotation.Param;
import org.nutz.mvc.upload.TempFile; import org.nutz.mvc.upload.TempFile;
import org.nutz.mvc.upload.UploadAdaptor; import org.nutz.mvc.upload.UploadAdaptor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -94,8 +102,11 @@ public class ActivityBasicScopeUserDataController {
"""); """);
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
if (StrUtil.isNotBlank(pageForm.getSearchName()) && StrUtil.isNotBlank(pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())){
cnd.and(Cnd.likeEX(pageForm.getSearchName(), pageForm.getSearchKeyword())); SqlExpressionGroup group = new SqlExpressionGroup();
group.orLike("u.username", pageForm.getSearchKeyword());
group.orLike("u.loginname", pageForm.getSearchKeyword());
cnd.and(group);
} }
if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) { if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) {
cnd.orderBy(pageForm.getPageOrderName(), pageForm.getPageOrderBy().equalsIgnoreCase("ascending") ? "ASC" : "DESC"); cnd.orderBy(pageForm.getPageOrderName(), pageForm.getPageOrderBy().equalsIgnoreCase("ascending") ? "ASC" : "DESC");
@@ -229,4 +240,50 @@ public class ActivityBasicScopeUserDataController {
return Result.success(nutMap); return Result.success(nutMap);
} }
@At
@Ok("void")
@ApiOperation("导出人员名单")
@SaCheckPermission("activity.basic.user")
public void doExportUser(Integer groupId, HttpServletResponse response) {
try {
Sql sql = Sqls.create("""
SELECT
u.username AS userName,
u.loginname AS loginName,
u.sex,
u.mobile,
u.unitname AS unitName,
u.unionName AS unionName
FROM
activity_user_scope aus
LEFT JOIN `vw_user` u ON u.id = aus.userId
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.andEX("aus.groupId", "=", groupId);
sql.setCondition(cnd);
List<NutMap> listMap = baseService.listMap(sql);
List<ExcelExportEntity> exportEntities = new ArrayList<>();
exportEntities.add(new ExcelExportEntity("姓名", "userName", 20));
exportEntities.add(new ExcelExportEntity("工号", "loginName", 20));
exportEntities.add(new ExcelExportEntity("工会", "unionName", 20));
exportEntities.add(new ExcelExportEntity("单位", "unitName", 20));
exportEntities.add(new ExcelExportEntity("手机号码", "mobile", 20));
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF);
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, listMap);
CommonDownloadUtil.download("人员名单.xlsx", workbook, response);
} catch (Exception e) {
e.printStackTrace();
}
}
} }
src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateApplyController.java
+8
View File
@@ -13,6 +13,7 @@ import com.budwk.app.flow.entity.ProcessTask;
import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
import com.budwk.app.flow.service.FlowCommonService; import com.budwk.app.flow.service.FlowCommonService;
import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.dayofficework.evaluation.models.EvaluateActivity;
import com.budwk.app.zhgh.dayofficework.evaluation.models.EvaluateApply; import com.budwk.app.zhgh.dayofficework.evaluation.models.EvaluateApply;
import com.budwk.app.zhgh.dayofficework.evaluation.service.EvaluateActivityService; import com.budwk.app.zhgh.dayofficework.evaluation.service.EvaluateActivityService;
import com.budwk.app.zhgh.dayofficework.evaluation.service.EvaluateService; import com.budwk.app.zhgh.dayofficework.evaluation.service.EvaluateService;
@@ -91,6 +92,13 @@ public class EvaluateApplyController {
@SaCheckPermission("evaluation.apply") @SaCheckPermission("evaluation.apply")
@ApiOperation("验证能否申请") @ApiOperation("验证能否申请")
public Result valid(@Valid String id) { public Result valid(@Valid String id) {
EvaluateActivity activity = evaluateActivityService.fetch(id);
if (activity.getStartTime().after(new Date())){
return Result.success().addData(false).addMsg("活动未开始");
}
if (activity.getEndTime().before(new Date())){
return Result.success().addData(false).addMsg("活动已结束");
}
return Result.success().addData(true); return Result.success().addData(true);
} }
src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorManageController.java
+10 -10
View File
@@ -7,7 +7,6 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.db.Page;
import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.constant.RoleConstant;
import com.budwk.app.base.page.Pagination; import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result; import com.budwk.app.base.result.Result;
@@ -24,6 +23,7 @@ import org.nutz.dao.Cnd;
import org.nutz.dao.Dao; import org.nutz.dao.Dao;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.json.Json; import org.nutz.json.Json;
@@ -32,11 +32,8 @@ import org.nutz.lang.util.NutMap;
import org.nutz.mvc.Mvcs; import org.nutz.mvc.Mvcs;
import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -83,9 +80,12 @@ public class HonorManageController {
cnd.andEX("h.honorType", "=", pageForm.getHonorType()); cnd.andEX("h.honorType", "=", pageForm.getHonorType());
cnd.andEX("h.prize", "=", pageForm.getPrize()); cnd.andEX("h.prize", "=", pageForm.getPrize());
cnd.andEX("h.honorLevel", "=", pageForm.getHonorLevel()); cnd.andEX("h.honorLevel", "=", pageForm.getHonorLevel());
if (Strings.isNotBlank(pageForm.getUserName())) { cnd.andEX("h.unionId", "=", pageForm.getUnionId());
cnd.andEX("h.userName", "like", "%" + pageForm.getUserName() + "%"); if (Strings.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup group = new SqlExpressionGroup();
group.orLike("u.loginname", "%" + pageForm.getSearchKeyword() + "%");
group.orLike("u.username", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(group);
} }
if (Strings.isNotBlank(pageForm.getUnitName())) { if (Strings.isNotBlank(pageForm.getUnitName())) {
cnd.andEX("h.unitName", "like", "%" + pageForm.getUnitName() + "%"); cnd.andEX("h.unitName", "like", "%" + pageForm.getUnitName() + "%");
@@ -105,7 +105,7 @@ public class HonorManageController {
Pagination pagination = honorViService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); Pagination pagination = honorViService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
List<NutMap> list = pagination.getList(); List<NutMap> list = pagination.getList();
list.forEach(v -> { list.forEach(v -> {
if(StrUtil.isNotBlank(v.getString("awardMaterials"))){ if (StrUtil.isNotBlank(v.getString("awardMaterials"))) {
v.setv("awardMaterialsExcel", getBasicNameById(v.getString("awardMaterials")).toString()); v.setv("awardMaterialsExcel", getBasicNameById(v.getString("awardMaterials")).toString());
} }
}); });
@@ -195,11 +195,11 @@ public class HonorManageController {
v.setPrize(null); v.setPrize(null);
} }
} }
if(v.getAwardMaterials() != null && !v.getAwardMaterials().isEmpty()) { if (v.getAwardMaterials() != null && !v.getAwardMaterials().isEmpty()) {
v.setAwardMaterialsExcel(getBasicNameById(Json.toJson(v.getAwardMaterials())).toString()); v.setAwardMaterialsExcel(getBasicNameById(Json.toJson(v.getAwardMaterials())).toString());
} }
v.setHonorType(singleHonor.get().getName()); v.setHonorType(singleHonor.get().getName());
if(StrUtil.isNotBlank(v.getUserId())) { if (StrUtil.isNotBlank(v.getUserId())) {
Sys_user user = dao.fetch(Sys_user.class, v.getUserId()); Sys_user user = dao.fetch(Sys_user.class, v.getUserId());
v.setLoginname(user != null ? user.getLoginname() : ""); v.setLoginname(user != null ? user.getLoginname() : "");
} }
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetQueryStatisticsServiceImpl.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class ActivityBudgetQueryStatisticsServiceImpl extends BaseServiceImpl im
} else if (outlayManageSource.equals("ACTIVITY_BUDGET_TYPE_THREE")) { } else if (outlayManageSource.equals("ACTIVITY_BUDGET_TYPE_THREE")) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
@YEAR `year`, @year `year`,
sc.clubCode, sc.clubCode,
sc.clubName, sc.clubName,
ab.clubId, ab.clubId,
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseApplyController.java
+3
View File
@@ -104,6 +104,9 @@ public class OutlayReimburseApplyController {
Dict args = Dict.create(); Dict args = Dict.create();
args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode()); args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
args.set(FlowConst.FORM_DATA, outlayReimburse); args.set(FlowConst.FORM_DATA, outlayReimburse);
if (outlayReimburse.getOutlayManageSource().equals("ACTIVITY_BUDGET_TYPE_THREE")){
args.set("clubId", outlayReimburse.getClubId());
}
args.set("outlayManageSource", outlayReimburse.getOutlayManageSource()); args.set("outlayManageSource", outlayReimburse.getOutlayManageSource());
ProcessInstance instance = flowEngine.startProcessInstanceByKey("FYBXSQ", outlayReimburse.getId(), SecurityUtil.getUserId(), args); ProcessInstance instance = flowEngine.startProcessInstanceByKey("FYBXSQ", outlayReimburse.getId(), SecurityUtil.getUserId(), args);
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java
+30
View File
@@ -2,15 +2,22 @@ package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.controller;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode; import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.page.Pagination; import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.param.PageForm; import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result; import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService; import com.budwk.app.base.service.BaseService;
import com.budwk.app.base.utils.PageUtil; import com.budwk.app.base.utils.PageUtil;
import com.budwk.app.flow.constant.FlowConst;
import com.budwk.app.flow.engine.FlowEngine;
import com.budwk.app.flow.entity.ProcessInstance;
import com.budwk.app.flow.entity.ProcessTask;
import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.flow.enums.ProcessTaskStateEnum;
import com.budwk.app.sys.services.SysDictService; import com.budwk.app.sys.services.SysDictService;
import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.model.OutlayReimburse;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -22,6 +29,7 @@ import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap; import org.nutz.lang.util.NutMap;
import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import java.util.List; import java.util.List;
@@ -42,12 +50,17 @@ public class OutlayReimburseClubAuditController {
@Inject @Inject
private SysDictService sysDictService; private SysDictService sysDictService;
@Inject
private FlowEngine flowEngine;
@At("/index") @At("/index")
@Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayReimburse/clubAudit/index.html") @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayReimburse/clubAudit/index.html")
@SaCheckPermission("outlay.reimburse.clubAudit") @SaCheckPermission("outlay.reimburse.clubAudit")
public void index() { public void index() {
} }
@At("/h5") @At("/h5")
@Ok("beetl:/platform/zhghh5/dayofficework/outlayReimburse/clubAudit/index.html") @Ok("beetl:/platform/zhghh5/dayofficework/outlayReimburse/clubAudit/index.html")
@SaCheckPermission("h5.outlay.reimburse.clubAudit") @SaCheckPermission("h5.outlay.reimburse.clubAudit")
@@ -118,7 +131,24 @@ public class OutlayReimburseClubAuditController {
} }
@At
@ApiOperation("协会审核")
@SaCheckPermission(value = {"outlay.reimburse.clubAudit", "h5.outlay.reimburse.clubAudit"}, mode = SaMode.OR)
public Result submit(@Param("data") OutlayReimburse outlayReimburse) {
// 开启流程实例
Dict args = Dict.create();
args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
args.set(FlowConst.FORM_DATA, outlayReimburse);
args.set("clubId", outlayReimburse.getClubId());
ProcessInstance instance = flowEngine.startProcessInstanceByKey("FYBXSQ", outlayReimburse.getId(), SecurityUtil.getUserId(), args);
// 自动完成第一个申请任务
List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
for (ProcessTask task : doingTaskList) {
flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
}
return Result.success();
}
} }
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseUnionAuditController.java
+1
View File
@@ -65,6 +65,7 @@ public class OutlayReimburseUnionAuditController {
String outlayManageSource) { String outlayManageSource) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
ta.actorId,
info.*, info.*,
YEAR(info.applyTime) year, YEAR(info.applyTime) year,
ins.id AS instanceId, ins.id AS instanceId,
src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java
+2 -2
View File
@@ -140,7 +140,7 @@ public class ExecutiveCommitteePushController {
ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class, ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
Cnd.where("teacherMeetId", "=", teacherMeetId)); Cnd.where("teacherMeetId", "=", teacherMeetId));
if (ObjectUtil.isEmpty(config)) { /* if (ObjectUtil.isEmpty(config)) {
return Result.error("请先配置基础信息"); return Result.error("请先配置基础信息");
} }
if (config.getFirstStartTime().getTime() > System.currentTimeMillis()) { if (config.getFirstStartTime().getTime() > System.currentTimeMillis()) {
@@ -148,7 +148,7 @@ public class ExecutiveCommitteePushController {
} }
if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) { if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) {
return Result.error("一次预选已结束"); return Result.error("一次预选已结束");
} }*/
int dbCount = dao.count(ExecutiveCommitteeOnePush.class, int dbCount = dao.count(ExecutiveCommitteeOnePush.class,
Cnd.where("teacherMeetId", "=", teacherMeetId) Cnd.where("teacherMeetId", "=", teacherMeetId)
src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java
+7 -3
View File
@@ -1,5 +1,6 @@
package com.budwk.app.zhgh.democratic.executiveCommittee.service.impl; package com.budwk.app.zhgh.democratic.executiveCommittee.service.impl;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.zhgh.democratic.executiveCommittee.param.ExecutiveCommitteePageForm; import com.budwk.app.zhgh.democratic.executiveCommittee.param.ExecutiveCommitteePageForm;
import com.budwk.app.zhgh.democratic.executiveCommittee.service.ExecutiveCommitteeMemberService; import com.budwk.app.zhgh.democratic.executiveCommittee.service.ExecutiveCommitteeMemberService;
@@ -7,8 +8,8 @@ import org.nutz.dao.Cnd;
import org.nutz.dao.Dao; import org.nutz.dao.Dao;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Strings;
/** /**
* @author zhf * @author zhf
@@ -50,8 +51,11 @@ public class ExecutiveCommitteeMemberServiceImpl extends BaseServiceImpl impleme
cnd.andEX("op.unitId", "=", pageForm.getUnitId()); cnd.andEX("op.unitId", "=", pageForm.getUnitId());
cnd.andEX("it.unionid", "=", pageForm.getUnionId()); cnd.andEX("it.unionid", "=", pageForm.getUnionId());
cnd.andEX("op.delegationId", "=", pageForm.getDelegationId()); cnd.andEX("op.delegationId", "=", pageForm.getDelegationId());
if (Strings.isNotBlank(pageForm.getSearchName()) && Strings.isNotBlank(pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.and(pageForm.getSearchName(), "LIKE", "%" + pageForm.getSearchKeyword() + "%"); SqlExpressionGroup group = new SqlExpressionGroup();
group.orLike("op.userName", pageForm.getSearchKeyword());
group.orLike("op.loginName", pageForm.getSearchKeyword());
cnd.and(group);
} }
cnd.desc("pushCount"); cnd.desc("pushCount");
cnd.asc("op.firstLetter"); cnd.asc("op.firstLetter");
src/main/resources/static/components/module/activity/UserDataScope.vue
+3 -11
View File
@@ -28,17 +28,9 @@
<div class="search-item"> <div class="search-item">
<div class="search-item-label">姓名/工号</div> <div class="search-item-label">姓名/工号</div>
<div class="search-item-option"> <div class="search-item-option">
<el-input <el-input @keyup.enter.native="doSearch" clearable
placeholder="请输入姓名或工号" placeholder="请输入姓名或工号"
clearable v-model="pageForm.searchKeyword">
v-model="pageForm.searchKeyword"
style="width: 100%"
@keyup.enter.native="doSearch"
>
<el-select v-model="pageForm.searchName" slot="prepend" placeholder="查询类型" style="width: 80px">
<el-option label="姓名" value="username"></el-option>
<el-option label="工号" value="loginname"></el-option>
</el-select>
</el-input> </el-input>
</div> </div>
</div> </div>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html
+11 -2
View File
@@ -236,11 +236,20 @@ layout("/layouts/platform.html"){
openAdd() { openAdd() {
this.stepActive = 0 this.stepActive = 0
this.dialogVisible = true this.dialogVisible = true
this.formData={} this.formData={
name: "",
year: new Date().getFullYear().toString(),
startTime: null,
endTime: null,
notice: null,
quotaAllocations: null,
activityGroupId: "",
enable: true
}
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.formRef.resetFields() this.$refs.formRef.resetFields()
this.$refs.formRef.clearValidate()
}) })
this.$refs.formRef.clearValidate()
this.$axios.post("/platform/evaluate/activity/initQuotaAllocations").then((res) => { this.$axios.post("/platform/evaluate/activity/initQuotaAllocations").then((res) => {
if (res.code === 0) { if (res.code === 0) {
this.$set(this.formData, "quotaAllocations", res.data) this.$set(this.formData, "quotaAllocations", res.data)
src/main/resources/views/platform/zhgh/dayofficework/honor/manage/index.html
+59 -42
View File
@@ -7,21 +7,24 @@ layout("/layouts/platform.html"){
<search @search="doSearch"> <search @search="doSearch">
<search-item label="授予年度"> <search-item label="授予年度">
<el-date-picker <el-date-picker
v-model="pageForm.year" v-model="pageForm.year"
type="year" type="year"
style="width: 100%" style="width: 100%"
value-format="yyyy" value-format="yyyy"
placeholder="授予年度" placeholder="授予年度"
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="荣誉类型"> <search-item label="荣誉类型">
<el-select v-model="pageForm.honorType" placeholder="请选择荣誉类型" style="width: 100%" @change="honorTypeChange"> <el-select v-model="pageForm.honorType" placeholder="请选择荣誉类型" style="width: 100%"
@change="honorTypeChange">
<el-option v-for="o in honorTypeList" :key="o.id" :label="o.name" :value="o.id"></el-option> <el-option v-for="o in honorTypeList" :key="o.id" :label="o.name" :value="o.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="获奖奖项"> <search-item label="获奖奖项">
<el-select v-model="pageForm.prize" filterable style="width: 100%" placeholder="请选择荣誉奖项" clearable> <el-select v-model="pageForm.prize" filterable style="width: 100%" placeholder="请选择荣誉奖项"
<el-option v-for="o in honorPrizeList" :key="o.id" style="width: 100%" :label="o.name" :value="o.id"></el-option> clearable>
<el-option v-for="o in honorPrizeList" :key="o.id" style="width: 100%" :label="o.name"
:value="o.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="荣誉级别"> <search-item label="荣誉级别">
@@ -29,12 +32,14 @@ layout("/layouts/platform.html"){
<el-option v-for="o in honorLevelList" :key="o.id" :label="o.name" :value="o.id"></el-option> <el-option v-for="o in honorLevelList" :key="o.id" :label="o.name" :value="o.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="姓名"> <search-item label="姓名/工号">
<el-input v-model="pageForm.userName" placeholder="请输入姓名"></el-input> <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable=""></el-input>
</search-item> </search-item>
<search-item label="获奖工会"> <search-item label="获奖工会">
<el-select v-model="pageForm.unionName" placeholder="请选择获奖工会" @change="doSearch" style="width: 100%" clearable> <el-select v-model="pageForm.unionId" placeholder="请选择获奖工会" @change="doSearch"
<el-option v-for="o in unionList" :key="o.id" :label="o.unionname" :value="o.unionname"></el-option> style="width: 100%" clearable>
<el-option v-for="o in unionList" :key="o.id" :label="o.name"
:value="o.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
</search> </search>
@@ -45,34 +50,44 @@ layout("/layouts/platform.html"){
<el-button type="primary" size="small" @click="doExport">导出</el-button> <el-button type="primary" size="small" @click="doExport">导出</el-button>
</table-tool> </table-tool>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="序号" type="index" header-align="center" align="center" width="50"></el-table-column> <el-table-column label="序号" type="index"
width="50"></el-table-column>
<template v-if="pageForm.queryTypeCode=='HONOR_SINGLE'"> <template v-if="pageForm.queryTypeCode=='HONOR_SINGLE'">
<el-table-column prop="userName" label="姓名" header-align="center" align="center" sortable></el-table-column> <el-table-column prop="userName" label="姓名"
<el-table-column prop="loginName" label="工号" header-align="center" align="center" sortable></el-table-column> sortable></el-table-column>
<el-table-column prop="unionName" label="所属工会" header-align="center" align="center" sortable></el-table-column> <el-table-column prop="loginname" label="工号"
<el-table-column prop="unitName" label="所属单位" header-align="center" align="center" sortable></el-table-column> sortable></el-table-column>
<el-table-column prop="unionName" label="所属工会"
sortable></el-table-column>
<el-table-column prop="unitName" label="所属单位"
sortable></el-table-column>
</template> </template>
<template v-if="pageForm.queryTypeCode=='HONOR_LIST'"> <template v-if="pageForm.queryTypeCode=='HONOR_LIST'">
<el-table-column prop="applyUnionName" label="申报分工会" header-align="center" align="center" sortable></el-table-column> <el-table-column prop="applyUnionName" label="申报分工会"
<el-table-column sortable></el-table-column>
prop="gameName" <!-- <el-table-column
label="参加比赛名称" prop="gameName"
header-align="center" label="参加比赛名称"
align="center" header-align="center"
show-overflow-tooltip align="center"
></el-table-column> show-overflow-tooltip
></el-table-column>-->
</template> </template>
<el-table-column prop="prizeName" label="奖项" header-align="center" align="center" sortable></el-table-column> <el-table-column prop="prizeName" label="奖项"
<!--<el-table-column prop="prizeDesc" label="奖项说明" header-align="center" align="center"></el-table-column>--> sortable></el-table-column>
<el-table-column prop="typeName" label="荣誉类型" header-align="center" align="center"></el-table-column> <!--<el-table-column prop="prizeDesc" label="奖项说明" ></el-table-column>-->
<el-table-column prop="levelName" label="级别" header-align="center" align="center" sortable></el-table-column> <el-table-column prop="typeName" label="荣誉类型"></el-table-column>
<el-table-column prop="grantUnit" label="授予单位" header-align="center" align="center" show-overflow-tooltip></el-table-column> <el-table-column prop="levelName" label="级别"
<el-table-column prop="grantDate" label="授予时间" header-align="center" align="center" sortable></el-table-column> sortable></el-table-column>
<el-table-column prop="grantUnit" label="授予单位"
show-overflow-tooltip></el-table-column>
<el-table-column prop="grantDate" label="授予时间"
sortable></el-table-column>
<!--<el-table-column prop="archiveStatus" label="存档情况" header-align="center" <!--<el-table-column prop="archiveStatus" label="存档情况" header-align="center"
align="center"></el-table-column>--> align="center"></el-table-column>-->
<el-table-column prop="awardMaterialsExcel" label="获奖材料" header-align="center" align="center"></el-table-column> <el-table-column prop="awardMaterialsExcel" label="获奖材料"></el-table-column>
<el-table-column align="center" header-align="center" label="操作" fixed="right" width="100px"> <el-table-column label="操作" fixed="right" width="100px">
<template scope="{row}"> <template scope="{row}">
<el-dropdown @command="dropdownCommand"> <el-dropdown @command="dropdownCommand">
<el-button plain size="mini"> <el-button plain size="mini">
@@ -191,7 +206,8 @@ layout("/layouts/platform.html"){
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item prop="user_name" label="附&emsp;&emsp;件"> <el-form-item prop="user_name" label="附&emsp;&emsp;件">
<file-upload v-if="viewData.files&&viewData.files.length" :files="viewData.files" :view="true"></file-upload> <file-upload v-if="viewData.files&&viewData.files.length" :files="viewData.files"
:view="true"></file-upload>
<span v-else>暂无</span> <span v-else>暂无</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -229,7 +245,7 @@ layout("/layouts/platform.html"){
}, },
methods: { methods: {
dropdownCommand(command) { dropdownCommand(command) {
const { type, row } = command const {type, row} = command
if (type === "edit") { if (type === "edit") {
this.openEdit(row) this.openEdit(row)
} else if (type === "delete") { } else if (type === "delete") {
@@ -246,7 +262,7 @@ layout("/layouts/platform.html"){
this.$refs.guava.view() this.$refs.guava.view()
}, },
doExport() { doExport() {
const { year, honorType, prize, honorLevel, userName, unitName } = this.pageForm const {year, honorType, prize, honorLevel, userName, unitName} = this.pageForm
window.location.href = window.location.href =
"/platform/honor/manage/doExport?year=" + "/platform/honor/manage/doExport?year=" +
year + year +
@@ -262,11 +278,11 @@ layout("/layouts/platform.html"){
unitName unitName
}, },
openEdit(row) { openEdit(row) {
this.$store.dispatch("pjaxRoute", "/platform/honor/registration?id=" + row.id) commonUtil.pjaxPush("/platform/honor/registration?id=" + row.id)
// window.location.href = "/platform/honor/registration?id=" + row.id // window.location.href = "/platform/honor/registration?id=" + row.id
}, },
async doDelete(row) { async doDelete(row) {
const { id } = row const {id} = row
const confirm = await this.$confirm("确定要删除该记录吗？", "提示", { const confirm = await this.$confirm("确定要删除该记录吗？", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@@ -274,17 +290,17 @@ layout("/layouts/platform.html"){
}) })
if ("confirm" === confirm) { if ("confirm" === confirm) {
this.$set(row, "loading", true) this.$set(row, "loading", true)
const resp = await $.post(loc() + "/doDelete", { id: id }) const resp = await $.post(loc() + "/doDelete", {id: id})
if (resp.code === 0) { if (resp.code === 0) {
this.$notify.success({ title: "成功", message: resp.msg }) this.$notify.success({title: "成功", message: resp.msg})
this.doSearch() this.doSearch()
} else { } else {
this.$notify.error({ title: "失败", message: resp.msg }) this.$notify.error({title: "失败", message: resp.msg})
} }
} }
}, },
async getHonorPrize(honorType) { async getHonorPrize(honorType) {
const res = await this.$axios.post("/platform/honor/basic/settings/getData", { parentId: honorType }) const res = await this.$axios.post("/platform/honor/basic/settings/getData", {parentId: honorType})
return res.data return res.data
}, },
getHonorType() { getHonorType() {
@@ -316,6 +332,7 @@ layout("/layouts/platform.html"){
this.$businessTool.listUnit().then((data) => { this.$businessTool.listUnit().then((data) => {
this.units = data this.units = data
}) })
this.unionList = await this.$businessTool.listUnion()
if (this.honorTypeList && this.honorLevelList.length > 0) { if (this.honorTypeList && this.honorLevelList.length > 0) {
this.formData = { this.formData = {
honorType: this.honorTypeList[0].id, honorType: this.honorTypeList[0].id,
src/main/resources/views/platform/zhgh/dayofficework/honor/registration/index.html
+113 -93
View File
@@ -12,7 +12,8 @@ layout("/layouts/platform.html"){
<el-col :span="24"> <el-col :span="24">
<el-form-item label="荣誉类型" prop="honorType"> <el-form-item label="荣誉类型" prop="honorType">
<el-select v-model="formData.honorType" style="width: 100%" @change="honorTypeChange"> <el-select v-model="formData.honorType" style="width: 100%" @change="honorTypeChange">
<el-option v-for="o in honorTypeList" :key="o.id" :label="o.name" :value="o.id"></el-option> <el-option v-for="o in honorTypeList" :key="o.id" :label="o.name"
:value="o.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -30,15 +31,22 @@ layout("/layouts/platform.html"){
<el-input v-model="formData.userName" readonly></el-input> <el-input v-model="formData.userName" readonly></el-input>
</el-form-item> </el-form-item>
<el-form-item v-else prop="userId" label="姓名"> <el-form-item v-else prop="userId" label="姓名">
<user-select <el-select
v-model="formData.userId" style="width: 100%"
@change="userChange" v-model="formData.userId"
ref="beComfortedUserRef" filterable remote
api="/platform/honor/registration/listBeComfortedUser" @change="userChange"
api_input_key_name="keyWord" reserve-keyword
:option_label_func="(item)=>{return item.userName + item.loginName + '(' + item.unitName + ')'}" placeholder="请输入姓名或工号"
style="width: 100%" :remote-method="userRemoteMethod">
></user-select> <el-option
v-for="item in userOptions"
:key="item.id"
:label="item.userName + item.loginName + '(' + item.unitName + ')'"
:value="item.id">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -55,28 +63,30 @@ layout("/layouts/platform.html"){
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属单位" prop="unitId"> <el-form-item label="所属单位" prop="unitId">
<el-select <el-select
placeholder="所属单位" placeholder="所属单位"
v-model="formData.unitId" v-model="formData.unitId"
clearable clearable
style="width: 100%" style="width: 100%"
clearable clearable
filterable filterable
> >
<el-option v-for="item in units" :label="item.name" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in units" :label="item.name" :value="item.id"
:key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属工会" prop="unionId"> <el-form-item label="所属工会" prop="unionId">
<el-select <el-select
placeholder="所属工会" placeholder="所属工会"
v-model="formData.unionId" v-model="formData.unionId"
clearable clearable
style="width: 100%" style="width: 100%"
clearable clearable
filterable filterable
> >
<el-option v-for="item in unions" :label="item.name" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in unions" :label="item.name" :value="item.id"
:key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -86,11 +96,11 @@ layout("/layouts/platform.html"){
<el-col :span="12"> <el-col :span="12">
<el-form-item label="生日" prop="birthday"> <el-form-item label="生日" prop="birthday">
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
v-model="formData.birthday" v-model="formData.birthday"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -118,11 +128,11 @@ layout("/layouts/platform.html"){
<el-col :span="12"> <el-col :span="12">
<el-form-item label="加入工会时间" prop="joinTime"> <el-form-item label="加入工会时间" prop="joinTime">
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
v-model="formData.joinTime" v-model="formData.joinTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -138,15 +148,16 @@ layout("/layouts/platform.html"){
<el-col :span="12"> <el-col :span="12">
<el-form-item label="申报分工会" prop="unionId"> <el-form-item label="申报分工会" prop="unionId">
<el-select <el-select
placeholder="请选择申报分工会" placeholder="请选择申报分工会"
v-model="formData.unionId" v-model="formData.unionId"
style="width: 100%" style="width: 100%"
disabled disabled
clearable clearable
filterable filterable
@change="searchUnionInfo(formData.unionId)" @change="searchUnionInfo(formData.unionId)"
> >
<el-option v-for="item in unions" :label="item.name" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in unions" :label="item.name" :value="item.id"
:key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -177,7 +188,8 @@ layout("/layouts/platform.html"){
</el-col>--> </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="会员人数" prop="memberNumber"> <el-form-item label="会员人数" prop="memberNumber">
<el-input-number v-model="formData.memberNumber" :min="0" :max="2000" style="width: 100%"></el-input-number> <el-input-number v-model="formData.memberNumber" :min="0" :max="2000"
style="width: 100%"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -192,14 +204,16 @@ layout("/layouts/platform.html"){
<el-col :span="12"> <el-col :span="12">
<el-form-item label="奖项" prop="prize"> <el-form-item label="奖项" prop="prize">
<el-select v-model="formData.prize" style="width: 100%"> <el-select v-model="formData.prize" style="width: 100%">
<el-option v-for="o in honorPrizeList" :key="o.id" :label="o.name" :value="o.id"></el-option> <el-option v-for="o in honorPrizeList" :key="o.id" :label="o.name"
:value="o.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖材料" prop="awardMaterials"> <el-form-item label="获奖材料" prop="awardMaterials">
<el-select v-model="formData.awardMaterials" multiple style="width: 100%"> <el-select v-model="formData.awardMaterials" multiple style="width: 100%">
<el-option v-for="o in honorAwardList" :key="o.id" :label="o.name" :value="o.id"></el-option> <el-option v-for="o in honorAwardList" :key="o.id" :label="o.name"
:value="o.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -219,11 +233,11 @@ layout("/layouts/platform.html"){
<el-col :span="12"> <el-col :span="12">
<el-form-item label="授予时间"> <el-form-item label="授予时间">
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
v-model="formData.grantDate" v-model="formData.grantDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -237,8 +251,10 @@ layout("/layouts/platform.html"){
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="级别"> <el-form-item label="级别">
<el-select v-model="formData.honorLevel" placeholder="请选择级别" style="width: 100%"> <el-select v-model="formData.honorLevel" placeholder="请选择级别"
<el-option v-for="o in honorLevelList" :key="o.id" :label="o.name" :value="o.id"></el-option> style="width: 100%">
<el-option v-for="o in honorLevelList" :key="o.id" :label="o.name"
:value="o.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -253,7 +269,8 @@ layout("/layouts/platform.html"){
</el-row> </el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="附件" prop="files"> <el-form-item label="附件" prop="files">
<file-upload card :files.sync="formData.files" :max-size="50 * 1024 * 1024"></file-upload> <file-upload card :files.sync="formData.files"
:max-size="50 * 1024 * 1024"></file-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
@@ -287,10 +304,17 @@ layout("/layouts/platform.html"){
userOptions: [], userOptions: [],
isEdit: false, isEdit: false,
firstInPage: true, firstInPage: true,
id: GetQueryString("id") ? GetQueryString("id") : "" id: GetQueryString("id") ? GetQueryString("id") : "",
} }
}, },
methods: { methods: {
async userRemoteMethod(query) {
if (query) {
this.userOptions = []
const resp = await this.$axios.post("/platform/honor/registration/listBeComfortedUser", {keyWord: query})
this.userOptions = resp.data
}
},
doBack() { doBack() {
if (GetQueryString("id")) { if (GetQueryString("id")) {
this.$store.dispatch("pjaxRoute", "/platform/honor/manage") this.$store.dispatch("pjaxRoute", "/platform/honor/manage")
@@ -311,7 +335,7 @@ layout("/layouts/platform.html"){
}) })
}, },
userChange(id) { userChange(id) {
this.$axios.post("/platform/honor/apply/getUserInfo", { id: id }).then((res) => { this.$axios.post("/platform/honor/apply/getUserInfo", {id: id}).then((res) => {
if (res.code === 0) { if (res.code === 0) {
this.setFormData(res.data) this.setFormData(res.data)
} }
@@ -330,7 +354,7 @@ layout("/layouts/platform.html"){
this.$set(this.formData, "political", user.political) this.$set(this.formData, "political", user.political)
}, },
async getUser(keyWord) { async getUser(keyWord) {
const resp = await this.$axios.post("/platform/condolence/apply/listBeComfortedUser", { keyWord: keyWord }) const resp = await this.$axios.post("/platform/condolence/apply/listBeComfortedUser", {keyWord: keyWord})
return resp.data return resp.data
}, },
async honorTypeChange(val) { async honorTypeChange(val) {
@@ -339,7 +363,7 @@ layout("/layouts/platform.html"){
const data = this.honorTypeList.find((v) => v.id === val) const data = this.honorTypeList.find((v) => v.id === val)
if (data) { if (data) {
this.$set(this.formData, "queryTypeCode", data.queryTypeCode) this.$set(this.formData, "queryTypeCode", data.queryTypeCode)
if(data.queryTypeCode === 'HONOR_LIST') { if (data.queryTypeCode === 'HONOR_LIST') {
this.$set(this.formData, "unionId", this.$store.state.user.union ? this.$store.state.user.union.id : "") this.$set(this.formData, "unionId", this.$store.state.user.union ? this.$store.state.user.union.id : "")
if (this.formData.unionId) { if (this.formData.unionId) {
this.searchUnionInfo(this.formData.unionId) this.searchUnionInfo(this.formData.unionId)
@@ -350,32 +374,29 @@ layout("/layouts/platform.html"){
} }
}, },
async getHonorPrize(honorType) { async getHonorPrize(honorType) {
const res = await this.$axios.post("/platform/honor/basic/settings/getData", { parentId: honorType }) const res = await this.$axios.post("/platform/honor/basic/settings/getData", {parentId: honorType})
return res.data return res.data
}, },
getHonorType() { async getHonorType() {
this.$axios.post("/platform/honor/basic/settings/getHonorType").then((res) => { const res = await this.$axios.post("/platform/honor/basic/settings/getHonorType")
if (res.code === 0) { if (res.code === 0) {
this.honorTypeList = res.data this.honorTypeList = res.data
} }
})
}, },
getHonorLevel() { async getHonorLevel() {
this.$axios.post("/platform/honor/basic/settings/getHonorLevel").then((res) => { const res = await this.$axios.post("/platform/honor/basic/settings/getHonorLevel")
if (res.code === 0) { if (res.code === 0) {
this.honorLevelList = res.data this.honorLevelList = res.data
} }
})
}, },
getHonorAwardType() { async getHonorAwardType() {
this.$axios.post("/platform/honor/basic/settings/getHonorAwardType").then((res) => { const res = await this.$axios.post("/platform/honor/basic/settings/getHonorAwardType")
if (res.code === 0) { if (res.code === 0) {
this.honorAwardList = res.data this.honorAwardList = res.data
} }
})
}, },
searchUnionInfo(id) { searchUnionInfo(id) {
this.$axios.post("/platform/honor/basic/settings/getUnionInfo", { id: id }).then((res) => { this.$axios.post("/platform/honor/basic/settings/getUnionInfo", {id: id}).then((res) => {
if (res.code === 0) { if (res.code === 0) {
this.formData.memberNumber = res.data.memberNumber this.formData.memberNumber = res.data.memberNumber
this.formData.unionLeader = res.data.username this.formData.unionLeader = res.data.username
@@ -383,29 +404,28 @@ layout("/layouts/platform.html"){
}) })
}, },
async findData(id) { async findData(id) {
const resp = await this.$axios.post(loc() + "/findData", { id: id }) const resp = await this.$axios.post(loc() + "/findData", {id: id})
const data1 = resp.data const data1 = resp.data
this.formData = resp.data this.formData = resp.data
if (this.formData.userId && this.formData.userId !== "") { if (this.formData.userId && this.formData.userId !== "") {
this.$nextTick(() => { await this.userRemoteMethod(this.formData.userName)
this.userChange(this.formData.userId)
})
} else { } else {
this.$set(this.formData, "userName", this.formData.userName) this.$set(this.formData, "userName", this.formData.userName)
} }
await this.honorTypeChange(data1.honorType) await this.honorTypeChange(data1.honorType)
this.$set(this.formData, "prize", data1.prize) /* this.$set(this.formData, "prize", data1.prize)
this.$set(this.formData, "honorLevel", data1.honorLevel) this.$set(this.formData, "honorLevel", data1.honorLevel)
this.$set(this.formData, "political", data1.political) this.$set(this.formData, "political", data1.political)
this.$set(this.formData, "post", data1.post) this.$set(this.formData, "post", data1.post)
this.$set(this.formData, "title", data1.title) this.$set(this.formData, "title", data1.title)
this.$set(this.formData, "unionId", data1.unionId) this.$set(this.formData, "unionId", data1.unionId)
this.$set(this.formData, "unionLeader", data1.unionLeader) this.$set(this.formData, "unionLeader", data1.unionLeader)*/
console.log(this.formData)
}, },
async initData() { async initData() {
this.getHonorType() await this.getHonorType()
this.getHonorLevel() await this.getHonorLevel()
this.getHonorAwardType() await this.getHonorAwardType()
this.unions = await this.$businessTool.listUnion() this.unions = await this.$businessTool.listUnion()
this.units = await this.$businessTool.listUnit() this.units = await this.$businessTool.listUnit()
/*this.$set(this.formData, "unionId", this.$store.state.user.union ? this.$store.state.user.union.id : "") /*this.$set(this.formData, "unionId", this.$store.state.user.union ? this.$store.state.user.union.id : "")
@@ -421,8 +441,8 @@ layout("/layouts/platform.html"){
} }
} }
}, },
created() { async created() {
this.initData() await this.initData()
if (GetQueryString("id")) { if (GetQueryString("id")) {
this.findData(GetQueryString("id")) this.findData(GetQueryString("id"))
} }
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/clubAudit/index.html
+1 -1
View File
@@ -145,7 +145,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(() => { }).then(() => {
this.$axios.post("/flow/common/executeTask", { this.$axios.post("/platform/outlay/reimburse/clubAudit/submit", {
data: JSON.stringify({ data: JSON.stringify({
...this.formData, ...this.formData,
submitType: val submitType: val
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html
+2 -13
View File
@@ -6,18 +6,8 @@ layout("/layouts/platform.html"){
<guava ref="guava"> <guava ref="guava">
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="关键字"> <search-item label="姓名/工号">
<el-input v-model="pageForm.searchKeyword" placeholder="请填写内容"> <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号"></el-input>
<el-select
slot="prepend"
v-model="pageForm.searchName"
placeholder="查询"
style="width: 100px;"
>
<el-option label="工号" value="op.loginName"></el-option>
<el-option label="姓名" value="op.userName"></el-option>
</el-select>
</el-input>
</search-item> </search-item>
<search-item label="教代会"> <search-item label="教代会">
<el-select <el-select
@@ -137,7 +127,6 @@ layout("/layouts/platform.html"){
return { return {
pageDataUrl: "/platform/executiveCommittee/executiveCommitteeMember/pageData", pageDataUrl: "/platform/executiveCommittee/executiveCommitteeMember/pageData",
pageForm: { pageForm: {
searchName: 'op.userName',
}, },
teacherMeets: [], teacherMeets: [],
unionOptions: [], unionOptions: [],
src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/clubAudit/index.html
+1 -1
View File
@@ -121,7 +121,7 @@ layout("/layouts/platform_h5.html"){
title: '温馨提示', title: '温馨提示',
message: '您确定要提交吗？', message: '您确定要提交吗？',
}).then(() => { }).then(() => {
this.$axios.post('/flow/common/executeTask', { this.$axios.post('/platform/outlay/reimburse/clubAudit/submit', {
data: JSON.stringify({ data: JSON.stringify({
...this.formData, ...this.formData,
submitType: val submitType: val