查询修改
This commit is contained in:
=
-1
@@ -98,7 +98,6 @@ public class CadreTrainingActController {
|
||||
}
|
||||
|
||||
@At
|
||||
@SaCheckPermission("cadreTraining.activity")
|
||||
@ApiOperation("查询单个活动信息")
|
||||
public Result get(@Param("id") String id) {
|
||||
CadreTrainingAct cadreTrainingAct = cadreTrainingActService.fetch(id);
|
||||
|
||||
-1
@@ -141,7 +141,6 @@ public class CadreTrainingCollectController {
|
||||
|
||||
@At
|
||||
@ApiOperation("获取活动列表")
|
||||
@SaCheckPermission(value = {"cadreTraining.collect", "h5.cadreTraining.collect"}, mode = SaMode.OR)
|
||||
public Result getActivityList(Integer year) {
|
||||
Cnd cnd = Cnd.NEW();
|
||||
// 添加年度筛选条件，基于报名开始时间
|
||||
|
||||
+1
@@ -112,6 +112,7 @@ public class CadreTrainingSchoolAuditController {
|
||||
}
|
||||
// 活动ID查询条件
|
||||
cnd.andEX("info.cadreTrainingActId", "=", activityId);
|
||||
cnd.andEX("year(info.applyTime)", "=", year);
|
||||
|
||||
// 工会、单位名称查询条件
|
||||
cnd.andEX("info.unionId", "=", unionId);
|
||||
|
||||
+1
-1
@@ -88,7 +88,7 @@ public class CadreTrainingSignUpController {
|
||||
Dict args = Dict.create();
|
||||
args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
|
||||
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);
|
||||
|
||||
+1
-1
@@ -112,7 +112,7 @@ public class ExerciseCardQueryController {
|
||||
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||
response.setCharacterEncoding("utf-8");
|
||||
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)
|
||||
.sheet("人员导入模版")
|
||||
.doWrite(ArrayList::new);
|
||||
|
||||
+3
-5
@@ -101,10 +101,8 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl<ExerciseCard> imple
|
||||
errorInfos.add(v);
|
||||
continue;
|
||||
}
|
||||
//设置excel列的数据
|
||||
user.setUsername(v.getUsername());
|
||||
if (StrUtil.isNotBlank(v.getSex())) {
|
||||
user.setSex(v.getSex());
|
||||
if (StrUtil.isNotBlank(v.getUsername())) {
|
||||
user.setUsername(v.getUsername());
|
||||
}
|
||||
|
||||
insertOrUpdateUserList.add(user);
|
||||
@@ -117,7 +115,7 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl<ExerciseCard> imple
|
||||
Record vwUser = vwUserMap.get(v.getLoginName());
|
||||
if (vwUser != null) {
|
||||
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.setUnionId(vwUser.getString("unionId"));
|
||||
exerciseCard.setUnitId(vwUser.getString("unitId"));
|
||||
|
||||
+2
-1
@@ -39,11 +39,12 @@ public class QsvBankController {
|
||||
|
||||
@At
|
||||
@SaCheckPermission("qsv.bank")
|
||||
public Result pageData(PageForm pageForm) {
|
||||
public Result pageData(PageForm pageForm, String title) {
|
||||
Cnd cnd = Cnd.NEW();
|
||||
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
|
||||
cnd.where().andLike(QsvBank::getTitle, pageForm.getSearchKeyword());
|
||||
}
|
||||
cnd.and(Cnd.likeEX("title", title));
|
||||
Pagination pagination = qsvBankService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd);
|
||||
return Result.success(pagination);
|
||||
}
|
||||
|
||||
@@ -16,10 +16,10 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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 label="编码">
|
||||
<el-input placeholder="编码" v-model="pageForm.name"></el-input>
|
||||
<el-input placeholder="请输入编码" v-model="pageForm.name"></el-input>
|
||||
</search-item>
|
||||
</search>
|
||||
</el-card>
|
||||
|
||||
@@ -13,10 +13,10 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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 label="编码">
|
||||
<el-input v-model="pageForm.name" placeholder="编码" clearable></el-input>
|
||||
<el-input v-model="pageForm.name" placeholder="请输入编码" clearable></el-input>
|
||||
</search-item>
|
||||
</search>
|
||||
</el-card>
|
||||
|
||||
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
</el-card>
|
||||
|
||||
+4
-4
@@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
|
||||
<div id="app" v-cloak>
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<search-item label="年度：">
|
||||
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
|
||||
<search-item label="年度">
|
||||
<el-date-picker 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 label="活动名称">
|
||||
<el-input placeholder="请输入活动名称" clearable v-model="pageForm.searchKeyword"></el-input>
|
||||
</search-item>
|
||||
</search>
|
||||
</el-card>
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
|
||||
type="year"
|
||||
:clearable="false"
|
||||
value-format="yyyy"
|
||||
placeholder="年度"
|
||||
placeholder="请选择年度"
|
||||
style="width: 100%"
|
||||
@change="getActivityByYear">
|
||||
</el-date-picker>
|
||||
|
||||
@@ -5,11 +5,11 @@ 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" 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 label="活动名称">
|
||||
<el-input placeholder="请输入活动名称" clearable v-model="pageForm.searchKeyword"></el-input>
|
||||
</search-item>
|
||||
</search>
|
||||
</el-card>
|
||||
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column label="操作" fixed="right" width="300px">
|
||||
<template slot-scope="{row}">
|
||||
<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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
|
||||
v-model="pageForm.year"
|
||||
type="year"
|
||||
value-format="yyyy"
|
||||
placeholder="年度"
|
||||
placeholder="请选择年度"
|
||||
style="width: 100%"
|
||||
@change="getActivityByYear">
|
||||
</el-date-picker>
|
||||
|
||||
+4
-4
@@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
|
||||
<div id="app" v-cloak>
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<search-item label="年度：">
|
||||
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
|
||||
<search-item label="年度">
|
||||
<el-date-picker 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 label="活动名称">
|
||||
<el-input placeholder="请输入活动名称" clearable v-model="pageForm.searchKeyword"></el-input>
|
||||
</search-item>
|
||||
</search>
|
||||
</el-card>
|
||||
|
||||
@@ -5,10 +5,10 @@ layout("/layouts/platform.html"){
|
||||
<div id="app" v-cloak>
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<search-item label="年度：">
|
||||
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
|
||||
<search-item label="年度">
|
||||
<el-date-picker 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 placeholder="请输入评优评先名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
|
||||
</search-item>
|
||||
</search>
|
||||
|
||||
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
</search-item>
|
||||
<search-item label="姓名/工号">
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
</search-item>
|
||||
<search-item label="姓名/工号">
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
</search-item>
|
||||
<search-item label="姓名/工号">
|
||||
|
||||
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
</search-item>
|
||||
<search-item label="姓名/工号">
|
||||
|
||||
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
</search-item>
|
||||
</search>
|
||||
|
||||
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
</search-item>
|
||||
<search-item label="姓名/工号">
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
</search-item>
|
||||
<search-item label="工号/姓名">
|
||||
|
||||
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
</search-item>
|
||||
<search-item label="姓名/工号">
|
||||
|
||||
+1
-1
@@ -18,7 +18,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>
|
||||
|
||||
@@ -16,7 +16,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>
|
||||
|
||||
@@ -22,7 +22,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>
|
||||
|
||||
@@ -30,7 +30,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>
|
||||
|
||||
@@ -85,7 +85,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>
|
||||
|
||||
+1
-1
@@ -18,7 +18,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>
|
||||
|
||||
@@ -22,7 +22,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>
|
||||
|
||||
@@ -12,7 +12,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
|
||||
+3
-3
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
|
||||
<search-item label="年度">
|
||||
<el-date-picker
|
||||
@change="doSearch"
|
||||
placeholder="选择年度"
|
||||
placeholder="请选择年度"
|
||||
style="width: 100%" type="year"
|
||||
v-model="pageForm.year"
|
||||
:clearable="false"
|
||||
@@ -21,11 +21,11 @@ layout("/layouts/platform.html"){
|
||||
<el-input v-model="pageForm.activityMatter" placeholder="请输入活动项目"
|
||||
clearable></el-input>
|
||||
</search-item>
|
||||
<search-item label="分工会"
|
||||
<search-item label="所属工会"
|
||||
v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_TWO'">
|
||||
<el-select v-model="pageForm.unionId" filterable
|
||||
clearable
|
||||
placeholder="请选择工会" style="width: 100%;">
|
||||
placeholder="请选择所属工会" style="width: 100%;">
|
||||
<el-option v-for="item in unionList" :label="item.name"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
|
||||
+3
-3
@@ -9,7 +9,7 @@ layout("/layouts/platform.html"){
|
||||
<search-item label="年度">
|
||||
<el-date-picker
|
||||
@change="doSearch"
|
||||
placeholder="选择年"
|
||||
placeholder="请选择年度"
|
||||
style="width: 100%"
|
||||
type="year"
|
||||
v-model="pageForm.year"
|
||||
@@ -24,11 +24,11 @@ layout("/layouts/platform.html"){
|
||||
<el-input v-model="pageForm.activityMatter" placeholder="请输入活动项目"
|
||||
clearable></el-input>
|
||||
</search-item>
|
||||
<search-item label="分工会"
|
||||
<search-item label="所属工会"
|
||||
v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_TWO'">
|
||||
<el-select v-model="pageForm.unionId" filterable
|
||||
clearable
|
||||
placeholder="请选择工会" style="width: 100%;">
|
||||
placeholder="请选择所属工会" style="width: 100%;">
|
||||
<el-option v-for="item in unionList" :label="item.name"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
|
||||
@@ -7,11 +7,11 @@ 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"
|
||||
<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 placeholder="标题" v-model="pageForm.title" clearable></el-input>
|
||||
<el-input placeholder="请输入标题" v-model="pageForm.title" clearable></el-input>
|
||||
</search-item>
|
||||
</search>
|
||||
|
||||
|
||||
@@ -6,10 +6,10 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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 label="名称：">
|
||||
<el-input placeholder="请输入名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
|
||||
<search-item label="名称">
|
||||
<el-input placeholder="请输入名称" clearable v-model="pageForm.searchKeyword"></el-input>
|
||||
</search-item>
|
||||
</search>
|
||||
</el-card>
|
||||
|
||||
@@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
|
||||
<div id="app" v-cloak>
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<search-item label="年度：">
|
||||
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
|
||||
<search-item label="年度">
|
||||
<el-date-picker 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 label="名称">
|
||||
<el-input placeholder="请输入名称" clearable v-model="pageForm.searchKeyword"></el-input>
|
||||
</search-item>
|
||||
</search>
|
||||
</el-card>
|
||||
|
||||
+2
-2
@@ -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>
|
||||
|
||||
+1
-1
@@ -74,7 +74,7 @@ layout("/layouts/platform.html"){
|
||||
<search-item label="姓名/工号">
|
||||
<el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable></el-input>
|
||||
</search-item>
|
||||
<search-item label="所属工会：">
|
||||
<search-item label="所属工会">
|
||||
<el-select v-model="pageForm.unionId"
|
||||
placeholder="请选择所属工会"
|
||||
filterable
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
|
||||
<template>
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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 label="教代会">
|
||||
<el-select v-model="pageForm.sessionId" clearable>
|
||||
|
||||
@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
|
||||
<template>
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
|
||||
@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
|
||||
<template>
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
|
||||
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<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>
|
||||
</el-card>
|
||||
|
||||
@@ -13,7 +13,7 @@ layout("/layouts/platform.html"){
|
||||
<el-form-item prop="childRelationship">
|
||||
<dict-select v-model="formData.childRelationship" code="CHILD_MANAGE_GRADE" style="width: 100%" placeholder="请选择就读年级">
|
||||
</dict-select>
|
||||
</el-form-item></el-descriptions-item>
|
||||
</el-form-item></el-descriptions-item>
|
||||
<el-descriptions-item label="入学年份">
|
||||
<el-form-item prop="childrenBirthday">
|
||||
<el-date-picker
|
||||
@@ -82,31 +82,13 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item></el-descriptions-item>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<table-tool label="监护人信息"></table-tool>
|
||||
<table-tool label="监护人信息"></table-tool>
|
||||
<el-descriptions :column="2" border>
|
||||
<el-descriptions-item label="监护人1">
|
||||
<el-form-item label="监护人1" prop="guardianUserName1">
|
||||
<el-select
|
||||
style="width: 100%"
|
||||
v-model="formData.guardianUserName1"
|
||||
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-input v-model="formData.guardianUserName1" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="工号" >
|
||||
<el-form-item prop="guardianLoginName1">{{formData.guardianLoginName1}}
|
||||
</el-form-item>
|
||||
@@ -118,35 +100,17 @@ layout("/layouts/platform.html"){
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="所在单位">
|
||||
<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-descriptions-item>
|
||||
<el-descriptions-item label="监护人2">
|
||||
<el-form-item label="监护人2" prop="guardianUserName2">
|
||||
<el-select
|
||||
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-input v-model="formData.guardianUserName2" placeholder="请输入监护人姓名" maxlength="30"></el-input>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
<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-descriptions-item>
|
||||
<el-descriptions-item label="手机号码">
|
||||
@@ -181,8 +145,6 @@ layout("/layouts/platform.html"){
|
||||
return {
|
||||
bizId: GetQueryString("bizId"),
|
||||
formData: {},
|
||||
userOptions: [],
|
||||
userOptions2: [],
|
||||
formRules: {
|
||||
childRelationship: [{ required: true, message: '请选择就读年级', trigger: 'change' }],
|
||||
childrenYear: [{ required: true, message: '请选择入学年份', trigger: 'change' }],
|
||||
@@ -196,92 +158,6 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
},
|
||||
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() {
|
||||
if (!this.formData.childrenIdCard) {
|
||||
this.$message.error("请填写子女身份证号码")
|
||||
@@ -343,6 +219,14 @@ layout("/layouts/platform.html"){
|
||||
unionName: union.name,
|
||||
unionId: union.id,
|
||||
mobile: mobile,
|
||||
// 自动填充监护人1信息
|
||||
guardianUserName1: username,
|
||||
guardianLoginName1: loginname,
|
||||
guardianMobile1: mobile,
|
||||
guardianUnitName1: unit.name,
|
||||
guardianUnitId1: unit.id,
|
||||
guardianUnionName1: union.name,
|
||||
guardianUnionId1: union.id
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,7 +104,6 @@ layout("/layouts/platform_h5.html"){
|
||||
<van-field
|
||||
label="手机号码"
|
||||
v-model="formData.guardianMobile1"
|
||||
readonly
|
||||
placeholder="读取信息中心数据"
|
||||
:rules="formRules.guardianMobile1"
|
||||
></van-field>
|
||||
|
||||
Reference in New Issue
Block a user