Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html
#	src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html
#	src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html

src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java

@@ -117,6 +117,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.setBirthday(DateUtil.parse(vwUser.getString("birthday"), "yyyy-MM-dd"));
                 exerciseCard.setUnionId(vwUser.getString("unionId"));
                 exerciseCard.setUnitId(vwUser.getString("unitId"));
@@ -127,7 +128,6 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl<ExerciseCard> imple
 
             // 设置其他基本信息
             exerciseCard.setLoginName(v.getLoginName());
-            exerciseCard.setUserName(v.getUsername());
             exerciseCard.setApplyTime(new Date()); // 设置当前时间为申请时间
 
             // 设置额度信息

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUndertakeSuggestionController.java

@@ -0,0 +1,150 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertakeSuggestion;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.Static;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @ClassName ProposalUndertakeSuggestionController
+ * @Author JyuHsin
+ * @Date 2025/10/16 16:34
+ * @Version 1.0
+ * @Description TODO
+ */
+@IocBean
+@At("/platform/proposal/suggestion")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案-办理-承办单位提出意见")
+public class ProposalUndertakeSuggestionController {
+
+	@Inject
+	private ProposalCommonService proposalCommonService;
+
+	@At("")
+	@Ok("beetl:/platform/zhgh/democratic/proposal/transact/suggestion/index.html")
+	@SaCheckPermission("proposal.suggestion")
+	public void index() {
+	}
+
+	@At("/h5")
+	@Ok("beetl:/platform/zhghh5/democratic/proposal/transact/suggestion/index.html")
+	@SaCheckPermission("h5.proposal.suggestion")
+	public void h5Index() {
+	}
+
+	@At
+	@SaCheckPermission(value = {"proposal.suggestion", "h5.proposal.suggestion"}, mode = SaMode.OR)
+	@ApiOperation("分页列表")
+	public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
+		Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.state instanceState,
+                    IFNULL(GROUP_CONCAT(DISTINCT nt.displayName), '结束') curTaskName,
+                    (select count(1) from proposal_undertake_suggestion where proposalId = info.id $unitId) as count
+                FROM
+                	wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		cnd.and("t.taskState", "=", 10);
+		cnd.and("t.taskName", "=", "committee");
+
+		if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+			// 查询当前登录用户负责的承办单位
+			ProposalUndertake undertake = proposalCommonService.getSelfManageUndertake();
+			cnd.and(new Static("JSON_CONTAINS(suggestUnits, JSON_QUOTE('" + undertake.getName() + "'))"));
+			sql.setVar("unitId", " and unitId = '%s'".formatted(undertake.getId()));
+		}
+
+		ProposalSearchParam.buildSearch(cnd, pageForm);
+		cnd.groupBy("t.id");
+
+		cnd.having(Cnd.where("count", approval ? ">" : "=", 0));
+		cnd.desc("t.createdAt");
+		sql.setCondition(cnd);
+		Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		return Result.success(pagination);
+	}
+
+	@At
+	@ApiOperation("承办单位提出意见")
+	@Aop(TransAop.READ_COMMITTED)
+	@SaCheckPermission(value = {"proposal.suggestion", "h5.proposal.suggestion"}, mode = SaMode.OR)
+	@SLog(tag = "提案系统-承办单位意见", msg = "提出意见")
+	public Result suggest(ProposalUndertakeSuggestion suggestion) {
+		suggestion.setUserId(SecurityUtil.getUserId());
+		suggestion.setUserName(SecurityUtil.getUserUsername());
+		suggestion.setTime(DateUtil.now());
+
+		ProposalUndertake undertake = proposalCommonService.getSelfManageUndertake();
+
+		suggestion.setUnitId(Objects.requireNonNullElse(undertake.getId(), ""));
+		suggestion.setUnitName(Objects.requireNonNullElse(undertake.getName(), ""));
+		proposalCommonService.dao().insert(suggestion);
+		return Result.success();
+	}
+
+	@At
+	@ApiOperation("承办单位提出意见")
+	@Aop(TransAop.READ_COMMITTED)
+	@SaCheckPermission(value = {"proposal.suggestion", "h5.proposal.suggestion"}, mode = SaMode.OR)
+	@SLog(tag = "提案系统-承办单位意见", msg = "删除意见")
+	public Result delete(String id) {
+		proposalCommonService.dao().delete(ProposalUndertakeSuggestion.class, id);
+		return Result.success();
+	}
+
+	@At
+	@ApiOperation("查询意见")
+	@SaCheckPermission(value = {"proposal.suggestion", "h5.proposal.suggestion"}, mode = SaMode.OR)
+	public Result selectSuggestion(String proposalId) {
+		Cnd cnd = Cnd.NEW();
+		cnd.and(ProposalUndertakeSuggestion::getProposalId, "=", proposalId);
+		if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+			cnd.and(ProposalUndertakeSuggestion::getUnitId, "=", proposalCommonService.getSelfManageUndertake().getId());
+		}
+		cnd.desc(ProposalUndertakeSuggestion::getTime);
+		List<ProposalUndertakeSuggestion> list = proposalCommonService.dao().query(ProposalUndertakeSuggestion.class, cnd);
+		return Result.success(list);
+	}
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/models/ProposalUndertakeSuggestion.java

@@ -0,0 +1,68 @@
+package com.budwk.app.zhgh.democratic.proposal.models;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * @ClassName ProposalUndertakeSugges
+ * @Author JyuHsin
+ * @Date 2025/10/16 16:29
+ * @Version 1.0
+ * @Description TODO
+ */
+@Table("proposal_undertake_suggestion")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("提案承办单位意见")
+public class ProposalUndertakeSuggestion extends BaseModel {
+
+	@Name
+	@Comment("ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	@PrevInsert(uu32 = true)
+	private String id;
+
+	@Column
+	@Comment("提案id")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String proposalId;
+
+	@Column
+	@Comment("用户id")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String userId;
+
+	@Column
+	@Comment("用户姓名")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String userName;
+
+	@Column
+	@Comment("单位id")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String unitId;
+
+	@Column
+	@Comment("单位名称")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String unitName;
+
+	@Column
+	@Comment("提出时间")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String time;
+
+	@Column
+	@Comment("提出意见")
+	@ColDefine(type = ColType.VARCHAR, width = 500)
+	private String opinion;
+
+	@Column
+	@Comment("结果")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String result;
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonService.java

@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.democratic.proposal.service.common;
 
 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
 import org.nutz.lang.util.NutMap;
 
 import javax.servlet.http.HttpServletResponse;
@@ -80,6 +81,13 @@ public interface ProposalCommonService extends BaseService<ProposalInfo> {
     List<String> getSelfManageDelegationIds();
 
 
+	/**
+	 * 获取自管承办单位
+	 *
+	 * @return
+	 */
+	ProposalUndertake getSelfManageUndertake();
+
     /**
      * 根据提案id查询并案的提案
      *

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java

@@ -28,6 +28,7 @@ import com.budwk.app.web.commons.base.Globals;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalConsolidation;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalMerge;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
 import com.budwk.app.zhgh.democratic.teachercongress.prepare.models.Teacher_congress_session;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
@@ -44,6 +45,7 @@ import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.json.Json;
+import org.nutz.lang.Lang;
 import org.nutz.lang.util.NutMap;
 
 import javax.servlet.http.HttpServletResponse;
@@ -434,7 +436,18 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         return delegationIds;
     }
 
-    @Override
+	@Override
+	public ProposalUndertake getSelfManageUndertake() {
+		Sys_role role = sysRoleService.getByCode(RoleConstant.PROPOSAL_UNIT_LEADER.name());
+		Sys_user_role userRole = dao().fetch(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", role.getId())
+				.and(Sys_user_role::getUserId, "=", SecurityUtil.getUserId()));
+		if(Lang.isEmpty(userRole)) {
+			throw new RuntimeException("当前登录用户不是" + role.getName());
+		}
+		return dao().fetch(ProposalUndertake.class, Cnd.where(ProposalUndertake::getId, "=", userRole.getUnderTakeId()));
+	}
+
+	@Override
     public List<String> getConsolidation(String id) {
         ProposalConsolidation consolidation = dao().fetch(ProposalConsolidation.class, Cnd.where(new Static("JSON_CONTAINS(consolidationIds,'\"" + id + "\"')")));
         if (ObjectUtil.isNotEmpty(consolidation)) {

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyController.java

@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.staffmanage.member.controller.apply;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -72,6 +73,9 @@ public class MemberApplyController {
     @SaCheckPermission("member.apply.submit")
     @SLog(tag = "会员入会申请", msg = "保存申请,申请人: ${args[0].username}")
     public Result save(@Param("data") MemberApplyRecord memberApplyRecord) {
+        if (StrUtil.isBlank(memberApplyRecord.getId())) {
+            memberCommonService.validateApplyOrChangeIsDoing(null, "apply");
+        }
         dao.insertOrUpdate(memberApplyRecord);
         return Result.success();
     }
@@ -83,6 +87,9 @@ public class MemberApplyController {
     @SaCheckPermission("member.apply.submit")
     @SLog(tag = "会员入会申请", msg = "提交申请,申请人: ${args[0].username}")
     public Result submit(@Param("data") MemberApplyRecord memberApplyRecord){
+        if (StrUtil.isBlank(memberApplyRecord.getId())) {
+            memberCommonService.validateApplyOrChangeIsDoing(null, "apply");
+        }
         // 开启流程实例
         Dict args = Dict.create();
         // 设置流程变量
@@ -119,6 +126,9 @@ public class MemberApplyController {
     @SaCheckPermission("member.apply.submit")
     @SLog(tag = "会员入会申请", msg = "重新提交申请,申请人: ${args[0].username}")
     public Result submitAgain(@Param("data") MemberApplyRecord memberApplyRecord, @Param("taskId") Long taskId) {
+        if (StrUtil.isBlank(memberApplyRecord.getId())) {
+            memberCommonService.validateApplyOrChangeIsDoing(null, "apply");
+        }
         Dict dict = Dict.create();
         // 设置流程变量
         if ("HMC".equals(Globals.SchoolCode)) {

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java

@@ -75,6 +75,9 @@ public class MemberChangeApplyController {
     @SaCheckPermission("member.apply.submit")
     @SLog(tag = "会员变更申请", msg = "保存申请,申请人: ${args[0].username}")
     public Result save(@Param("data") MemberChangeRecord memberChangeRecord) {
+        if (StrUtil.isBlank(memberChangeRecord.getId())) {
+            memberCommonService.validateApplyOrChangeIsDoing(null, "change");
+        }
         // 校验是否有变更
         memberCommonService.validateChangeAndSetBasicData(memberChangeRecord);
         dao.insertOrUpdate(memberChangeRecord);
@@ -88,6 +91,9 @@ public class MemberChangeApplyController {
     @SaCheckPermission("member.apply.submit")
     @SLog(tag = "会员变更申请", msg = "提交申请,申请人: ${args[0].username}")
     public Result submit(@Param("data") MemberChangeRecord memberChangeRecord){
+        if (StrUtil.isBlank(memberChangeRecord.getId())) {
+            memberCommonService.validateApplyOrChangeIsDoing(null, "change");
+        }
         // 校验是否有变更
         memberCommonService.validateChangeAndSetBasicData(memberChangeRecord);
         dao.insertOrUpdate(memberChangeRecord);
@@ -118,6 +124,9 @@ public class MemberChangeApplyController {
     @SaCheckPermission("member.apply.submit")
     @SLog(tag = "会员变更申请", msg = "重新提交申请,申请人: ${args[0].username}")
     public Result submitAgain(@Param("data") MemberChangeRecord memberChangeRecord, @Param("taskId") Long taskId) {
+        if (StrUtil.isBlank(memberChangeRecord.getId())) {
+            memberCommonService.validateApplyOrChangeIsDoing(null, "change");
+        }
         // 校验是否有变更
         memberCommonService.validateChangeAndSetBasicData(memberChangeRecord);
         dao.insertOrUpdate(memberChangeRecord);

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java

@@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.RepeatSubmit;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.BpmProcessConstant;
@@ -100,6 +101,11 @@ public class MemberChangeManageController {
         if (Lang.isEmpty(record)) {
             return Result.error("未获取到异动数据");
         }
+
+        if (StrUtil.isBlank(record.getId())) {
+            memberCommonService.validateApplyOrChangeIsDoing(record.getUserId(), "change");
+        }
+
         boolean schoolRoleBool = AuthUtil.hasRoleOr(RoleConstant.SCHOOL_UNION_CHAIRMAN.name(), RoleConstant.SCHOOL_UNION_MEMBER_ADMIN.name(), RoleConstant.SYSADMIN.name());
         boolean branchRoleBool = AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name());
         boolean groupRoleBool = AuthUtil.hasRole(RoleConstant.BRANCH_UNION_GROUP_LEADER.name());

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffmanage.member.controller.change;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
@@ -147,7 +148,7 @@ public class MemberChangeMineController {
 
     @At
     @ApiOperation("根据id查询变更记录")
-    @SaCheckPermission("member.change.mine")
+    @SaCheckPermission(value = {"member.change.mine", "member.change.unionGroup.audit"}, mode = SaMode.OR)
     public Result findMemberChangeRecord(String id){
         MemberChangeRecord record = dao.fetch(MemberChangeRecord.class, id);
         NutMap nutMap = Lang.obj2nutmap(record);

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberCommonService.java

@@ -107,4 +107,12 @@ public interface MemberCommonService extends BaseService<Sys_user> {
      * @param record
      */
     void validateChangeAndSetBasicData(MemberChangeRecord record, MemberChangeOrigin origin);
+
+
+    /**
+     * 校验申请和变更是否正在进行中
+     * @param userId  用户id
+     * @param type    类型： apply or change
+     */
+    void validateApplyOrChangeIsDoing(String userId, String type);
 }

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java

@@ -10,6 +10,9 @@ import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.sys.models.*;
 import com.budwk.app.sys.services.SysDictService;
 import com.budwk.app.sys.services.SysRoleService;
@@ -508,6 +511,38 @@ public class MemberManageServiceImpl extends BaseServiceImpl<Sys_user> implement
         record.setApplyDateTime(DateUtil.date());
     }
 
+
+    /**
+     * 验证申请或变更是否正在进行
+     * @param userId  用户id
+     * @param type    类型： apply or change
+     */
+    @Override
+    public void validateApplyOrChangeIsDoing(String userId, String type) {
+        String businessNo = "";
+
+        Cnd cnd = Cnd.NEW();
+        cnd.and("userId", "=", StrUtil.isNotBlank(userId) ? userId : SecurityUtil.getUserId());
+        cnd.desc("applyDateTime");
+        if ("apply".equals(type)) {
+            // 申请
+            MemberApplyRecord apply = dao().fetch(MemberApplyRecord.class, cnd);
+            businessNo = apply.getId();
+        } else {
+            // 变更
+            MemberChangeRecord change = dao().fetch(MemberChangeRecord.class, cnd);
+            businessNo = change.getId();
+        }
+
+        int count = dao().count(ProcessInstance.class, Cnd.where("businessNo", "=", businessNo)
+                .and(ProcessInstance::getState, "=", ProcessTaskStateEnum.DOING.getCode()));
+        if (count > 0) {
+            throw new BaseException("您有%s流程还在进行中，请等待流程结束后再次操作".formatted("apply".equals(type) ? "申请" : "变更"));
+        }
+
+    }
+
+
     private String booleanVerification(Object value) {
         // 检查是否为null或空字符串
         if (ObjectUtil.isAllEmpty(value, "")) {

src/main/resources/views/platform/sys/msg/summary/index.html

@@ -7,19 +7,19 @@ layout("/layouts/platform.html"){
     <guava ref="guava">
         <el-card shadow="never">
             <search @search="doSearch">
-                <search-item label="消息类型：">
+                <search-item label="消息类型">
                     <el-select clearable placeholder="请选择消息类型" v-model="pageForm.searchType" style="width: 100%" @change="getMsg">
                         <el-option label="全部类型消息" value="all"></el-option>
                         <el-option label="系统消息" value="system"></el-option>
                         <el-option label="用户消息" value="user"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="消息标题：">
+                <search-item label="消息标题">
                     <el-select placeholder="请选择消息标题" v-model="pageForm.msgId" style="width: 100%" @change="doSearch">
                         <el-option v-for="item in msgOptions" :key="item.id" :label="item.title" :value="item.id"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="状态：">
+                <search-item label="状态">
                     <el-select placeholder="请选择状态" v-model="pageForm.readStatus" style="width: 100%" @change="doSearch">
                         <el-option label="全部" :value="null"></el-option>
                         <el-option label="未阅读" :value="0"></el-option>
@@ -28,20 +28,20 @@ layout("/layouts/platform.html"){
                         <el-option label="已阅读已反馈" :value="3"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="姓名/工号：">
+                <search-item label="姓名/工号">
-                    <el-input placeholder="请输入内容" v-model="pageForm.searchKeyword" @keyup.enter.native="doSearch" clearable>
+                    <el-input placeholder="请输入姓名或工号" v-model="pageForm.searchKeyword" @keyup.enter.native="doSearch" clearable>
                         <el-select v-model="pageForm.searchName" slot="prepend" placeholder="查询类型" style="width: 80px">
                             <el-option label="工号" value="mu.loginname"></el-option>
                             <el-option label="姓名" value="mu.userName"></el-option>
                         </el-select>
                     </el-input>
                 </search-item>
-                <search-item label="所属工会：">
+                <search-item label="所属工会">
                     <el-select v-model="pageForm.unionId" @change="flushUnits" @clear="flushUnits" placeholder="请选择所属工会" filterable clearable>
                         <el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="所属单位：">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable @change="doSearch">
                         <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>

src/main/resources/views/platform/sys/union/index.html

@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
                         @node-click="treeNodeClick"
                         :filter-node-method="filterNode"
                         highlight-current
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
                 </div>
             </el-card>
         </el-col>

src/main/resources/views/platform/sys/unit/index.html

@@ -21,7 +21,15 @@ layout("/layouts/platform.html"){
                         @node-click="treeNodeClick"
                         :filter-node-method="filterNode"
                         highlight-current
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
                 </div>
             </el-card>
         </el-col>

src/main/resources/views/platform/zhgh/activity/basic/settings/index.html

@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
                         highlight-current
                         node-key="id"
                         ref="treeRef"
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
                 </div>
             </el-card>
         </el-col>

src/main/resources/views/platform/zhgh/activity/basic/union/index.html

@@ -18,7 +18,15 @@ layout("/layouts/platform.html"){
                         default-expand-all
                         highlight-current
                         ref="treeRef"
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
                 </div>
             </el-card>
         </el-col>

src/main/resources/views/platform/zhgh/activity/basic/unit/index.html

@@ -19,7 +19,15 @@ layout("/layouts/platform.html"){
                         highlight-current
                         node-key="id"
                         ref="treeRef"
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
                 </div>
             </el-card>
         </el-col>

src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js

@@ -44,7 +44,7 @@ const ACTIVITY_CULTURE_USER_STATISTICS = {
 
                         <search-item label="姓名/工号">
                             <el-input @keyup.enter.native="doSearch" clearable
-                                      placeholder="请输入姓名/工号"
+                                      placeholder="请输入姓名或工号"
                                       v-model="pageForm.searchKeyword">
                                 <el-select placeholder="姓名/工号" slot="prepend"
                                            style="width: 80px;"

src/main/resources/views/platform/zhgh/activity/family/userAdjust/userInfo.js

@@ -4,15 +4,15 @@ const userInfo = {
             <div class="left-span-label">{{ registerCourse.courseName + '报名人员' }}</div>
             <div>
                 <search @search="registerSearch">
-                    <search-item label="姓名/工号：">
+                    <search-item label="姓名/工号">
-                        <el-input v-model="registerForm.searchKeyword" placeholder="请输入内容"></el-input>
+                        <el-input v-model="registerForm.searchKeyword" placeholder="请输入姓名或工号"></el-input>
                     </search-item>
-                    <search-item label="所属工会：">
+                    <search-item label="所属工会">
                         <el-select v-model="registerForm.unionId" clearable filterable placeholder="请选择院级工会" @change="getUnitList()">
                             <el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="所属单位：">
+                    <search-item label="所属单位">
                         <el-select v-model="registerForm.unitId" clearable filterable placeholder="请选择单位">
                             <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>

src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js

@@ -4,15 +4,15 @@ const userInfo = {
             <div class="left-span-label">{{ registerCourse.courseName + '报名人员' }}</div>
             <div>
                 <search @search="registerSearch">
-                    <search-item label="姓名/工号：">
+                    <search-item label="姓名/工号">
-                        <el-input v-model="registerForm.searchKeyword" placeholder="请输入内容"></el-input>
+                        <el-input v-model="registerForm.searchKeyword" placeholder="请输入姓名或工号"></el-input>
                     </search-item>
-                    <search-item label="所属工会：">
+                    <search-item label="所属工会">
                         <el-select v-model="registerForm.unionId" clearable filterable placeholder="请选择院级工会" @change="getUnitList()">
                             <el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="所属单位：">
+                    <search-item label="所属单位">
                         <el-select v-model="registerForm.unitId" clearable filterable placeholder="请选择单位">
                             <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>

src/main/resources/views/platform/zhgh/activity/workscollection/read/index.html

@@ -30,8 +30,8 @@ layout("/layouts/platform.html"){
                     <el-option v-for="item in worksTypeOptions" :key="item.id" :label="item.worksTypeName" :value="item.id"></el-option>
                 </el-select>
             </search-item>
-            <search-item label="工号/姓名">
+            <search-item label="姓名/工号">
-                <el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入内容"></el-input>
+                <el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入姓名或工号"></el-input>
             </search-item>
             <search-item label="所属工会">
                 <el-select clearable filterable placeholder="请选择所属工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">

src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js

@@ -3,13 +3,13 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
             <div>
                 <el-card shadow="never">
                     <search @search="doSearch">
-                        <search-item label="姓名/工号：">
+                        <search-item label="姓名/工号">
-                             <el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
+                             <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                         </search-item>
-                        <search-item label="教职工类别：">
+                        <search-item label="教职工类别">
                              <dict-select code="USER_PERSON_TYPE" placeholder="请选择人员类型" clearable v-model="pageForm.personType"></dict-select>
                         </search-item>
-                        <search-item label="在职状态：">
+                        <search-item label="在职状态">
                              <dict-select clearable code="USER_STATE" placeholder="请选择人员状态" v-model="pageForm.userState"></dict-select>
                         </search-item>
                     </search>

src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html

@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
                                 @node-click="treeNodeClick"
                                 :filter-node-method="filterNode"
                                 highlight-current
-                            ></el-tree>
+                            >
+                                <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                                </template>
+                            </el-tree>
                         </div>
                     </el-card>
                 </el-col>

src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html

@@ -26,7 +26,7 @@ layout("/layouts/platform.html"){
                     </el-select>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input>
                 </search-item>
                 <search-item label="性别">
                     <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">

src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html

@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
                     </el-select>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input>
                 </search-item>
                 <search-item label="性别">
                     <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">

src/main/resources/views/platform/zhgh/dayofficework/clothing/apply/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
                                 disabled
                                 placeholder="请选择年度"
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
                                 value-format="yyyy"
                         ></el-date-picker>
                     </search-item>
-                    <search-item label="项目名称：">
+                    <search-item label="项目名称">
                         <el-select v-model="pageForm.projectId" placeholder="请选择项目名称" filterable
                                    @change="doSearch" style="width: 100%">
                             <el-option
@@ -32,23 +32,23 @@ layout("/layouts/platform.html"){
                             </el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="所属工会：">
+                    <search-item label="所属工会">
                         <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
                                    @change="doSearch" style="width: 100%">
                             <el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="近两年内：">
+                    <search-item label="近两年内">
                         <el-radio-group @change="(val) => doSearch()" v-model="pageForm.isBuy">
                             <el-radio-button :label="true">已购买</el-radio-button>
                             <el-radio-button :label="false">未购买</el-radio-button>
                         </el-radio-group>
                     </search-item>
-                    <search-item label="姓名/工号：">
+                    <search-item label="姓名/工号">
-                        <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"
+                        <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"
                                   @keyup.enter.native="doSearch"></el-input>
                     </search-item>
-                    <search-item label="性别：">
+                    <search-item label="性别">
                         <el-select @change="doSearch" filterable clearable v-model="pageForm.sex"
                                    placeholder="请选择性别" style="width: 100%">
                             <el-option label="男" value="男"></el-option>

src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html

@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
                                     style="width: 100%"></el-date-picker>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="性别">
                     <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
@@ -47,7 +47,7 @@ layout("/layouts/platform.html"){
             <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
                 <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
                 <el-table-column prop="loginName" label="工号"></el-table-column>
-                <el-table-column prop="userName" label="职工姓名"></el-table-column>
+                <el-table-column prop="userName" label="姓名"></el-table-column>
                 <el-table-column prop="sex" label="性别"></el-table-column>
                 <el-table-column prop="unionName" label="所属工会"></el-table-column>
                 <el-table-column prop="unitName" label="所属单位"></el-table-column>

src/main/resources/views/platform/zhgh/dayofficework/fund/member/batchJoin/index.html

@@ -5,13 +5,13 @@ layout("/layouts/platform.html"){
     <guava ref="guava">
         <el-card shadow="never">
             <search @search="doSearch">
-                <search-item label="工号/姓名">
+                <search-item label="姓名/工号">
-                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询"
+                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号"
                               clearable></el-input>
                 </search-item>
-                <search-item label="分工会">
+                <search-item label="所属工会">
                     <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择分工会" clearable>
+                               placeholder="请选择所属工会" clearable>
                         <el-option v-for="item in unionOptions"
                                    :value="item.id"
                                    :key="item.id"

src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html

@@ -9,8 +9,9 @@ layout("/layouts/platform.html"){
                     <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
                                     style="width: 100%"></el-date-picker>
                 </search-item>
-                <search-item label="工号/姓名">
+                <search-item label="姓名/工号">
-                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询" clearable></el-input>
+                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号"
+                              clearable></el-input>
                 </search-item>
             </search>
         </el-card>

src/main/resources/views/platform/zhgh/dayofficework/fund/member/changeRecord/index.html

@@ -9,13 +9,13 @@ layout("/layouts/platform.html"){
                     <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
                                     style="width: 100%"></el-date-picker>
                 </search-item>
-                <search-item label="工号/姓名">
+                <search-item label="姓名/工号">
-                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询"
+                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号"
                               clearable></el-input>
                 </search-item>
-                <search-item label="分工会">
+                <search-item label="所属工会">
                     <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择分工会" clearable>
+                               placeholder="请选择所属工会" clearable>
                         <el-option v-for="item in unionOptions"
                                    :value="item.id"
                                    :key="item.id"

src/main/resources/views/platform/zhgh/dayofficework/fund/member/his/index.html

@@ -9,13 +9,13 @@ layout("/layouts/platform.html"){
                     <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
                                     style="width: 100%"></el-date-picker>
                 </search-item>
-                <search-item label="工号/姓名">
+                <search-item label="姓名/工号">
-                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询"
+                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号"
                               clearable></el-input>
                 </search-item>
-                <search-item label="分工会">
+                <search-item label="所属工会">
                     <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择分工会" clearable>
+                               placeholder="请选择所属工会" clearable>
                         <el-option v-for="item in unionOptions"
                                    :value="item.id"
                                    :key="item.id"

src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html

@@ -9,13 +9,13 @@ layout("/layouts/platform.html"){
                     <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
                                     style="width: 100%"></el-date-picker>
                 </search-item>
-                <search-item label="工号/姓名">
+                <search-item label="姓名/工号">
-                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询"
+                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号"
                               clearable></el-input>
                 </search-item>
-                <search-item label="分工会">
+                <search-item label="所属工会">
                     <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择分工会" clearable>
+                               placeholder="请选择所属工会" clearable>
                         <el-option v-for="item in unionOptions"
                                    :value="item.id"
                                    :key="item.id"

src/main/resources/views/platform/zhgh/dayofficework/fund/subsidy/query/index.html

@@ -9,13 +9,13 @@ layout("/layouts/platform.html"){
                     <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
                                     style="width: 100%"></el-date-picker>
                 </search-item>
-                <search-item label="工号/姓名">
+                <search-item label="姓名/工号">
-                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询"
+                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号"
                               clearable></el-input>
                 </search-item>
-                <search-item label="分工会">
+                <search-item label="所属工会">
                     <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择分工会" clearable>
+                               placeholder="请选择所属工会" clearable>
                         <el-option v-for="item in unionOptions"
                                    :value="item.id"
                                    :key="item.id"

src/main/resources/views/platform/zhgh/dayofficework/honor/basic/index.html

@@ -24,7 +24,16 @@ layout("/layouts/platform.html"){
                         highlight-current
                         node-key="id"
                         ref="treeRef"
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
+
                 </div>
             </el-card>
         </el-col>
@@ -36,8 +45,8 @@ layout("/layouts/platform.html"){
                         新建基础类型
                     </el-button>
                 </table-tool>
-                <el-table :data="tableData" :height="tableHeight" border ref="table" size="small">
+                <el-table :data="tableData" :height="tableHeight" border ref="table" size="medium">
-                    <el-table-column label="序号" sortable type="index"></el-table-column>
+                    <el-table-column label="序号" sortable type="index" width="50px"></el-table-column>
                     <el-table-column label="名称" prop="name"></el-table-column>
                     <el-table-column label="代码" prop="code"></el-table-column>
                     <el-table-column label="等级" prop="level"

src/main/resources/views/platform/zhgh/dayofficework/integral/detail/index.html

@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
                         </el-date-picker>
                     </search-item>
                     <search-item label="姓名/工号">
-                        <el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
+                        <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                     </search-item>
                     <search-item label="所属工会">
                         <el-select

src/main/resources/views/platform/zhgh/dayofficework/integral/manage/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>
+                        <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                     </search-item>
                     <search-item label="所属工会">
                         <el-select

src/main/resources/views/platform/zhgh/dayofficework/literacy/userAdjust/userInfo.js

@@ -4,15 +4,15 @@ const userInfo = {
             <div class="left-span-label">{{ registerCourse.courseName + '报名人员' }}</div>
             <div>
                 <search @search="registerSearch">
-                    <search-item label="姓名/工号：">
+                    <search-item label="姓名/工号">
-                        <el-input v-model="registerForm.searchKeyword" placeholder="请输入内容"></el-input>
+                        <el-input v-model="registerForm.searchKeyword" placeholder="请输入姓名或工号"></el-input>
                     </search-item>
-                    <search-item label="所属工会：">
+                    <search-item label="所属工会">
                         <el-select v-model="registerForm.unionId" clearable filterable placeholder="请选择院级工会" @change="getUnitList()">
                             <el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="所属单位：">
+                    <search-item label="所属单位">
                         <el-select v-model="registerForm.unitId" clearable filterable placeholder="请选择单位">
                             <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>

src/main/resources/views/platform/zhgh/dayofficework/literacy/userManage/index.html

@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
     <guava ref="guava">
         <el-card shadow="never">
             <search @search="doSearch">
-                <search-item label="年度：">
+                <search-item label="年度">
                     <el-date-picker
                         placeholder="选择年度"
                         type="year"
@@ -15,7 +15,7 @@ layout("/layouts/platform.html"){
                         value-format="yyyy"
                     ></el-date-picker>
                 </search-item>
-                <search-item label="活动名称：">
+                <search-item label="活动名称">
                     <el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
                         <el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
                     </el-select>
@@ -25,8 +25,8 @@ layout("/layouts/platform.html"){
                         <el-option :label="item.courseName" :value="item.id" v-for="item in courseList" :key="item.id"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="人员信息：">
+                <search-item label="姓名/工号">
-                    <el-input clearable placeholder="输入姓名或者工号搜索" v-model="pageForm.userKeyWord"></el-input>
+                    <el-input clearable placeholder="请输入姓名或工号" v-model="pageForm.userKeyWord"></el-input>
                 </search-item>
             </search>
         </el-card>
@@ -79,8 +79,8 @@ layout("/layouts/platform.html"){
             <el-table-column prop="username" label="姓名"></el-table-column>
             <el-table-column prop="loginname" label="工号"></el-table-column>
             <el-table-column prop="mobile" label="联系方式"></el-table-column>
-            <el-table-column prop="unitName" label="单位"></el-table-column>
+            <el-table-column prop="unionName" label="所属工会"></el-table-column>
-            <el-table-column prop="unionName" label="工会"></el-table-column>
+            <el-table-column prop="unitName" label="所属单位"></el-table-column>
             <el-table-column prop="signUpTime" label="报名时间"></el-table-column>
         </el-table>
         <span slot="footer" class="dialog-footer">
@@ -108,8 +108,8 @@ layout("/layouts/platform.html"){
                     { label: "姓名", prop: "username" },
                     { label: "工号", prop: "loginname" },
                     { label: "联系方式", prop: "mobile" },
-                    { label: "单位", prop: "unitName", sortable: true },
+                    { label: "所属工会", prop: "unionName", sortable: true },
-                    { label: "分工会", prop: "unionName", sortable: true },
+                    { label: "所属单位", prop: "unitName", sortable: true },
                     { label: "课程", prop: "courseNames", sortable: true },
                     { label: "缺席次数", prop: "absentCount" },
                     { label: "是否黑名单", prop: "isDisabled", sortable: true }

src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/periodsInfo.js

@@ -39,12 +39,12 @@ const periodsInfo = {
             <el-alert :title="tooltip + '人员名单'" type="info" effect="dark" class="mt20 mb20" :closable="false" show-icon></el-alert>
             <div style="padding: 20px; border-radius: 8px; border: 1px solid #ebeef5">
                 <search @search="doSearch">
-                    <search-item label="姓名/工号：">
+                    <search-item label="姓名/工号">
-                        <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"
+                        <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"
                                   @keyup.enter.native="doSearch">
                         </el-input>
                     </search-item>
-                    <search-item label="所属工会：">
+                    <search-item label="所属工会">
                         <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
                                    @change="doSearch" style="width: 100%">
                             <el-option
@@ -55,7 +55,7 @@ const periodsInfo = {
                             </el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="所属单位：">
+                    <search-item label="所属单位">
                         <el-select @change="doSearch"
                                    clearable
                                    filterable

src/main/resources/views/platform/zhgh/dayofficework/qsv/quiz/rank.html

@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
                     </el-select>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input v-model="pageForm.searchKeyword" placeholder="姓名/工号" clearable></el-input>
+                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable></el-input>
                 </search-item>
                 <search-item label="所属工会">
                     <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"

src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/ledger/index.html

@@ -33,7 +33,7 @@ layout("/layouts/platform.html"){
         <template>
             <el-card shadow="never">
                 <search @search="doSearch">
-                    <search-item label="批次名称：">
+                    <search-item label="批次名称">
                         <el-select v-model="pageForm.batchId" @change="doSearch" style="width: 100%"
                                    placeholder="请选择批次名称" filterable>
                             <el-option v-for="item in batchOptions"
@@ -43,7 +43,7 @@ layout("/layouts/platform.html"){
                             ></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="退休年份：">
+                    <search-item label="退休年份">
                         <el-date-picker
                             v-model="pageForm.year"
                             type="year"
@@ -53,7 +53,7 @@ layout("/layouts/platform.html"){
                             style="width: 100%"
                         ></el-date-picker>
                     </search-item>
-                    <search-item label="退休月份：">
+                    <search-item label="退休月份">
                         <el-date-picker
                             v-model="pageForm.month"
                             type="month"
@@ -63,7 +63,7 @@ layout("/layouts/platform.html"){
                             style="width: 100%"
                         ></el-date-picker>
                     </search-item>
-                    <search-item label="领取状态：">
+                    <search-item label="领取状态">
                         <el-select v-model="pageForm.receive" @change="doSearch" style="width: 100%"
                                    placeholder="请选择领取状态" filterable clearable>
                             <el-option :value="null" label="全部"></el-option>
@@ -71,18 +71,8 @@ layout("/layouts/platform.html"){
                             <el-option :value="true" label="已领取"></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="工号/姓名：">
+                    <search-item label="姓名/工号">
-                        <el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询" clearable></el-input>
+                        <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable></el-input>
-                    </search-item>
-                    <search-item label="所属单位：">
-                        <el-select @change="doSearch"
-                                   clearable
-                                   filterable
-                                   placeholder="请选择单位"
-                                   style="width: 100%"
-                                   v-model="pageForm.unitId">
-                            <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
-                        </el-select>
                     </search-item>
                     <search-item label="所属工会：">
                         <el-select v-model="pageForm.unionId"
@@ -99,6 +89,16 @@ layout("/layouts/platform.html"){
                             </el-option>
                         </el-select>
                     </search-item>
+                    <search-item label="所属单位">
+                        <el-select @change="doSearch"
+                                   clearable
+                                   filterable
+                                   placeholder="请选择所属单位"
+                                   style="width: 100%"
+                                   v-model="pageForm.unitId">
+                            <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                        </el-select>
+                    </search-item>
                 </search>
             </el-card>
 
@@ -225,8 +225,8 @@ layout("/layouts/platform.html"){
                     {prop: 'loginName', label: '工号'},
                     {prop: 'sex', label: '性别'},
                     {prop: 'mobile', label: '联系方式'},
-                    {prop: 'unitName', label: '所属单位'},
                     {prop: 'unionName', label: '所属工会'},
+                    {prop: 'unitName', label: '所属单位'},
                     {prop: 'retireTimeFormat', label: '退休时间'},
                     {prop: 'msgCount', label: '短信提醒次数'},
                     {prop: 'receive', label: '是否领取'},

src/main/resources/views/platform/zhgh/dayofficework/site/mine/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>

src/main/resources/views/platform/zhgh/dayofficework/site/record/index.html

@@ -17,7 +17,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>

src/main/resources/views/platform/zhgh/dayofficework/site/schoolUnionAudit/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>

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/collect/index.html

@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
                                     style="width: 100%"></el-date-picker>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="所属工会">
                         <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html

@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
                                     style="width: 100%"></el-date-picker>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="所属工会">
                         <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html

@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
                                     style="width: 100%"></el-date-picker>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="所属工会">
                         <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"

src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/index.html

@@ -8,7 +8,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 v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable>
                         </el-input>
                     </search-item>
                     <search-item label="教代会">
@@ -28,7 +28,7 @@ layout("/layouts/platform.html"){
                         </el-select>
                     </search-item>
                     <search-item label="代表团" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">
-                        <el-select clearable filterable placeholder="代表团" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
                                    v-model="pageForm.delegationId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in delegations"></el-option>
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
                     <el-table-column label="姓名" prop="userName"></el-table-column>
                     <el-table-column label="年龄" prop="age"></el-table-column>
                     <el-table-column label="性别" prop="sex"></el-table-column>
-                    <el-table-column label="所属单位" prop="unitName"></el-table-column>
-                    <el-table-column label="所属工会" prop="unionName"></el-table-column>
                     <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                    <el-table-column label="所属工会" prop="unionName"></el-table-column>
+                    <el-table-column label="所属单位" prop="unitName"></el-table-column>
                     <el-table-column label="操作" width="100" fixed="right">
                         <template scope="{row}">
                             <el-button

src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html

@@ -8,7 +8,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 v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable>
                         </el-input>
                     </search-item>
                     <search-item label="教代会">
@@ -28,7 +28,7 @@ layout("/layouts/platform.html"){
                         </el-select>
                     </search-item>
                     <search-item label="代表团" >
-                        <el-select clearable filterable placeholder="代表团" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
                                    v-model="pageForm.delegationId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in delegations"></el-option>
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
                     <el-table-column label="姓名" prop="userName"></el-table-column>
                     <el-table-column label="年龄" prop="age"></el-table-column>
                     <el-table-column label="性别" prop="sex"></el-table-column>
-                    <el-table-column label="所属单位" prop="unitName"></el-table-column>
-                    <el-table-column label="所属工会" prop="unionName"></el-table-column>
                     <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                    <el-table-column label="所属工会" prop="unionName"></el-table-column>
+                    <el-table-column label="所属单位" prop="unitName"></el-table-column>
                     <el-table-column label="操作" width="100" fixed="right">
                         <template scope="{row}">
                             <el-button

src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html

@@ -35,7 +35,7 @@ layout("/layouts/platform.html"){
                     </el-select>
                 </search-item>
                 <search-item label="代表团" >
-                    <el-select clearable filterable placeholder="代表团" style="width: 100%"
+                    <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
                                v-model="pageForm.delegationId">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in delegations"></el-option>
@@ -87,9 +87,9 @@ layout("/layouts/platform.html"){
                 <el-table-column label="姓名" prop="userName"></el-table-column>
                 <el-table-column label="年龄" prop="age"></el-table-column>
                 <el-table-column label="性别" prop="sex"></el-table-column>
-                <el-table-column label="所属单位" prop="unitName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
                 <el-table-column label="所属工会" prop="unionName"></el-table-column>
-                <el-table-column label="所属代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="所属单位" prop="unitName"></el-table-column>
                 <el-table-column label="票数" prop="pushCount"></el-table-column>
                 <el-table-column label="操作" width="130" fixed="right">
                     <template scope="{row}">

src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html

@@ -8,7 +8,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 v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable>
                         </el-input>
                     </search-item>
                     <search-item label="教代会">
@@ -35,7 +35,7 @@ layout("/layouts/platform.html"){
                         </el-select>
                     </search-item>
                     <search-item label="代表团">
-                        <el-select clearable filterable placeholder="代表团" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
                                    v-model="pageForm.delegationId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in delegations"></el-option>
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
                     <el-table-column align="center" label="姓名" prop="userName"></el-table-column>
                     <el-table-column align="center" label="年龄" prop="age"></el-table-column>
                     <el-table-column align="center" label="性别" prop="sex"></el-table-column>
-                    <el-table-column align="center" label="所属单位" prop="unitName"></el-table-column>
+                    <el-table-column align="center" label="代表团" prop="delegationName"></el-table-column>
                     <el-table-column align="center" label="所属工会" prop="unionName"></el-table-column>
-                    <el-table-column align="center" label="所属代表团" prop="delegationName"></el-table-column>
+                    <el-table-column align="center" label="所属单位" prop="unitName"></el-table-column>
                     <el-table-column align="center" label="操作" width="100" fixed="right">
                         <template scope="{row}">
                             <el-button

src/main/resources/views/platform/zhgh/democratic/proposal/query/collectProgress/index.html

@@ -35,8 +35,8 @@ layout("/layouts/platform.html"){
                             style="width: 100%"
                     ></el-input>
                 </search-item>
-                <search-item label="姓名/工号：">
+                <search-item label="姓名/工号">
-                    <el-input placeholder="请输入提案人姓名或工号查询" clearable
+                    <el-input placeholder="请输入姓名或工号" clearable
                               v-model="pageForm.createUserKeyword"></el-input>
                 </search-item>
                 <search-item label="代表团">

src/main/resources/views/platform/zhgh/democratic/proposal/transact/commissioner/index.html

@@ -21,8 +21,8 @@ layout("/layouts/platform.html"){
                     <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
                               style="width: 100%"></el-input>
                 </search-item>
-                <search-item label="姓名/工号：">
+                <search-item label="姓名/工号">
-                    <el-input placeholder="请输入提案人姓名或工号查询" clearable
+                    <el-input placeholder="请输入姓名或工号" clearable
                               v-model="pageForm.createUserKeyword"></el-input>
                 </search-item>
             </search>

src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html

@@ -21,8 +21,8 @@ layout("/layouts/platform.html"){
                     <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
                               style="width: 100%"></el-input>
                 </search-item>
-                <search-item label="姓名/工号：">
+                <search-item label="姓名/工号">
-                    <el-input placeholder="请输入提案人姓名或工号查询" clearable v-model="pageForm.createUserKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
                 </search-item>
 <!--                <search-item label="提案人姓名">-->
 <!--                    <el-input-->

src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html

@@ -17,8 +17,8 @@ layout("/layouts/platform.html"){
                     <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
                               style="width: 100%"></el-input>
                 </search-item>
-                <search-item label="姓名/工号：">
+                <search-item label="姓名/工号">
-                    <el-input placeholder="请输入提案人姓名或工号查询" clearable v-model="pageForm.createUserKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
                 </search-item>
             </search>
         </el-card>

src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html

@@ -21,8 +21,8 @@ layout("/layouts/platform.html"){
                     <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
                               style="width: 100%"></el-input>
                 </search-item>
-                <search-item label="姓名/工号：">
+                <search-item label="姓名/工号">
-                    <el-input placeholder="请输入提案人姓名或工号查询" clearable v-model="pageForm.createUserKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
                 </search-item>
 <!--                <search-item label="提案人姓名">-->
 <!--                    <el-input-->

src/main/resources/views/platform/zhgh/democratic/proposal/transact/suggestion/index.html

@@ -71,8 +71,8 @@ layout("/layouts/platform.html"){
                     <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
                               style="width: 100%"></el-input>
                 </search-item>
-                <search-item label="姓名/工号：">
+                <search-item label="姓名/工号">
-                    <el-input placeholder="请输入提案人姓名或工号查询" clearable v-model="pageForm.createUserKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
                 </search-item>
                 <!--                <search-item label="提案人姓名">-->
                 <!--                    <el-input-->
@@ -98,8 +98,8 @@ layout("/layouts/platform.html"){
         <el-card shadow="never">
             <table-tool :columns.sync="tableColumns">
                 <el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
-                    <el-radio-button :label="true">已审核</el-radio-button>
+                    <el-radio-button :label="true">已反馈</el-radio-button>
-                    <el-radio-button :label="false">未审核</el-radio-button>
+                    <el-radio-button :label="false">未反馈</el-radio-button>
                 </el-radio-group>
             </table-tool>
             <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
@@ -122,11 +122,17 @@ layout("/layouts/platform.html"){
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
                                   size="small"></enum-tag>
                     </template>
+                    <template v-else-if="column.prop === 'suggestUnits'" scope="{row}">
+                        {{ JSON.parse(row.suggestUnits)?.map(item => item).join('，') || '' }}
+                    </template>
+                    <template v-else-if="column.prop === 'count'" scope="{ row }">
+                        <el-link size="mini" type="primary" @click="openSuggestion(row)">{{ row.count }}</el-link>
+                    </template>
                 </el-table-column>
-                <el-table-column label="操作" fixed="right" min-width="100px">
+                <el-table-column label="操作" fixed="right" min-width="160px">
                     <template slot-scope="{row}">
                         <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
-                        <el-button @click="openAudit(row)" size="mini" type="primary">答复</el-button>
+                        <el-button @click="openAudit(row)" size="mini" type="primary">反馈意见</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -136,30 +142,50 @@ layout("/layouts/platform.html"){
         <template #edit>
             <proposal-info ref="proposalInfoRef">
                 <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        承办单位意见
+                    </div>
                     <el-form :model="formData" ref="formRef" label-width="80px" :rules="formRules" label-suffix="">
-                        <el-form-item label="承办单位">
+                        <el-form-item label="承办意向" prop="result"
-                            <el-input :value="formData.underTakeName" disabled></el-input>
-                        </el-form-item>
-                        <el-form-item label="落实情况" prop="tf_implementState"
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                            <el-radio-group v-model="formData.tf_implementState" size="small">
+                            <el-radio-group v-model="formData.result" size="small">
-                                <el-radio v-for="item in dict.type.PROPOSAL_REPLY_IMPLEMENT" :label="item.code" border>
+                                <el-radio v-for="item in dict.type.UNDERTAKE_SUGGESTION" :label="item.code" border>
                                     {{item.label}}
                                 </el-radio>
                             </el-radio-group>
                         </el-form-item>
-                        <el-form-item label="答复内容" prop="tf_opinion"
+                        <el-form-item label="反馈意见" prop="opinion"
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                            <text-editor v-model="formData.tf_opinion"></text-editor>
+                            <text-editor v-model="formData.opinion"></text-editor>
                         </el-form-item>
                     </el-form>
                     <el-row type="flex" justify="end">
                         <el-button @click="$refs.guava.index()" size="small">取消</el-button>
-                        <el-button @click="" size="small" type="primary">提交</el-button>
+                        <el-button @click="onAudit()" size="small" type="primary">提交</el-button>
                     </el-row>
                 </div>
             </proposal-info>
         </template>
+
+        <template #view>
+            <template v-for="item,index in suggestionList">
+                <div style="display: flex; justify-content: space-between; align-items: center">
+                    <div class="left-span-label">意见{{ index + 1 }}</div>
+                    <div>
+                        <el-button @click="onDelete(item)" size="mini" type="danger">删除</el-button>
+                    </div>
+                </div>
+                <el-descriptions :column="2" border>
+                    <el-descriptions-item label="反馈人">{{ item.userName }}</el-descriptions-item>
+                    <el-descriptions-item label="所属单位">{{ item.unitName }}</el-descriptions-item>
+                    <el-descriptions-item label="反馈时间">{{ item.time }}</el-descriptions-item>
+                    <el-descriptions-item label="反馈结果">{{ item.result }}</el-descriptions-item>
+                    <el-descriptions-item label="反馈意见">
+                        <span v-html="item.opinion"></span>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </template>
+        </template>
     </guava>
 
 </div>
@@ -169,7 +195,7 @@ layout("/layouts/platform.html"){
     new Vue({
         el: "#app",
         store,
-        dicts: ["PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_REPLY_IMPLEMENT"],
+        dicts: ["UNDERTAKE_SUGGESTION"],
         mixins: [initTableMixins],
         components: {
             "proposal-info": PROPOSAL_INFO
@@ -182,6 +208,8 @@ layout("/layouts/platform.html"){
                     {label: "提案类别", prop: "typeName"},
                     {label: "届次", prop: "sessionName"},
                     {label: "代表团", prop: "delegationName"},
+                    {label: "建议承办单位", prop: "suggestUnits"},
+                    {label: "意见数", prop: "count"},
                     {label: "当前节点", prop: "curTaskName"},
                     {label: "流程状态", prop: "instanceState"}
                 ],
@@ -191,21 +219,82 @@ layout("/layouts/platform.html"){
                 showApprovalForm: false,
                 formData: {},
                 sessionOptions: [],
+
+                suggestionList: [],
             }
         },
         methods: {
+            openSuggestion(row) {
+                this.$axios.post('/platform/proposal/suggestion/selectSuggestion', {
+                    proposalId: row.id,
+                }).then(res => {
+                    if(res.code === 0) {
+                        this.suggestionList = res.data
+                        if(this.suggestionList.length === 0) {
+                            this.$message.warning('暂无意见数')
+                            return
+                        }
+                        this.$refs.guava.view()
+                    } else {
+                        this.$message.error(res.msg)
+                    }
+                })
+            },
+            onDelete(row) {
+                this.$confirm("您确定要删除吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post('/platform/proposal/suggestion/delete', { id: row.id, })
+                        .then(res => {
+                        if(res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.$refs.guava.index()
+                            this.pageData()
+                        } else {
+                            this.$message.error(res.msg)
+                        }
+                    })
+                })
+            },
             openView(row) {
                 this.$refs.guava.edit(() => {
                     this.showApprovalForm = false
                     this.$refs.proposalInfoRef.onOpen(row)
                 })
             },
-
+            openAudit(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        proposalId: row.id,
+                    }
+                    this.$refs.proposalInfoRef.onOpen(row)
+                })
+            },
+            onAudit() {
+                this.$refs.formRef.validate(valid => {
+                    if (!valid) return
+                    this.$confirm("您确定要提交吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    }).then(() => {
+                        this.$axios.post("/platform/proposal/suggestion/suggest", this.formData).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.guava.index()
+                                this.$message.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    })
+                })
+            },
             // 教代会
             async meetingChange(val) {
                 this.doSearch()
             },
-
             // 查询开启的教代会
             listOpenSession() {
                 this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => {

src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitReply/index.html

@@ -71,8 +71,8 @@ layout("/layouts/platform.html"){
                     <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
                               style="width: 100%"></el-input>
                 </search-item>
-                <search-item label="姓名/工号：">
+                <search-item label="姓名/工号">
-                    <el-input placeholder="请输入提案人姓名或工号查询" clearable v-model="pageForm.createUserKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
                 </search-item>
 <!--                <search-item label="提案人姓名">-->
 <!--                    <el-input-->

src/main/resources/views/platform/zhgh/democratic/proposal/transact/viceDelegation/index.html

@@ -17,8 +17,8 @@ layout("/layouts/platform.html"){
                     <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
                               style="width: 100%"></el-input>
                 </search-item>
-                <search-item label="姓名/工号：">
+                <search-item label="姓名/工号">
-                    <el-input placeholder="请输入提案人姓名或工号查询" clearable v-model="pageForm.createUserKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
                 </search-item>
             </search>
         </el-card>

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/index.html

@@ -6,7 +6,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-item label="教代会">
                 <el-select v-model="pageForm.sessionId" @change="sessionChange">

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html

@@ -5,7 +5,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-item label="教代会">
                 <el-select v-model="pageForm.sessionId">

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html

@@ -5,7 +5,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-item label="教代会">
                 <el-select v-model="pageForm.sessionId">

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/read/index.html

@@ -6,7 +6,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-item label="教代会">
                 <el-select v-model="pageForm.sessionId" @change="sessionChange">

src/main/resources/views/platform/zhgh/democratic/workercongress/delegate/manage/index.html

@@ -6,7 +6,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-item label="教代会">
                 <el-select v-model="pageForm.sessionId" @change="sessionChange">

src/main/resources/views/platform/zhgh/democratic/workercongress/delegate/read/index.html

@@ -6,7 +6,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-item label="教代会">
                 <el-select v-model="pageForm.sessionId" @change="sessionChange">

src/main/resources/views/platform/zhgh/democratic/workercongress/delegation/tree.js

@@ -16,7 +16,15 @@ const TREE_TEMPLATE = {
                     default-expand-all
                     @node-click="treeNodeClick"
                     :filter-node-method="filterNode"
-                ></el-tree>
+                >
+                <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+</el-tree>
             </el-card>
         `,
     data() {

src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html

@@ -17,7 +17,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>

src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/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>

src/main/resources/views/platform/zhgh/staffbenefit/condolence/read/index.html

@@ -17,7 +17,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>

src/main/resources/views/platform/zhgh/staffbenefit/condolence/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>

src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/collect/index.html

@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
                                     style="width: 100%"></el-date-picker>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="性别">
                     <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">

src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html

@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
                                     style="width: 100%"></el-date-picker>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="性别">
                     <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">

src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html

@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
                                     style="width: 100%"></el-date-picker>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="性别">
                     <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">

src/main/resources/views/platform/zhgh/staffbenefit/legal/doctorManage/index.html

@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
         <template>
             <el-card shadow="never">
                 <search @search="doSearch">
-                    <search-item label="姓名/工号：">
+                    <search-item label="姓名/工号">
-                        <el-input placeholder="请输入姓名或工号查询" v-model="pageForm.searchKeyword" clearable @keyup.enter.native="doSearch"></el-input>
+                        <el-input placeholder="请输入姓名或工号" v-model="pageForm.searchKeyword" clearable @keyup.enter.native="doSearch"></el-input>
                     </search-item>
                 </search>
             </el-card>

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/collect/index.html

@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
                                     style="width: 100%"></el-date-picker>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="性别">
                     <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html

@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
                                     style="width: 100%"></el-date-picker>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="性别">
                     <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html

@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
                                     style="width: 100%"></el-date-picker>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="性别">
                     <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">

src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html

@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
                     </el-select>
                 </search-item>
                 <search-item label="姓名/工号">
-                    <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="性别">
                     <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
@@ -180,6 +180,10 @@ layout("/layouts/platform.html"){
             this.$set(this.pageForm, 'year', currentYear);
             // 获取当前年份的项目列表
             this.getProjectByYear();
+            //工会查询
+            this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            //单位查询
+            this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
         }
     })
 </script>

src/main/resources/views/platform/zhgh/staffbenefit/psychology/doctorManage/index.html

@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
         <template>
             <el-card shadow="never">
                 <search @search="doSearch">
-                    <search-item label="姓名/工号：">
+                    <search-item label="姓名/工号">
-                        <el-input placeholder="请输入姓名或工号查询" v-model="pageForm.searchKeyword" clearable @keyup.enter.native="doSearch"></el-input>
+                        <el-input placeholder="请输入姓名或工号" v-model="pageForm.searchKeyword" clearable @keyup.enter.native="doSearch"></el-input>
                     </search-item>
                 </search>
             </el-card>

src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html

@@ -38,7 +38,7 @@ layout("/layouts/platform.html"){
                     </el-input>
                 </search-item>
                 <search-item label="性别">
-                    <el-select clearable placeholder="请选择性别"
+                    <el-select clearable placeholder="请选择子女性别"
                                style="width: 100%;"
                                v-model="pageForm.childrenSex">
                         <el-option label="男" value="男"></el-option>

src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js

@@ -2,7 +2,7 @@ const COMMON_QUERY = {
     template: /*language=HTML*/ `
 	    <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>
 		    <template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])">
 			    <search-item label="所属工会">

src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/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-item label="名单事项">
                         <el-select

src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js

@@ -2,7 +2,7 @@ const COMMON_QUERY = {
     template: /*language=HTML*/ `
 	    <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-item label="所属工会">
 			    <el-select @change="flushUnits" @clear="flushUnits" clearable filterable

src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js

@@ -50,7 +50,8 @@ const INFO = {
 					    </el-descriptions-item>
 					    <el-descriptions-item></el-descriptions-item>
 					    
-					    <template v-if="viewData.loginname == $store.state.user.loginname">
+<!--					    <template v-if="viewData.loginname == $store.state.user.loginname">-->
+					    <template>
 						    <el-descriptions-item label="家庭主要成员" :span="3">
 							    <el-table v-if="viewData.families&&viewData.families.length"
 							              :data="viewData.families" size="mini" border

src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html

@@ -6,7 +6,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-item label="所属工会">
 				    <el-select @change="flushUnits" @clear="flushUnits" clearable filterable

src/main/resources/views/platform/zhgh/staffmanage/member/change/record/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-item label="所属工会">
                         <el-select @change="flushUnits" @clear="flushUnits" clearable filterable

src/main/resources/views/platform/zhgh/staffmanage/member/common/manage/memberManageQuery.js

@@ -3,7 +3,7 @@ const MEMBER_MANAGE_QUERY = {
             <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-item label="所属工会">
                         <el-select @change="flushUnits" @clear="flushUnits" clearable filterable

src/main/resources/views/platform/zhgh/staffmanage/member/info/board/index.html

@@ -106,7 +106,7 @@ layout("/layouts/platform.html"){
 
     .content-left .card .chart-container {
         flex: 1;
-        min-height: 200px;
+        /*min-height: 200px;*/
     }
 
     /* 右侧表格样式 */

src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js

@@ -8,7 +8,7 @@ const COMMON_QUERY = {
 					    filterable
 					    remote
 					    collapse-tags
-					    placeholder="输入工号或者姓名查找"
+					    placeholder="请输入姓名或工号"
 					    :remote-method="queryUser"
 					    @change="doSearch"
 					    style="width: 100%"

src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html

@@ -17,7 +17,7 @@ layout("/layouts/platform.html"){
                         ></el-date-picker>
                     </search-item>
                     <search-item label="姓名/工号">
-                        <el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
+                        <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
                     </search-item>
                     <search-item label="模糊查询">
                         <member-cnd @cnd="(v)=>pageForm={...pageForm,...v}"></member-cnd>

src/main/resources/views/platform/zhgh/staffmanage/member/modelworker/manage/index.html

@@ -6,7 +6,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-item label="所属工会">
                     <el-select @change="flushUnits" @clear="flushUnits" clearable filterable

src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/schoolViewAndHandle.js

@@ -6,7 +6,7 @@ const SCHOOL_VIEW_AND_HANDLE = {
         <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-item label="所属单位">
                     <el-select clearable filterable placeholder="请选择所属单位" style="width: 100%"

src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationQuery.js

@@ -3,7 +3,7 @@ const VERIFICATION_QUERY = {
         <el-card>
             <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-item label="所属工会">
                     <el-select @change="flushUnits" @clear="flushUnits" clearable filterable

src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationSetUserList.js

@@ -4,7 +4,7 @@ const VERIFICATION_SET_USER_LIST = {
             <el-card>
                 <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-item label="性别">
                         <dict-select v-model="pageForm.sex" placeholder="性别" @change="doSearch"

src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationShowSelectionUsers.js

@@ -6,7 +6,7 @@ const VERIFICATION_SHOW_SELECTION_USERS = {
                     <el-card>
                         <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-item label="所属工会">
                                 <el-select @change="flushUnits" @clear="flushUnits" clearable filterable

src/main/resources/views/platform/zhgh/staffmanage/membercost/refund/index.html

@@ -5,7 +5,7 @@ layout("/layouts/platform.html"){
     <guava ref="guava">
         <template>
             <el-card shadow="never">
-	            
+
 	            <search @search="doSearch">
 		            <search-item label="年度">
 			            <el-date-picker
@@ -18,7 +18,7 @@ layout("/layouts/platform.html"){
 					            value-format="yyyy"
 			            ></el-date-picker>
 		            </search-item>
-		            
+
 		            <search-item label="缴费项目">
 			            <el-select
 					            placeholder="请选择项目"
@@ -33,11 +33,11 @@ layout("/layouts/platform.html"){
 				                       :label="item.projectName" :value="item.id"></el-option>
 			            </el-select>
 		            </search-item>
-		            
+
-		            <search-item label="工号/姓名">
+		            <search-item label="姓名/工号">
-			            <el-input placeholder="请输入工号/姓名" v-model="pageForm.searchKeyword" clearable></el-input>
+			            <el-input placeholder="请输入姓名或工号" v-model="pageForm.searchKeyword" clearable></el-input>
 		            </search-item>
-		            
+
 		            <search-item label="交易单号">
 			            <el-input placeholder="请输入交易单号"
 			                      v-model="pageForm.transactionId" clearable>

src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html

@@ -24,7 +24,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-item label="所属工会">
                         <el-select @change="flushUnits" @clear="flushUnits" clearable filterable

src/main/resources/views/platform/zhgh/staffmanage/specialstaff/manage/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-item label="所属类型">
                         <dict-select v-model="pageForm.specialStaffType" placeholder="特别人员所属类型" @change="doSearch"

src/main/resources/views/platform/zhgh/staffmanage/thirtyTeach/manage/index.html

@@ -7,8 +7,8 @@ layout("/layouts/platform.html"){
         <template>
             <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"
                                   style="width: 100%">
                         </el-input>
                     </search-item>

src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html

@@ -0,0 +1,247 @@
+<!--#
+layout("/layouts/platform_h5.html"){
+#-->
+
+<style scoped>
+    .van-button--small {
+        height: 26px;
+    }
+</style>
+
+<div id="app">
+    <van-nav-bar title="承办单位意见" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
+
+    <van-sticky offset-top="46px">
+        <van-search
+            v-model="pageForm.name"
+            :show-action="false"
+            :reverse-color="false"
+            input-align="left"
+            placeholder="请输入提案名称搜索"
+            @search="doSearch"
+        ></van-search>
+        <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
+            <van-dropdown-item v-model="pageForm.sessionId" :options="sessionOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
+        </van-dropdown-menu>
+        <van-tabs v-model="pageForm.approvalText"
+                  @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
+            <van-tab title="已反馈" name="1"></van-tab>
+            <van-tab title="未反馈" name="0"></van-tab>
+        </van-tabs>
+    </van-sticky>
+
+    <table-list api="/platform/proposal/suggestion/pageData" :page_form.sync="pageForm" ref="tableListRef" title="name" @ready="onReady">
+        <template v-slot="{index,row}">
+            <table-column label="提案编号">{{row.code}}</table-column>
+            <table-column label="提案类别">{{row.typeName}}</table-column>
+            <table-column label="提案人">{{row.createUserName}}</table-column>
+            <table-column label="代表团">{{row.delegationName}}</table-column>
+            <table-column label="建议承办单位"> {{ JSON.parse(row.suggestUnits)?.map(item => item).join('，') || '' }}</table-column>
+            <table-column label="意见数">{{row.count}}</table-column>
+            <table-column label="当前节点">{{row.curTaskName}}</table-column>
+        </template>
+        <template #actions="{index,row}">
+            <div class="action-btn" @click="onView(row)">
+                <i class="fa fa-eye"></i>
+                <span>查看</span>
+            </div>
+            <div class="action-btn" @click="openSuggestion(row)" v-if="pageForm.approval === true">
+                <i class="fa fa-eye"></i>
+                <span>查看意见</span>
+            </div>
+            <div class="action-btn" @click="onAudit(row)">
+                <i class="fa fa-edit"></i>
+                <span>反馈意见</span>
+            </div>
+        </template>
+    </table-list>
+
+    <proposal-info ref="proposalInfoRef">
+        <div v-if="showApprovalForm">
+            <div class="process-title">承办单位意见</div>
+            <van-form ref="formRef">
+                <van-field
+                    v-model="formData.result"
+                    name="result"
+                    label="承办意向"
+                    placeholder="请选择承办意向"
+                    :rules="[{ required: true, message: '必填' }]"
+                    required
+                    is-link
+                    @click="showPicker = true"
+                ></van-field>
+                <van-popup v-model="showPicker" position="bottom">
+                    <van-picker
+                        show-toolbar
+                        :columns="dict.type.UNDERTAKE_SUGGESTION.map(item => item.code)"
+                        @confirm="(val) => {formData.result = val; showPicker = false}"
+                        @cancel="showPicker = false"
+                    ></van-picker>
+                </van-popup>
+                <van-field
+                    v-model="formData.opinion"
+                    name="opinion"
+                    label="反馈意见"
+                    placeholder="请输入反馈意见"
+                    :rules="[{ required: true, message: '必填' }]"
+                    required
+                    show-word-limit
+                ></van-field>
+            </van-form>
+            <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
+                <van-button block @click="">取消</van-button>
+                <van-button type="primary" block @click="doSubmit">提交</van-button>
+            </div>
+        </div>
+    </proposal-info>
+
+    <van-action-sheet v-model="visible" title="意见信息">
+        <div class="detail-container">
+            <van-cell-group :key="index" v-for="item,index in suggestionList">
+                <template #title>
+                    <div style="display: flex; justify-content: space-between; align-items: center">
+                        <div>{{ '意见' + (index + 1) }}</div>
+                        <div>
+                            <van-button type="danger" @click="onDelete(item)" size="small">删除</van-button>
+                        </div>
+                    </div>
+                </template>
+                <van-cell title="反馈人">{{ item.userName }}</van-cell>
+                <van-cell title="所属单位">{{ item.unitName }}</van-cell>
+                <van-cell title="反馈时间">{{ item.time }}</van-cell>
+                <van-cell title="反馈结果">{{ item.result }}</van-cell>
+                <van-cell title="反馈意见" class="direction-column-cell">
+                    <span v-html="item.opinion"></span>
+                </van-cell>
+            </van-cell-group>
+        </div>
+    </van-action-sheet>
+</div>
+
+<script>
+    <!--#include("../../common/info.js"){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        dicts: ["UNDERTAKE_SUGGESTION"],
+        components: {
+            "proposal-info": PROPOSAL_INFO
+        },
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    name: null,
+                    sessionId: null,
+                    approvalText: "0",
+                    approval: false
+                },
+
+                sessionOptions: [],
+                formData: {},
+                showApprovalForm: false,
+
+                showPicker: false,
+                suggestionList: [],
+                visible: false,
+            }
+        },
+        methods: {
+            onDelete(row) {
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要删除吗？"
+                }).then(() => {
+                    this.$axios.post('/platform/proposal/suggestion/delete', { id: row.id, })
+                        .then(res => {
+                            if(res.code === 0) {
+                                this.$toast.success(res.msg)
+                                this.visible = false
+                                this.doSearch()
+                            } else {
+                                this.$message.fail(res.msg)
+                            }
+                        })
+                }).catch(() => {})
+            },
+            openSuggestion(row) {
+                this.$axios.post('/platform/proposal/suggestion/selectSuggestion', {
+                    proposalId: row.id,
+                }).then(res => {
+                    if(res.code === 0) {
+                        this.suggestionList = res.data
+                        if(this.suggestionList.length === 0) {
+                            this.$toast('暂无意见数')
+                            return
+                        }
+                        this.visible = true
+                    } else {
+                        this.$toast.fail(res.msg)
+                    }
+                })
+            },
+            onReady() {
+                this.listSession()
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = [
+                            {
+                                text: "全部届次",
+                                value: null
+                            }
+                        ].concat(res.data.map((v) => ({text: v.fullName, value: v.id})))
+                        if (this.sessionOptions.length > 0) {
+                            this.pageForm.sessionId = this.sessionOptions[0].value
+                            this.doSearch()
+                        }
+                    }
+                })
+            },
+            onAudit(row) {
+                this.showApprovalForm = true
+                this.$refs.proposalInfoRef.onOpen(row)
+                this.formData = {
+                    proposalId: row.id,
+                }
+            },
+            async doSubmit() {
+                try {
+                    await this.$refs.formRef.validate()
+                    this.$dialog.confirm({
+                        title: "提示",
+                        message: "您确定要提交吗？"
+                    }).then(() => {
+                        this.$axios.post("/platform/proposal/suggestion/suggest", this.formData)
+                            .then((res) => {
+                                if (res.code === 0) {
+                                    this.$refs.proposalInfoRef.onClose()
+                                    this.$toast.success(res.msg)
+                                    this.doSearch()
+                                }
+                            })
+                    }).catch(() => {})
+                } catch (error) {}
+            },
+            onView(row) {
+                this.showApprovalForm = false
+                this.$refs.proposalInfoRef.onOpen(row)
+            },
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            }
+        },
+    })
+</script>
+
+<!--#
+}
+#-->