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

Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

Browse Source
This commit is contained in:
c-zhouhf1
2025-10-19 17:18:40 +08:00
parent d36cbacf66 b6d7127ec7
commit 908c8d4d76
159 changed files with 625 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java
+1 -1
View File
@@ -204,7 +204,7 @@ public class FamilyActivityApplyController {
if(Lang.isEmpty(courseList)) {
return Result.success(new ArrayList<>());
}
List<String> assortList = courseList.stream().map(FamilyCourse::getAssort).filter(StrUtil::isNotBlank).toList();
List<String> assortList = courseList.stream().map(FamilyCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList();
return Result.success(assortList);
}
src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyUserManageController.java
+3
View File
@@ -210,6 +210,9 @@ public class FamilyUserManageController {
excelCommonExportEntity.add(new ExcelExportEntity("签到时间", "attendTimeExcel", 22));
for (FamilyCourse c : courseList) {
if(!c.isMobileSign()) {
continue;
}
String courseId = c.getId();
String courseName = c.getCourseName();
List<NutMap> v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList());
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java
+1 -1
View File
@@ -208,7 +208,7 @@ public class TrainSignUpApplyController {
if (Lang.isEmpty(courseList)) {
return Result.success(new ArrayList<>());
}
List<String> assortList = courseList.stream().map(TrainSignUpCourse::getAssort).filter(StrUtil::isNotBlank).toList();
List<String> assortList = courseList.stream().map(TrainSignUpCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList();
return Result.success(assortList);
}
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpUserManageController.java
+3
View File
@@ -208,6 +208,9 @@ public class TrainSignUpUserManageController {
excelCommonExportEntity.add(new ExcelExportEntity("签到时间", "attendTimeExcel", 22));
for (TrainSignUpCourse c : courseList) {
if(!c.isMobileSign()) {
continue;
}
String courseId = c.getId();
String courseName = c.getCourseName();
List<NutMap> v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList());
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java
+2 -2
View File
@@ -133,8 +133,8 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
u.id as userId,
u.loginname,
u.username,
u.unitname,
u.unionname,
u.unitName,
u.unionName,
u.sex,
ifnull(tsuu.mobile, u.mobile) as mobile,
tsuu.signUpTime,
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpUserServiceImpl.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class TrainSignUpUserServiceImpl extends BaseServiceImpl<TrainSignUpBlack
u.username,
u.loginname,
ifnull(tsuu.mobile, u.mobile) as mobile,
u.unitname,
u.unionname,
u.unitName,
u.unionName,
tsuc.courseName,
tsuu.state,
( SELECT count( 1 ) FROM train_sign_up_user_course WHERE userId = tsuu.userId $var) courseTotal,
src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/controller/FundMemberCommonController.java
+13 -1
View File
@@ -3,6 +3,7 @@ package com.budwk.app.zhgh.dayofficework.fund.member.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.SysOfficeTemplateUtil;
@@ -10,6 +11,7 @@ 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.vo.ProcessTaskVO;
import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.zhgh.dayofficework.fund.member.models.FundMemberApply;
import com.budwk.app.zhgh.dayofficework.fund.member.service.FundMemberService;
import com.deepoove.poi.XWPFTemplate;
@@ -21,6 +23,7 @@ import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Lang;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
@@ -51,7 +54,13 @@ public class FundMemberCommonController {
@At
@SaCheckPermission("fundMember")
public Result info(@Valid String id) {
FundMemberApply fundMember = fundMemberService.fetch(id);
FundMemberApply fundMember;
Sys_user user = dao.fetch(Sys_user.class, Cnd.where("id", "=", id));
if (Lang.isNotEmpty(user)) {
fundMember = fundMemberService.fetch(Cnd.where("loginname", "=", user.getLoginname()));
} else {
fundMember = fundMemberService.fetch(id);
}
return Result.success(fundMember);
}
@@ -66,6 +75,9 @@ public class FundMemberCommonController {
docData.put("birthday", DateUtil.format(fundMember.getBirthday(), "yyyy年MM月dd日"));
docData.put("joinWorkTime", DateUtil.format(fundMember.getJoinWorkTime(), "yyyy年MM月dd日"));
docData.put("retireTime", DateUtil.format(fundMember.getRetireTime(), "yyyy年MM月dd日"));
if (StrUtil.isNotBlank(fundMember.getAvatar())) {
docData.put("avatar", sysOfficeTemplateUtil.createPictureRenderData(fundMember.getAvatar()));
}
// 流程实例
ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", id));
src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/controller/FundMemberQueryController.java
+8 -1
View File
@@ -8,12 +8,15 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.date.DateUtil;
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.page.Pagination;
import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.sys.models.Sys_user;
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.dayofficework.fund.member.models.FundMemberApply;
import com.budwk.app.zhgh.dayofficework.fund.member.models.FundMemberHis;
@@ -100,7 +103,11 @@ public class FundMemberQueryController {
public void exportExcel(Integer year, String unionId, HttpServletResponse response) {
Cnd cnd = Cnd.NEW();
cnd.and("YEAR(submitTime)", "=", year);
cnd.andEX("unionId", "=", unionId);
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
cnd.and("unionId", "=", SecurityUtil.getUnionId());
} else {
cnd.andEX("unionId", "=", unionId);
}
cnd.andEX(FundMemberApply::getIsJoin, "=", 1);
cnd.asc("unionId");
List<FundMemberApply> list = fundMemberService.query(cnd);
src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/controller/FundMemberWriteController.java
+21
View File
@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.dayofficework.fund.member.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.result.Result;
import com.budwk.app.flow.constant.FlowConst;
@@ -12,6 +13,7 @@ import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
import com.budwk.app.flow.service.FlowCommonService;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.dayofficework.fund.member.models.FundMemberApply;
import com.budwk.app.zhgh.dayofficework.fund.member.service.FundMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nutz.aop.interceptor.ioc.TransAop;
@@ -37,6 +39,8 @@ public class FundMemberWriteController {
@Inject
private FlowEngine flowEngine;
@Inject
private FundMemberService fundMemberService;
@Inject
private FlowCommonService flowCommonService;
@At("")
@@ -51,6 +55,9 @@ public class FundMemberWriteController {
@ApiOperation("保存申请")
@SLog(tag = "建言献策-填写申请", msg = "保存申请")
public Result save(@Param("data") FundMemberApply fundMember) {
if (StrUtil.isBlank(fundMember.getId())) {
fundMemberService.validateApply();
}
dao.insertOrUpdate(fundMember);
return Result.success();
}
@@ -62,6 +69,9 @@ public class FundMemberWriteController {
@Aop(TransAop.READ_COMMITTED)
@SLog(tag = "基金会员-填写申请", msg = "提交申请")
public Result submit(@Param("data") FundMemberApply fundMember) {
if (StrUtil.isBlank(fundMember.getId())) {
fundMemberService.validateApply();
}
fundMember.setSubmitTime(new Date());
fundMember.setIsJoin(true);
dao.insertOrUpdate(fundMember);
@@ -86,6 +96,9 @@ public class FundMemberWriteController {
@Aop(TransAop.READ_COMMITTED)
@SLog(tag = "基金会员-填写申请", msg = "重新提交申请")
public Result submitAgain(@Param("data") FundMemberApply fundMember, @Param("taskId") Long taskId) {
if (StrUtil.isBlank(fundMember.getId())) {
fundMemberService.validateApply();
}
dao.insertOrUpdate(fundMember);
Dict dict = Dict.create();
@@ -103,4 +116,12 @@ public class FundMemberWriteController {
return Result.success(box);
}
@At
@SaCheckPermission("fundMember.write")
@ApiOperation("校验是否有申请在流程中")
public Result validateApply(){
fundMemberService.validateApply();
return Result.success();
}
}
src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/FundMemberService.java
+5
View File
@@ -4,4 +4,9 @@ import com.budwk.app.base.service.BaseService;
import com.budwk.app.zhgh.dayofficework.fund.member.models.FundMemberApply;
public interface FundMemberService extends BaseService<FundMemberApply> {
/**
* 验证是否已经申请了
*/
void validateApply();
}
src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/impl/FundMemberServiceImpl.java
+25
View File
@@ -1,14 +1,39 @@
package com.budwk.app.zhgh.dayofficework.fund.member.service.impl;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.flow.entity.ProcessInstance;
import com.budwk.app.flow.enums.ProcessTaskStateEnum;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.dayofficework.fund.member.models.FundMemberApply;
import com.budwk.app.zhgh.dayofficework.fund.member.service.FundMemberService;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Lang;
@IocBean(args = {"refer:dao"})
public class FundMemberServiceImpl extends BaseServiceImpl<FundMemberApply> implements FundMemberService {
public FundMemberServiceImpl(Dao dao) {
super(dao);
}
@Override
public void validateApply() {
FundMemberApply apply = dao().fetch(FundMemberApply.class,
Cnd.where(FundMemberApply::getLoginName, "=", SecurityUtil.getUserLoginname())
.and("isJoin", "=", 1)
.desc("submitTime"));
if (Lang.isEmpty(apply)) {
return;
}
int count = dao().count(ProcessInstance.class, Cnd.where("businessNo", "=", apply.getId())
.and(ProcessInstance::getState, "=", ProcessTaskStateEnum.DOING.getCode()));
if (count > 0) {
throw new RuntimeException("您有申请流程正在进行中，请等待流程结束后再次操作");
}
}
}
src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyApplyController.java
+1 -1
View File
@@ -208,7 +208,7 @@ public class LiteracyApplyController {
if (Lang.isEmpty(courseList)) {
return Result.success(new ArrayList<>());
}
List<String> assortList = courseList.stream().map(LiteracyCourse::getAssort).filter(StrUtil::isNotBlank).toList();
List<String> assortList = courseList.stream().map(LiteracyCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList();
return Result.success(assortList);
}
src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyUserManageController.java
+3
View File
@@ -208,6 +208,9 @@ public class LiteracyUserManageController {
excelCommonExportEntity.add(new ExcelExportEntity("签到时间", "attendTimeExcel", 22));
for (LiteracyCourse c : courseList) {
if(!c.isMobileSign()) {
continue;
}
String courseId = c.getId();
String courseName = c.getCourseName();
List<NutMap> v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList());
src/main/java/com/budwk/app/zhgh/dayofficework/qsv/service/impl/QsvSurveyServiceImpl.java
+2 -2
View File
@@ -300,8 +300,8 @@ public class QsvSurveyServiceImpl extends BaseServiceImpl<QsvUserAnswerRecord> i
List<ExcelExportEntity> excelExportEntities = new ArrayList<>();
excelExportEntities.add(new ExcelExportEntity("工号", "loginName", 20));
excelExportEntities.add(new ExcelExportEntity("姓名", "userName", 20));
excelExportEntities.add(new ExcelExportEntity("单位", "unitName", 20));
excelExportEntities.add(new ExcelExportEntity("分工会", "unionName", 20));
excelExportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20));
excelExportEntities.add(new ExcelExportEntity("所属单位", "unitName", 20));
excelExportEntities.add(new ExcelExportEntity("联系方式", "mobile", 20));
for (QsvSubject subject : subjects) {
excelExportEntities.add(new ExcelExportEntity(subject.getTitle(), subject.getId(), 20));
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskGroupAuditController.java
+14
View File
@@ -0,0 +1,14 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
import org.nutz.ioc.loader.annotation.IocBean;
/**
* @version 1.0
* @Author FKY
* @name：CheckTaskGroupAuditController
* @Date 2025/10/17 16:46
* @注释
*/
@IocBean
public class CheckTaskGroupAuditController {
}
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskSingleController.java
+34
View File
@@ -1,5 +1,16 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.budwk.app.base.result.Result;
import com.budwk.app.zhgh.staffmanage.personnelcheck.service.CheckTaskCommonService;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
/**
* @version 1.0
* @Author FKY
@@ -7,5 +18,28 @@ package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
* @Date 2025/10/15 10:48
* @注释
*/
@Slf4j
@IocBean
@Api("个人核对")
@Ok("json:full")
@At("/platform/personnel/check/verification/manage")
public class CheckTaskSingleController {
@Inject
private Dao dao;
@Inject
private CheckTaskCommonService checkTaskCommonService;
@At("/")
@SaCheckPermission("personnel.check.verification.single")
@Ok("beetl:/platform/zhgh/staffmanage/personnelcheck/single/index.html")
public void index() {
}
@At
@SaCheckPermission("personnel.check.verification.single")
public Result getSingleCheckTask(){
return Result.success();
}
}
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskVerificationController.java
+20 -7
View File
@@ -1,6 +1,8 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.budwk.app.base.annotation.SLog;
@@ -40,8 +42,8 @@ import org.nutz.mvc.upload.UploadAdaptor;
*/
@Slf4j
@IocBean
@Ok("json:full")
@Api("核对任务")
@Ok("json:full")
@At("/platform/personnel/check/verification/manage")
public class CheckTaskVerificationController {
@@ -79,9 +81,6 @@ public class CheckTaskVerificationController {
@SaCheckPermission("personnel.check.verification.manage")
@AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
public Result doAddOrModify(@Param("baseData") String data, TempFile file){
log.info("=================================主体数据：{}", data);
log.info("=================================导入文件：{}", file);
CheckTaskVerificationVO vo = JSONUtil.toBean(data, CheckTaskVerificationVO.class);
if (StrUtil.isNotBlank(vo.getId())) {
@@ -89,14 +88,28 @@ public class CheckTaskVerificationController {
// 1.重新配置核对字段，filedConfigData
dao.clear(CheckTaskFiledConfig.class, Cnd.where("taskId", "=", vo.getId()));
// 2.重新设置待核对人员表，personnelData
// dao.clear(Check)
dao.clear(CheckTaskPersonnel.class, Cnd.where("taskId", "=", vo.getId()));
}
// 修改审核流程配置
// 插入逻辑
// 1.界面可能会对相关审核步骤做修改，修改审核流程配置
dao.update(vo.getBusinessConfig());
// 2.新增或者修改事项任务
CheckTaskVerification verification = new CheckTaskVerification();
verification.setId(vo.getId());
verification.setCreateTime(vo.getCreateTime() == null ? DateUtil.date() : vo.getCreateTime());
verification.setYear(DateUtil.year(verification.getCreateTime()));
dao.insertOrUpdate(verification);
// 3.往字段表里面插入数据，最好做下字段映射，把相关字段与数据库的字段对应
// todo 字段映射
// 4.读取文件，构造数据（动态字段 data），往 CheckTaskPersonnel 表中插入数据
// todo 读取文件 转换成数据
log.info("=================================数据转换：{}", vo);
return Result.success();
}
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/vo/CheckTaskVerificationVO.java
+6
View File
@@ -36,6 +36,12 @@ public class CheckTaskVerificationVO {
@ApiModelProperty("结束时间")
private Date endTime;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("状态")
private String status;
@ApiModelProperty("业务配置数据")
private CheckTaskBusinessConfig businessConfig;
src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
+3 -3
View File
@@ -97,11 +97,11 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl<WelfareProject
for (NutMap union : mapUnions) {
// 福利人数
long teacherSum = welfareSelectionList.stream().filter(v -> v.getString("welfareUnionId", "").equals(union.getString("id"))).count();
long teacherSum = welfareSelectionList.stream().filter(v -> StrUtil.isNotBlank(v.getString("welfareUnionId")) && v.getString("welfareUnionId", "").equals(union.getString("id"))).count();
union.put("teacherSum", teacherSum);
// 已选人数
long selectedNum = welfareSelectionList.stream().filter(v -> v.getString("welfareUnionId", "").equals(union.getString("id")) && v.getBoolean("has_selected")).count();
long selectedNum = welfareSelectionList.stream().filter(v -> StrUtil.isNotBlank(v.getString("welfareUnionId")) && v.getString("welfareUnionId", "").equals(union.getString("id")) && v.getBoolean("has_selected")).count();
union.put("selectedNum", selectedNum);
// 未选人数
@@ -109,7 +109,7 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl<WelfareProject
// 各选项的选择人数
for (WelfareProjectSubjectOption option : welfareOptions) {
long count = userSelections.stream().filter(v -> v.getString("welfareUnionId").equals(union.getString("id")) && StrUtil.isNotBlank(v.getString("selectOptionId")) && v.getString("selectOptionId").equals(option.getId())).map(v -> v.getString("selectUserId")).distinct().count();
long count = userSelections.stream().filter(v -> StrUtil.isNotBlank(v.getString("welfareUnionId")) && v.getString("welfareUnionId").equals(union.getString("id")) && StrUtil.isNotBlank(v.getString("selectOptionId")) && v.getString("selectOptionId").equals(option.getId())).map(v -> v.getString("selectUserId")).distinct().count();
union.put(option.getId(), count);
}
}
src/main/resources/static/assets/platform/css/common.css
+1 -1
View File
@@ -553,7 +553,7 @@ td.no-b {
}
.el-transfer__buttons {
width: 200px;
/*width: 200px;*/
text-align: center;
}
src/main/resources/static/components/module/activity/UserDataScope.vue
+7 -7
View File
@@ -3,7 +3,7 @@
<el-card shadow="never">
<div class="search">
<div class="search-item">
<div class="search-item-label">活动分组：</div>
<div class="search-item-label">活动分组</div>
<div class="search-item-option">
<el-select
placeholder="活动分组"
@@ -26,10 +26,10 @@
</div>
<div class="search-item">
<div class="search-item-label">姓名工号：</div>
<div class="search-item-label">姓名/工号</div>
<div class="search-item-option">
<el-input
placeholder="请输入内容"
placeholder="请输入姓名或工号"
clearable
v-model="pageForm.searchKeyword"
style="width: 100%"
@@ -44,7 +44,7 @@
</div>
<div class="search-item" v-if="is_sysadmin || is_A06">
<div class="search-item-label">所属工会：</div>
<div class="search-item-label">所属工会</div>
<div class="search-item-option">
<el-select
placeholder="所属工会"
@@ -61,7 +61,7 @@
</div>
<div class="search-item">
<div class="search-item-label">所属单位：</div>
<div class="search-item-label">所属单位</div>
<div class="search-item-option">
<el-select placeholder="所属单位" v-model="pageForm.unitId" style="width: 100%" clearable @change="doSearch"
filterable>
@@ -100,7 +100,7 @@
</div>-->
<div class="search-item">
<div class="search-item-label">教职工类别：</div>
<div class="search-item-label">教职工类别</div>
<div class="search-item-option">
<dict-select v-model="pageForm.personType" code="USER_PERSON_TYPE" @change="doSearch"
style="width: 100%"></dict-select>
@@ -108,7 +108,7 @@
</div>
<div class="search-item">
<div class="search-item-label">在职状态：</div>
<div class="search-item-label">在职状态</div>
<div class="search-item-option">
<dict-select
v-model="pageForm.userState"
src/main/resources/static/components/plugins/sysUserAuditOpinion/index.vue
+1 -1
View File
@@ -16,7 +16,7 @@
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="意见内容">
<template slot-scope="scope">
<el-input v-model="scope.row.text" placeholder="请输入内容" max="50"></el-input>
<el-input v-model="scope.row.text" placeholder="请输入意见内容" max="50"></el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="100px">
src/main/resources/views/platform/bpm/cfg/design/index.html
+2 -2
View File
@@ -6,10 +6,10 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker placeholder="按年度查询" type="year" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
<el-date-picker placeholder="请选择年度" type="year" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="活动主题">
<el-input clearable placeholder="请输入内容" v-model="pageForm.searchKeyword"></el-input>
<el-input clearable placeholder="请输入活动主题" v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
</el-card>
src/main/resources/views/platform/sys/data/user/pull.html
+2 -2
View File
@@ -32,10 +32,10 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="姓名">
<el-input placeholder="请输入内容" clearable v-model="pageForm.userName" style="width: 100%"></el-input>
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName" style="width: 100%"></el-input>
</search-item>
<search-item label="工号">
<el-input placeholder="请输入内容" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
<el-input placeholder="请输入工号" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
</search-item>
<search-item label="所属单位">
<el-select placeholder="请选择所属单位" v-model="pageForm.unitName" clearable filterable>
src/main/resources/views/platform/sys/data/user/update.html
+2 -2
View File
@@ -26,10 +26,10 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="姓名">
<el-input placeholder="请输入内容" clearable v-model="pageForm.userName" style="width: 100%"></el-input>
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName" style="width: 100%"></el-input>
</search-item>
<search-item label="工号">
<el-input placeholder="请输入内容" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
<el-input placeholder="请输入工号" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
</search-item>
<search-item label="所属单位">
<el-select placeholder="请选择所属单位" v-model="pageForm.unitId" clearable style="width: 100%">
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/form.html
+18 -18
View File
@@ -3,7 +3,7 @@
<el-descriptions :column="2" border>
<el-descriptions-item label="活动名称">
<el-form-item prop="activityName">
<el-input placeholder="请输入内容" style="width: 100%" v-model="formData.activityName">
<el-input placeholder="请输入活动名称" style="width: 100%" v-model="formData.activityName">
</el-input>
</el-form-item>
</el-descriptions-item>
@@ -20,13 +20,13 @@
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="申请人姓名">
<el-form-item prop="userName">
<el-input disabled type="text" v-model="formData.userName"></el-input>
</el-form-item>
</el-descriptions-item>
<template v-if="formData.activityType == 'CLUB'">
<el-descriptions-item label="申请协会">
<el-form-item prop="clubId" label="申请协会">
@@ -49,7 +49,7 @@
</el-form-item>
</el-descriptions-item>
</template>
<el-descriptions-item label="联系方式">
<el-form-item prop="mobile">
<el-input type="text" v-model="formData.mobile" placeholder="请输入联系方式" maxlength="11"></el-input>
@@ -60,8 +60,8 @@
<el-input disabled type="text" v-model="formData.applyTime"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动计划时间">
<el-form-item prop="planDate">
<el-date-picker
@@ -80,14 +80,14 @@
<el-input-number v-model="formData.activityNumber" placeholder="请输入活动人数"></el-input-number>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动地址" :span="2">
<el-form-item prop="activityAddress">
<el-input maxlength="150" placeholder="请填写活动地址" type="text"
v-model="formData.activityAddress"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动预算费用" :span="2">
<el-form-item prop="budgets">
<el-table :data="formData.budgets" border max-height="500" size="mini" style="width: 100%">
@@ -129,13 +129,13 @@
</el-table>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动方案及简介" :span="2">
<el-form-item prop="activityContent">
<text-editor v-model="formData.activityContent"></text-editor>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="附件" :span="2">
<el-form-item prop="files">
<file-upload :value.sync="formData.files"
@@ -145,7 +145,7 @@
complete_result></file-upload>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
@@ -153,7 +153,7 @@
</el-descriptions-item>
</el-descriptions>
</el-form>
<snaker-flow-task-form-action @task-action="handleTaskAction" @save-draft="handleSaveDraft"></snaker-flow-task-form-action>
</div>
@@ -168,7 +168,7 @@
formData: {
id: GetQueryString("businessId"),
},
formRules: {
activityName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
activityType: [{required: true, message: '必填', trigger: ['blur', 'change']}],
@@ -179,7 +179,7 @@
mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
},
activityDeclareReimbursementList: [],
clubList: [],
}
@@ -189,12 +189,12 @@
handleTaskAction(val) {
this.$refs.formRef.validate((valid) => {
if (valid) {
if (this.formData.planDate && this.formData.planDate.length > 0) {
this.formData.planStartTime = this.formData.planDate[0]
this.formData.planEndTime = this.formData.planDate[1]
}
if (!this.instanceId) {
this.handleApply(val)
} else {
@@ -275,7 +275,7 @@
},
// 取消
handleCancel() {
},
// 设置申报主体名称
setDeclareUnitName(val){
@@ -328,5 +328,5 @@
.el-descriptions-item__label {
width: 15% !important;
}
</style>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html
+1 -1
View File
@@ -17,7 +17,7 @@ layout("/layouts/platform.html"){
<el-descriptions :column="2" border>
<el-descriptions-item label="活动名称">
<el-form-item prop="activityName">
<el-input placeholder="请输入内容" style="width: 100%" v-model="formData.activityName">
<el-input placeholder="请输入活动名称" style="width: 100%" v-model="formData.activityName">
</el-input>
</el-form-item>
</el-descriptions-item>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/branchunion/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/index.html
+11 -11
View File
@@ -7,18 +7,18 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy">
</el-date-picker>
</search-item>
<search-item label="申请人">
<el-input placeholder="请输入申请人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
@@ -28,7 +28,7 @@ layout("/layouts/platform.html"){
</search-item>
</search>
</el-card>
<el-card shadow="never" class="mt10">
<table-tool :app="this" label="审批列表">
<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -36,12 +36,12 @@ layout("/layouts/platform.html"){
<el-radio-button label="false">未审核</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
ref="table" row-key="id" style="width: 100%">
<el-table-column :index="indexMethod" header-align="center" label="序号"
type="index" width="60px"></el-table-column>
<el-table-column
:label="column.label"
:prop="column.prop"
@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #edit>
<info ref="infoRef">
<div v-if="showApprovalForm">
@@ -104,7 +104,7 @@ layout("/layouts/platform.html"){
<script>
<!--#include("../common/info.js"){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
@@ -129,7 +129,7 @@ layout("/layouts/platform.html"){
unions: [],
units: [],
clubs: [],
// 审核相关
formData: {},
showApprovalForm: false
@@ -155,7 +155,7 @@ layout("/layouts/platform.html"){
this.$refs.infoRef.onOpen(row)
})
},
handleTaskAction(val) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
@@ -176,7 +176,7 @@ layout("/layouts/platform.html"){
})
})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html
+11 -11
View File
@@ -7,18 +7,18 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy">
</el-date-picker>
</search-item>
<search-item label="申请人">
<el-input placeholder="请输入申请人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
@@ -28,7 +28,7 @@ layout("/layouts/platform.html"){
</search-item>
</search>
</el-card>
<el-card shadow="never" class="mt10">
<table-tool :app="this" label="审批列表">
<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -36,12 +36,12 @@ layout("/layouts/platform.html"){
<el-radio-button label="false">未审核</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
ref="table" row-key="id" style="width: 100%">
<el-table-column :index="indexMethod" header-align="center" label="序号"
type="index" width="60px"></el-table-column>
<el-table-column
:label="column.label"
:prop="column.prop"
@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #edit>
<info ref="infoRef">
<div v-if="showApprovalForm">
@@ -104,7 +104,7 @@ layout("/layouts/platform.html"){
<script>
<!--#include("../common/info.js"){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
@@ -129,7 +129,7 @@ layout("/layouts/platform.html"){
unions: [],
units: [],
clubs: [],
// 审核相关
formData: {},
showApprovalForm: false
@@ -155,7 +155,7 @@ layout("/layouts/platform.html"){
this.$refs.infoRef.onOpen(row)
})
},
handleTaskAction(val) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
@@ -176,7 +176,7 @@ layout("/layouts/platform.html"){
})
})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/activity/family/apply/index.html
+3 -3
View File
@@ -58,9 +58,9 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -68,7 +68,7 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="活动状态：">
<search-item label="活动状态">
<el-select v-model="pageForm.activityType" @change="doSearch" style="width: 100%"
placeholder="请选择活动状态" filterable>
<el-option :value="1" label="全部"></el-option>
src/main/resources/views/platform/zhgh/activity/family/manage/index.html
+2 -2
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
@change="doSearch"
placeholder="请选择年度"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称：">
<search-item label="活动名称">
<el-input
@keyup.enter.native="doSearch"
clearable
src/main/resources/views/platform/zhgh/activity/family/statistics/index.html
+2 -2
View File
@@ -14,7 +14,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="请选择年度"
type="year"
@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称：">
<search-item label="活动名称">
<el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/activity/family/userAdjust/index.html
+2 -2
View File
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="请选择年度"
type="year"
@@ -20,7 +20,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称：">
<search-item label="活动名称">
<el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/activity/family/userAdjust/userInfo.js
-1
View File
@@ -51,7 +51,6 @@ const userInfo = {
<el-table-column label="单选" width="160">
<template v-slot="{row}">
<el-radio
:label="row.id"
@change.native="getCurrentRow(row)"
:disabled="(row.courseReservedNumber + row.registerNum) >= row.coursePeopleNumber"
v-model="afterAdjustCourse"
src/main/resources/views/platform/zhgh/activity/family/userManage/index.html
+6 -6
View File
@@ -6,16 +6,16 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称：">
<search-item label="活动名称">
<el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
<el-option :label="item.courseName" :value="item.id" v-for="item in courseList" :key="item.id"></el-option>
</el-select>
</search-item>
<search-item label="人员信息：">
<search-item label="人员信息">
<el-input clearable placeholder="输入姓名或者工号搜索" v-model="pageForm.userKeyWord"></el-input>
</search-item>
</search>
@@ -108,8 +108,8 @@ layout("/layouts/platform.html"){
{ label: "姓名", prop: "username" },
{ label: "工号", prop: "loginname" },
{ label: "联系方式", prop: "mobile" },
{ label: "单位", prop: "unitName", sortable: true },
{ label: "分工会", prop: "unionName", sortable: true },
{ label: "单位", prop: "unitname", sortable: true },
{ label: "分工会", prop: "unionname", sortable: true },
{ label: "课程", prop: "courseNames", sortable: true },
{ label: "缺席次数", prop: "absentCount" },
{ label: "是否黑名单", prop: "isDisabled", sortable: true }
src/main/resources/views/platform/zhgh/activity/fitnesswalk/activityManage.html
+4 -4
View File
@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
</el-date-picker>
</search-item>
<search-item label="活动名称">
<el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"
<el-input placeholder="请输入活动名称" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
@@ -425,7 +425,7 @@ layout("/layouts/platform.html"){
</el-col>
<span style="color: #ac3111;margin-left: 160px;top: -15px;position: relative">如果没有天数，此项请勿填写；例如：达标80000步抽奖，请在抽奖资格步数中填写80000即可</span>
</el-row>
<el-row :gutter="20" v-if="formData.lotteryQualificationDays && formData.lotteryQualificationSteps">
<el-col :span="12">
<el-form-item label="积分模式" prop="isPoints" :rules="[{ required:true, message: '必填' }]">
@@ -435,7 +435,7 @@ layout("/layouts/platform.html"){
</el-radio-group>
</el-form-item>
</el-col>
<template v-if="formData.isPoints">
<el-col :span="12">
<el-form-item label="达标积分" prop="lotteryQualificationPoints" :rules="[{ required:true, message: '必填' }]">
@@ -453,7 +453,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
</template>
</el-row>
</template>
src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html
+6 -6
View File
@@ -18,7 +18,7 @@ layout("/layouts/platform.html"){
placeholder="选择年">
</el-date-picker>
</search-item>
<search-item label="活动">
<el-cascader
style="width: 100%"
@@ -28,12 +28,12 @@ layout("/layouts/platform.html"){
:props="{ checkStrictly: true,emitPath:false}"
:clearable="false"></el-cascader>
</search-item>
<search-item label="姓名工号">
<el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"
<search-item label="姓名/工号">
<el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"></el-input>
</search-item>
<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')">
<search-item label="所属工会">
<el-select @change="unionChange" clearable filterable style="width: 100%"
@@ -46,7 +46,7 @@ layout("/layouts/platform.html"){
</el-option>
</el-select>
</search-item>
<search-item label="所属单位">
<el-select @change="doSearch" clearable filterable style="width: 100%"
placeholder="请选择所属单位" v-model="pageForm.unitId">
src/main/resources/views/platform/zhgh/activity/planSummary/yearPlan/index.html
+2 -2
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="请选择年度"
type="year"
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="计划名称：">
<search-item label="计划名称">
<el-input
@keyup.enter.native="doSearch"
clearable
src/main/resources/views/platform/zhgh/activity/planSummary/yearSummary/index.html
+2 -2
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="请选择年度"
type="year"
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="总结类型：">
<search-item label="总结类型">
<el-select v-model="pageForm.summaryType" placeholder="请选择总结类型"
clearable style="width: 100%;" @change="doSearch">
<el-option v-for="item in dict.type.SUMMARY_TYPE" :label="item.name" :value="item.code" :key="item.code"></el-option>
src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js
+1 -1
View File
@@ -192,7 +192,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
prop="mobile" width="150">
<template v-slot="{row}">
<el-input placeholder="请输入联系方式"
v-model="row.mobile"></el-input>
v-model="row.mobile" maxlength="11"></el-input>
</template>
</el-table-column>
src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html
+15 -5
View File
@@ -18,6 +18,13 @@ layout("/layouts/platform.html"){
.el-carousel__container {
height: 250px !important;
}
.one-line {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
}
</style>
<div id="app" v-cloak>
<guava ref="guava">
@@ -27,7 +34,7 @@ layout("/layouts/platform.html"){
<search-item label="年度">
<el-date-picker
@change="activityInfoData"
placeholder="选择年"
placeholder="请选择年度"
style="width: 100%"
type="year"
v-model="pageForm.year"
@@ -125,10 +132,13 @@ layout("/layouts/platform.html"){
报名未开始
</el-tag>
</div>
<div class="text e-item">
<span style="color: gray">活动地址：</span>
{{item.address}}
</div>
<el-tooltip :disabled="item.address.length <= 15"
:content="item.address" placement="top">
<div class="text e-item one-line">
<span style="color: gray">活动地址：</span>
{{ item.address }}
</div>
</el-tooltip>
<div class="text e-item">
<span style="color: gray">报名时间：</span>
{{$moment(item.applyStartTime).format('YYYY/MM/DD HH:mm')}}
src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="activityInfoData">
<search-item label="">
<search-item label="年度">
<el-date-picker
@change="activityInfoData"
placeholder="选择年"
src/main/resources/views/platform/zhgh/activity/sports/infoManage/index.html
+1 -1
View File
@@ -9,7 +9,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="选择年"
placeholder="请选择年度"
style="width: 100%"
type="year"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/activity/sports/reading/index.html
+2 -2
View File
@@ -40,12 +40,12 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="院级工会">
<search-item label="所属工会">
<el-select
@change="unionIdChange"
clearable
filterable
placeholder="院级工会筛选"
placeholder="请选择所属工会"
style="width: 100%; font-weight: bold"
v-model="pageForm.unionid"
>
src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html
+2 -2
View File
@@ -10,9 +10,9 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/index.html
+2 -2
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
@change="doSearch"
placeholder="请选择年度"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称：">
<search-item label="活动名称">
<el-input
@keyup.enter.native="doSearch"
clearable
src/main/resources/views/platform/zhgh/activity/trainSignUp/statistics/index.html
+2 -2
View File
@@ -14,7 +14,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="请选择年度"
type="year"
@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称：">
<search-item label="活动名称">
<el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/index.html
+2 -2
View File
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="请选择年度"
type="year"
@@ -20,7 +20,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称：">
<search-item label="活动名称">
<el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js
+3
View File
@@ -206,6 +206,9 @@ const userInfo = {
async getCourse(val) {
const {data} = await this.$axios.post(loc() + "/getCourse", {activityId: val})
this.courseList = data
},
async getUnitList() {
this.unitList = await this.$businessTool.listUnit(this.registerForm.unionId)
}
},
async created() {
src/main/resources/views/platform/zhgh/activity/trainSignUp/userManage/index.html
+6 -6
View File
@@ -6,16 +6,16 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称：">
<search-item label="活动名称">
<el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
<el-option :label="item.courseName" :value="item.id" v-for="item in courseList" :key="item.id"></el-option>
</el-select>
</search-item>
<search-item label="人员信息：">
<search-item label="人员信息">
<el-input clearable placeholder="输入姓名或者工号搜索" v-model="pageForm.userKeyWord"></el-input>
</search-item>
</search>
@@ -108,8 +108,8 @@ layout("/layouts/platform.html"){
{ label: "姓名", prop: "username" },
{ label: "工号", prop: "loginname" },
{ label: "联系方式", prop: "mobile" },
{ label: "单位", prop: "unitName", sortable: true },
{ label: "分工会", prop: "unionName", sortable: true },
{ label: "单位", prop: "unitname", sortable: true },
{ label: "分工会", prop: "unionname", sortable: true },
{ label: "课程", prop: "courseNames", sortable: true },
{ label: "缺席次数", prop: "absentCount" },
{ label: "是否黑名单", prop: "isDisabled", sortable: true }
src/main/resources/views/platform/zhgh/activity/workscollection/manage/index.html
+2 -2
View File
@@ -10,11 +10,11 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker placeholder="按年度查询" type="year" v-model="pageForm.year"
<el-date-picker placeholder="请选择年度" type="year" v-model="pageForm.year"
value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="活动主题">
<el-input clearable placeholder="请输入内容" v-model="pageForm.searchKeyword"></el-input>
<el-input clearable placeholder="请输入活动主题" v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
</el-card>
src/main/resources/views/platform/zhgh/activity/workscollection/read/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="按年度查询"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/activity/workscollection/upload/auForm.js
+1 -1
View File
@@ -4,7 +4,7 @@ const AU_FORM_TEMPLATE = {
:close-on-click-modal="false">
<el-form :model="formData" ref="formRef" size="small" label-width="80px" :rules="formRules">
<el-form-item label="活动主题" prop="activityId">
<el-select clearable placeholder="请输入内容" v-model="formData.activityId" @change="activityChange"
<el-select clearable placeholder="请输入活动主题" v-model="formData.activityId" @change="activityChange"
style="width: 100%">
<el-option v-for="item in activityOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option>
src/main/resources/views/platform/zhgh/activity/workscollection/upload/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="按年度查询"
placeholder="请选择年度"
type="year"
v-model="pageForm.year"
value-format="yyyy"
src/main/resources/views/platform/zhgh/benefit/order/index.html
+1 -1
View File
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入商品名称"
style="width: 100%"
v-model="pageForm.goodsName"
></el-input>
src/main/resources/views/platform/zhgh/club/evaluate/clubAudit/index.html
+3 -3
View File
@@ -7,16 +7,16 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/club/evaluate/mine/index.html
+3 -3
View File
@@ -8,16 +8,16 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/club/evaluate/schoolAudit/index.html
+3 -3
View File
@@ -7,16 +7,16 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/club/examine/clubAudit/index.html
+3 -3
View File
@@ -11,16 +11,16 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/club/examine/mine/index.html
+3 -3
View File
@@ -10,9 +10,9 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -20,7 +20,7 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/club/examine/schoolAudit/index.html
+3 -3
View File
@@ -9,9 +9,9 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -19,7 +19,7 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/club/infoManage/auditManager/index.html
+4 -4
View File
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
src/main/resources/views/platform/zhgh/club/infoManage/change/index.html
+4 -4
View File
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
src/main/resources/views/platform/zhgh/club/infoManage/manage/schoolClubManage.js
+2 -2
View File
@@ -3,11 +3,11 @@ const SCHOOL_CLUB_MANAGE_TEMPLATE = {
<div>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="协会名称：">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
src/main/resources/views/platform/zhgh/club/infoManage/refreshReport/index.html
+4 -4
View File
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
src/main/resources/views/platform/zhgh/club/infoManage/ruleUpdate/index.html
+4 -4
View File
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
src/main/resources/views/platform/zhgh/club/infoManage/schoolAuditReport/index.html
+4 -4
View File
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
src/main/resources/views/platform/zhgh/club/infoManage/schoolAuditRule/index.html
+4 -4
View File
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
src/main/resources/views/platform/zhgh/club/join/clubApproval/index.html
+4 -4
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -16,15 +16,15 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="姓名/工号：">
<search-item label="姓名/工号">
<el-input clearable placeholder="请输入姓名或工号" v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="所属工会：">
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable style="width: 100%">
<el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</search-item>
<search-item label="所属单位：">
<search-item label="所属单位">
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%">
<el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/club/join/mine/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html
+4 -4
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -16,15 +16,15 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="关键字：">
<search-item label="关键字">
<el-input clearable placeholder="请输入姓名或者工号查询" v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="所属工会：">
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable style="width: 100%">
<el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</search-item>
<search-item label="所属单位：">
<search-item label="所属单位">
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%">
<el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
src/main/resources/views/platform/zhgh/dayofficework/fund/member/info.js
+3 -1
View File
@@ -16,7 +16,9 @@ const fundMemberInfo = {
<el-descriptions-item label="家庭住址">{{viewData.address}}</el-descriptions-item>
<el-descriptions-item label="手机电话">{{viewData.mobile}}</el-descriptions-item>
<el-descriptions-item label="住宅号码">{{viewData.homePhone}}</el-descriptions-item>
<el-descriptions-item label="照片">{{viewData.avatar}}</el-descriptions-item>
<el-descriptions-item label="照片">
<img :src="viewData.avatar" alt="" style="width: 120px;height: 150px" v-if="viewData.avatar">
</el-descriptions-item>
</el-descriptions>
<template v-for="task in doneTasks">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html
+2 -1
View File
@@ -64,8 +64,9 @@ layout("/layouts/platform.html"){
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #edit>
<fund-member-info ref="fundMemberInfoRef"></fund-member-info>
</template>
</guava>
</div>
src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html
+8 -4
View File
@@ -82,12 +82,12 @@ layout("/layouts/platform.html"){
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="手机号码" prop="mobile">
<el-input v-model="formData.mobile" placeholder="请输入手机号码"></el-input>
<el-input v-model="formData.mobile" placeholder="请输入手机号码" maxlength="11"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="住宅号码" prop="homePhone">
<el-input v-model="formData.homePhone" placeholder="请输入住宅电话"></el-input>
<el-input v-model="formData.homePhone" placeholder="请输入住宅电话" maxlength="20"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -209,7 +209,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post('/platform/suggestionBox/write/submitAgain', {
this.$axios.post('/platform/fundMember/write/submitAgain', {
data: JSON.stringify(this.formData),
taskId: GetQueryString("taskId")
}).then(res => {
@@ -244,10 +244,14 @@ layout("/layouts/platform.html"){
idCard: idCard
}
}
}
},
},
created() {
this.init()
if(!this.bizId){
this.$axios.post('/platform/fundMember/write/validateApply')
}
}
})
</script>
src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html
+2 -2
View File
@@ -14,11 +14,11 @@ layout("/layouts/platform.html"){
type="year"
style="width: 100%"
value-format="yyyy"
placeholder="请选择">
placeholder="请选择年度">
</el-date-picker>
</search-item>
<search-item label="项目名称">
<el-input placeholder="请输入内容" clearable v-model="pageForm.name"
<el-input placeholder="请输入项目名称" clearable v-model="pageForm.name"
@keyup.enter.native="doSearch" style="width:100%"></el-input>
</search-item>
</search>
src/main/resources/views/platform/zhgh/dayofficework/literacy/userAdjust/userInfo.js
-1
View File
@@ -51,7 +51,6 @@ const userInfo = {
<el-table-column label="单选" width="160">
<template v-slot="{row}">
<el-radio
:label="row.id"
@change.native="getCurrentRow(row)"
:disabled="(row.courseReservedNumber + row.registerNum) >= row.coursePeopleNumber"
v-model="afterAdjustCourse"
src/main/resources/views/platform/zhgh/dayofficework/literacy/userManage/index.html
+2 -2
View File
@@ -108,8 +108,8 @@ layout("/layouts/platform.html"){
{ label: "姓名", prop: "username" },
{ label: "工号", prop: "loginname" },
{ label: "联系方式", prop: "mobile" },
{ label: "所属工会", prop: "unionName", sortable: true },
{ label: "所属单位", prop: "unitName", sortable: true },
{ label: "所属工会", prop: "unionname", sortable: true },
{ label: "所属单位", prop: "unitname", sortable: true },
{ label: "课程", prop: "courseNames", sortable: true },
{ label: "缺席次数", prop: "absentCount" },
{ label: "是否黑名单", prop: "isDisabled", sortable: true }
src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html
+4 -4
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -17,14 +17,14 @@ layout("/layouts/platform.html"){
style="width: 100%"
></el-date-picker>
</search-item>
<search-item label="名称/地点：">
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
<search-item label="会议类型：">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html
+4 -4
View File
@@ -5,7 +5,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -15,14 +15,14 @@ layout("/layouts/platform.html"){
style="width: 100%"
></el-date-picker>
</search-item>
<search-item label="名称/地点：">
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
<search-item label="会议类型：">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/index.html
+2 -2
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
style="width: 100%"
></el-date-picker>
</search-item>
<search-item label="名称/地点：">
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
src/main/resources/views/platform/zhgh/dayofficework/meeting/mine/index.html
+4 -4
View File
@@ -19,7 +19,7 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -29,14 +29,14 @@ layout("/layouts/platform.html"){
style="width: 100%"
></el-date-picker>
</search-item>
<search-item label="名称/地点：">
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
<search-item label="会议类型：">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html
+4 -4
View File
@@ -74,7 +74,7 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -84,14 +84,14 @@ layout("/layouts/platform.html"){
style="width: 100%"
></el-date-picker>
</search-item>
<search-item label="名称/地点：">
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
<search-item label="会议类型：">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html
+4 -4
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -17,14 +17,14 @@ layout("/layouts/platform.html"){
style="width: 100%"
></el-date-picker>
</search-item>
<search-item label="名称/地点：">
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
<search-item label="会议类型：">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/index.html
+4 -4
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -21,14 +21,14 @@ layout("/layouts/platform.html"){
style="width: 100%"
></el-date-picker>
</search-item>
<search-item label="名称/地点：">
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
<search-item label="会议类型：">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/meeting/type/index.html
+1 -1
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="名称/编码：">
<search-item label="名称/编码">
<el-input placeholder="请输入名称或编码查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
src/main/resources/views/platform/zhgh/dayofficework/qsv/bank/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="标题">
<el-input placeholder="标题" v-model="pageForm.title" clearable></el-input>
<el-input placeholder="请输入标题" v-model="pageForm.title" clearable></el-input>
</search-item>
</search>
src/main/resources/views/platform/zhgh/dayofficework/qsv/quiz/rank.html
+3 -3
View File
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
<el-date-picker
:clearable="false"
@change="listActivity"
placeholder="选择年"
placeholder="请选择年度"
style="width: 100%"
type="year"
v-model="pageForm.year"
@@ -64,8 +64,8 @@ layout("/layouts/platform.html"){
<el-table-column label="姓名" prop="userName" sortable></el-table-column>
<el-table-column label="工号" prop="loginName" sortable></el-table-column>
<el-table-column label="性别" prop="sex" sortable></el-table-column>
<el-table-column label="单位" prop="unitName" sortable></el-table-column>
<el-table-column label="分工会" prop="unionName" sortable></el-table-column>
<el-table-column label="所属工会" prop="unionName" sortable></el-table-column>
<el-table-column label="所属单位" prop="unitName" sortable></el-table-column>
<el-table-column label="联系方式" prop="mobile" sortable></el-table-column>
<el-table-column label="答题日期" prop="attemptDate" sortable></el-table-column>
<el-table-column label="得分" prop="totalScore" sortable></el-table-column>
src/main/resources/views/platform/zhgh/dayofficework/qsv/survey/index.html
+1 -1
View File
@@ -9,7 +9,7 @@ layout("/layouts/platform.html"){
<search-item label="年度">
<el-date-picker
:clearable="false"
placeholder="选择年"
placeholder="请选择年度"
style="width: 100%"
type="year"
v-model="pageForm.year"
src/main/resources/views/platform/zhgh/dayofficework/qsv/survey/report.js
+2 -2
View File
@@ -43,8 +43,8 @@ const report = {
<el-table :data="optionUsers" size="small">
<el-table-column label="姓名" prop="userName"></el-table-column>
<el-table-column label="工号" prop="loginName"></el-table-column>
<el-table-column label="单位" prop="unitName"></el-table-column>
<el-table-column label="分工会" prop="unionName"></el-table-column>
<el-table-column label="所属工会" prop="unionName"></el-table-column>
<el-table-column label="所属单位" prop="unitName"></el-table-column>
<el-table-column label="选择时间" prop="attemptDate"></el-table-column>
</el-table>
</el-dialog>
src/main/resources/views/platform/zhgh/dayofficework/site/apply/index.html
+2 -2
View File
@@ -16,8 +16,8 @@ layout("/layouts/platform.html"){
@change="doSearch" value-format="yyyy">
</el-date-picker>
</search-item>
<search-item label="名称/地址：">
<el-input placeholder="请输入名称或地址查询" clearable v-model="pageForm.searchKeyword"
<search-item label="名称/地址">
<el-input placeholder="请输入名称或地址" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/approval/index.html
+2 -2
View File
@@ -8,14 +8,14 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="选择年"
placeholder="请选择年度"
style="width: 100%"
type="year"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="所属工会：">
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
style="width: 100%">
<el-option v-for="item in unionList" :key="item.id" :label="item.name"
src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/mine/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker placeholder="选择年" style="width: 100%" type="year" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
<el-date-picker placeholder="请选择年度" style="width: 100%" type="year" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="会议名称">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称" v-model="pageForm.searchKeyword"></el-input>

Some files were not shown because too many files have changed in this diff Show More