Merge remote-tracking branch 'origin/main'
This commit is contained in:
@jyuhsin
@@ -34,7 +34,7 @@
|
||||
<script>
|
||||
module.exports = {
|
||||
components: {
|
||||
'user-change-history': httpVueLoader('/components/userChangeHistory/UserChangeHistory.vue?v=' + new Date().getTime()),
|
||||
'user-change-history': httpVueLoader('/components/userChangeHistory/userChangeHistory.vue?v=' + new Date().getTime()),
|
||||
},
|
||||
props: {
|
||||
records: {type: Array, default: []},
|
||||
|
||||
@@ -204,12 +204,12 @@
|
||||
placeholder="更新时间"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item prop="schoolTime" label="参加工作日期">
|
||||
<el-form-item prop="workDate" label="参加工作日期">
|
||||
<el-date-picker
|
||||
style="width: 100%"
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd"
|
||||
v-model="formData.schoolTime"
|
||||
v-model="formData.workDate"
|
||||
type="date"
|
||||
placeholder="选择参加工作日期"
|
||||
></el-date-picker>
|
||||
|
||||
@@ -158,10 +158,17 @@ layout("/layouts/platform.html"){
|
||||
<!-- <span class="text-danger">（温馨提醒：异动类型为新增的教职工，需要新入职变更操作后才能成为工会会员！）</span>-->
|
||||
</template>
|
||||
<template #func>
|
||||
<el-radio-group v-model="pageForm.myUnionGroupUser" @change="doSearch" class="mr5"
|
||||
v-if="isThreeUnit" size="small">
|
||||
<el-radio-button label="">全部</el-radio-button>
|
||||
<el-radio-button :label="1">本小组会员</el-radio-button>
|
||||
<el-radio-button :label="0">非本小组会员</el-radio-button>
|
||||
</el-radio-group>
|
||||
|
||||
<span class="text-danger">人员信息有无变化：</span>
|
||||
<el-select v-model="pageForm.isMember" @change="doSearch()"
|
||||
:clearable="false" size="small"
|
||||
style="width: 200px;margin-right: 5px">
|
||||
style="width: 130px;margin-right: 5px">
|
||||
<el-option label="全部" value=""></el-option>
|
||||
<el-option label="是会员" value="1"></el-option>
|
||||
<el-option label="不是会员" value="0"></el-option>
|
||||
@@ -169,11 +176,11 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<el-radio-group v-model="pageForm.changed" @change="doSearch" class="mr5"
|
||||
size="small">
|
||||
<el-radio-button label="">全部({{numData.userSumNum || 0}})
|
||||
<el-radio-button label="">全部
|
||||
</el-radio-button>
|
||||
<el-radio-button :label="1">有变化({{numData.changeNum || 0}})
|
||||
<el-radio-button :label="1">有变化
|
||||
</el-radio-button>
|
||||
<el-radio-button :label="0">无变化({{numData.notChangeNum || 0}})
|
||||
<el-radio-button :label="0">无变化
|
||||
</el-radio-button>
|
||||
</el-radio-group>
|
||||
|
||||
@@ -588,6 +595,7 @@ layout("/layouts/platform.html"){
|
||||
formData: {},
|
||||
pageForm: {
|
||||
searchName: "u.username",
|
||||
myUnionGroupUser: '',
|
||||
changed: '',
|
||||
isMember: '1',
|
||||
changeTypes: [],
|
||||
@@ -606,8 +614,8 @@ layout("/layouts/platform.html"){
|
||||
{prop: 'preparedBy', label: '人员性质', sortable: true},
|
||||
{prop: 'unionname', label: '所属工会', sortable: true},
|
||||
{prop: 'unitname', label: '所属单位', sortable: true},
|
||||
// {prop: 'threeUnitName', label: '所在科室', sortable: true, checked: 0},
|
||||
// {prop: 'unionGroupName', label: '工会小组', sortable: true, checked: 0},
|
||||
{prop: 'threeUnitName', label: '所在科室', sortable: true, checked: 0},
|
||||
{prop: 'unionGroupName', label: '工会小组', sortable: true, checked: 0},
|
||||
// {prop: 'campusName', label: '所属校区', sortable: true},
|
||||
],
|
||||
campusOptions: [],
|
||||
@@ -863,12 +871,12 @@ layout("/layouts/platform.html"){
|
||||
return changeType
|
||||
},
|
||||
async getNumData() {
|
||||
const resp = await $.post(loc() + '/getButtonNum', this.pageForm)
|
||||
if (resp.code === 0) {
|
||||
this.numData = resp.data
|
||||
} else {
|
||||
this.notifyWarning(resp.msg)
|
||||
}
|
||||
// const resp = await $.post(loc() + '/getButtonNum', this.pageForm)
|
||||
// if (resp.code === 0) {
|
||||
// this.numData = resp.data
|
||||
// } else {
|
||||
// this.notifyWarning(resp.msg)
|
||||
// }
|
||||
},
|
||||
getChangeTypes(changeTypes) {
|
||||
if (changeTypes) {
|
||||
@@ -902,8 +910,11 @@ layout("/layouts/platform.html"){
|
||||
|
||||
},
|
||||
async created() {
|
||||
this.isThreeUnit = await getConfigKey('isThreeUnit') === 'true'
|
||||
// this.isThreeUnit = await getConfigKey('isThreeUnit') === 'true'
|
||||
this.isThreeUnit = '${@shiro.getPrincipalProperty("union").getUnionname()}'.includes('机关') && "${@shiro.hasRole('ghxzzz')}"
|
||||
console.log(this.isThreeUnit)
|
||||
if (this.isThreeUnit) {
|
||||
this.pageForm.myUnionGroupUser = 1
|
||||
this.tableColumns.forEach(v => {
|
||||
if (["threeUnitName", "unionGroupName"].includes(v.prop)) {
|
||||
v.checked = 1
|
||||
|
||||
@@ -286,9 +286,9 @@ layout("/layouts/platform.html"){
|
||||
{ prop: 'mobile', label: '联系电话' },
|
||||
{ prop: 'personType', label: '人员类型', sortable: true },
|
||||
{ prop: 'userState', label: '在职状态', sortable: true },
|
||||
{ prop: 'personnelRelationUnionName', label: '人事关系工会', sortable: true, width: 150 },
|
||||
{ prop: 'personnelRelationUnionName', label: '人事关系工会', sortable: true, width: 180 },
|
||||
{ prop: 'personnelRelationUnitName', label: '人事关系单位', sortable: true },
|
||||
{ prop: 'unionRelationUnionName', label: '工会关系工会', sortable: true, width: 150 },
|
||||
{ prop: 'unionRelationUnionName', label: '工会关系工会', sortable: true, width: 180 },
|
||||
{ prop: 'distSpecialStaffType', label: '特别人员类型', sortable: true },
|
||||
// { prop: 'specialStaffRemark', label: '多单位人员备注', sortable: true, checked: 0 }
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user