commit
This commit is contained in:
@@ -53,39 +53,42 @@ layout("/layouts/platform.html"){
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<template v-if="searchMore">
|
<template v-if="searchMore">
|
||||||
<div class="search-item">
|
|
||||||
<div class="search-item-label">工会小组:</div>
|
|
||||||
<div class="search-item-option">
|
|
||||||
<el-select v-model="pageForm.unionGroupId" style="width: 100%"
|
|
||||||
filterable
|
|
||||||
clearable
|
|
||||||
@change="getThreeUnits"
|
|
||||||
placeholder="请选择">
|
|
||||||
<el-option
|
|
||||||
v-for="item in unionGroups"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.groupName"
|
|
||||||
:value="item.id">
|
|
||||||
</el-option>
|
|
||||||
</el-select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="search-item">
|
<template v-if="isThreeUnit">
|
||||||
<div class="search-item-label">组成科室:</div>
|
<div class="search-item">
|
||||||
<div class="search-item-option">
|
<div class="search-item-label">工会小组:</div>
|
||||||
<el-select v-model="pageForm.threeUnitId" style="width: 100%" filterable
|
<div class="search-item-option">
|
||||||
clearable
|
<el-select v-model="pageForm.unionGroupId" style="width: 100%"
|
||||||
placeholder="请选择">
|
filterable
|
||||||
<el-option
|
clearable
|
||||||
v-for="item in threeUnits"
|
@change="getThreeUnits"
|
||||||
:key="item.id"
|
placeholder="请选择">
|
||||||
:label="item.name"
|
<el-option
|
||||||
:value="item.id">
|
v-for="item in unionGroups"
|
||||||
</el-option>
|
:key="item.id"
|
||||||
</el-select>
|
:label="item.groupName"
|
||||||
|
:value="item.id">
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="search-item">
|
||||||
|
<div class="search-item-label">组成科室:</div>
|
||||||
|
<div class="search-item-option">
|
||||||
|
<el-select v-model="pageForm.threeUnitId" style="width: 100%" filterable
|
||||||
|
clearable
|
||||||
|
placeholder="请选择">
|
||||||
|
<el-option
|
||||||
|
v-for="item in threeUnits"
|
||||||
|
:key="item.id"
|
||||||
|
:label="item.name"
|
||||||
|
:value="item.id">
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
<div class="search-item">
|
<div class="search-item">
|
||||||
<div class="search-item-label">人员类型:</div>
|
<div class="search-item-label">人员类型:</div>
|
||||||
@@ -349,13 +352,14 @@ layout("/layouts/platform.html"){
|
|||||||
{prop: 'username', label: '姓名'},
|
{prop: 'username', label: '姓名'},
|
||||||
{prop: 'unionname', label: '所属工会', sortable: true},
|
{prop: 'unionname', label: '所属工会', sortable: true},
|
||||||
{prop: 'unitname', label: '所属单位', sortable: true},
|
{prop: 'unitname', label: '所属单位', sortable: true},
|
||||||
{prop: 'threeUnitName', label: '所在科室', sortable: true},
|
{prop: 'threeUnitName', label: '所在科室', sortable: true, checked: 0},
|
||||||
{prop: 'unionGroupName', label: '工会小组', sortable: true},
|
{prop: 'unionGroupName', label: '工会小组', sortable: true, checked: 0},
|
||||||
{prop: 'type', label: '变更类型', sortable: true},
|
{prop: 'type', label: '变更类型', sortable: true},
|
||||||
{prop: 'applyDate', label: '申请时间', sortable: true},
|
{prop: 'applyDate', label: '申请时间', sortable: true},
|
||||||
{prop: 'applyOrigin', label: '申请方式', sortable: true},
|
{prop: 'applyOrigin', label: '申请方式', sortable: true},
|
||||||
{prop: 'stateId', label: '状态', sortable: true}
|
{prop: 'stateId', label: '状态', sortable: true}
|
||||||
],
|
],
|
||||||
|
isThreeUnit
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
@@ -417,6 +421,16 @@ layout("/layouts/platform.html"){
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
async created() {
|
async created() {
|
||||||
|
|
||||||
|
this.isThreeUnit = await getConfigKey('isThreeUnit') === 'true'
|
||||||
|
if (this.isThreeUnit) {
|
||||||
|
this.tableColumns.forEach(v => {
|
||||||
|
if (["threeUnitName", "unionGroupName"].includes(v.prop)) {
|
||||||
|
v.checked = 1
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
this.pageData();
|
this.pageData();
|
||||||
if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === 'true') {
|
if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === 'true') {
|
||||||
this.unions = await getUnions(null, false)
|
this.unions = await getUnions(null, false)
|
||||||
|
|||||||
Reference in New Issue
Block a user