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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-10-16 10:47:25 +08:00
parent e19c316f78
commit 6f3e1ae47c
118 changed files with 459 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/sys/controller/SysHomeController.java
+4 -2
View File
@@ -150,7 +150,8 @@ public class SysHomeController {
); );
List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId()); List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId());
List<String> allMenuIds = menus.stream().map(Sys_menu::getId).toList(); 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); return Result.success(sysMenus);
} }
@@ -166,7 +167,8 @@ public class SysHomeController {
); );
List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId()); List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId());
List<String> allMenuIds = menus.stream().map(Sys_menu::getId).toList(); 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); return Result.success(sysMenus);
} }
src/main/resources/static/components/plugins/sysUpload/index.vue
+2
View File
@@ -205,6 +205,8 @@ module.exports = {
} }
if (fileAccept) { if (fileAccept) {
tips = tips + `只能上传<span style="color: red">${fileAccept}</span>文件；` tips = tips + `只能上传<span style="color: red">${fileAccept}</span>文件；`
} else {
tips = tips + '不限格式；'
} }
if (fileSize) { if (fileSize) {
tips = tips + `单个文件大小不能超过<span style="color: red">${fileSize / 1024 / 1024}</span>M；` tips = tips + `单个文件大小不能超过<span style="color: red">${fileSize / 1024 / 1024}</span>M；`
src/main/resources/views/layouts/v4/home/act.js
+2 -2
View File
@@ -141,10 +141,10 @@ const act = {
padding: 40px 0; padding: 40px 0;
} }
.section-act .section-act-title span:hover { /*.section-act .section-act-title span:hover {
color: var(--color-primary); color: var(--color-primary);
cursor: pointer; cursor: pointer;
} }*/
/deep/ .section-act .section-act-title span::before { /deep/ .section-act .section-act-title span::before {
content: ''; content: '';
src/main/resources/views/layouts/v4/home/entry.js
+22 -1
View File
@@ -2,7 +2,7 @@ const entry = {
template: /*language=HTML*/ ` template: /*language=HTML*/ `
<div class="entry-wrapper"> <div class="entry-wrapper">
<div class="entry-title"> <div class="entry-title">
常用入口 <span>常用入口</span>
</div> </div>
<div class="entry-container"> <div class="entry-container">
@@ -144,6 +144,27 @@ const entry = {
padding: 40px 0; 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 { .entry-container {
width: 80%; width: 80%;
src/main/resources/views/layouts/v4/home/jcdt.js
+30 -3
View File
@@ -3,11 +3,11 @@ const jcdt = {
<div class="jcdt-wrapper"> <div class="jcdt-wrapper">
<div class="jcdt-container"> <div class="jcdt-container">
<div class="jcdt-title"> <div class="jcdt-title">
基层动态 <span>基层动态</span>
</div> </div>
<div class="jcdt-content"> <div class="jcdt-content">
<div class="jcdt-list"> <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="date">{{item.date}}</div>
<div class="title">{{item.title}}</div> <div class="title">{{item.title}}</div>
<div class="image"> <div class="image">
@@ -29,7 +29,12 @@ const jcdt = {
default: [] default: []
} }
}, },
methods: {}, methods: {
onLink(item) {
if(!item.url) return
window.open(item.url)
},
},
style: /*language=CSS*/ ` style: /*language=CSS*/ `
.jcdt-wrapper { .jcdt-wrapper {
width: 100%; width: 100%;
@@ -55,6 +60,28 @@ const jcdt = {
padding: 40px 0; 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 { .jcdt-list {
display: grid; display: grid;
grid-template-columns: repeat(4, 1fr); grid-template-columns: repeat(4, 1fr);
src/main/resources/views/platform/sys/data/user/pull.html
+1 -1
View File
@@ -38,7 +38,7 @@ layout("/layouts/platform.html"){
<el-input placeholder="请输入内容" clearable v-model="pageForm.loginName" style="width: 100%"></el-input> <el-input placeholder="请输入内容" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
</search-item> </search-item>
<search-item label="所属单位"> <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-option v-for="item in unitNameOptions" :key="item" :label="item" :value="item"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/sys/data/user/update.html
+1 -1
View File
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
<el-input placeholder="请输入内容" clearable v-model="pageForm.loginName" style="width: 100%"></el-input> <el-input placeholder="请输入内容" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
</search-item> </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-option v-for="i in unitOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/sys/user/index.html
+2 -2
View File
@@ -4,8 +4,8 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak> <div id="app" v-cloak>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="单位"> <search-item label="所属单位">
<el-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-option :key="item.id" :label="item.name" :value="item.id" v-for="item in units"></el-option>
</el-select> </el-select>
<!-- <el-cascader :props="props" v-model="parentUnitSearch" placeholder="请选择单位" clearable filterable></el-cascader>--> <!-- <el-cascader :props="props" v-model="parentUnitSearch" placeholder="请选择单位" clearable filterable></el-cascader>-->
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html
+1 -1
View File
@@ -171,7 +171,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
</div> </div>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/branchunion/index.html
+2 -2
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html
+2 -2
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/index.html
+2 -2
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/index.html
+2 -2
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html
+1 -1
View File
@@ -197,7 +197,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html
+2 -2
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html
+2 -2
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html
+2 -2
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html
+2 -2
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/activity/fitnesswalk/bindingRecord.html
+1 -1
View File
@@ -13,7 +13,7 @@ layout("/layouts/platform.html"){
<el-input placeholder="请输入关键字查询" v-model="pageForm.keyWord"></el-input> <el-input placeholder="请输入关键字查询" v-model="pageForm.keyWord"></el-input>
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" clearable filterable placeholder="请选择院级工会" <el-select v-model="pageForm.unionId" clearable filterable placeholder="请选择所属工会"
style="width: 100%"> style="width: 100%">
<el-option <el-option
v-for="item in unionList" v-for="item in unionList"
src/main/resources/views/platform/zhgh/activity/workscollection/read/index.html
+2 -2
View File
@@ -34,12 +34,12 @@ layout("/layouts/platform.html"){
<el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入内容"></el-input> <el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入内容"></el-input>
</search-item> </search-item>
<search-item label="所属工会"> <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-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
</el-select> </el-select>
</search-item> </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-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/benefit/userList/index.html
+2 -2
View File
@@ -41,13 +41,13 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属工会"> <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-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionList"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位"> <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-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitList"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html
+2 -2
View File
@@ -48,13 +48,13 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属工会"> <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-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionList"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位"> <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-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitList"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html
+4 -4
View File
@@ -34,9 +34,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -44,9 +44,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html
+4 -4
View File
@@ -33,9 +33,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -43,9 +43,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/schoolAudit/index.html
+2 -2
View File
@@ -38,14 +38,14 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </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"> @change="flushUnits" @clear="flushUnits">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </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> filterable>
<el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/summary/index.html
+2 -2
View File
@@ -38,14 +38,14 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </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"> @change="flushUnits" @clear="flushUnits">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </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> filterable>
<el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html
+4 -4
View File
@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html
+1 -1
View File
@@ -51,7 +51,7 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select placeholder="所属单位" v-model="pageForm.unitId" <el-select placeholder="请选择所属单位" v-model="pageForm.unitId"
style="width: 100%;" style="width: 100%;"
clearable clearable
filterable> filterable>
src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html
+1 -1
View File
@@ -38,7 +38,7 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select placeholder="所属单位" v-model="pageForm.unitId" <el-select placeholder="请选择所属单位" v-model="pageForm.unitId"
style="width: 100%;" style="width: 100%;"
clearable clearable
filterable> filterable>
src/main/resources/views/platform/zhgh/dayofficework/honor/honorLevelSummary/index.html
+1 -1
View File
@@ -17,7 +17,7 @@ layout("/layouts/platform.html"){
</el-date-picker> </el-date-picker>
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="所属工会">
<el-select placeholder="所属工会" v-model="pageForm.unionId" style="width: 100%;" <el-select placeholder="请选择所属工会" v-model="pageForm.unionId" style="width: 100%;"
clearable clearable
filterable @change="honorLevelData"> filterable @change="honorLevelData">
<el-option v-for="item in unions" :label="item.name" :value="item.id"></el-option> <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
+1 -1
View File
@@ -17,7 +17,7 @@ layout("/layouts/platform.html"){
</el-date-picker> </el-date-picker>
</search-item> </search-item>
<search-item label="所属工会"> <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"> clearable filterable @change="pageData">
<el-option v-for="item in unions" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unions" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/dayofficework/integral/detail/index.html
+2 -2
View File
@@ -35,7 +35,7 @@ layout("/layouts/platform.html"){
@clear="flushUnits" @clear="flushUnits"
clearable clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%" style="width: 100%"
v-model="pageForm.unionId" v-model="pageForm.unionId"
> >
@@ -44,7 +44,7 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </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.unitId"> v-model="pageForm.unitId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unitList"></el-option> v-for="item in unitList"></el-option>
src/main/resources/views/platform/zhgh/dayofficework/integral/manage/index.html
+2 -2
View File
@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
@clear="flushUnits" @clear="flushUnits"
clearable clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%" style="width: 100%"
v-model="pageForm.unionId" v-model="pageForm.unionId"
> >
@@ -33,7 +33,7 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </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.unitId"> v-model="pageForm.unitId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unitList"></el-option> v-for="item in unitList"></el-option>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolCnAudit/index.html
+1 -1
View File
@@ -30,7 +30,7 @@ layout("/layouts/platform.html"){
</el-input> </el-input>
</search-item> </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%">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolKjAudit/index.html
+1 -1
View File
@@ -30,7 +30,7 @@ layout("/layouts/platform.html"){
</el-input> </el-input>
</search-item> </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%">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolZxAudit/index.html
+1 -1
View File
@@ -30,7 +30,7 @@ layout("/layouts/platform.html"){
</el-input> </el-input>
</search-item> </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%">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/summary/index.html
+1 -1
View File
@@ -30,7 +30,7 @@ layout("/layouts/platform.html"){
</el-input> </el-input>
</search-item> </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%">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/dayofficework/qsv/quiz/rank.html
+2 -2
View File
@@ -28,14 +28,14 @@ layout("/layouts/platform.html"){
<el-input v-model="pageForm.searchKeyword" placeholder="姓名/工号" clearable></el-input> <el-input v-model="pageForm.searchKeyword" placeholder="姓名/工号" clearable></el-input>
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="所属工会">
<el-select clearable filterable placeholder="所属工会" style="width: 100%" <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"
v-model="pageForm.unionId" @change="flushUnits"> v-model="pageForm.unionId" @change="flushUnits">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
</el-select> </el-select>
</search-item> </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> filterable>
<el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html
+1 -1
View File
@@ -228,7 +228,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
</div> </div>
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/collect/index.html
+4 -4
View File
@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
<search-item label="姓名/工号"> <search-item label="姓名/工号">
<el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -22,9 +22,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html
+4 -4
View File
@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
<search-item label="姓名/工号"> <search-item label="姓名/工号">
<el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -22,9 +22,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html
+4 -4
View File
@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
<search-item label="姓名/工号"> <search-item label="姓名/工号">
<el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -22,9 +22,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/mine.html
+1 -1
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="doSearch" clearable="true" <el-select @change="doSearch" clearable="true"
filterable="true" filterable="true"
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/organizationAudit.html
+1 -1
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="doSearch" clearable="true" <el-select @change="doSearch" clearable="true"
filterable="true" filterable="true"
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/schoolAudit.html
+1 -1
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="doSearch" clearable="true" <el-select @change="doSearch" clearable="true"
filterable="true" filterable="true"
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/statistics.html
+1 -1
View File
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="doSearch" clearable="true" <el-select @change="doSearch" clearable="true"
filterable="true" filterable="true"
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
src/main/resources/views/platform/zhgh/dayofficework/workershome/info/info.html
+1 -1
View File
@@ -107,7 +107,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="doSearch" clearable="true" <el-select @change="doSearch" clearable="true"
filterable="true" filterable="true"
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
src/main/resources/views/platform/zhgh/dayofficework/workershome/info/mine.html
+1 -1
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="doSearch" clearable="true" <el-select @change="doSearch" clearable="true"
filterable="true" filterable="true"
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
src/main/resources/views/platform/zhgh/dayofficework/workershome/info/schoolAudit.html
+1 -1
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="doSearch" clearable="true" <el-select @change="doSearch" clearable="true"
filterable="true" filterable="true"
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/index.html
+2 -2
View File
@@ -34,8 +34,8 @@ layout("/layouts/platform.html"){
v-for="item in delegations"></el-option> v-for="item in delegations"></el-option>
</el-select> </el-select>
</search-item> </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"> v-model="pageForm.unionId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html
+2 -2
View File
@@ -34,8 +34,8 @@ layout("/layouts/platform.html"){
v-for="item in delegations"></el-option> v-for="item in delegations"></el-option>
</el-select> </el-select>
</search-item> </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"> v-model="pageForm.unionId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html
+1 -1
View File
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </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" @change="flushUnits" @clear="flushUnits"> v-model="pageForm.unionId" @change="flushUnits" @clear="flushUnits">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html
+2 -2
View File
@@ -27,8 +27,8 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </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"> v-model="pageForm.unionId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/write/index.html
+1 -1
View File
@@ -44,7 +44,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
</guava> </guava>
src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/statistics/index.html
+2 -2
View File
@@ -12,8 +12,8 @@ layout("/layouts/platform.html"){
<search-item label="会议名称"> <search-item label="会议名称">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称" v-model="pageForm.searchKeyword"></el-input> <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称" v-model="pageForm.searchKeyword"></el-input>
</search-item> </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-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/write/index.html
+1 -1
View File
@@ -108,7 +108,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
</guava> </guava>
src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html
+4 -4
View File
@@ -65,15 +65,15 @@ layout("/layouts/platform.html"){
v-for="item in delegationOptions"></el-option> v-for="item in delegationOptions"></el-option>
</el-select> </el-select>
</search-item> </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();"> @change="pageForm.unitId=null;listUnit();">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
</el-select> </el-select>
</search-item> </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" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unitOptions"></el-option> v-for="item in unitOptions"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/democratic/suggestionBox/query/index.html
+4 -4
View File
@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
<search-item label="标题"> <search-item label="标题">
<el-input v-model="pageForm.title" placeholder="标题" clearable></el-input> <el-input v-model="pageForm.title" placeholder="标题" clearable></el-input>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -22,9 +22,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/democratic/suggestionBox/write/index.html
+1 -1
View File
@@ -46,7 +46,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
</div> </div>
src/main/resources/views/platform/zhgh/democratic/suggestionBox/xgh/index.html
+4 -4
View File
@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
<search-item label="标题"> <search-item label="标题">
<el-input v-model="pageForm.title" placeholder="标题" clearable></el-input> <el-input v-model="pageForm.title" placeholder="标题" clearable></el-input>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -22,9 +22,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/index.html
+4 -4
View File
@@ -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-option v-for="i in delegationOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </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-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </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-option v-for="i in unitOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html
+2 -2
View File
@@ -13,8 +13,8 @@ layout("/layouts/platform.html"){
:key="item.id"></el-option> :key="item.id"></el-option>
</el-select> </el-select>
</search-item> </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-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/read/index.html
+4 -4
View File
@@ -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-option v-for="i in delegationOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </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-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </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-option v-for="i in unitOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/index.html
+1 -1
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属工会"> <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" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/democratic/workercongress/delegate/manage/index.html
+4 -4
View File
@@ -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-option v-for="i in delegationOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </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-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </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-option v-for="i in unitOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/democratic/workercongress/delegate/read/index.html
+4 -4
View File
@@ -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-option v-for="i in delegationOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </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-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </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-option v-for="i in unitOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html
+1 -1
View File
@@ -222,7 +222,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
</div> </div>
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html
+2 -2
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -31,7 +31,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/mine/index.html
+2 -2
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -31,7 +31,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/reading/index.html
+2 -2
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -31,7 +31,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html
+2 -2
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable <el-select @change="flushUnits" @clear="flushUnits" clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
@@ -31,7 +31,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位" <el-select clearable filterable placeholder="请选择所属单位"
style="width: 100%;" v-model="pageForm.unitId"> style="width: 100%;" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" <el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html
+1 -1
View File
@@ -152,7 +152,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
</div> </div>
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/collect/index.html
+4 -4
View File
@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html
+4 -4
View File
@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html
+4 -4
View File
@@ -19,9 +19,9 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])"> <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%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -29,9 +29,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/schoolAudit/index.html
+2 -2
View File
@@ -48,14 +48,14 @@ layout("/layouts/platform.html"){
</el-input> </el-input>
</search-item> </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"> @change="flushUnits" @clear="flushUnits">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </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> filterable>
<el-option v-for="item in unitOptions" :label="item.name" :value="item.id" <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"
:key="item.id"></el-option> :key="item.id"></el-option>
src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/summary/index.html
+2 -2
View File
@@ -48,14 +48,14 @@ layout("/layouts/platform.html"){
</el-input> </el-input>
</search-item> </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"> @change="flushUnits" @clear="flushUnits">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </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> filterable>
<el-option v-for="item in unitOptions" :label="item.name" :value="item.id" <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"
:key="item.id"></el-option> :key="item.id"></el-option>
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html
+1 -1
View File
@@ -152,7 +152,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
</div> </div>
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/collect/index.html
+4 -4
View File
@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html
+4 -4
View File
@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html
+4 -4
View File
@@ -19,9 +19,9 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])"> <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%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -29,9 +29,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/apply/index.html
+1 -1
View File
@@ -211,7 +211,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
</template> </template>
src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html
+4 -4
View File
@@ -32,9 +32,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择分工会" clearable> placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -42,9 +42,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位"> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位" clearable> placeholder="请选择所属单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/staffbenefit/recuperation/line/index.html
+1 -1
View File
@@ -68,7 +68,7 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </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" <el-select @change="doSearch"
clearable clearable
filterable filterable
src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html
+4 -4
View File
@@ -45,15 +45,15 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </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"> @change="flushUnits" @clear="flushUnits">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </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> filterable>
<el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js
+2 -2
View File
@@ -11,7 +11,7 @@ const COMMON_QUERY = {
@clear="flushUnits" @clear="flushUnits"
clearable clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%" style="width: 100%"
v-model="pageForm.unionId" v-model="pageForm.unionId"
> >
@@ -19,7 +19,7 @@ const COMMON_QUERY = {
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位"> <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-option :key="item.id" :label="item.name" :value="item.id" v-for="item in units"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
+1 -1
View File
@@ -206,7 +206,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
</div> </div>
src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html
+2 -2
View File
@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
@clear="flushUnits" @clear="flushUnits"
clearable clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%" style="width: 100%"
v-model="pageForm.unionId" v-model="pageForm.unionId"
> >
@@ -35,7 +35,7 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位"> <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-option :key="item.id" :label="item.name" :value="item.id" v-for="item in units"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js
+2 -2
View File
@@ -6,13 +6,13 @@ const COMMON_QUERY = {
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable filterable <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" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unions"></el-option> v-for="item in unions"></el-option>
</el-select> </el-select>
</search-item> </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.unitId"> v-model="pageForm.unitId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html
+2 -2
View File
@@ -10,13 +10,13 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable filterable <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" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unions"></el-option> v-for="item in unions"></el-option>
</el-select> </el-select>
</search-item> </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.unitId"> v-model="pageForm.unitId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html
+2 -2
View File
@@ -11,13 +11,13 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable filterable <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" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unions"></el-option> v-for="item in unions"></el-option>
</el-select> </el-select>
</search-item> </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.unitId"> v-model="pageForm.unitId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html
+1 -1
View File
@@ -277,7 +277,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <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="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-row>
</el-card> </el-card>
</div> </div>
src/main/resources/views/platform/zhgh/staffmanage/member/common/manage/memberManageQuery.js
+2 -2
View File
@@ -7,13 +7,13 @@ const MEMBER_MANAGE_QUERY = {
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable filterable <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" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unions"></el-option> v-for="item in unions"></el-option>
</el-select> </el-select>
</search-item> </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.unitId"> v-model="pageForm.unitId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js
+2 -2
View File
@@ -21,13 +21,13 @@ const COMMON_QUERY = {
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable filterable <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" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unions"></el-option> v-for="item in unions"></el-option>
</el-select> </el-select>
</search-item> </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.unitId"> v-model="pageForm.unitId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html
+2 -2
View File
@@ -28,7 +28,7 @@ layout("/layouts/platform.html"){
@clear="flushUnits" @clear="flushUnits"
clearable clearable
filterable filterable
placeholder="所属工会" placeholder="请选择所属工会"
style="width: 100%" style="width: 100%"
v-model="pageForm.unionId" v-model="pageForm.unionId"
> >
@@ -36,7 +36,7 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位"> <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-option :key="item.id" :label="item.name" :value="item.id" v-for="item in units"></el-option>
</el-select> </el-select>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/staffmanage/member/modelworker/manage/index.html
+2 -2
View File
@@ -10,13 +10,13 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable filterable <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" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unions"></el-option> v-for="item in unions"></el-option>
</el-select> </el-select>
</search-item> </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.unitId"> v-model="pageForm.unitId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/index.html
+1 -1
View File
@@ -16,7 +16,7 @@ layout("/layouts/platform.html"){
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="doSearch" clearable filterable <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" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unions"></el-option> v-for="item in unions"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/schoolViewAndHandle.js
+1 -1
View File
@@ -9,7 +9,7 @@ const SCHOOL_VIEW_AND_HANDLE = {
<el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="请选择" style="width: 100%" <el-select clearable filterable placeholder="请选择所属单位" style="width: 100%"
v-model="pageForm.unitId"> v-model="pageForm.unitId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/viewChangeTypeUser.js
+1 -1
View File
@@ -7,7 +7,7 @@ const VIEW_CHANGE_TYPE_USER = {
<el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="所属单位">
<el-select clearable filterable placeholder="请选择" style="width: 100%" <el-select clearable filterable placeholder="请选择所属单位" style="width: 100%"
v-model="pageForm.unitId"> v-model="pageForm.unitId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationQuery.js
+2 -2
View File
@@ -7,13 +7,13 @@ const VERIFICATION_QUERY = {
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable filterable <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" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unions"></el-option> v-for="item in unions"></el-option>
</el-select> </el-select>
</search-item> </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.unitId"> v-model="pageForm.unitId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in units"></el-option> v-for="item in units"></el-option>

Some files were not shown because too many files have changed in this diff Show More