diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingActController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingActController.java
index 2fdcebb3..07556885 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingActController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingActController.java
@@ -98,7 +98,6 @@ public class CadreTrainingActController {
     }
 
     @At
-    @SaCheckPermission("cadreTraining.activity")
     @ApiOperation("查询单个活动信息")
     public Result get(@Param("id") String id) {
         CadreTrainingAct cadreTrainingAct = cadreTrainingActService.fetch(id);
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingCollectController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingCollectController.java
index 903e0ec4..63aad75e 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingCollectController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingCollectController.java
@@ -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();
         // 添加年度筛选条件，基于报名开始时间
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSchoolAuditController.java
index 25e5b3f4..465f672b 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSchoolAuditController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSchoolAuditController.java
@@ -112,6 +112,7 @@ public class CadreTrainingSchoolAuditController {
         }
         // 活动ID查询条件
         cnd.andEX("info.cadreTrainingActId", "=", activityId);
+        cnd.andEX("year(info.applyTime)", "=", year);
 
         // 工会、单位名称查询条件
         cnd.andEX("info.unionId", "=", unionId);
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSignUpController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSignUpController.java
index 115f5810..d009b12c 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSignUpController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSignUpController.java
@@ -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);
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateMineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateMineController.java
index e36fd5bc..2550ee8b 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateMineController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateMineController.java
@@ -80,6 +80,7 @@ public class EvaluateMineController {
         Cnd cnd = Cnd.NEW();
         cnd.andEX("YEAR(info.year)", "=", year);
         cnd.and("info.loginName", "=", SecurityUtil.getUserLoginname());
+		cnd.desc("info.createdAt");
         sql.setCondition(cnd);
         Pagination pagination = evaluateService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardQueryController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardQueryController.java
index 94ec92b1..a68bba80 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardQueryController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardQueryController.java
@@ -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);
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java
index a29ccc09..b8569f27 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java
@@ -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"));
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorManageController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorManageController.java
index fcc738a9..418ea06a 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorManageController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorManageController.java
@@ -61,7 +61,7 @@ public class HonorManageController {
         Sql sql = Sqls.create("""
                 SELECT
                 	h.*,
-                	u.loginname,
+                	u.loginName,
                 	prize.`name` AS prizeName,
                 	type.`name` AS typeName,
                 	`level`.`name` AS levelName,
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingMineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingMineController.java
index d96db682..5d339830 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingMineController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingMineController.java
@@ -100,7 +100,7 @@ public class MeetingMineController {
 		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
 			SqlExpressionGroup seg = new SqlExpressionGroup();
 			seg.or("name", "like", "%" + pageForm.getSearchKeyword() + "%");
-			seg.or("name", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("address", "like", "%" + pageForm.getSearchKeyword() + "%");
 			cnd.and(seg);
 		}
 		if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) {
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/controller/QsvBankController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/controller/QsvBankController.java
index 3e448b92..73fb63c8 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/controller/QsvBankController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/controller/QsvBankController.java
@@ -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);
     }
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java
index 1989e861..f18c2fc8 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java
@@ -10,6 +10,7 @@ import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Strings;
 
 /**
  * @author zhf
diff --git a/src/main/resources/views/platform/bpm/processDefine/index.html b/src/main/resources/views/platform/bpm/processDefine/index.html
index a478dc72..c1a1afd2 100644
--- a/src/main/resources/views/platform/bpm/processDefine/index.html
+++ b/src/main/resources/views/platform/bpm/processDefine/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/flow/definition/index.html b/src/main/resources/views/platform/flow/definition/index.html
index 6060d77f..b5e4aea6 100644
--- a/src/main/resources/views/platform/flow/definition/index.html
+++ b/src/main/resources/views/platform/flow/definition/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js b/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js
index 9707be8e..f0e2e88f 100644
--- a/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js
+++ b/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js
@@ -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"
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/birthdayWishes/plan/index.html b/src/main/resources/views/platform/zhgh/dayofficework/birthdayWishes/plan/index.html
index ac756be3..2e70ef1e 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/birthdayWishes/plan/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/birthdayWishes/plan/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html
index a22af9c1..74850174 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html
index b9db3f04..d31592b8 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/mine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/mine/index.html
index 4b7babd9..77a60837 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/mine/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/mine/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html
index 2c1080fd..08b976fa 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html
index f785f9ce..9bcb3d86 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html
index 1319d92e..b5f5ba9a 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/index.html
index b1107c65..1dadb9d8 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/index.html
@@ -60,6 +60,10 @@ layout("/layouts/platform.html"){
         },
         methods: {
             openApply(row) {
+                if(this.$moment().isAfter(this.$moment(row.endTime))) {
+                    this.$message.warning('申请时间已截止')
+                    return
+                }
                 $.post("/platform/evaluate/apply/valid", {id: row.id}).then((res) => {
                     if (res.code === 0) {
                         const {msg, data} = res
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html b/src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html
index 699e1e4b..6f31dbf6 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html
@@ -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="姓名/工号">
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html
index 9059847b..d0608b8c 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html
@@ -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="姓名/工号">
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/changeRecord/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/changeRecord/index.html
index 5cad6ef7..d2f80aee 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/changeRecord/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/changeRecord/index.html
@@ -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="姓名/工号">
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/his/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/his/index.html
index 3d6969c4..25c107f6 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/his/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/his/index.html
@@ -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="姓名/工号">
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html
index 37e0d336..95057d72 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html
index 32df8067..f185ea93 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html
@@ -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="姓名/工号">
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html
index 5ead82a5..4b3c2878 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html
@@ -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="工号/姓名">
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/subsidy/query/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/subsidy/query/index.html
index cfbafd94..63d1f1bc 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/fund/subsidy/query/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/subsidy/query/index.html
@@ -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="姓名/工号">
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html
index 3c719079..12e25333 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html
index d376c13a..550a9c85 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js b/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js
index 722ca17b..79f9352d 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js
+++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js
@@ -231,6 +231,10 @@ const basicForm = {
     },
     methods: {
         next() {
+            if(!this.formData.typeId) {
+                this.$message.warning('请选择会议类型')
+                return
+            }
             const type = this.typeOptions.find(o => o.id === this.formData.typeId)
             if(type.designId === 'JDHHY' && !this.formData.teacherCongressSessionId) {
                 this.$message.warning('请选择所属教代会')
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/index.html
index 1997af51..dc75235f 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/mine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/mine/index.html
index 1dab4414..79122d96 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/mine/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/mine/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html
index 0f453944..803febf2 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html
index 3c719079..12e25333 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/index.html
index b0abfc9a..b30b75f0 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/type/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/type/index.html
index 8684a257..412fc8a9 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/type/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/type/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html
index 0c8a8c6d..07eea3ea 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html
index 29735766..d5346173 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/index.html b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/index.html
index ad5a7f67..1bec75e4 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/index.html
@@ -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>
 
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/optionImg.js b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/optionImg.js
index 13a6df59..0a9a801a 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/optionImg.js
+++ b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/optionImg.js
@@ -1,9 +1,9 @@
 const optionImg = {
     template: /*language=HTML*/ `
-        <el-dialog :visible="visible" title="设置图片" append-to-body width="700px">
+        <el-dialog :visible.sync="visible" title="设置图片" append-to-body width="700px">
             <div style="background: #f7f8f9;text-align: center;border: solid 1px #d7d8d9;border-radius: 4px;">
                 <el-upload
-                        action="/file_server/uploadFile"
+                        action="/platform/sys/file/uploadDynamicReturnUrl"
                         :show-file-list="false"
                         :on-success="handleSuccess"
                         :before-upload="beforeUpload">
@@ -38,7 +38,7 @@ const optionImg = {
             console.log(file)
             console.log(fileList)
             if (response.code === 0) {
-                this.img = FILE_STREAM_PREVIEW_ADDRESS + "?id=" + response.data.filepath
+                this.img = response.data
                 // this.img = "/platform/sys/file/download?id=t38dmq4beuhrupqb54prl52t4u"
                 this.$message.success("图片上传成功")
             }
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/setting.js b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/setting.js
index afff7f0d..5367a467 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/setting.js
+++ b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/setting.js
@@ -32,6 +32,7 @@ const setting = {
         },
         onConfirm(){
             this.$emit('confirm', { option:this.formData,ext:this.ext })
+            this.visible = false
         }
     }
 
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/rest/activity/index.html b/src/main/resources/views/platform/zhgh/dayofficework/rest/activity/index.html
index 631c1a38..ec1f8f02 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/rest/activity/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/rest/activity/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/rest/signUp/index.html b/src/main/resources/views/platform/zhgh/dayofficework/rest/signUp/index.html
index 9515948e..1126d0bf 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/rest/signUp/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/rest/signUp/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/batch/index.html b/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/batch/index.html
index 404f1f7e..d1f49c29 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/batch/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/batch/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/ledger/index.html b/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/ledger/index.html
index 7b1a8b30..5cac2d84 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/ledger/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/ledger/index.html
@@ -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
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/site/manage/index.html b/src/main/resources/views/platform/zhgh/dayofficework/site/manage/index.html
index da3c4174..7444229a 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/site/manage/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/site/manage/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/site/type/index.html b/src/main/resources/views/platform/zhgh/dayofficework/site/type/index.html
index 1c1cc19d..7a534757 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/site/type/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/site/type/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/file/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/file/index.html
index 342274ac..63bbd817 100644
--- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/file/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/file/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/index.html
index b8402343..7a852b46 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/contribution/type/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/contribution/type/index.html
index 82f58eb5..1f54a45a 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/contribution/type/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/contribution/type/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/huimin/manage/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/huimin/manage/index.html
index 2aaffa8f..32981a60 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/huimin/manage/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/huimin/manage/index.html
@@ -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>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/childManage/write/index.html b/src/main/resources/views/platform/zhgh/staffmanage/childManage/write/index.html
index d7b28bcf..ec9d2437 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/childManage/write/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/childManage/write/index.html
@@ -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
                     }
                 }
             }
diff --git a/src/main/resources/views/platform/zhghh5/activity/family/list/index.html b/src/main/resources/views/platform/zhghh5/activity/family/list/index.html
index dad57aa7..d54ded44 100644
--- a/src/main/resources/views/platform/zhghh5/activity/family/list/index.html
+++ b/src/main/resources/views/platform/zhghh5/activity/family/list/index.html
@@ -30,6 +30,12 @@ layout("/layouts/platform_h5.html"){
         </van-dropdown-menu>
     </van-sticky>
 
+    <van-tabs v-if="assortList.length > 0" type="card" color="#1867B0"
+              style="margin-top: 10px" @click="tabClick">
+        <van-tab v-for="item in assortList" :name="item" :title="item">
+        </van-tab>
+    </van-tabs>
+
     <table-list api="/platform/family/apply/pageData"
                 :page_form.sync="pageForm"
                 ref="tableListRef"
@@ -117,6 +123,7 @@ layout("/layouts/platform_h5.html"){
                     courseTypeId: null,
                     activityId: GetQueryString('id'),
                     dataType: GetQueryString('dataType'),
+                    assortTypes: [],
                 },
                 typeOptions: [],
                 assortOptions: [],
@@ -125,10 +132,18 @@ layout("/layouts/platform_h5.html"){
 
                 introduceRow: {},
                 activity: {},
+                assortList: [],
+
                 weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'},
             }
         },
         methods: {
+            tabClick(name) {
+                this.pageForm.assortTypes = []
+                this.pageForm.assortTypes.push(name)
+                this.pageForm.assortTypes = JSON.stringify(this.pageForm.assortTypes)
+                this.doSearch()
+            },
             refresh() {
                 this.doSearch()
             },
@@ -197,6 +212,7 @@ layout("/layouts/platform_h5.html"){
                 }
             },
             async onReady() {
+                this.queryCourseAssort()
                 const typeList = await this.getCourseTypeList()
                 this.sourceTypeOptions = clone(typeList)
                 this.typeOptions = [
@@ -221,6 +237,15 @@ layout("/layouts/platform_h5.html"){
                 const resp = await this.$axios.post("/platform/family/type/getAllType")
                 return resp.data
             },
+            queryCourseAssort() {
+                this.$axios.post("/platform/family/apply/queryCourseAssort", {activityId: this.pageForm.activityId})
+                    .then((resp) => {
+                        this.assortList = resp.data
+                        if(this.assortList.length > 0) {
+                            this.pageForm.assortTypes = JSON.stringify([this.assortList[0]])
+                        }
+                    })
+            },
             doSearch() {
                 this.$nextTick(() => {
                     this.pageForm.pageNumber = 1
diff --git a/src/main/resources/views/platform/zhghh5/activity/trainSignUp/list/index.html b/src/main/resources/views/platform/zhghh5/activity/trainSignUp/list/index.html
index 002986f0..cd95afbe 100644
--- a/src/main/resources/views/platform/zhghh5/activity/trainSignUp/list/index.html
+++ b/src/main/resources/views/platform/zhghh5/activity/trainSignUp/list/index.html
@@ -24,6 +24,12 @@ layout("/layouts/platform_h5.html"){
         </van-dropdown-menu>
     </van-sticky>
 
+    <van-tabs v-if="assortList.length > 0" type="card" color="#1867B0"
+              style="margin-top: 10px" @click="tabClick">
+        <van-tab v-for="item in assortList" :name="item" :title="item">
+        </van-tab>
+    </van-tabs>
+
     <table-list api="/platform/trainSignUp/apply/pageData"
                 :page_form.sync="pageForm"
                 ref="tableListRef"
@@ -110,6 +116,7 @@ layout("/layouts/platform_h5.html"){
                     courseTypeId: null,
                     activityId: GetQueryString('id'),
                     dataType: GetQueryString('dataType'),
+                    assortTypes: [],
                 },
                 typeOptions: [],
                 assortOptions: [],
@@ -118,11 +125,18 @@ layout("/layouts/platform_h5.html"){
 
                 introduceRow: {},
                 activity: {},
+                assortList: [],
 
                 weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'},
             }
         },
         methods: {
+            tabClick(name) {
+                this.pageForm.assortTypes = []
+                this.pageForm.assortTypes.push(name)
+                this.pageForm.assortTypes = JSON.stringify(this.pageForm.assortTypes)
+                this.doSearch()
+            },
             refresh() {
                 this.doSearch()
             },
@@ -191,6 +205,7 @@ layout("/layouts/platform_h5.html"){
                 }
             },
             async onReady() {
+                this.queryCourseAssort()
                 const typeList = await this.getCourseTypeList()
                 this.sourceTypeOptions = clone(typeList)
                 this.typeOptions = [
@@ -215,6 +230,15 @@ layout("/layouts/platform_h5.html"){
                 const resp = await this.$axios.post("/platform/trainSignUp/type/getAllType")
                 return resp.data
             },
+            queryCourseAssort() {
+                this.$axios.post("/platform/trainSignUp/apply/queryCourseAssort", {activityId: this.pageForm.activityId})
+                    .then((resp) => {
+                        this.assortList = resp.data
+                        if(this.assortList.length > 0) {
+                            this.pageForm.assortTypes = JSON.stringify([this.assortList[0]])
+                        }
+                    })
+            },
             doSearch() {
                 this.$nextTick(() => {
                     this.pageForm.pageNumber = 1
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/literacy/list/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/literacy/list/index.html
index 989be05e..415933ff 100644
--- a/src/main/resources/views/platform/zhghh5/dayofficework/literacy/list/index.html
+++ b/src/main/resources/views/platform/zhghh5/dayofficework/literacy/list/index.html
@@ -24,6 +24,12 @@ layout("/layouts/platform_h5.html"){
         </van-dropdown-menu>
     </van-sticky>
 
+    <van-tabs v-if="assortList.length > 0" type="card" color="#1867B0"
+              style="margin-top: 10px" @click="tabClick">
+        <van-tab v-for="item in assortList" :name="item" :title="item">
+        </van-tab>
+    </van-tabs>
+
     <table-list api="/platform/literacy/apply/pageData"
                 :page_form.sync="pageForm"
                 ref="tableListRef"
@@ -110,6 +116,7 @@ layout("/layouts/platform_h5.html"){
                     courseTypeId: null,
                     activityId: GetQueryString('id'),
                     dataType: GetQueryString('dataType'),
+                    assortTypes: [],
                 },
                 typeOptions: [],
                 assortOptions: [],
@@ -118,11 +125,18 @@ layout("/layouts/platform_h5.html"){
 
                 introduceRow: {},
                 activity: {},
+                assortList: [],
 
                 weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'},
             }
         },
         methods: {
+            tabClick(name) {
+                this.pageForm.assortTypes = []
+                this.pageForm.assortTypes.push(name)
+                this.pageForm.assortTypes = JSON.stringify(this.pageForm.assortTypes)
+                this.doSearch()
+            },
             refresh() {
                 this.doSearch()
             },
@@ -191,6 +205,7 @@ layout("/layouts/platform_h5.html"){
                 }
             },
             async onReady() {
+                this.queryCourseAssort()
                 const typeList = await this.getCourseTypeList()
                 this.sourceTypeOptions = clone(typeList)
                 this.typeOptions = [
@@ -215,6 +230,15 @@ layout("/layouts/platform_h5.html"){
                 const resp = await this.$axios.post("/platform/literacy/type/getAllType")
                 return resp.data
             },
+            queryCourseAssort() {
+                this.$axios.post("/platform/literacy/apply/queryCourseAssort", {activityId: this.pageForm.activityId})
+                    .then((resp) => {
+                        this.assortList = resp.data
+                        if(this.assortList.length > 0) {
+                            this.pageForm.assortTypes = JSON.stringify([this.assortList[0]])
+                        }
+                    })
+            },
             doSearch() {
                 this.$nextTick(() => {
                     this.pageForm.pageNumber = 1
diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/childmanage/write/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/childmanage/write/index.html
index e5600b97..20815dee 100644
--- a/src/main/resources/views/platform/zhghh5/staffmanage/childmanage/write/index.html
+++ b/src/main/resources/views/platform/zhghh5/staffmanage/childmanage/write/index.html
@@ -104,7 +104,6 @@ layout("/layouts/platform_h5.html"){
 			<van-field
 					label="手机号码"
 					v-model="formData.guardianMobile1"
-					readonly
 					placeholder="读取信息中心数据"
 					:rules="formRules.guardianMobile1"
 			></van-field>