From 7eaac9b2283a9ae02a76c530c613b57e281a70b5 Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 17 Mar 2022 16:14:30 +0800 Subject: [PATCH 01/13] BUG 28301 --- src/apps/AppSpecialPeople/AppSpecialPeople.vue | 2 +- src/apps/AppSpecialPeople/add.vue | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/apps/AppSpecialPeople/AppSpecialPeople.vue b/src/apps/AppSpecialPeople/AppSpecialPeople.vue index ced3e67e..e130bd80 100644 --- a/src/apps/AppSpecialPeople/AppSpecialPeople.vue +++ b/src/apps/AppSpecialPeople/AppSpecialPeople.vue @@ -108,7 +108,7 @@ export default { return this.user.girdCheckType != 0 }, isAdmin() { - return this.user.girdCheckType == 1 + return this.user.girdCheckType == 2 }, }, created() { diff --git a/src/apps/AppSpecialPeople/add.vue b/src/apps/AppSpecialPeople/add.vue index 91ca6ec3..39c50ea5 100644 --- a/src/apps/AppSpecialPeople/add.vue +++ b/src/apps/AppSpecialPeople/add.vue @@ -205,8 +205,10 @@ export default { onShow() { if (this.isEdit) { document.title = "编辑人员" - this.appId = this.$route.query.appId - this.getDetail() + if (!this.appId) { + let {appId: value} = this.$route.query + Promise.all([this.getDetail(), this.typeConfirm([{value}])]).then(() => this.$forceUpdate()) + } } else { document.title = '新增人员' if (this.$route.query.appId && !this.appId) { @@ -238,7 +240,7 @@ export default { typeConfirm(e) { this.appId = e[0].value this.appName = e[0].label - this.$http.post(`/app/appapplicationinfo/queryApplicationInfo?appId=${this.appId}`).then((res) => { + return this.$http.post(`/app/appapplicationinfo/queryApplicationInfo?appId=${this.appId}`).then((res) => { if (res?.data) { this.formData = {} let data = res.data @@ -469,13 +471,13 @@ export default { }, getDetail() { let {id, appId} = this.$route.query - id && this.$http.post("/app/appapplicationinfo/queryDetailById", null, { + return id ? this.$http.post("/app/appapplicationinfo/queryDetailById", null, { params: {id, appId} }).then(res => { if (res?.data) { this.formData = res.data } - }) + }) : Promise.resolve() } } } From 570d52d78cde1553844b4c8385673bca818d1939 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 17 Mar 2022 16:31:09 +0800 Subject: [PATCH 02/13] 28329 --- src/apps/AppIntegralAudit/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppIntegralAudit/detail.vue b/src/apps/AppIntegralAudit/detail.vue index b17a6695..99142774 100644 --- a/src/apps/AppIntegralAudit/detail.vue +++ b/src/apps/AppIntegralAudit/detail.vue @@ -77,7 +77,7 @@
积分类别
-
{{ form.auditIntegralType }}
+
{{ $dict.getLabel('atWillReportType', form.auditIntegralType) }}
积分事项
From 17391d7908908f9e6f1a698e2c605c57bebb1dbd Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 17 Mar 2022 16:57:26 +0800 Subject: [PATCH 03/13] BUG 28303 --- src/components/AiPagePicker.vue | 2 +- src/components/pages/selectGird.vue | 6 +++--- src/components/pages/selectResident.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/AiPagePicker.vue b/src/components/AiPagePicker.vue index 9c31a68e..a9bc3183 100644 --- a/src/components/AiPagePicker.vue +++ b/src/components/AiPagePicker.vue @@ -44,7 +44,7 @@ export default { handleJump() { let {config, nodeKey} = this, selected = this.value || this.selected?.map(e => e[nodeKey]) - uni.$once('pagePicker', data => { + uni.$once('pagePicker:' + this.type, data => { this.$emit("update:selected", data) this.$emit("select", data) this.$emit("change", data.map(e => e[nodeKey])) diff --git a/src/components/pages/selectGird.vue b/src/components/pages/selectGird.vue index bf11d96c..2755015e 100644 --- a/src/components/pages/selectGird.vue +++ b/src/components/pages/selectGird.vue @@ -88,13 +88,13 @@ export default { if (params.isDisabledOneGird) { this.isDisabledOneGird = params.isDisabledOneGird } - if(this.isGirdUser){ + if (this.isGirdUser) { if (this.isMyGird) { this.getMyGird() } else { this.getTree() } - }else this.$u.toast('当前人员不是网格员或网格管理员') + } else this.$u.toast('当前人员不是网格员或网格管理员') }, methods: { getMyGird() { @@ -185,7 +185,7 @@ export default { if (this.SelectGird.id != null) { uni.navigateBack({ success: () => { - uni.$emit("pagePicker", [this.SelectGird]) + uni.$emit("pagePicker:gird", [this.SelectGird]) } }) } else { diff --git a/src/components/pages/selectResident.vue b/src/components/pages/selectResident.vue index 78a43d9e..6ce132bb 100644 --- a/src/components/pages/selectResident.vue +++ b/src/components/pages/selectResident.vue @@ -96,7 +96,7 @@ export default { } else { uni.navigateBack({ success: () => { - uni.$emit("pagePicker", checkList) + uni.$emit("pagePicker:resident", checkList) } }) } From 81dd979440479dc3c50a0957d4cbc11bba86b34e Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 17 Mar 2022 17:02:10 +0800 Subject: [PATCH 04/13] BUG 28296 --- src/apps/AppPeopleList/AppPeopleList.vue | 6 +- src/apps/AppPeopleList/PeopleList.vue | 115 +++++++++++++---------- 2 files changed, 67 insertions(+), 54 deletions(-) diff --git a/src/apps/AppPeopleList/AppPeopleList.vue b/src/apps/AppPeopleList/AppPeopleList.vue index a8264fe4..1d6b963c 100644 --- a/src/apps/AppPeopleList/AppPeopleList.vue +++ b/src/apps/AppPeopleList/AppPeopleList.vue @@ -39,10 +39,6 @@ export default { \ No newline at end of file + diff --git a/src/apps/AppPeopleList/PeopleList.vue b/src/apps/AppPeopleList/PeopleList.vue index 80cb269d..7adb23c7 100644 --- a/src/apps/AppPeopleList/PeopleList.vue +++ b/src/apps/AppPeopleList/PeopleList.vue @@ -1,30 +1,34 @@