commit

src/main/java/com/budwk/app/sys/controller/SysHomeController.java

@@ -150,7 +150,8 @@ public class SysHomeController {
         );
         List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId());
         List<String> allMenuIds = menus.stream().map(Sys_menu::getId).toList();
-        List<Sys_menu> sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList();
+        //List<Sys_menu> sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList();
+        List<Sys_menu> sysMenus = list.stream().sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList();
         return Result.success(sysMenus);
     }
 
@@ -166,7 +167,8 @@ public class SysHomeController {
         );
         List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId());
         List<String> allMenuIds = menus.stream().map(Sys_menu::getId).toList();
-        List<Sys_menu> sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList();
+        //List<Sys_menu> sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList();
+        List<Sys_menu> sysMenus = list.stream().sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList();
         return Result.success(sysMenus);
     }
 

src/main/resources/static/components/plugins/sysUpload/index.vue

@@ -205,6 +205,8 @@ module.exports = {
       }
       if (fileAccept) {
         tips = tips + `只能上传<span style="color: red">${fileAccept}</span>文件；`
+      } else {
+          tips = tips + '不限格式；'
       }
       if (fileSize) {
         tips = tips + `单个文件大小不能超过<span style="color: red">${fileSize / 1024 / 1024}</span>M；`

src/main/resources/views/layouts/v4/home/act.js

@@ -141,10 +141,10 @@ const act = {
             padding: 40px 0;
         }
 
-        .section-act .section-act-title span:hover {
+        /*.section-act .section-act-title span:hover {
             color: var(--color-primary);
             cursor: pointer;
-        }
+        }*/
 
         /deep/ .section-act .section-act-title span::before {
             content: '';

src/main/resources/views/layouts/v4/home/entry.js

@@ -2,7 +2,7 @@ const entry = {
     template: /*language=HTML*/ `
         <div class="entry-wrapper">
             <div class="entry-title">
-                常用入口
+                <span>常用入口</span>
             </div>
 
             <div class="entry-container">
@@ -144,6 +144,27 @@ const entry = {
             padding: 40px 0;
         }
 
+        /deep/ .entry-title span::before {
+            content: '';
+            width: 24px;
+            height: 11px;
+            background: url(https://www.ncu.edu.cn/images/titl.svg) no-repeat center;
+            background-size: 24px 11px;
+            display: inline-block;
+            margin-right: 0;
+            vertical-align: middle;
+        }
+
+        /deep/ .entry-title span::after {
+            content: '';
+            width: 24px;
+            height: 11px;
+            background: url(https://www.ncu.edu.cn/images/titr.svg) no-repeat center;
+            background-size: 24px 11px;
+            display: inline-block;
+            margin-left: 0;
+            vertical-align: middle;
+        }
 
         .entry-container {
             width: 80%;

src/main/resources/views/layouts/v4/home/jcdt.js

@@ -3,11 +3,11 @@ const jcdt = {
         <div class="jcdt-wrapper">
             <div class="jcdt-container">
                 <div class="jcdt-title">
-                    基层动态
+                    <span>基层动态</span>
                 </div> 
                 <div class="jcdt-content">
                     <div class="jcdt-list">
-                        <div class="jcdt-item" v-for="item in list" :key="item.title">
+                        <div class="jcdt-item" v-for="item in list" :key="item.title" @click="onLink(item)">
                             <div class="date">{{item.date}}</div>
                             <div class="title">{{item.title}}</div>
                             <div class="image">
@@ -29,7 +29,12 @@ const jcdt = {
             default: []
         }
     },
-    methods: {},
+    methods: {
+        onLink(item) {
+            if(!item.url) return
+            window.open(item.url)
+        },
+    },
     style: /*language=CSS*/ `
         .jcdt-wrapper {
             width: 100%;
@@ -54,6 +59,28 @@ const jcdt = {
             text-align: center;
             padding: 40px 0;
         }
+
+        /deep/ .jcdt-container .jcdt-title span::before {
+            content: '';
+            width: 24px;
+            height: 11px;
+            background: url(https://www.ncu.edu.cn/images/titl.svg) no-repeat center;
+            background-size: 24px 11px;
+            display: inline-block;
+            margin-right: 0;
+            vertical-align: middle;
+        }
+
+        /deep/ .jcdt-container .jcdt-title span::after {
+            content: '';
+            width: 24px;
+            height: 11px;
+            background: url(https://www.ncu.edu.cn/images/titr.svg) no-repeat center;
+            background-size: 24px 11px;
+            display: inline-block;
+            margin-left: 0;
+            vertical-align: middle;
+        }
         
         .jcdt-list {
             display: grid;

src/main/resources/views/platform/sys/data/user/pull.html

@@ -38,7 +38,7 @@ layout("/layouts/platform.html"){
                 <el-input placeholder="请输入内容" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
             </search-item>
             <search-item label="所属单位">
-                <el-select v-model="pageForm.unitName" clearable filterable>
+                <el-select placeholder="请选择所属单位" v-model="pageForm.unitName" clearable filterable>
                     <el-option v-for="item in unitNameOptions" :key="item" :label="item" :value="item"></el-option>
                 </el-select>
             </search-item>

src/main/resources/views/platform/sys/data/user/update.html

@@ -7,11 +7,11 @@ layout("/layouts/platform.html"){
 		width: 100%;
 		margin-bottom: 10px;
 	}
-	
+
 	.pullTimeRadioGroup .el-radio.is-bordered + .el-radio.is-bordered {
 		margin-left: 0;
 	}
-	
+
 	.condition-builder {
 		border: 1px solid #dcdfe6;
 		border-radius: 4px;
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
 						<el-input placeholder="请输入内容" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
 					</search-item>
 					<search-item label="所属单位">
-						<el-select v-model="pageForm.unitId" clearable style="width: 100%">
+						<el-select placeholder="请选择所属单位" v-model="pageForm.unitId" clearable style="width: 100%">
 							<el-option v-for="i in unitOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
 						</el-select>
 					</search-item>
@@ -47,7 +47,7 @@ layout("/layouts/platform.html"){
 					</search-item>
 				</search>
 			</el-card>
-			
+
 			<el-card shadow="never">
 				<table-tool label="系统当前用户数据">
 					<el-button type="primary" size="mini" @click="updateDataDict" icon="el-icon-refresh">更新【码表】数据</el-button>
@@ -87,11 +87,11 @@ layout("/layouts/platform.html"){
 				<!--#include("/layouts/pagination.html"){}#-->
 			</el-card>
 		</template>
-		
+
 		<template #view>
 			<member-all-change-info ref="memberAllChangeInfoRef"></member-all-change-info>
 		</template>
-		
+
 	</guava>
 	<el-dialog title="选择数据源" :visible.sync="updateDialog" width="70%">
 		<el-timeline>
@@ -105,7 +105,7 @@ layout("/layouts/platform.html"){
 					</el-radio>
 				</el-radio-group>
 			</el-timeline-item>
-			
+
 			<el-timeline-item timestamp="更新方式" placement="top">
 				<el-radio-group class="checkGroup" style="width: 100%" v-model="updateFromData.updateMode" size="small">
 					<el-row>
@@ -114,10 +114,10 @@ layout("/layouts/platform.html"){
 					</el-row>
 				</el-radio-group>
 			</el-timeline-item>
-			
+
 			<el-timeline-item timestamp="高级条件筛选" placement="top">
 				<el-switch v-model="enableAdvancedConditions" active-text="启用高级条件"></el-switch>
-				
+
 				<div v-if="enableAdvancedConditions" class="condition-builder">
 					<!-- 条件构建器组件 -->
 					<condition-group :group="updateFromData.conditionGroup" :field_options="fieldOptions" @remove="removeRootGroup"></condition-group>
@@ -133,7 +133,7 @@ layout("/layouts/platform.html"){
 
 <script>
 	<!--#include("../../../zhgh/staffmanage/member/change/common/memberAllChangeInfo.js"){}#-->
-	
+
 	new Vue({
 		el: "#app",
 		mixins: [initTableMixins],
@@ -193,7 +193,7 @@ layout("/layouts/platform.html"){
 								}
 							})
 				})
-				
+
 			},
 			// 更新码表数据
 			updateDataDict() {
@@ -262,12 +262,12 @@ layout("/layouts/platform.html"){
 					this.$message.warning("请选择更新方式")
 					return
 				}
-				
+
 				// 如果未启用高级条件，则移除条件组
 				if (!this.enableAdvancedConditions) {
 					this.updateFromData.conditionGroup = null
 				}
-				
+
 				this.$confirm("确定要更新数据吗？", "提示", {
 					confirmButtonText: "确定",
 					cancelButtonText: "取消",

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

@@ -4,8 +4,8 @@ layout("/layouts/platform.html"){
 <div id="app" v-cloak>
     <el-card shadow="never">
         <search @search="doSearch">
-            <search-item label="单位">
+            <search-item label="所属单位">
-	            <el-select clearable filterable placeholder="请选择" style="width: 100%" v-model="pageForm.searchUnit" @change="doSearch">
+	            <el-select clearable filterable placeholder="请选择所属单位" style="width: 100%" v-model="pageForm.searchUnit" @change="doSearch">
 		            <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in units"></el-option>
 	            </el-select>
 <!--                <el-cascader :props="props" v-model="parentUnitSearch" placeholder="请选择单位" clearable filterable></el-cascader>-->
@@ -298,7 +298,7 @@ layout("/layouts/platform.html"){
                         })
                     }
                 },
-	            
+
 	            units: []
             }
         },

src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html

@@ -171,7 +171,7 @@ layout("/layouts/platform.html"){
 		<el-row type="flex" justify="end" class="mt20">
 			<el-button type="primary" plain @click="onSave">保存</el-button>
 			<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-			<el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+			<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
 		</el-row>
 	</el-card>
 </div>

src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/branchunion/index.html

@@ -14,25 +14,25 @@ layout("/layouts/platform.html"){
 							value-format="yyyy">
 					</el-date-picker>
 				</search-item>
-				
+
 				<search-item label="申请人">
 					<el-input placeholder="请输入申请人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
 				</search-item>
-				
+
 				<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_ADMIN')">
 					<search-item label="所属工会">
 						<el-select @change="flushUnits" @clear="flushUnits" clearable
 						           filterable
-						           placeholder="所属工会"
+						           placeholder="请选择所属工会"
 						           style="width: 100%;"
 						           v-model="pageForm.unionId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in unions"></el-option>
 						</el-select>
 					</search-item>
-					
+
 					<search-item label="所属单位">
-						<el-select clearable filterable placeholder="所属单位"
+						<el-select clearable filterable placeholder="请选择所属单位"
 						           style="width: 100%;" v-model="pageForm.unitId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in units"></el-option>
@@ -41,7 +41,7 @@ layout("/layouts/platform.html"){
 				</template>
 			</search>
 		</el-card>
-		
+
 		<el-card shadow="never" class="mt10">
 			<table-tool :app="this" label="审批列表">
 				<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -49,12 +49,12 @@ layout("/layouts/platform.html"){
 					<el-radio-button label="false">未审核</el-radio-button>
 				</el-radio-group>
 			</table-tool>
-			
+
 			<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
 			          ref="table" row-key="id" style="width: 100%">
 				<el-table-column :index="indexMethod" header-align="center" label="序号"
 				                 type="index" width="60px"></el-table-column>
-				
+
 				<el-table-column
 						:label="column.label"
 						:prop="column.prop"
@@ -88,7 +88,7 @@ layout("/layouts/platform.html"){
 			</el-table>
 			<!--#include("/layouts/pagination.html"){}#-->
 		</el-card>
-		
+
 		<template #edit>
 			<info ref="infoRef">
 				<div v-if="showApprovalForm">
@@ -117,7 +117,7 @@ layout("/layouts/platform.html"){
 
 <script>
 	<!--#include("../common/info.js"){}#-->
-	
+
 	new Vue({
 		el: "#app",
 		mixins: [initTableMixins],
@@ -142,7 +142,7 @@ layout("/layouts/platform.html"){
 				unions: [],
 				units: [],
 				clubs: [],
-				
+
 				// 审核相关
 				formData: {},
 				showApprovalForm: false
@@ -168,7 +168,7 @@ layout("/layouts/platform.html"){
 					this.$refs.infoRef.onOpen(row)
 				})
 			},
-			
+
 			handleTaskAction(val) {
 				this.$confirm("您确定要提交吗？", "提示", {
 					confirmButtonText: "确定",
@@ -189,7 +189,7 @@ layout("/layouts/platform.html"){
 					})
 				})
 			},
-			
+
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗？", "提示", {
 					confirmButtonText: "确定",

src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html

@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
 					<search-item label="所属工会">
 						<el-select @change="flushUnits" @clear="flushUnits" clearable
 						           filterable
-						           placeholder="所属工会"
+						           placeholder="请选择所属工会"
 						           style="width: 100%;"
 						           v-model="pageForm.unionId">
 							<el-option :label="item.name" :value="item.id"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
 					</search-item>
 
 					<search-item label="所属单位">
-						<el-select clearable filterable placeholder="所属单位"
+						<el-select clearable filterable placeholder="请选择所属单位"
 						           style="width: 100%;" v-model="pageForm.unitId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in units"></el-option>

src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/index.html

@@ -14,25 +14,25 @@ layout("/layouts/platform.html"){
 							value-format="yyyy">
 					</el-date-picker>
 				</search-item>
-				
+
 				<search-item label="申请人">
 					<el-input placeholder="请输入申请人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
 				</search-item>
-				
+
 				<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_ADMIN')">
 					<search-item label="所属工会">
 						<el-select @change="flushUnits" @clear="flushUnits" clearable
 						           filterable
-						           placeholder="所属工会"
+						           placeholder="请选择所属工会"
 						           style="width: 100%;"
 						           v-model="pageForm.unionId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in unions"></el-option>
 						</el-select>
 					</search-item>
-					
+
 					<search-item label="所属单位">
-						<el-select clearable filterable placeholder="所属单位"
+						<el-select clearable filterable placeholder="请选择所属单位"
 						           style="width: 100%;" v-model="pageForm.unitId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in units"></el-option>
@@ -41,7 +41,7 @@ layout("/layouts/platform.html"){
 				</template>
 			</search>
 		</el-card>
-		
+
 		<el-card shadow="never" class="mt10">
 			<table-tool :app="this" label="审批列表">
 				<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -49,12 +49,12 @@ layout("/layouts/platform.html"){
 					<el-radio-button label="false">未审核</el-radio-button>
 				</el-radio-group>
 			</table-tool>
-			
+
 			<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
 			          ref="table" row-key="id" style="width: 100%">
 				<el-table-column :index="indexMethod" header-align="center" label="序号"
 				                 type="index" width="60px"></el-table-column>
-				
+
 				<el-table-column
 						:label="column.label"
 						:prop="column.prop"
@@ -88,7 +88,7 @@ layout("/layouts/platform.html"){
 			</el-table>
 			<!--#include("/layouts/pagination.html"){}#-->
 		</el-card>
-		
+
 		<template #edit>
 			<info ref="infoRef">
 				<div v-if="showApprovalForm">
@@ -117,7 +117,7 @@ layout("/layouts/platform.html"){
 
 <script>
 	<!--#include("../common/info.js"){}#-->
-	
+
 	new Vue({
 		el: "#app",
 		mixins: [initTableMixins],
@@ -142,7 +142,7 @@ layout("/layouts/platform.html"){
 				unions: [],
 				units: [],
 				clubs: [],
-				
+
 				// 审核相关
 				formData: {},
 				showApprovalForm: false
@@ -168,7 +168,7 @@ layout("/layouts/platform.html"){
 					this.$refs.infoRef.onOpen(row)
 				})
 			},
-			
+
 			handleTaskAction(val) {
 				this.$confirm("您确定要提交吗？", "提示", {
 					confirmButtonText: "确定",
@@ -189,7 +189,7 @@ layout("/layouts/platform.html"){
 					})
 				})
 			},
-			
+
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗？", "提示", {
 					confirmButtonText: "确定",

src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/index.html

@@ -14,25 +14,25 @@ layout("/layouts/platform.html"){
 							value-format="yyyy">
 					</el-date-picker>
 				</search-item>
-				
+
 				<search-item label="申请人">
 					<el-input placeholder="请输入申请人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
 				</search-item>
-				
+
 				<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_ADMIN')">
 					<search-item label="所属工会">
 						<el-select @change="flushUnits" @clear="flushUnits" clearable
 						           filterable
-						           placeholder="所属工会"
+						           placeholder="请选择所属工会"
 						           style="width: 100%;"
 						           v-model="pageForm.unionId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in unions"></el-option>
 						</el-select>
 					</search-item>
-					
+
 					<search-item label="所属单位">
-						<el-select clearable filterable placeholder="所属单位"
+						<el-select clearable filterable placeholder="请选择所属单位"
 						           style="width: 100%;" v-model="pageForm.unitId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in units"></el-option>
@@ -41,7 +41,7 @@ layout("/layouts/platform.html"){
 				</template>
 			</search>
 		</el-card>
-		
+
 		<el-card shadow="never" class="mt10">
 			<table-tool :app="this" label="审批列表">
 				<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -49,12 +49,12 @@ layout("/layouts/platform.html"){
 					<el-radio-button label="false">未审核</el-radio-button>
 				</el-radio-group>
 			</table-tool>
-			
+
 			<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
 			          ref="table" row-key="id" style="width: 100%">
 				<el-table-column :index="indexMethod" header-align="center" label="序号"
 				                 type="index" width="60px"></el-table-column>
-				
+
 				<el-table-column
 						:label="column.label"
 						:prop="column.prop"
@@ -88,7 +88,7 @@ layout("/layouts/platform.html"){
 			</el-table>
 			<!--#include("/layouts/pagination.html"){}#-->
 		</el-card>
-		
+
 		<template #edit>
 			<info ref="infoRef">
 				<div v-if="showApprovalForm">
@@ -117,7 +117,7 @@ layout("/layouts/platform.html"){
 
 <script>
 	<!--#include("../common/info.js"){}#-->
-	
+
 	new Vue({
 		el: "#app",
 		mixins: [initTableMixins],
@@ -142,7 +142,7 @@ layout("/layouts/platform.html"){
 				unions: [],
 				units: [],
 				clubs: [],
-				
+
 				// 审核相关
 				formData: {},
 				showApprovalForm: false
@@ -168,7 +168,7 @@ layout("/layouts/platform.html"){
 					this.$refs.infoRef.onOpen(row)
 				})
 			},
-			
+
 			handleTaskAction(val) {
 				this.$confirm("您确定要提交吗？", "提示", {
 					confirmButtonText: "确定",
@@ -189,7 +189,7 @@ layout("/layouts/platform.html"){
 					})
 				})
 			},
-			
+
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗？", "提示", {
 					confirmButtonText: "确定",

src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html

@@ -197,7 +197,7 @@ layout("/layouts/platform.html"){
 			<el-row type="flex" justify="end" class="mt20">
 				<el-button type="primary" plain @click="onSave">保存</el-button>
 				<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-				<el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+				<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
 			</el-row>
 		</el-card>
 

src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html

@@ -14,25 +14,25 @@ layout("/layouts/platform.html"){
 							value-format="yyyy">
 					</el-date-picker>
 				</search-item>
-				
+
 				<search-item label="申请人">
 					<el-input placeholder="请输入申请人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
 				</search-item>
-				
+
 				<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_ADMIN')">
 					<search-item label="所属工会">
 						<el-select @change="flushUnits" @clear="flushUnits" clearable
 						           filterable
-						           placeholder="所属工会"
+						           placeholder="请选择所属工会"
 						           style="width: 100%;"
 						           v-model="pageForm.unionId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in unions"></el-option>
 						</el-select>
 					</search-item>
-					
+
 					<search-item label="所属单位">
-						<el-select clearable filterable placeholder="所属单位"
+						<el-select clearable filterable placeholder="请选择所属单位"
 						           style="width: 100%;" v-model="pageForm.unitId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in units"></el-option>
@@ -41,7 +41,7 @@ layout("/layouts/platform.html"){
 				</template>
 			</search>
 		</el-card>
-		
+
 		<el-card shadow="never" class="mt10">
 			<table-tool :app="this" label="审批列表">
 				<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -49,12 +49,12 @@ layout("/layouts/platform.html"){
 					<el-radio-button label="false">未审核</el-radio-button>
 				</el-radio-group>
 			</table-tool>
-			
+
 			<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
 			          ref="table" row-key="id" style="width: 100%">
 				<el-table-column :index="indexMethod" header-align="center" label="序号"
 				                 type="index" width="60px"></el-table-column>
-				
+
 				<el-table-column
 						:label="column.label"
 						:prop="column.prop"
@@ -88,7 +88,7 @@ layout("/layouts/platform.html"){
 			</el-table>
 			<!--#include("/layouts/pagination.html"){}#-->
 		</el-card>
-		
+
 		<template #edit>
 			<info ref="infoRef">
 				<div v-if="showApprovalForm">
@@ -117,7 +117,7 @@ layout("/layouts/platform.html"){
 
 <script>
 	<!--#include("../common/info.js"){}#-->
-	
+
 	new Vue({
 		el: "#app",
 		mixins: [initTableMixins],
@@ -142,7 +142,7 @@ layout("/layouts/platform.html"){
 				unions: [],
 				units: [],
 				clubs: [],
-				
+
 				// 审核相关
 				formData: {},
 				showApprovalForm: false
@@ -168,7 +168,7 @@ layout("/layouts/platform.html"){
 					this.$refs.infoRef.onOpen(row)
 				})
 			},
-			
+
 			handleTaskAction(val) {
 				this.$confirm("您确定要提交吗？", "提示", {
 					confirmButtonText: "确定",
@@ -189,7 +189,7 @@ layout("/layouts/platform.html"){
 					})
 				})
 			},
-			
+
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗？", "提示", {
 					confirmButtonText: "确定",

src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html

@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
 					<search-item label="所属工会">
 						<el-select @change="flushUnits" @clear="flushUnits" clearable
 						           filterable
-						           placeholder="所属工会"
+						           placeholder="请选择所属工会"
 						           style="width: 100%;"
 						           v-model="pageForm.unionId">
 							<el-option :label="item.name" :value="item.id"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
 					</search-item>
 
 					<search-item label="所属单位">
-						<el-select clearable filterable placeholder="所属单位"
+						<el-select clearable filterable placeholder="请选择所属单位"
 						           style="width: 100%;" v-model="pageForm.unitId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in units"></el-option>

src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html

@@ -14,25 +14,25 @@ layout("/layouts/platform.html"){
 							value-format="yyyy">
 					</el-date-picker>
 				</search-item>
-				
+
 				<search-item label="申请人">
 					<el-input placeholder="请输入申请人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
 				</search-item>
-				
+
 				<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_ADMIN')">
 					<search-item label="所属工会">
 						<el-select @change="flushUnits" @clear="flushUnits" clearable
 						           filterable
-						           placeholder="所属工会"
+						           placeholder="请选择所属工会"
 						           style="width: 100%;"
 						           v-model="pageForm.unionId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in unions"></el-option>
 						</el-select>
 					</search-item>
-					
+
 					<search-item label="所属单位">
-						<el-select clearable filterable placeholder="所属单位"
+						<el-select clearable filterable placeholder="请选择所属单位"
 						           style="width: 100%;" v-model="pageForm.unitId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in units"></el-option>
@@ -41,7 +41,7 @@ layout("/layouts/platform.html"){
 				</template>
 			</search>
 		</el-card>
-		
+
 		<el-card shadow="never" class="mt10">
 			<table-tool :app="this" label="审批列表">
 				<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -49,12 +49,12 @@ layout("/layouts/platform.html"){
 					<el-radio-button label="false">未审核</el-radio-button>
 				</el-radio-group>
 			</table-tool>
-			
+
 			<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
 			          ref="table" row-key="id" style="width: 100%">
 				<el-table-column :index="indexMethod" header-align="center" label="序号"
 				                 type="index" width="60px"></el-table-column>
-				
+
 				<el-table-column
 						:label="column.label"
 						:prop="column.prop"
@@ -88,7 +88,7 @@ layout("/layouts/platform.html"){
 			</el-table>
 			<!--#include("/layouts/pagination.html"){}#-->
 		</el-card>
-		
+
 		<template #edit>
 			<info ref="infoRef">
 				<div v-if="showApprovalForm">
@@ -117,7 +117,7 @@ layout("/layouts/platform.html"){
 
 <script>
 	<!--#include("../common/info.js"){}#-->
-	
+
 	new Vue({
 		el: "#app",
 		mixins: [initTableMixins],
@@ -142,7 +142,7 @@ layout("/layouts/platform.html"){
 				unions: [],
 				units: [],
 				clubs: [],
-				
+
 				// 审核相关
 				formData: {},
 				showApprovalForm: false
@@ -168,7 +168,7 @@ layout("/layouts/platform.html"){
 					this.$refs.infoRef.onOpen(row)
 				})
 			},
-			
+
 			handleTaskAction(val) {
 				this.$confirm("您确定要提交吗？", "提示", {
 					confirmButtonText: "确定",
@@ -189,7 +189,7 @@ layout("/layouts/platform.html"){
 					})
 				})
 			},
-			
+
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗？", "提示", {
 					confirmButtonText: "确定",

src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html

@@ -14,25 +14,25 @@ layout("/layouts/platform.html"){
 							value-format="yyyy">
 					</el-date-picker>
 				</search-item>
-				
+
 				<search-item label="申请人">
 					<el-input placeholder="请输入申请人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
 				</search-item>
-				
+
 				<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_ADMIN')">
 					<search-item label="所属工会">
 						<el-select @change="flushUnits" @clear="flushUnits" clearable
 						           filterable
-						           placeholder="所属工会"
+						           placeholder="请选择所属工会"
 						           style="width: 100%;"
 						           v-model="pageForm.unionId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in unions"></el-option>
 						</el-select>
 					</search-item>
-					
+
 					<search-item label="所属单位">
-						<el-select clearable filterable placeholder="所属单位"
+						<el-select clearable filterable placeholder="请选择所属单位"
 						           style="width: 100%;" v-model="pageForm.unitId">
 							<el-option :label="item.name" :value="item.id"
 							           v-for="item in units"></el-option>
@@ -41,7 +41,7 @@ layout("/layouts/platform.html"){
 				</template>
 			</search>
 		</el-card>
-		
+
 		<el-card shadow="never" class="mt10">
 			<table-tool :app="this" label="审批列表">
 				<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -49,12 +49,12 @@ layout("/layouts/platform.html"){
 					<el-radio-button label="false">未审核</el-radio-button>
 				</el-radio-group>
 			</table-tool>
-			
+
 			<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
 			          ref="table" row-key="id" style="width: 100%">
 				<el-table-column :index="indexMethod" header-align="center" label="序号"
 				                 type="index" width="60px"></el-table-column>
-				
+
 				<el-table-column
 						:label="column.label"
 						:prop="column.prop"
@@ -88,7 +88,7 @@ layout("/layouts/platform.html"){
 			</el-table>
 			<!--#include("/layouts/pagination.html"){}#-->
 		</el-card>
-		
+
 		<template #edit>
 			<info ref="infoRef">
 				<div v-if="showApprovalForm">
@@ -117,7 +117,7 @@ layout("/layouts/platform.html"){
 
 <script>
 	<!--#include("../common/info.js"){}#-->
-	
+
 	new Vue({
 		el: "#app",
 		mixins: [initTableMixins],
@@ -142,7 +142,7 @@ layout("/layouts/platform.html"){
 				unions: [],
 				units: [],
 				clubs: [],
-				
+
 				// 审核相关
 				formData: {},
 				showApprovalForm: false
@@ -168,7 +168,7 @@ layout("/layouts/platform.html"){
 					this.$refs.infoRef.onOpen(row)
 				})
 			},
-			
+
 			handleTaskAction(val) {
 				this.$confirm("您确定要提交吗？", "提示", {
 					confirmButtonText: "确定",
@@ -189,7 +189,7 @@ layout("/layouts/platform.html"){
 					})
 				})
 			},
-			
+
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗？", "提示", {
 					confirmButtonText: "确定",

src/main/resources/views/platform/zhgh/activity/fitnesswalk/bindingRecord.html

@@ -7,13 +7,13 @@ layout("/layouts/platform.html"){
 <div id="app" v-cloak>
     <guava>
         <el-card shadow="never">
-	        
+
 	        <search @search="doSearch">
 		        <search-item label="姓名工号">
 			        <el-input placeholder="请输入关键字查询" v-model="pageForm.keyWord"></el-input>
 		        </search-item>
 		        <search-item label="所属工会">
-			        <el-select v-model="pageForm.unionId" clearable filterable placeholder="请选择院级工会"
+			        <el-select v-model="pageForm.unionId" clearable filterable placeholder="请选择所属工会"
 			                   style="width: 100%">
 				        <el-option
 						        v-for="item in unionList"
@@ -251,7 +251,7 @@ layout("/layouts/platform.html"){
         },
         async created() {
             this.pageData();
-	        
+
 	        const hasAdminRole = this.$auth.hasRoleOr("SYSADMIN, SCHOOL_UNION_ADMIN")
 	        if (hasAdminRole) {
 		        this.unionList = await this.$businessTool.listUnion()

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

@@ -34,12 +34,12 @@ layout("/layouts/platform.html"){
                 <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();">
+                <el-select clearable filterable placeholder="请选择所属工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
                     <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
                 </el-select>
             </search-item>
             <search-item label="所属单位">
-                <el-select clearable filterable placeholder="提案单位" v-model="pageForm.unitId">
+                <el-select clearable filterable placeholder="请选择所属单位" 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>

src/main/resources/views/platform/zhgh/benefit/userList/index.html

@@ -41,13 +41,13 @@ layout("/layouts/platform.html"){
                     </search-item>
 
                     <search-item label="所属工会">
-                        <el-select clearable filterable placeholder="请选择工会" style="width: 100%" v-model="pageForm.unionId">
+                        <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%" v-model="pageForm.unionId">
                             <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionList"></el-option>
                         </el-select>
                     </search-item>
 
                     <search-item label="所属单位">
-                        <el-select clearable filterable multiple placeholder="请选择单位" style="width: 100%" v-model="pageForm.unitIds">
+                        <el-select clearable filterable multiple placeholder="请选择所属单位" style="width: 100%" v-model="pageForm.unitIds">
                             <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitList"></el-option>
                         </el-select>
                     </search-item>

src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html

@@ -48,13 +48,13 @@ layout("/layouts/platform.html"){
                     </search-item>
 
                     <search-item label="所属工会">
-                        <el-select clearable filterable placeholder="请选择工会" style="width: 100%" v-model="pageForm.unionId">
+                        <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%" v-model="pageForm.unionId">
                             <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionList"></el-option>
                         </el-select>
                     </search-item>
 
                     <search-item label="所属单位">
-                        <el-select clearable filterable multiple placeholder="请选择单位" style="width: 100%" v-model="pageForm.unitIds">
+                        <el-select clearable filterable multiple placeholder="请选择所属单位" style="width: 100%" v-model="pageForm.unitIds">
                             <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitList"></el-option>
                         </el-select>
                     </search-item>

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

@@ -34,9 +34,9 @@ layout("/layouts/platform.html"){
                         <el-option label="女" value="女"></el-option>
                     </el-select>
                 </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"
@@ -44,9 +44,9 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择单位" clearable>
+                               placeholder="请选择所属单位" clearable>
                         <el-option v-for="item in unitOptions"
                                    :value="item.id"
                                    :key="item.id"

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

@@ -33,9 +33,9 @@ layout("/layouts/platform.html"){
                         <el-option label="女" value="女"></el-option>
                     </el-select>
                 </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"
@@ -43,9 +43,9 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择单位" clearable>
+                               placeholder="请选择所属单位" clearable>
                         <el-option v-for="item in unitOptions"
                                    :value="item.id"
                                    :key="item.id"

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

@@ -38,14 +38,14 @@ layout("/layouts/platform.html"){
                     </el-select>
                 </search-item>
                 <search-item label="所属工会">
-                    <el-select v-model="pageForm.unionId" placeholder="请选择分工会" clearable style="width: 100%"
+                    <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" clearable style="width: 100%"
                                @change="flushUnits" @clear="flushUnits">
                         <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
                                    :value="item.id"></el-option>
                     </el-select>
                 </search-item>
                 <search-item label="所属单位">
-                    <el-select placeholder="所属单位" style="width: 100%" v-model="pageForm.unitId" clearable
+                    <el-select placeholder="请选择所属单位" style="width: 100%" v-model="pageForm.unitId" clearable
                                filterable>
                         <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option>
                     </el-select>

src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/summary/index.html

@@ -38,14 +38,14 @@ layout("/layouts/platform.html"){
                     </el-select>
                 </search-item>
                 <search-item label="所属工会">
-                    <el-select v-model="pageForm.unionId" placeholder="请选择分工会" clearable style="width: 100%"
+                    <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" clearable style="width: 100%"
                                @change="flushUnits" @clear="flushUnits">
                         <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
                                    :value="item.id"></el-option>
                     </el-select>
                 </search-item>
                 <search-item label="所属单位">
-                    <el-select placeholder="所属单位" style="width: 100%" v-model="pageForm.unitId" clearable
+                    <el-select placeholder="请选择所属单位" style="width: 100%" v-model="pageForm.unitId" clearable
                                filterable>
                         <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option>
                     </el-select>

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

@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
                         <el-option label="女" value="女"></el-option>
                     </el-select>
                 </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"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择单位" clearable>
+                               placeholder="请选择所属单位" clearable>
                         <el-option v-for="item in unitOptions"
                                    :value="item.id"
                                    :key="item.id"

src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html

@@ -51,7 +51,7 @@ layout("/layouts/platform.html"){
                         </el-select>
                     </search-item>
                     <search-item label="所属单位">
-                        <el-select placeholder="所属单位" v-model="pageForm.unitId"
+                        <el-select placeholder="请选择所属单位" v-model="pageForm.unitId"
                                    style="width: 100%;"
                                    clearable
                                    filterable>

src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html

@@ -38,7 +38,7 @@ layout("/layouts/platform.html"){
                         </el-select>
                     </search-item>
                     <search-item label="所属单位">
-                        <el-select placeholder="所属单位" v-model="pageForm.unitId"
+                        <el-select placeholder="请选择所属单位" v-model="pageForm.unitId"
                                    style="width: 100%;"
                                    clearable
                                    filterable>

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

@@ -17,7 +17,7 @@ layout("/layouts/platform.html"){
                     </el-date-picker>
                 </search-item>
                 <search-item label="所属工会">
-                    <el-select placeholder="所属工会" v-model="pageForm.unionId" style="width: 100%;"
+                    <el-select placeholder="请选择所属工会" v-model="pageForm.unionId" style="width: 100%;"
                                clearable
                                filterable @change="honorLevelData">
                         <el-option v-for="item in unions" :label="item.name" :value="item.id"></el-option>

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

@@ -17,7 +17,7 @@ layout("/layouts/platform.html"){
                     </el-date-picker>
                 </search-item>
                 <search-item label="所属工会">
-                    <el-select placeholder="所属工会" v-model="pageForm.unionId" style="width: 100%;"
+                    <el-select placeholder="请选择所属工会" v-model="pageForm.unionId" style="width: 100%;"
                                clearable filterable @change="pageData">
                         <el-option v-for="item in unions" :label="item.name" :value="item.id"></el-option>
                     </el-select>

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

@@ -35,7 +35,7 @@ layout("/layouts/platform.html"){
                                 @clear="flushUnits"
                                 clearable
                                 filterable
-                                placeholder="所属工会"
+                                placeholder="请选择所属工会"
                                 style="width: 100%"
                                 v-model="pageForm.unionId"
                         >
@@ -44,7 +44,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.unitId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in unitList"></el-option>

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

@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
                                 @clear="flushUnits"
                                 clearable
                                 filterable
-                                placeholder="所属工会"
+                                placeholder="请选择所属工会"
                                 style="width: 100%"
                                 v-model="pageForm.unionId"
                         >
@@ -33,7 +33,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.unitId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in unitList"></el-option>

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolCnAudit/index.html

@@ -30,7 +30,7 @@ layout("/layouts/platform.html"){
                     </el-input>
                 </search-item>
                 <search-item label="所属工会">
-                    <el-select v-model="pageForm.unionId" placeholder="请选择分工会" clearable style="width: 100%">
+                    <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" clearable style="width: 100%">
                         <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
                                    :value="item.id"></el-option>
                     </el-select>

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolKjAudit/index.html

@@ -30,7 +30,7 @@ layout("/layouts/platform.html"){
                     </el-input>
                 </search-item>
                 <search-item label="所属工会">
-                    <el-select v-model="pageForm.unionId" placeholder="请选择分工会" clearable style="width: 100%">
+                    <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" clearable style="width: 100%">
                         <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
                                    :value="item.id"></el-option>
                     </el-select>

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolZxAudit/index.html

@@ -30,7 +30,7 @@ layout("/layouts/platform.html"){
                     </el-input>
                 </search-item>
                 <search-item label="所属工会">
-                    <el-select v-model="pageForm.unionId" placeholder="请选择分工会" clearable style="width: 100%">
+                    <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" clearable style="width: 100%">
                         <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
                                    :value="item.id"></el-option>
                     </el-select>

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/summary/index.html

@@ -30,7 +30,7 @@ layout("/layouts/platform.html"){
                     </el-input>
                 </search-item>
                 <search-item label="所属工会">
-                    <el-select v-model="pageForm.unionId" placeholder="请选择分工会" clearable style="width: 100%">
+                    <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" clearable style="width: 100%">
                         <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
                                    :value="item.id"></el-option>
                     </el-select>

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

@@ -28,14 +28,14 @@ layout("/layouts/platform.html"){
                     <el-input v-model="pageForm.searchKeyword" placeholder="姓名/工号" clearable></el-input>
                 </search-item>
                 <search-item label="所属工会">
-                    <el-select clearable filterable placeholder="所属工会" style="width: 100%"
+                    <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"
                                v-model="pageForm.unionId" @change="flushUnits">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in unionOptions"></el-option>
                     </el-select>
                 </search-item>
                 <search-item label="所属单位">
-                    <el-select placeholder="所属单位" style="width: 100%" v-model="pageForm.unitId" clearable
+                    <el-select placeholder="请选择所属单位" style="width: 100%" v-model="pageForm.unitId" clearable
                                filterable>
                         <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option>
                     </el-select>

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

@@ -228,7 +228,7 @@ layout("/layouts/platform.html"){
         <el-row type="flex" justify="end" class="mt20">
             <el-button type="primary" plain @click="onSave">保存</el-button>
             <el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-            <el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+            <el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
         </el-row>
     </el-card>
 </div>

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

@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
                 <search-item label="姓名/工号">
                     <el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></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"
@@ -22,9 +22,9 @@ layout("/layouts/platform.html"){
                             ></el-option>
                         </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                         <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                                   placeholder="请选择单位" clearable>
+                                   placeholder="请选择所属单位" clearable>
                             <el-option v-for="item in unitOptions"
                                        :value="item.id"
                                        :key="item.id"

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

@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
                 <search-item label="姓名/工号">
                     <el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></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"
@@ -22,9 +22,9 @@ layout("/layouts/platform.html"){
                             ></el-option>
                         </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                         <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                                   placeholder="请选择单位" clearable>
+                                   placeholder="请选择所属单位" clearable>
                             <el-option v-for="item in unitOptions"
                                        :value="item.id"
                                        :key="item.id"

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

@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
                 <search-item label="姓名/工号">
                     <el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></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"
@@ -22,9 +22,9 @@ layout("/layouts/platform.html"){
                             ></el-option>
                         </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                         <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                                   placeholder="请选择单位" clearable>
+                                   placeholder="请选择所属单位" clearable>
                             <el-option v-for="item in unitOptions"
                                        :value="item.id"
                                        :key="item.id"

src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/mine.html

@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
 		            <search-item label="所属工会">
 			            <el-select @change="doSearch" clearable="true"
 			                       filterable="true"
-			                       placeholder="所属工会"
+			                       placeholder="请选择所属工会"
 			                       style="width: 100%;"
 			                       v-model="pageForm.unionId">
 				            <el-option :label="item.name" :value="item.id"

src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/organizationAudit.html

@@ -18,11 +18,11 @@ layout("/layouts/platform.html"){
 					            value-format="yyyy">
 			            </el-date-picker>
 		            </search-item>
-		            
+
 		            <search-item label="所属工会">
 			            <el-select @change="doSearch" clearable="true"
 			                       filterable="true"
-			                       placeholder="所属工会"
+			                       placeholder="请选择所属工会"
 			                       style="width: 100%;"
 			                       v-model="pageForm.unionId">
 				            <el-option :label="item.name" :value="item.id"

src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/schoolAudit.html

@@ -18,11 +18,11 @@ layout("/layouts/platform.html"){
 					            value-format="yyyy">
 			            </el-date-picker>
 		            </search-item>
-		            
+
 		            <search-item label="所属工会">
 			            <el-select @change="doSearch" clearable="true"
 			                       filterable="true"
-			                       placeholder="所属工会"
+			                       placeholder="请选择所属工会"
 			                       style="width: 100%;"
 			                       v-model="pageForm.unionId">
 				            <el-option :label="item.name" :value="item.id"

src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/statistics.html

@@ -17,11 +17,11 @@ layout("/layouts/platform.html"){
 					            value-format="yyyy">
 			            </el-date-picker>
 		            </search-item>
-		            
+
 		            <search-item label="所属工会">
 			            <el-select @change="doSearch" clearable="true"
 			                       filterable="true"
-			                       placeholder="所属工会"
+			                       placeholder="请选择所属工会"
 			                       style="width: 100%;"
 			                       v-model="pageForm.unionId">
 				            <el-option :label="item.name" :value="item.id"

src/main/resources/views/platform/zhgh/dayofficework/workershome/info/info.html

@@ -103,11 +103,11 @@ layout("/layouts/platform.html"){
 					            value-format="yyyy">
 			            </el-date-picker>
 		            </search-item>
-		            
+
 		            <search-item label="所属工会">
 			            <el-select @change="doSearch" clearable="true"
 			                       filterable="true"
-			                       placeholder="所属工会"
+			                       placeholder="请选择所属工会"
 			                       style="width: 100%;"
 			                       v-model="pageForm.unionId">
 				            <el-option :label="item.name" :value="item.id"

src/main/resources/views/platform/zhgh/dayofficework/workershome/info/mine.html

@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
 		            <search-item label="所属工会">
 			            <el-select @change="doSearch" clearable="true"
 			                       filterable="true"
-			                       placeholder="所属工会"
+			                       placeholder="请选择所属工会"
 			                       style="width: 100%;"
 			                       v-model="pageForm.unionId">
 				            <el-option :label="item.name" :value="item.id"

src/main/resources/views/platform/zhgh/dayofficework/workershome/info/schoolAudit.html

@@ -18,11 +18,11 @@ layout("/layouts/platform.html"){
 					            value-format="yyyy">
 			            </el-date-picker>
 		            </search-item>
-		            
+
 		            <search-item label="所属工会">
 			            <el-select @change="doSearch" clearable="true"
 			                       filterable="true"
-			                       placeholder="所属工会"
+			                       placeholder="请选择所属工会"
 			                       style="width: 100%;"
 			                       v-model="pageForm.unionId">
 				            <el-option :label="item.name" :value="item.id"

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

@@ -34,8 +34,8 @@ layout("/layouts/platform.html"){
                                        v-for="item in delegations"></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="分工会">
+                    <search-item label="所属工会">
-                        <el-select clearable filterable placeholder="分工会" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"
                                    v-model="pageForm.unionId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in unionOptions"></el-option>

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

@@ -34,8 +34,8 @@ layout("/layouts/platform.html"){
                                        v-for="item in delegations"></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="分工会">
+                    <search-item label="所属工会">
-                        <el-select clearable filterable placeholder="分工会" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"
                                    v-model="pageForm.unionId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in unionOptions"></el-option>

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

@@ -42,7 +42,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.unionId" @change="flushUnits" @clear="flushUnits">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in unionOptions"></el-option>

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

@@ -27,8 +27,8 @@ layout("/layouts/platform.html"){
                             ></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="分工会">
+                    <search-item label="所属工会">
-                        <el-select clearable filterable placeholder="分工会" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"
                                    v-model="pageForm.unionId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in unionOptions"></el-option>

src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/write/index.html

@@ -44,7 +44,7 @@ layout("/layouts/platform.html"){
             <el-row type="flex" justify="end" class="mt20">
                 <el-button type="primary" plain @click="onSave">保存</el-button>
                 <el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-                <el-button type="primary" @click="submitAgain" v-else>提交1</el-button>
+                <el-button type="primary" @click="submitAgain" v-else>提交</el-button>
             </el-row>
         </el-card>
     </guava>

src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/statistics/index.html

@@ -12,8 +12,8 @@ layout("/layouts/platform.html"){
                 <search-item label="会议名称">
                     <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称" v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
-                <search-item label="分工会">
+                <search-item label="所属工会">
-                    <el-select v-model="pageForm.unionId" placeholder="请选择分工会" filterable clearable style="width: 100%">
+                    <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable style="width: 100%">
                         <el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </search-item>

src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/write/index.html

@@ -108,7 +108,7 @@ layout("/layouts/platform.html"){
             <el-row type="flex" justify="end" class="mt20">
                 <el-button type="primary" plain @click="onSave">保存</el-button>
                 <el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-                <el-button type="primary" @click="submitAgain" v-else>提交1</el-button>
+                <el-button type="primary" @click="submitAgain" v-else>提交</el-button>
             </el-row>
         </el-card>
     </guava>

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

@@ -65,15 +65,15 @@ layout("/layouts/platform.html"){
                                    v-for="item in delegationOptions"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="分工会">
+                <search-item label="所属工会">
-                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId"
+                    <el-select clearable filterable placeholder="请选择所属工会" v-model="pageForm.unionId"
                                @change="pageForm.unitId=null;listUnit();">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in unionOptions"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
-                    <el-select clearable filterable placeholder="单位" v-model="pageForm.unitId">
+                    <el-select clearable filterable placeholder="请选择所属单位" v-model="pageForm.unitId">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in unitOptions"></el-option>
                     </el-select>

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

@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
                 <search-item label="标题">
                     <el-input v-model="pageForm.title" 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"
@@ -22,9 +22,9 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择单位" clearable>
+                               placeholder="请选择所属单位" clearable>
                         <el-option v-for="item in unitOptions"
                                    :value="item.id"
                                    :key="item.id"

src/main/resources/views/platform/zhgh/democratic/suggestionBox/write/index.html

@@ -46,7 +46,7 @@ layout("/layouts/platform.html"){
         <el-row type="flex" justify="end" class="mt20">
             <el-button type="primary" plain @click="onSave">保存</el-button>
             <el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-            <el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+            <el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
         </el-row>
     </el-card>
 </div>

src/main/resources/views/platform/zhgh/democratic/suggestionBox/xgh/index.html

@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
                 <search-item label="标题">
                     <el-input v-model="pageForm.title" 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"
@@ -22,9 +22,9 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择单位" clearable>
+                               placeholder="请选择所属单位" clearable>
                         <el-option v-for="item in unitOptions"
                                    :value="item.id"
                                    :key="item.id"

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

@@ -18,13 +18,13 @@ layout("/layouts/platform.html"){
                     <el-option v-for="i in delegationOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>
-            <search-item label="分工会">
+            <search-item label="所属工会">
-                <el-select v-model="pageForm.unionId" filterable @change="listUnit" clearable style="width: 100%">
+                <el-select placeholder="请选择所属工会" v-model="pageForm.unionId" filterable @change="listUnit" clearable style="width: 100%">
                     <el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>
-            <search-item label="单位">
+            <search-item label="所属单位">
-                <el-select v-model="pageForm.unitId" filterable clearable style="width: 100%">
+                <el-select placeholder="请选择所属单位" v-model="pageForm.unitId" filterable clearable style="width: 100%">
                     <el-option v-for="i in unitOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>

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

@@ -13,8 +13,8 @@ layout("/layouts/platform.html"){
                                :key="item.id"></el-option>
                 </el-select>
             </search-item>
-            <search-item label="分工会">
+            <search-item label="所属工会">
-                <el-select v-model="pageForm.unionId" filterable clearable style="width: 100%">
+                <el-select placeholder="请选择所属工会" v-model="pageForm.unionId" filterable clearable style="width: 100%">
                     <el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>

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

@@ -18,13 +18,13 @@ layout("/layouts/platform.html"){
                     <el-option v-for="i in delegationOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>
-            <search-item label="分工会">
+            <search-item label="所属工会">
-                <el-select v-model="pageForm.unionId" filterable @change="listUnit" clearable style="width: 100%">
+                <el-select placeholder="请选择所属工会" v-model="pageForm.unionId" filterable @change="listUnit" clearable style="width: 100%">
                     <el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>
-            <search-item label="单位">
+            <search-item label="所属单位">
-                <el-select v-model="pageForm.unitId" clearable filterable style="width: 100%">
+                <el-select placeholder="请选择所属单位" v-model="pageForm.unitId" clearable filterable style="width: 100%">
                     <el-option v-for="i in unitOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>

src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/index.html

@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
                 </el-select>
             </search-item>
             <search-item label="所属工会">
-                <el-select clearable filterable placeholder="所属工会" style="width: 100%" v-model="pageForm.unionId">
+                <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%" v-model="pageForm.unionId">
                     <el-option :key="item.id" :label="item.name" :value="item.id"
                                v-for="item in unionOptions"></el-option>
                 </el-select>

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

@@ -18,13 +18,13 @@ layout("/layouts/platform.html"){
                     <el-option v-for="i in delegationOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>
-            <search-item label="分工会">
+            <search-item label="所属工会">
-                <el-select v-model="pageForm.unionId" @change="listUnit" clearable style="width: 100%">
+                <el-select placeholder="请选择所属工会" v-model="pageForm.unionId" @change="listUnit" clearable style="width: 100%">
                     <el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>
-            <search-item label="单位">
+            <search-item label="所属单位">
-                <el-select v-model="pageForm.unitId" clearable style="width: 100%">
+                <el-select placeholder="请选择所属单位" v-model="pageForm.unitId" clearable style="width: 100%">
                     <el-option v-for="i in unitOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>

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

@@ -18,13 +18,13 @@ layout("/layouts/platform.html"){
                     <el-option v-for="i in delegationOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>
-            <search-item label="分工会">
+            <search-item label="所属工会">
-                <el-select v-model="pageForm.unionId" @change="listUnit" clearable style="width: 100%">
+                <el-select placeholder="请选择所属工会" v-model="pageForm.unionId" @change="listUnit" clearable style="width: 100%">
                     <el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>
-            <search-item label="单位">
+            <search-item label="所属单位">
-                <el-select v-model="pageForm.unitId" clearable style="width: 100%">
+                <el-select placeholder="请选择所属单位" v-model="pageForm.unitId" clearable style="width: 100%">
                     <el-option v-for="i in unitOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html

@@ -222,7 +222,7 @@ layout("/layouts/platform.html"){
 		<el-row type="flex" justify="end" class="mt20">
 			<el-button type="primary" plain @click="onSave">保存</el-button>
 			<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-			<el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+			<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
 		</el-row>
 	</el-card>
 </div>

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html

@@ -14,24 +14,24 @@ layout("/layouts/platform.html"){
 							value-format="yyyy">
 					</el-date-picker>
 				</search-item>
-				
+
 				<search-item label="受助人">
 					<el-input placeholder="请输入受助人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
 				</search-item>
-				
+
 				<search-item label="所属工会">
 					<el-select @change="flushUnits" @clear="flushUnits" clearable
 					           filterable
-					           placeholder="所属工会"
+					           placeholder="请选择所属工会"
 					           style="width: 100%;"
 					           v-model="pageForm.unionId">
 						<el-option :label="item.name" :value="item.id"
 						           v-for="item in unions"></el-option>
 					</el-select>
 				</search-item>
-				
+
 				<search-item label="所属单位">
-					<el-select clearable filterable placeholder="所属单位"
+					<el-select clearable filterable placeholder="请选择所属单位"
 					           style="width: 100%;" v-model="pageForm.unitId">
 						<el-option :label="item.name" :value="item.id"
 						           v-for="item in units"></el-option>
@@ -39,7 +39,7 @@ layout("/layouts/platform.html"){
 				</search-item>
 			</search>
 		</el-card>
-		
+
 		<el-card shadow="never" class="mt10">
 			<table-tool :app="this" label="审批列表">
 				<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -78,7 +78,7 @@ layout("/layouts/platform.html"){
 			</el-table>
 			<!--#include("/layouts/pagination.html"){}#-->
 		</el-card>
-		
+
 		<template #edit>
 			<info ref="infoRef">
 				<div v-if="showApprovalForm">
@@ -101,14 +101,14 @@ layout("/layouts/platform.html"){
 				</div>
 			</info>
 		</template>
-		
+
 	</guava>
 </div>
 
 <script>
-	
+
 	<!--#include("../common/info.js"){}#-->
-	
+
 	new Vue({
 		el: "#app",
 		mixins: [initTableMixins],
@@ -131,7 +131,7 @@ layout("/layouts/platform.html"){
 				],
 				unions: [],
 				units: [],
-				
+
 				// 审核相关
 				formData: {},
 				showApprovalForm: false
@@ -157,7 +157,7 @@ layout("/layouts/platform.html"){
 					this.$refs.infoRef.onOpen(row)
 				})
 			},
-			
+
 			handleTaskAction(val) {
 				this.$confirm("您确定要提交吗？", "提示", {
 					confirmButtonText: "确定",
@@ -178,7 +178,7 @@ layout("/layouts/platform.html"){
 					})
 				})
 			},
-			
+
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗？", "提示", {
 					confirmButtonText: "确定",

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/mine/index.html

@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
 				<search-item label="所属工会">
 					<el-select @change="flushUnits" @clear="flushUnits" clearable
 					           filterable
-					           placeholder="所属工会"
+					           placeholder="请选择所属工会"
 					           style="width: 100%;"
 					           v-model="pageForm.unionId">
 						<el-option :label="item.name" :value="item.id"
@@ -31,7 +31,7 @@ layout("/layouts/platform.html"){
 				</search-item>
 
 				<search-item label="所属单位">
-					<el-select clearable filterable placeholder="所属单位"
+					<el-select clearable filterable placeholder="请选择所属单位"
 					           style="width: 100%;" v-model="pageForm.unitId">
 						<el-option :label="item.name" :value="item.id"
 						           v-for="item in units"></el-option>

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/reading/index.html

@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
 				<search-item label="所属工会">
 					<el-select @change="flushUnits" @clear="flushUnits" clearable
 					           filterable
-					           placeholder="所属工会"
+					           placeholder="请选择所属工会"
 					           style="width: 100%;"
 					           v-model="pageForm.unionId">
 						<el-option :label="item.name" :value="item.id"
@@ -31,7 +31,7 @@ layout("/layouts/platform.html"){
 				</search-item>
 
 				<search-item label="所属单位">
-					<el-select clearable filterable placeholder="所属单位"
+					<el-select clearable filterable placeholder="请选择所属单位"
 					           style="width: 100%;" v-model="pageForm.unitId">
 						<el-option :label="item.name" :value="item.id"
 						           v-for="item in units"></el-option>

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html

@@ -14,24 +14,24 @@ layout("/layouts/platform.html"){
 							value-format="yyyy">
 					</el-date-picker>
 				</search-item>
-				
+
 				<search-item label="受助人">
 					<el-input placeholder="请输入受助人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
 				</search-item>
-				
+
 				<search-item label="所属工会">
 					<el-select @change="flushUnits" @clear="flushUnits" clearable
 					           filterable
-					           placeholder="所属工会"
+					           placeholder="请选择所属工会"
 					           style="width: 100%;"
 					           v-model="pageForm.unionId">
 						<el-option :label="item.name" :value="item.id"
 						           v-for="item in unions"></el-option>
 					</el-select>
 				</search-item>
-				
+
 				<search-item label="所属单位">
-					<el-select clearable filterable placeholder="所属单位"
+					<el-select clearable filterable placeholder="请选择所属单位"
 					           style="width: 100%;" v-model="pageForm.unitId">
 						<el-option :label="item.name" :value="item.id"
 						           v-for="item in units"></el-option>
@@ -39,7 +39,7 @@ layout("/layouts/platform.html"){
 				</search-item>
 			</search>
 		</el-card>
-		
+
 		<el-card shadow="never" class="mt10">
 			<table-tool :app="this" label="审批列表">
 				<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -78,7 +78,7 @@ layout("/layouts/platform.html"){
 			</el-table>
 			<!--#include("/layouts/pagination.html"){}#-->
 		</el-card>
-		
+
 		<template #edit>
 			<info ref="infoRef">
 				<div v-if="showApprovalForm">
@@ -107,9 +107,9 @@ layout("/layouts/platform.html"){
 </div>
 
 <script>
-	
+
 	<!--#include("../common/info.js"){}#-->
-	
+
 	new Vue({
 		el: "#app",
 		mixins: [initTableMixins],
@@ -132,7 +132,7 @@ layout("/layouts/platform.html"){
 				],
 				unions: [],
 				units: [],
-				
+
 				// 审核相关
 				formData: {
 					tf_money: 0,
@@ -161,7 +161,7 @@ layout("/layouts/platform.html"){
 					this.$refs.infoRef.onOpen(row)
 				})
 			},
-			
+
 			handleTaskAction(val) {
 				this.$confirm("您确定要提交吗？", "提示", {
 					confirmButtonText: "确定",
@@ -182,7 +182,7 @@ layout("/layouts/platform.html"){
 					})
 				})
 			},
-			
+
 			onRevoke(row) {
 				this.$confirm("您确定要撤回吗？", "提示", {
 					confirmButtonText: "确定",

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

@@ -152,7 +152,7 @@ layout("/layouts/platform.html"){
         <el-row type="flex" justify="end" class="mt20">
             <el-button type="primary" plain @click="onSave">保存</el-button>
             <el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-            <el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+            <el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
         </el-row>
     </el-card>
 </div>

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

@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
                         <el-option label="女" value="女"></el-option>
                     </el-select>
                 </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"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择单位" clearable>
+                               placeholder="请选择所属单位" clearable>
                         <el-option v-for="item in unitOptions"
                                    :value="item.id"
                                    :key="item.id"

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

@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
                         <el-option label="女" value="女"></el-option>
                     </el-select>
                 </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"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择单位" clearable>
+                               placeholder="请选择所属单位" clearable>
                         <el-option v-for="item in unitOptions"
                                    :value="item.id"
                                    :key="item.id"

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

@@ -19,9 +19,9 @@ layout("/layouts/platform.html"){
                     </el-select>
                 </search-item>
                 <template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])">
-                <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"
@@ -29,9 +29,9 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择单位" clearable>
+                               placeholder="请选择所属单位" clearable>
                         <el-option v-for="item in unitOptions"
                                    :value="item.id"
                                    :key="item.id"

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

@@ -48,14 +48,14 @@ layout("/layouts/platform.html"){
                         </el-input>
                     </search-item>
                     <search-item label="所属工会">
-                        <el-select v-model="pageForm.unionId" placeholder="请选择分工会" clearable style="width: 100%"
+                        <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" clearable style="width: 100%"
                                    @change="flushUnits" @clear="flushUnits">
                             <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
                                        :value="item.id"></el-option>
                         </el-select>
                     </search-item>
                     <search-item label="所属单位">
-                        <el-select placeholder="所属单位" style="width: 100%" v-model="pageForm.unitId" clearable
+                        <el-select placeholder="请选择所属单位" style="width: 100%" v-model="pageForm.unitId" clearable
                                    filterable>
                             <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"
                                        :key="item.id"></el-option>

src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/summary/index.html

@@ -48,14 +48,14 @@ layout("/layouts/platform.html"){
                         </el-input>
                     </search-item>
                     <search-item label="所属工会">
-                        <el-select v-model="pageForm.unionId" placeholder="请选择分工会" clearable style="width: 100%"
+                        <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" clearable style="width: 100%"
                                    @change="flushUnits" @clear="flushUnits">
                             <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
                                        :value="item.id"></el-option>
                         </el-select>
                     </search-item>
                     <search-item label="所属单位">
-                        <el-select placeholder="所属单位" style="width: 100%" v-model="pageForm.unitId" clearable
+                        <el-select placeholder="请选择所属单位" style="width: 100%" v-model="pageForm.unitId" clearable
                                    filterable>
                             <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"
                                        :key="item.id"></el-option>

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

@@ -152,7 +152,7 @@ layout("/layouts/platform.html"){
         <el-row type="flex" justify="end" class="mt20">
             <el-button type="primary" plain @click="onSave">保存</el-button>
             <el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-            <el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+            <el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
         </el-row>
     </el-card>
 </div>

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

@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
                         <el-option label="女" value="女"></el-option>
                     </el-select>
                 </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"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择单位" clearable>
+                               placeholder="请选择所属单位" clearable>
                         <el-option v-for="item in unitOptions"
                                    :value="item.id"
                                    :key="item.id"

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

@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
                         <el-option label="女" value="女"></el-option>
                     </el-select>
                 </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"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择单位" clearable>
+                               placeholder="请选择所属单位" clearable>
                         <el-option v-for="item in unitOptions"
                                    :value="item.id"
                                    :key="item.id"

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

@@ -19,9 +19,9 @@ layout("/layouts/platform.html"){
                     </el-select>
                 </search-item>
                 <template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])">
-                    <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"
@@ -29,9 +29,9 @@ layout("/layouts/platform.html"){
                             ></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="单位">
+                    <search-item label="所属单位">
                         <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                                   placeholder="请选择单位" clearable>
+                                   placeholder="请选择所属单位" clearable>
                             <el-option v-for="item in unitOptions"
                                        :value="item.id"
                                        :key="item.id"

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

@@ -211,7 +211,7 @@ layout("/layouts/platform.html"){
                 <el-row type="flex" justify="end" class="mt20">
                     <el-button type="primary" plain @click="onSave">保存</el-button>
                     <el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-                    <el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+                    <el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
                 </el-row>
             </el-card>
         </template>

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

@@ -32,9 +32,9 @@ layout("/layouts/platform.html"){
                         <el-option label="女" value="女"></el-option>
                     </el-select>
                 </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"
@@ -42,9 +42,9 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
                     <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                               placeholder="请选择单位" clearable>
+                               placeholder="请选择所属单位" clearable>
                         <el-option v-for="item in unitOptions"
                                    :value="item.id"
                                    :key="item.id"

src/main/resources/views/platform/zhgh/staffbenefit/recuperation/line/index.html

@@ -68,7 +68,7 @@ layout("/layouts/platform.html"){
                             ></el-option>
                         </el-select>
                     </search-item>
-                    <search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')" label="分工会：">
+                    <search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')" label="所属工会：">
                         <el-select @change="doSearch"
                                    clearable
                                    filterable

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

@@ -45,15 +45,15 @@ layout("/layouts/platform.html"){
                         <el-option label="女" value="女"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="分工会">
+                <search-item label="所属工会">
-                    <el-select v-model="pageForm.unionId" placeholder="请选择分工会" clearable style="width: 100%"
+                    <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" clearable style="width: 100%"
                                @change="flushUnits" @clear="flushUnits">
                         <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
                                    :value="item.id"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="单位">
+                <search-item label="所属单位">
-                    <el-select placeholder="请选择单位" style="width: 100%" v-model="pageForm.unitId" clearable
+                    <el-select placeholder="请选择所属单位" style="width: 100%" v-model="pageForm.unitId" clearable
                                filterable>
                         <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option>
                     </el-select>

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

@@ -11,7 +11,7 @@ const COMMON_QUERY = {
 						    @clear="flushUnits"
 						    clearable
 						    filterable
-						    placeholder="所属工会"
+						    placeholder="请选择所属工会"
 						    style="width: 100%"
 						    v-model="pageForm.unionId"
 				    >
@@ -19,7 +19,7 @@ const COMMON_QUERY = {
 				    </el-select>
 			    </search-item>
 			    <search-item label="所属单位">
-				    <el-select clearable filterable placeholder="请选择" style="width: 100%" v-model="pageForm.unitId">
+				    <el-select 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 units"></el-option>
 				    </el-select>
 			    </search-item>

src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html

@@ -206,7 +206,7 @@ layout("/layouts/platform.html"){
 		<el-row type="flex" justify="end" class="mt20">
 			<el-button type="primary" plain @click="onSave">保存</el-button>
 			<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-			<el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+			<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
 		</el-row>
 	</el-card>
 </div>

src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html

@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
                             @clear="flushUnits"
                             clearable
                             filterable
-                            placeholder="所属工会"
+                            placeholder="请选择所属工会"
                             style="width: 100%"
                             v-model="pageForm.unionId"
                         >
@@ -35,7 +35,7 @@ layout("/layouts/platform.html"){
                         </el-select>
                     </search-item>
                     <search-item label="所属单位">
-                        <el-select clearable filterable placeholder="请选择" style="width: 100%" v-model="pageForm.unitId">
+                        <el-select 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 units"></el-option>
                         </el-select>
                     </search-item>

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

@@ -6,13 +6,13 @@ const COMMON_QUERY = {
 		    </search-item>
 		    <search-item label="所属工会">
 			    <el-select @change="flushUnits" @clear="flushUnits" clearable filterable
-			               placeholder="所属工会" style="width: 100%;" v-model="pageForm.unionId">
+			               placeholder="请选择所属工会" style="width: 100%;" v-model="pageForm.unionId">
 				    <el-option :key="item.id" :label="item.name" :value="item.id"
 				               v-for="item in unions"></el-option>
 			    </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.unitId">
 				    <el-option :key="item.id" :label="item.name" :value="item.id"
 				               v-for="item in units"></el-option>

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

@@ -10,13 +10,13 @@ layout("/layouts/platform.html"){
 			    </search-item>
 			    <search-item label="所属工会">
 				    <el-select @change="flushUnits" @clear="flushUnits" clearable filterable
-				               placeholder="所属工会" style="width: 100%;" v-model="pageForm.unionId">
+				               placeholder="请选择所属工会" style="width: 100%;" v-model="pageForm.unionId">
 					    <el-option :key="item.id" :label="item.name" :value="item.id"
 					               v-for="item in unions"></el-option>
 				    </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.unitId">
 					    <el-option :key="item.id" :label="item.name" :value="item.id"
 					               v-for="item in units"></el-option>
@@ -47,7 +47,7 @@ layout("/layouts/platform.html"){
 			    </search-item>
 		    </search>
 	    </el-card>
-	    
+
 	    <el-card shadow="never" class="mt10">
 		    <table-tool label="人员列表(工会小组或分工会提交的变更还需校工会审核哦)">
 			    <el-radio-group @change="doSearch" class="mr5"
@@ -57,7 +57,7 @@ layout("/layouts/platform.html"){
 				    <el-radio-button :label="1">会员</el-radio-button>
 				    <el-radio-button :label="0">非会员</el-radio-button>
 			    </el-radio-group>
-			    
+
 			    <span class="text-danger">人员异动：</span>
 			    <el-radio-group @change="doSearch" class="mr5" size="small"
 			                    v-model="pageForm.changed">
@@ -65,14 +65,14 @@ layout("/layouts/platform.html"){
 				    <el-radio-button :label="1">异动</el-radio-button>
 				    <el-radio-button :label="0">未异动</el-radio-button>
 			    </el-radio-group>
-			    
+
 			    <!--<div v-if="pageForm.changed == '1'" class="div-enum">
 					<dict-select v-model="pageForm.USER_CHANGE_TYPE" placeholder="异动类型" @change="doSearch"
 								 code="UserType"></dict-select>
 				</div>-->
-		    
+
 		    </table-tool>
-		    
+
 		    <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
 		              class="vi-table" ref="table" row-key="id" style="width: 100%">
 			    <el-table-column :index="indexMethod" align="center" header-align="center"
@@ -99,7 +99,7 @@ layout("/layouts/platform.html"){
 					    </template>
 				    </el-table-column>
 			    </el-table-column>
-			    
+
 			    <el-table-column align="center" header-align="center" label="会员" prop="member"
 			                     show-overflow-tooltip sortable>
 				    <template scope="{row}">
@@ -111,7 +111,7 @@ layout("/layouts/platform.html"){
                             </span>
 				    </template>
 			    </el-table-column>
-			    
+
 			    <el-table-column align="center" header-align="center" label="福利会员" prop="member"
 			                     show-overflow-tooltip sortable>
 				    <template scope="{row}">
@@ -123,7 +123,7 @@ layout("/layouts/platform.html"){
                             </span>
 				    </template>
 			    </el-table-column>
-			    
+
 			    <el-table-column align="center" header-align="center" label="操作"
 			                     prop="userOnline"
 			                     width="100px">
@@ -157,7 +157,7 @@ layout("/layouts/platform.html"){
         <template #public>
             <member-change ref="memberChangeRef" @do-back="$refs.guava.index()" @do-submit="doSubmit"></member-change>
         </template>
-	    
+
 	    <template #edit>
 		   <member-all-change ref="memberAllChangeRef"></member-all-change>
 	    </template>
@@ -225,7 +225,7 @@ layout("/layouts/platform.html"){
                 {prop: 'unionName', label: '所属工会', sortable: true},
                 {prop: 'unitName', label: '所属单位', sortable: true},
             ],
-	        
+
 	        changeTypeData: []
         },
         components: {
@@ -252,13 +252,13 @@ layout("/layouts/platform.html"){
 					this.$refs.memberInfoRef.onOpen(id)
                 })
             },
-            
+
             openUserChangeInfo(row) {
 				this.$refs.guava.edit(() => {
 					this.$refs.memberAllChangeRef.onOpen(row.id)
 				})
             },
-	        
+
 	        async doSubmit(data) {
 		        const loading = createLoading('正在提交中')
 				const resp = await this.$axios.post("/platform/member/change/manage/doSubmitChange", data)

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

@@ -11,13 +11,13 @@ layout("/layouts/platform.html"){
                     </search-item>
                     <search-item label="所属工会">
                         <el-select @change="flushUnits" @clear="flushUnits" clearable filterable
-                                   placeholder="所属工会" style="width: 100%;" v-model="pageForm.unionId">
+                                   placeholder="请选择所属工会" style="width: 100%;" v-model="pageForm.unionId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in unions"></el-option>
                         </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.unitId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in units"></el-option>
@@ -37,7 +37,7 @@ layout("/layouts/platform.html"){
                     </search-item>
                 </search>
             </el-card>
-	        
+
 	        <el-card shadow="never" class="mt10">
 		        <table-tool label="变更列表" :app="this"></table-tool>
 		        <el-table :data="tableData" style="width: 100%" row-key="id"
@@ -60,7 +60,7 @@ layout("/layouts/platform.html"){
 					        <el-link type="primary" @click="openUserView(row)">{{row.loginname}}</el-link>
 				        </template>
 			        </el-table-column>
-			        
+
 			        <el-table-column label="异动信息" header-align="center">
 				        <el-table-column label="更新时间" prop="changeTime" min-width="130px"
 				                         header-align="center"
@@ -77,7 +77,7 @@ layout("/layouts/platform.html"){
 					        </template>
 				        </el-table-column>
 			        </el-table-column>
-			        
+
 <!--			        <el-table-column label="审核状态">-->
 <!--				        <template scope="{row}">-->
 <!--					        <vi-table-state v-if="row.stateId" :state="row"></vi-table-state>-->
@@ -92,15 +92,15 @@ layout("/layouts/platform.html"){
 				        </template>
 			        </el-table-column>
 		        </el-table>
-		        
+
 		        <!--#include("/layouts/pagination.html"){}#-->
 	        </el-card>
         </template>
-	    
+
 	    <template #view>
 		    <member-all-change ref="memberAllChangeRef"></member-all-change>
 	    </template>
-	    
+
 	    <template #edit>
 		    <member-info ref="memberInfoRef"></member-info>
 	    </template>
@@ -108,7 +108,7 @@ layout("/layouts/platform.html"){
 
 </div>
 <script>
-	
+
 	<!--#include("../../common/info/memberInfo.js"){}#-->
 	<!--#include("../common/memberAllChangeInfo.js"){}#-->
 
@@ -162,7 +162,7 @@ layout("/layouts/platform.html"){
 			    }
 			    return null
 		    },
-		    
+
 		    async flushUnits() {
 			    this.$set(this.pageForm, "unitId", null)
 			    this.units = []
@@ -170,14 +170,14 @@ layout("/layouts/platform.html"){
 				    this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
 			    }
 		    },
-		    
+
 		    pageData() {
 			    const pageForm = clone(this.pageForm)
 			    pageForm.userStates = JSON.stringify(pageForm.userStates)
 			    pageForm.personTypes = JSON.stringify(pageForm.personTypes)
 			    pageForm.changeTypes = JSON.stringify(pageForm.changeTypes)
 			    pageForm.changeOrigins = JSON.stringify(pageForm.changeOrigins)
-			    
+
 			    this.$axios.post(loc() + '/pageData', pageForm)
 					    .then(res => {
 						    if (res.code === 0) {
@@ -188,17 +188,17 @@ layout("/layouts/platform.html"){
 						    }
 					    })
 		    },
-		    
+
 	    },
 	    async created() {
-		    
+
 		    this.pageData();
 		    if (this.$auth.hasRoleOr("SYSADMIN, SCHOOL_UNION_ADMIN")) {
 			    this.unions = await this.$businessTool.listUnion()
 		    } else {
 			    this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id)
 		    }
-		    
+
 		    this.changeTypeData = await this.$businessTool.getEnumOptions("MemberChangeType")
 	    }
     })

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

@@ -277,7 +277,7 @@ layout("/layouts/platform.html"){
 		<el-row type="flex" justify="end" class="mt20">
 			<el-button type="primary" plain @click="onSave">保存</el-button>
 			<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-			<el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+			<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
 		</el-row>
 	</el-card>
 </div>
@@ -497,7 +497,7 @@ layout("/layouts/platform.html"){
 						families,
 						personalData
 					} = this.user
-					
+
 					this.$set(this.formData, "userId", id)
 					this.$set(this.formData, "username", username)
 					this.$set(this.formData, "loginname", loginname)

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

@@ -7,13 +7,13 @@ const MEMBER_MANAGE_QUERY = {
                     </search-item>
                     <search-item label="所属工会">
                         <el-select @change="flushUnits" @clear="flushUnits" clearable filterable
-                                   placeholder="所属工会" style="width: 100%;" v-model="pageForm.unionId">
+                                   placeholder="请选择所属工会" style="width: 100%;" v-model="pageForm.unionId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in unions"></el-option>
                         </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.unitId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in units"></el-option>

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

@@ -21,13 +21,13 @@ const COMMON_QUERY = {
 		    </search-item>
 		    <search-item label="所属工会">
 			    <el-select @change="flushUnits" @clear="flushUnits" clearable filterable
-			               placeholder="所属工会" style="width: 100%;" v-model="pageForm.unionId">
+			               placeholder="请选择所属工会" style="width: 100%;" v-model="pageForm.unionId">
 				    <el-option :key="item.id" :label="item.name" :value="item.id"
 				               v-for="item in unions"></el-option>
 			    </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.unitId">
 				    <el-option :key="item.id" :label="item.name" :value="item.id"
 				               v-for="item in units"></el-option>

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

@@ -28,7 +28,7 @@ layout("/layouts/platform.html"){
                             @clear="flushUnits"
                             clearable
                             filterable
-                            placeholder="所属工会"
+                            placeholder="请选择所属工会"
                             style="width: 100%"
                             v-model="pageForm.unionId"
                         >
@@ -36,7 +36,7 @@ layout("/layouts/platform.html"){
                         </el-select>
                     </search-item>
                     <search-item label="所属单位">
-                        <el-select clearable filterable placeholder="请选择" style="width: 100%" v-model="pageForm.unitId">
+                        <el-select 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 units"></el-option>
                         </el-select>
                     </search-item>

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

@@ -10,13 +10,13 @@ layout("/layouts/platform.html"){
                 </search-item>
                 <search-item label="所属工会">
                     <el-select @change="flushUnits" @clear="flushUnits" clearable filterable
-                               placeholder="所属工会" style="width: 100%;" v-model="pageForm.unionId">
+                               placeholder="请选择所属工会" style="width: 100%;" v-model="pageForm.unionId">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in unions"></el-option>
                     </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.unitId">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in units"></el-option>

src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/index.html

@@ -16,7 +16,7 @@ layout("/layouts/platform.html"){
                     </search-item>
                     <search-item label="所属工会">
                         <el-select @change="doSearch" clearable filterable
-                                   placeholder="所属工会" style="width: 100%;" v-model="pageForm.unionId">
+                                   placeholder="请选择所属工会" style="width: 100%;" v-model="pageForm.unionId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in unions"></el-option>
                         </el-select>
@@ -105,7 +105,7 @@ layout("/layouts/platform.html"){
         <template #view>
             <view-change-type-user ref="viewChangeTypeUserRef" :label-name="labelName"></view-change-type-user>
         </template>
-	    
+
 	    <template #public>
 		    <table-tool>
 			    <el-button size="small" type="primary" icon="el-icon-plus" @click="welfareChooseNumExport">导出数据</el-button>
@@ -178,7 +178,7 @@ layout("/layouts/platform.html"){
                 userId: '',
                 url: '/platform/member/schoolUnion/verification/check/doCheckMember',
                 memberChangeDialog: false,
-	            
+
 	            welfareTableData: [],
 	            welfareTableHeader: [],
             }

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

@@ -9,7 +9,7 @@ const SCHOOL_VIEW_AND_HANDLE = {
                     <el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="所属单位">
-                    <el-select clearable filterable placeholder="请选择" style="width: 100%"
+                    <el-select 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 units"></el-option>

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

@@ -7,7 +7,7 @@ const VIEW_CHANGE_TYPE_USER = {
                         <el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
                     </search-item>
                     <search-item label="所属单位">
-                        <el-select clearable filterable placeholder="请选择" style="width: 100%"
+                        <el-select 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 units"></el-option>

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

@@ -7,13 +7,13 @@ const VERIFICATION_QUERY = {
                 </search-item>
                 <search-item label="所属工会">
                     <el-select @change="flushUnits" @clear="flushUnits" clearable filterable
-                               placeholder="所属工会" style="width: 100%;" v-model="pageForm.unionId">
+                               placeholder="请选择所属工会" style="width: 100%;" v-model="pageForm.unionId">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in unions"></el-option>
                     </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.unitId">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in units"></el-option>