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

查询修改

Browse Source
This commit is contained in:
=
2025-10-19 18:46:18 +08:00
parent 7f0843ed5a
commit 7ff317afb6
47 changed files with 91 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingActController.java
-1
View File
@@ -98,7 +98,6 @@ public class CadreTrainingActController {
} }
@At @At
@SaCheckPermission("cadreTraining.activity")
@ApiOperation("查询单个活动信息") @ApiOperation("查询单个活动信息")
public Result get(@Param("id") String id) { public Result get(@Param("id") String id) {
CadreTrainingAct cadreTrainingAct = cadreTrainingActService.fetch(id); CadreTrainingAct cadreTrainingAct = cadreTrainingActService.fetch(id);
src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingCollectController.java
-1
View File
@@ -141,7 +141,6 @@ public class CadreTrainingCollectController {
@At @At
@ApiOperation("获取活动列表") @ApiOperation("获取活动列表")
@SaCheckPermission(value = {"cadreTraining.collect", "h5.cadreTraining.collect"}, mode = SaMode.OR)
public Result getActivityList(Integer year) { public Result getActivityList(Integer year) {
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
// 添加年度筛选条件，基于报名开始时间 // 添加年度筛选条件，基于报名开始时间
src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSchoolAuditController.java
+1
View File
@@ -112,6 +112,7 @@ public class CadreTrainingSchoolAuditController {
} }
// 活动ID查询条件 // 活动ID查询条件
cnd.andEX("info.cadreTrainingActId", "=", activityId); cnd.andEX("info.cadreTrainingActId", "=", activityId);
cnd.andEX("year(info.applyTime)", "=", year);
// 工会、单位名称查询条件 // 工会、单位名称查询条件
cnd.andEX("info.unionId", "=", unionId); cnd.andEX("info.unionId", "=", unionId);
src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSignUpController.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class CadreTrainingSignUpController {
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, cadreTrainingSignUp); args.set(FlowConst.FORM_DATA, cadreTrainingSignUp);
ProcessInstance instance = flowEngine.startProcessInstanceByKey("GBPX", cadreTrainingSignUp.getId(), SecurityUtil.getUserId(), args); ProcessInstance instance = flowEngine.startProcessInstanceByKey("GHGBPX", cadreTrainingSignUp.getId(), SecurityUtil.getUserId(), args);
// 自动完成第一个申请任务 // 自动完成第一个申请任务
List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null); List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardQueryController.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class ExerciseCardQueryController {
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("人员导入模版", "UTF-8").replaceAll("\\+", "%20"); String fileName = URLEncoder.encode("人员导入模版", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); response.setHeader("Content-disposition", "attachment;filename*=" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), ExercisePeopleImportVo.class) EasyExcel.write(response.getOutputStream(), ExercisePeopleImportVo.class)
.sheet("人员导入模版") .sheet("人员导入模版")
.doWrite(ArrayList::new); .doWrite(ArrayList::new);
src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java
+3 -5
View File
@@ -101,10 +101,8 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl<ExerciseCard> imple
errorInfos.add(v); errorInfos.add(v);
continue; continue;
} }
//设置excel列的数据 if (StrUtil.isNotBlank(v.getUsername())) {
user.setUsername(v.getUsername()); user.setUsername(v.getUsername());
if (StrUtil.isNotBlank(v.getSex())) {
user.setSex(v.getSex());
} }
insertOrUpdateUserList.add(user); insertOrUpdateUserList.add(user);
@@ -117,7 +115,7 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl<ExerciseCard> imple
Record vwUser = vwUserMap.get(v.getLoginName()); Record vwUser = vwUserMap.get(v.getLoginName());
if (vwUser != null) { if (vwUser != null) {
exerciseCard.setUserId(vwUser.getString("id")); exerciseCard.setUserId(vwUser.getString("id"));
exerciseCard.setUserId(vwUser.getString("userName")); exerciseCard.setUserName(vwUser.getString("username"));
exerciseCard.setBirthday(DateUtil.parse(vwUser.getString("birthday"), "yyyy-MM-dd")); exerciseCard.setBirthday(DateUtil.parse(vwUser.getString("birthday"), "yyyy-MM-dd"));
exerciseCard.setUnionId(vwUser.getString("unionId")); exerciseCard.setUnionId(vwUser.getString("unionId"));
exerciseCard.setUnitId(vwUser.getString("unitId")); exerciseCard.setUnitId(vwUser.getString("unitId"));
src/main/java/com/budwk/app/zhgh/dayofficework/qsv/controller/QsvBankController.java
+2 -1
View File
@@ -39,11 +39,12 @@ public class QsvBankController {
@At @At
@SaCheckPermission("qsv.bank") @SaCheckPermission("qsv.bank")
public Result pageData(PageForm pageForm) { public Result pageData(PageForm pageForm, String title) {
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.where().andLike(QsvBank::getTitle, pageForm.getSearchKeyword()); cnd.where().andLike(QsvBank::getTitle, pageForm.getSearchKeyword());
} }
cnd.and(Cnd.likeEX("title", title));
Pagination pagination = qsvBankService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd); Pagination pagination = qsvBankService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd);
return Result.success(pagination); return Result.success(pagination);
} }
src/main/resources/views/platform/bpm/processDefine/index.html
+2 -2
View File
@@ -16,10 +16,10 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="名称"> <search-item label="名称">
<el-input placeholder="名称" v-model="pageForm.displayName"></el-input> <el-input placeholder="请输入名称" v-model="pageForm.displayName"></el-input>
</search-item> </search-item>
<search-item label="编码"> <search-item label="编码">
<el-input placeholder="编码" v-model="pageForm.name"></el-input> <el-input placeholder="请输入编码" v-model="pageForm.name"></el-input>
</search-item> </search-item>
</search> </search>
</el-card> </el-card>
src/main/resources/views/platform/flow/definition/index.html
+2 -2
View File
@@ -13,10 +13,10 @@ layout("/layouts/platform.html"){
<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.displayName" placeholder="名称" clearable></el-input> <el-input v-model="pageForm.displayName" placeholder="请输入名称" clearable></el-input>
</search-item> </search-item>
<search-item label="编码"> <search-item label="编码">
<el-input v-model="pageForm.name" placeholder="编码" clearable></el-input> <el-input v-model="pageForm.name" placeholder="请输入编码" clearable></el-input>
</search-item> </search-item>
</search> </search>
</el-card> </el-card>
src/main/resources/views/platform/zhgh/dayofficework/birthdayWishes/plan/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="名称"> <search-item label="名称">
<el-input placeholder="名称" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
</search> </search>
</el-card> </el-card>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html
+4 -4
View File
@@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak> <div id="app" v-cloak>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker> <el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item> </search-item>
<search-item label="活动名称："> <search-item label="活动名称">
<el-input placeholder="请输入活动名称查询" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入活动名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
</search> </search>
</el-card> </el-card>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html
+1 -1
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
type="year" type="year"
:clearable="false" :clearable="false"
value-format="yyyy" value-format="yyyy"
placeholder="年度" placeholder="请选择年度"
style="width: 100%" style="width: 100%"
@change="getActivityByYear"> @change="getActivityByYear">
</el-date-picker> </el-date-picker>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/mine/index.html
+4 -4
View File
@@ -5,11 +5,11 @@ 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-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker> <el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item> </search-item>
<search-item label="活动名称："> <search-item label="活动名称">
<el-input placeholder="请输入活动名称查询" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入活动名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
</search> </search>
</el-card> </el-card>
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
<el-table-column label="操作" fixed="right" width="300px"> <el-table-column label="操作" fixed="right" width="300px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button> <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.canRevoke" @click="onCancelSignUp(row)" size="mini" type="danger">取消报名 <el-button @click="onCancelSignUp(row)" size="mini" type="danger">取消报名
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html
+1 -1
View File
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
v-model="pageForm.year" v-model="pageForm.year"
type="year" type="year"
value-format="yyyy" value-format="yyyy"
placeholder="年度" placeholder="请选择年度"
style="width: 100%" style="width: 100%"
@change="getActivityByYear"> @change="getActivityByYear">
</el-date-picker> </el-date-picker>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html
+4 -4
View File
@@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak> <div id="app" v-cloak>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker> <el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item> </search-item>
<search-item label="活动名称："> <search-item label="活动名称">
<el-input placeholder="请输入活动名称查询" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入活动名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
</search> </search>
</el-card> </el-card>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html
+3 -3
View File
@@ -5,10 +5,10 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak> <div id="app" v-cloak>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker> <el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item> </search-item>
<search-item label="名称："> <search-item label="名称">
<el-input placeholder="请输入评优评先名称查询" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入评优评先名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
</search> </search>
src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名/工号"> <search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名/工号"> <search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/changeRecord/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名/工号"> <search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/his/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名/工号"> <search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
</search> </search>
src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名/工号"> <search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="工号/姓名"> <search-item label="工号/姓名">
src/main/resources/views/platform/zhgh/dayofficework/fund/subsidy/query/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名/工号"> <search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html
+1 -1
View File
@@ -18,7 +18,7 @@ layout("/layouts/platform.html"){
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="名称/地点"> <search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html
+1 -1
View File
@@ -16,7 +16,7 @@ layout("/layouts/platform.html"){
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="名称/地点"> <search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/index.html
+1 -1
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="名称/地点"> <search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/mine/index.html
+1 -1
View File
@@ -30,7 +30,7 @@ layout("/layouts/platform.html"){
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="名称/地点"> <search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html
+1 -1
View File
@@ -85,7 +85,7 @@ layout("/layouts/platform.html"){
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="名称/地点"> <search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html
+1 -1
View File
@@ -18,7 +18,7 @@ layout("/layouts/platform.html"){
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="名称/地点"> <search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/index.html
+1 -1
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="名称/地点"> <search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/type/index.html
+1 -1
View File
@@ -12,7 +12,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="名称/编码"> <search-item label="名称/编码">
<el-input placeholder="请输入名称或编码查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或编码" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html
+3 -3
View File
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
<search-item label="年度"> <search-item label="年度">
<el-date-picker <el-date-picker
@change="doSearch" @change="doSearch"
placeholder="选择年度" placeholder="请选择年度"
style="width: 100%" type="year" style="width: 100%" type="year"
v-model="pageForm.year" v-model="pageForm.year"
:clearable="false" :clearable="false"
@@ -21,11 +21,11 @@ layout("/layouts/platform.html"){
<el-input v-model="pageForm.activityMatter" placeholder="请输入活动项目" <el-input v-model="pageForm.activityMatter" placeholder="请输入活动项目"
clearable></el-input> clearable></el-input>
</search-item> </search-item>
<search-item label="分工会" <search-item label="所属工会"
v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_TWO'"> v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_TWO'">
<el-select v-model="pageForm.unionId" filterable <el-select v-model="pageForm.unionId" filterable
clearable clearable
placeholder="请选择工会" style="width: 100%;"> placeholder="请选择所属工会" style="width: 100%;">
<el-option v-for="item in unionList" :label="item.name" <el-option v-for="item in unionList" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html
+3 -3
View File
@@ -9,7 +9,7 @@ layout("/layouts/platform.html"){
<search-item label="年度"> <search-item label="年度">
<el-date-picker <el-date-picker
@change="doSearch" @change="doSearch"
placeholder="选择年" placeholder="请选择年度"
style="width: 100%" style="width: 100%"
type="year" type="year"
v-model="pageForm.year" v-model="pageForm.year"
@@ -24,11 +24,11 @@ layout("/layouts/platform.html"){
<el-input v-model="pageForm.activityMatter" placeholder="请输入活动项目" <el-input v-model="pageForm.activityMatter" placeholder="请输入活动项目"
clearable></el-input> clearable></el-input>
</search-item> </search-item>
<search-item label="分工会" <search-item label="所属工会"
v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_TWO'"> v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_TWO'">
<el-select v-model="pageForm.unionId" filterable <el-select v-model="pageForm.unionId" filterable
clearable clearable
placeholder="请选择工会" style="width: 100%;"> placeholder="请选择所属工会" style="width: 100%;">
<el-option v-for="item in unionList" :label="item.name" <el-option v-for="item in unionList" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/index.html
+2 -2
View File
@@ -7,11 +7,11 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
<el-date-picker placeholder="年度" style="width: 100%" type="year" v-model="pageForm.year" <el-date-picker placeholder="请选择年度" style="width: 100%" type="year" v-model="pageForm.year"
value-format="yyyy"></el-date-picker> value-format="yyyy"></el-date-picker>
</search-item> </search-item>
<search-item label="标题"> <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-item>
</search> </search>
src/main/resources/views/platform/zhgh/dayofficework/rest/activity/index.html
+3 -3
View File
@@ -6,10 +6,10 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度：">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker> <el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item> </search-item>
<search-item label="名称："> <search-item label="名称">
<el-input placeholder="请输入名称查询" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
</search> </search>
</el-card> </el-card>
src/main/resources/views/platform/zhgh/dayofficework/rest/signUp/index.html
+4 -4
View File
@@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak> <div id="app" v-cloak>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker> <el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item> </search-item>
<search-item label="名称："> <search-item label="名称">
<el-input placeholder="请输入名称查询" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
</search> </search>
</el-card> </el-card>
src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/batch/index.html
+2 -2
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<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"
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
style="width: 100%" style="width: 100%"
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="批次名称："> <search-item label="批次名称">
<el-input placeholder="请输入批次名称查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入批次名称查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/ledger/index.html
+1 -1
View File
@@ -74,7 +74,7 @@ layout("/layouts/platform.html"){
<search-item label="姓名/工号"> <search-item label="姓名/工号">
<el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable></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.unionId" <el-select v-model="pageForm.unionId"
placeholder="请选择所属工会" placeholder="请选择所属工会"
filterable filterable
src/main/resources/views/platform/zhgh/dayofficework/site/manage/index.html
+2 -2
View File
@@ -16,8 +16,8 @@ layout("/layouts/platform.html"){
@change="doSearch" value-format="yyyy"> @change="doSearch" value-format="yyyy">
</el-date-picker> </el-date-picker>
</search-item> </search-item>
<search-item label="名称/地址："> <search-item label="名称/地址">
<el-input placeholder="请输入名称或地址查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或地址" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/dayofficework/site/type/index.html
+2 -2
View File
@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="名称/编码："> <search-item label="名称/编码">
<el-input placeholder="请输入名称或编码查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或编码" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/file/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="名称"> <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-item>
<search-item label="教代会"> <search-item label="教代会">
<el-select v-model="pageForm.sessionId" clearable> <el-select v-model="pageForm.sessionId" clearable>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/index.html
+2 -2
View File
@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="名称/编码："> <search-item label="名称/编码">
<el-input placeholder="请输入名称或编码查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或编码" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/staffbenefit/contribution/type/index.html
+2 -2
View File
@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="名称/编码："> <search-item label="名称/编码">
<el-input placeholder="请输入名称或编码查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入名称或编码" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"> @keyup.enter.native="doSearch">
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/staffbenefit/huimin/manage/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<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="名称" clearable></el-input> <el-input v-model="pageForm.searchKeyword" placeholder="请输入名称" clearable></el-input>
</search-item> </search-item>
</search> </search>
</el-card> </el-card>
src/main/resources/views/platform/zhgh/staffmanage/childManage/write/index.html
+17 -133
View File
@@ -13,7 +13,7 @@ layout("/layouts/platform.html"){
<el-form-item prop="childRelationship"> <el-form-item prop="childRelationship">
<dict-select v-model="formData.childRelationship" code="CHILD_MANAGE_GRADE" style="width: 100%" placeholder="请选择就读年级"> <dict-select v-model="formData.childRelationship" code="CHILD_MANAGE_GRADE" style="width: 100%" placeholder="请选择就读年级">
</dict-select> </dict-select>
</el-form-item></el-descriptions-item> </el-form-item></el-descriptions-item>
<el-descriptions-item label="入学年份"> <el-descriptions-item label="入学年份">
<el-form-item prop="childrenBirthday"> <el-form-item prop="childrenBirthday">
<el-date-picker <el-date-picker
@@ -82,31 +82,13 @@ layout("/layouts/platform.html"){
</el-form-item></el-descriptions-item> </el-form-item></el-descriptions-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<table-tool label="监护人信息"></table-tool> <table-tool label="监护人信息"></table-tool>
<el-descriptions :column="2" border> <el-descriptions :column="2" border>
<el-descriptions-item label="监护人1"> <el-descriptions-item label="监护人1">
<el-form-item label="监护人1" prop="guardianUserName1"> <el-form-item label="监护人1" prop="guardianUserName1">
<el-select <el-input v-model="formData.guardianUserName1" readonly></el-input>
style="width: 100%" </el-form-item>
v-model="formData.guardianUserName1" </el-descriptions-item>
filterable
clearable
remote
reserve-keyword
placeholder="请输入姓名或工号查询"
:remote-method="createRemoteMethod(userOptions)"
@change="handleFatherChange"
@clear="clearUserInfo"
allow-create
default-first-option>
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
:value="item.id">
</el-option>
</el-select>
</el-form-item></el-descriptions-item>
<el-descriptions-item label="工号" > <el-descriptions-item label="工号" >
<el-form-item prop="guardianLoginName1">{{formData.guardianLoginName1}} <el-form-item prop="guardianLoginName1">{{formData.guardianLoginName1}}
</el-form-item> </el-form-item>
@@ -118,35 +100,17 @@ layout("/layouts/platform.html"){
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所在单位"> <el-descriptions-item label="所在单位">
<el-form-item prop="unitName1"> <el-form-item prop="unitName1">
<el-input v-model="formData.guardianUnitName1" placeholder="请输入所在单位" maxlength="100"></el-input> <el-input v-model="formData.guardianUnitName1" readonly></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="监护人2"> <el-descriptions-item label="监护人2">
<el-form-item label="监护人2" prop="guardianUserName2"> <el-form-item label="监护人2" prop="guardianUserName2">
<el-select <el-input v-model="formData.guardianUserName2" placeholder="请输入监护人姓名" maxlength="30"></el-input>
style="width: 100%"
v-model="formData.guardianUserName2"
filterable
clearable
remote
reserve-keyword
placeholder="请输入姓名或工号查询"
:remote-method="createRemoteMethod(userOptions2)"
@change="handleMotherChange"
@clear="clearUserInfo2"
allow-create
default-first-option>
<el-option
v-for="item in userOptions2"
:key="item.id"
:label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
:value="item.id">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="工号"> <el-descriptions-item label="工号">
<el-form-item prop="guardianLoginName2">{{formData.guardianLoginName2}} <el-form-item prop="guardianLoginName2">
<el-input v-model="formData.guardianLoginName2" placeholder="没有则不填" maxlength="30"></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="手机号码"> <el-descriptions-item label="手机号码">
@@ -181,8 +145,6 @@ layout("/layouts/platform.html"){
return { return {
bizId: GetQueryString("bizId"), bizId: GetQueryString("bizId"),
formData: {}, formData: {},
userOptions: [],
userOptions2: [],
formRules: { formRules: {
childRelationship: [{ required: true, message: '请选择就读年级', trigger: 'change' }], childRelationship: [{ required: true, message: '请选择就读年级', trigger: 'change' }],
childrenYear: [{ required: true, message: '请选择入学年份', trigger: 'change' }], childrenYear: [{ required: true, message: '请选择入学年份', trigger: 'change' }],
@@ -196,92 +158,6 @@ layout("/layouts/platform.html"){
} }
}, },
methods: { methods: {
clearUserInfo() {
// 清空监护人1相关信息
this.$set(this.formData, "guardianUserName1", "")
this.$set(this.formData, "guardianLoginName1", "")
this.$set(this.formData, "guardianMobile1", "")
this.$set(this.formData, "guardianUnitName1", "")
},
clearUserInfo2() {
// 清空监护人2相关信息
this.$set(this.formData, "guardianUserName2", "")
this.$set(this.formData, "guardianLoginName2", "")
this.$set(this.formData, "guardianMobile2", "")
this.$set(this.formData, "guardianUnitName2", "")
},
createRemoteMethod(options) {
return (keyword) => {
this.selectQueryUser(keyword, options)
}
},
// 查询监护人对象
selectQueryUser(keyword, options) {
options.length = 0
this.$axios.post("/platform/childManage/write/listUser", {keyword: keyword}).then((res) => {
if (res.code === 0) {
options.push(...res.data)
}
})
},
// 监护人1选择变化处理（支持手动输入）
handleFatherChange(val) {
// 先查找是否是选择的用户
const user = this.userOptions.find(o => o.userName === val || o.id === val);
if (user) {
// 如果是选择的用户，保存完整信息
this.$set(this.formData, "guardianUserName1", user.userName);
this.$set(this.formData, "guardianUserId1", user.id);
this.$set(this.formData, "guardianLoginName1", user.loginName);
this.$set(this.formData, "guardianUnionId1", user.unionId);
this.$set(this.formData, "guardianUnionName1", user.unionName);
this.$set(this.formData, "guardianMobile1", user.mobile);
this.$set(this.formData, "guardianUnitId1", user.unitId);
this.$set(this.formData, "guardianUnitName1", user.unitName);
} else {
// 如果是手动输入的姓名，只设置姓名，其他字段清空
this.$set(this.formData, "guardianUserName1", val || "")
this.$set(this.formData, "guardianUserId1", "")
this.$set(this.formData, "guardianLoginName1", "")
this.$set(this.formData, "guardianUnionId1", "")
this.$set(this.formData, "guardianUnionName1", "")
this.$set(this.formData, "guardianMobile1", "")
this.$set(this.formData, "guardianUnitId1", "")
this.$set(this.formData, "guardianUnitName1", "")
}
},
// 监护人2选择变化处理（支持手动输入）
handleMotherChange(val) {
// 先查找是否是选择的用户
const user = this.userOptions2.find(o => o.userName === val || o.id === val);
if (user) {
// 如果是选择的用户，保存完整信息
this.$set(this.formData, "guardianUserId2", user.id);
this.$set(this.formData, "guardianUserName2", user.userName);
this.$set(this.formData, "guardianLoginName2", user.loginName);
this.$set(this.formData, "guardianUnionId2", user.unionId);
this.$set(this.formData, "guardianUnionName2", user.unionName);
this.$set(this.formData, "guardianMobile2", user.mobile);
this.$set(this.formData, "guardianUnitId2", user.unitId);
this.$set(this.formData, "guardianUnitName2", user.unitName);
} else {
// 如果是手动输入的姓名，只设置姓名，其他字段清空
this.$set(this.formData, "guardianUserName2", val || "")
this.$set(this.formData, "guardianUserId2", "")
this.$set(this.formData, "guardianLoginName2", "")
this.$set(this.formData, "guardianUnionId2", "")
this.$set(this.formData, "guardianUnionName2", "")
this.$set(this.formData, "guardianMobile2", "")
this.$set(this.formData, "guardianUnitId2", "")
this.$set(this.formData, "guardianUnitName2", "")
}
},
async getIsRepeatByIdCard() { async getIsRepeatByIdCard() {
if (!this.formData.childrenIdCard) { if (!this.formData.childrenIdCard) {
this.$message.error("请填写子女身份证号码") this.$message.error("请填写子女身份证号码")
@@ -343,6 +219,14 @@ layout("/layouts/platform.html"){
unionName: union.name, unionName: union.name,
unionId: union.id, unionId: union.id,
mobile: mobile, mobile: mobile,
// 自动填充监护人1信息
guardianUserName1: username,
guardianLoginName1: loginname,
guardianMobile1: mobile,
guardianUnitName1: unit.name,
guardianUnitId1: unit.id,
guardianUnionName1: union.name,
guardianUnionId1: union.id
} }
} }
} }
src/main/resources/views/platform/zhghh5/staffmanage/childmanage/write/index.html
-1
View File
@@ -104,7 +104,6 @@ layout("/layouts/platform_h5.html"){
<van-field <van-field
label="手机号码" label="手机号码"
v-model="formData.guardianMobile1" v-model="formData.guardianMobile1"
readonly
placeholder="读取信息中心数据" placeholder="读取信息中心数据"
:rules="formRules.guardianMobile1" :rules="formRules.guardianMobile1"
></van-field> ></van-field>