From 3b9ca773746f5a0259743e181b4317ae0f5cd832 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Thu, 20 Feb 2025 18:51:44 +0800 Subject: [PATCH] commit --- .../member/change/branchUnionAudit/index.html | 45 +++++++++++++------ .../mobile/member/change/mine/index.html | 45 +++++++++++++------ .../member/change/schoolUnionAudit/index.html | 2 +- 3 files changed, 65 insertions(+), 27 deletions(-) diff --git a/src/main/resources/views/mobile/member/change/branchUnionAudit/index.html b/src/main/resources/views/mobile/member/change/branchUnionAudit/index.html index 8b1c6d7..8d75299 100644 --- a/src/main/resources/views/mobile/member/change/branchUnionAudit/index.html +++ b/src/main/resources/views/mobile/member/change/branchUnionAudit/index.html @@ -63,7 +63,7 @@ layout("/mobile/platform.html"){ + @change="unionChange"> @@ -206,6 +206,10 @@ layout("/mobile/platform.html"){ 'member-change-info': MEMBER_CHANGE_INFO, }, methods: { + async unionChange() { + await this.flushUnits() + this.doSearch() + }, async doRevoke(row) { const confirm = await vant.Dialog.confirm({ title: '提示', @@ -298,23 +302,38 @@ layout("/mobile/platform.html"){ this.loading = false }) }, - async getUnionList(){ - const {data} = await $.get("/platform/vi/common/unions") - data.forEach(v => { + async initUnion() { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === 'true') { + this.unionOptions = await getUnionList(null) + } else { + this.unionOptions = await getUnionList("${@shiro.getPrincipalProperty('unit').getUnionid()}") + } + this.unionOptions.forEach(v => { v.text = v.unionname v.value = v.id }) - data.unshift({text: "全部工会", value: ''}) - this.unionOptions = data + this.unionOptions.unshift({text: "全部工会", value: null}) + if (this.unionOptions && this.unionOptions.length > 0) { + this.$set(this.pageForm, "unionId", this.unionOptions[0].value) + } }, - async getUnitList(unionId) { - const {data} = await $.get("/platform/vi/common/units", {unionId}) - data.forEach(v => { + async initUnit(unionId) { + this.unitOptions = await getUnits(unionId) + this.unitOptions.forEach(v => { v.text = v.name v.value = v.id }) - data.unshift({text: "全部单位", value: ''}) - this.unitOptions = data + this.unitOptions.unshift({text: "全部单位", value: null}) + if (this.unitOptions && this.unitOptions.length > 0) { + this.$set(this.pageForm, "unitId", this.unitOptions[0].value) + } + }, + async flushUnits() { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === 'true') { + await this.initUnit(this.pageForm.unionId) + } else { + await this.initUnit("${@shiro.getPrincipalProperty('unit').getUnionid()}") + } }, async getPersonTypeList() { const data = await getDictOptions("PERSON_TYPE") @@ -328,8 +347,8 @@ layout("/mobile/platform.html"){ }, async created() { this.changeTypeData = await getEnumOptions("MemberChangeType") - await this.getUnionList() - await this.getUnitList() + await this.initUnion() + await this.flushUnits() await this.getPersonTypeList() } diff --git a/src/main/resources/views/mobile/member/change/mine/index.html b/src/main/resources/views/mobile/member/change/mine/index.html index 3b8e55a..6d938ea 100644 --- a/src/main/resources/views/mobile/member/change/mine/index.html +++ b/src/main/resources/views/mobile/member/change/mine/index.html @@ -61,7 +61,7 @@ layout("/mobile/platform.html"){ + @change="unionChange"> @@ -153,6 +153,10 @@ layout("/mobile/platform.html"){ 'member-change-info': MEMBER_CHANGE_INFO, }, methods: { + async unionChange() { + await this.flushUnits() + this.doSearch() + }, openView(row) { this.openType = 'view' this.memberChangeInfoPopup = true @@ -192,23 +196,38 @@ layout("/mobile/platform.html"){ this.loading = false }) }, - async getUnionList(){ - const {data} = await $.get("/platform/vi/common/unions") - data.forEach(v => { + async initUnion() { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === 'true') { + this.unionOptions = await getUnionList(null) + } else { + this.unionOptions = await getUnionList("${@shiro.getPrincipalProperty('unit').getUnionid()}") + } + this.unionOptions.forEach(v => { v.text = v.unionname v.value = v.id }) - data.unshift({text: "全部工会", value: ''}) - this.unionOptions = data + this.unionOptions.unshift({text: "全部工会", value: null}) + if (this.unionOptions && this.unionOptions.length > 0) { + this.$set(this.pageForm, "unionId", this.unionOptions[0].value) + } }, - async getUnitList(unionId) { - const {data} = await $.get("/platform/vi/common/units", {unionId}) - data.forEach(v => { + async initUnit(unionId) { + this.unitOptions = await getUnits(unionId) + this.unitOptions.forEach(v => { v.text = v.name v.value = v.id }) - data.unshift({text: "全部单位", value: ''}) - this.unitOptions = data + this.unitOptions.unshift({text: "全部单位", value: null}) + if (this.unitOptions && this.unitOptions.length > 0) { + this.$set(this.pageForm, "unitId", this.unitOptions[0].value) + } + }, + async flushUnits() { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === 'true') { + await this.initUnit(this.pageForm.unionId) + } else { + await this.initUnit("${@shiro.getPrincipalProperty('unit').getUnionid()}") + } }, async getPersonTypeList() { const data = await getDictOptions("PERSON_TYPE") @@ -222,8 +241,8 @@ layout("/mobile/platform.html"){ }, async created() { this.changeTypeData = await getEnumOptions("MemberChangeType") - await this.getUnionList() - await this.getUnitList() + await this.initUnion() + await this.flushUnits() await this.getPersonTypeList() } diff --git a/src/main/resources/views/mobile/member/change/schoolUnionAudit/index.html b/src/main/resources/views/mobile/member/change/schoolUnionAudit/index.html index 518bf6e..b5ad201 100644 --- a/src/main/resources/views/mobile/member/change/schoolUnionAudit/index.html +++ b/src/main/resources/views/mobile/member/change/schoolUnionAudit/index.html @@ -299,7 +299,7 @@ layout("/mobile/platform.html"){ }) }, async getUnionList(){ - const {data} = await $.get("/platform/vi/common/unions") + const {data} = await $.get("/platform/vi/common/getUnion") data.forEach(v => { v.text = v.unionname v.value = v.id