diff --git a/src/apps/AppEpidemicSituation/ErrorDetail.vue b/src/apps/AppEpidemicSituation/ErrorDetail.vue index 31120e71..943b4b47 100644 --- a/src/apps/AppEpidemicSituation/ErrorDetail.vue +++ b/src/apps/AppEpidemicSituation/ErrorDetail.vue @@ -131,43 +131,25 @@ export default { }, methods: { getUser() { - this.$loading() - this.$http - .post(`/app/appepidemicreportmember/queryDetailById?id=${this.id}`) - .then((res) => { - if (res.code == 0) { - this.userList = res.data - this.$hideLoading() - } else { - this.$hideLoading() - } - }) - .catch(() => { - this.$hideLoading() - }) + this.$http.post(`/app/appepidemicreportmember/queryDetailById?id=${this.id}`).then((res) => { + if (res.code == 0) { + this.userList = res.data + } + }) }, // 异常情况 getErrThing() { this.$loading() - this.$http - .post(`/app/appepidemichealthreport/list?memberId=${this.id}`) - .then((res) => { - if (res.code == 0) { - this.datas = res.data.records - this.$hideLoading() - } else { - this.$hideLoading() - } - }) - .catch(() => { - this.$hideLoading() - }) + this.$http.post(`/app/appepidemichealthreport/list?memberId=${this.id}`).then((res) => { + if (res.code == 0) { + this.datas = res.data.records + } + }) }, // 异常情况记录 getRecord() { - this.$loading() this.$http .post(`/app/appepidemicunusuallog/list`, null, { params: { @@ -179,14 +161,8 @@ export default { .then((res) => { if (res.code == 0) { this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records - this.$hideLoading() - } else { - this.$hideLoading() } }) - .catch(() => { - this.$hideLoading() - }) }, // 新增记录 @@ -217,7 +193,8 @@ export default { this.$http.post('/app/appepidemicreportmember/release', { id: this.id }).then((res) => { if (res.code == 0) { this.$u.toast('解除成功!') - uni.$emit('updateDetail') + uni.$emit('updateDetails') + uni.$emit('updateLists') setTimeout(() => { uni.navigateBack() }, 600) diff --git a/src/apps/AppEpidemicSituation/Health.vue b/src/apps/AppEpidemicSituation/Health.vue index 5d2239ee..0dcf900d 100644 --- a/src/apps/AppEpidemicSituation/Health.vue +++ b/src/apps/AppEpidemicSituation/Health.vue @@ -115,6 +115,12 @@ export default { this.areaName = this.user.areaName this.getList() this.getUserList() + + uni.$on('updateLists', () => { + this.current = 1 + this.getList() + this.getUserList() + }) }, onShow() { this.areaId = this.user.areaId @@ -129,29 +135,23 @@ export default { .then((res) => { if (res.code == 0) { this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records - } else { - } - }) - .catch(() => {}) - }, - - getUserList() { - uni.showLoading({ - title: '加载数据中', - }) - this.$http - .post(`/app/appepidemicreportmember/statistic?areaId=${this.areaId}`) - .then((res) => { - if (res.code == 0) { - this.userList = res.data - uni.hideLoading() - } else { - uni.hideLoading() + this.$forceUpdate() } }) .catch(() => { - uni.hideLoading() + this.$forceUpdate() }) + .finally(() => { + this.$forceUpdate() + }) + }, + + getUserList() { + this.$http.post(`/app/appepidemicreportmember/statistic?areaId=${this.areaId}`).then((res) => { + if (res.code == 0) { + this.userList = res.data + } + }) }, goDetail(item) { diff --git a/src/apps/AppEpidemicSituation/HealthDetail.vue b/src/apps/AppEpidemicSituation/HealthDetail.vue index 2ac95e5d..4c28505b 100644 --- a/src/apps/AppEpidemicSituation/HealthDetail.vue +++ b/src/apps/AppEpidemicSituation/HealthDetail.vue @@ -88,7 +88,7 @@ export default { } this.getRecord() - uni.$on('updateDetail', () => { + uni.$on('updateDetails', () => { this.getUser() this.getRecord() }) diff --git a/src/apps/AppEpidemicSituation/UserDetail.vue b/src/apps/AppEpidemicSituation/UserDetail.vue index 5955cd83..e2186e79 100644 --- a/src/apps/AppEpidemicSituation/UserDetail.vue +++ b/src/apps/AppEpidemicSituation/UserDetail.vue @@ -157,38 +157,22 @@ export default { methods: { getUser() { this.$loading() - this.$http - .post(`/app/appepidemicreportmember/queryDetailById?id=${this.userList.memberId}`) - .then((res) => { - if (res.code == 0) { - this.data = res.data - this.data.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2") - this.$hideLoading() - } else { - this.$hideLoading() - } - }) - .catch(() => { - this.$hideLoading() - }) + this.$http.post(`/app/appepidemicreportmember/queryDetailById?id=${this.userList.memberId}`).then((res) => { + if (res.code == 0) { + this.data = res.data + this.data.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/, '$1********$2') + } + }) }, // 异常情况记录 getRecord() { this.$loading() - this.$http - .post(`/app/appepidemicunusuallog/list?recordId=${this.userList.memberId}`) - .then((res) => { - if (res.code == 0) { - this.datas = res.data.records - this.$hideLoading() - } else { - this.$hideLoading() - } - }) - .catch(() => { - this.$hideLoading() - }) + this.$http.post(`/app/appepidemicunusuallog/list?recordId=${this.userList.memberId}`).then((res) => { + if (res.code == 0) { + this.datas = res.data.records + } + }) }, callPhone(phone) { diff --git a/src/apps/AppGridManagement/AddFamily.vue b/src/apps/AppGridManagement/AddFamily.vue index c6fe4744..edd7d864 100644 --- a/src/apps/AppGridManagement/AddFamily.vue +++ b/src/apps/AppGridManagement/AddFamily.vue @@ -11,7 +11,7 @@ -
+
+
确定选择
@@ -116,7 +117,6 @@ export default { this.userId = option.id this.areaId = this.user.areaId this.areaName = this.user.areaName - console.log(this.userId) }, onShow() { document.title = '新增责任家庭' @@ -131,7 +131,6 @@ export default { diff --git a/src/apps/AppResidentFile/components/document.vue b/src/apps/AppResidentFile/components/document.vue index f39fa1be..c6e5c5b2 100644 --- a/src/apps/AppResidentFile/components/document.vue +++ b/src/apps/AppResidentFile/components/document.vue @@ -83,13 +83,16 @@ export default { } }, created() { + + }, + onLoad() { + this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName') console.log('居民档案性别(无字典)', this.resident.sex) console.log('居民档案性别(有字典)', this.$dict.getLabel('sex', this.resident.sex)) console.log('居民档案字典值', this.$dict.getDict('sex')) }, onShow() { document.title = '居民详情' - this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName') }, } diff --git a/src/apps/AppResourcesManage/AppResourcesManage.vue b/src/apps/AppResourcesManage/AppResourcesManage.vue index c69b9822..3f429c92 100644 --- a/src/apps/AppResourcesManage/AppResourcesManage.vue +++ b/src/apps/AppResourcesManage/AppResourcesManage.vue @@ -62,6 +62,10 @@ export default { }) }, + onShow() { + document.title = '媒资管理' + }, + methods: { change(index) { this.isMore = false diff --git a/src/apps/AppResourcesManage/addPlay.vue b/src/apps/AppResourcesManage/addPlay.vue index 5837f242..44560834 100644 --- a/src/apps/AppResourcesManage/addPlay.vue +++ b/src/apps/AppResourcesManage/addPlay.vue @@ -52,6 +52,9 @@ export default { this.file = e }) }, + onShow() { + document.title = this.type == 1 ? '添加音频' : '添加文本' + }, methods: { toRecord() { diff --git a/src/apps/AppServicePublic/AppServicePublic.vue b/src/apps/AppServicePublic/AppServicePublic.vue index 9f56d026..9746a725 100644 --- a/src/apps/AppServicePublic/AppServicePublic.vue +++ b/src/apps/AppServicePublic/AppServicePublic.vue @@ -28,7 +28,7 @@ @click.stop="previewImage(item.files, items.accessUrl)"/>
- +
diff --git a/src/apps/AppServicePublic/Detail.vue b/src/apps/AppServicePublic/Detail.vue index 78c34fb6..79b91c74 100644 --- a/src/apps/AppServicePublic/Detail.vue +++ b/src/apps/AppServicePublic/Detail.vue @@ -27,7 +27,7 @@
- +
diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue index 7ef042c4..9af2d27e 100644 --- a/src/apps/AppVillageDiscuss/Detail.vue +++ b/src/apps/AppVillageDiscuss/Detail.vue @@ -201,18 +201,14 @@ export default { }, like(id) { - this.$loading() this.$http.post(`/app/appvillagediscussmessage/suport?id=${id}&userId=${this.user.id}`).then((res) => { this.$hideLoading() if (res.code === 0) { this.$u.toast('点赞成功') - - this.$nextTick(() => { - this.getDetail() - }) - } else { - this.$u.toast(res.msg) - } + this.getDetail() + } + }).catch((err) => { + this.$u.toast(err) }) }, diff --git a/src/apps/AppVillageDiscuss/userList.vue b/src/apps/AppVillageDiscuss/userList.vue index bff787f3..f7adcb92 100644 --- a/src/apps/AppVillageDiscuss/userList.vue +++ b/src/apps/AppVillageDiscuss/userList.vue @@ -9,12 +9,12 @@
{{ item.userName }} - 匿名用户 + 居民 {{ item.createTime }}
-
选择了选择了{{ item.item }}
+
选择了{{ item.item }}
diff --git a/src/apps/AppWalkask/detail.vue b/src/apps/AppWalkask/detail.vue index ce5cd59f..957921bd 100644 --- a/src/apps/AppWalkask/detail.vue +++ b/src/apps/AppWalkask/detail.vue @@ -5,7 +5,11 @@
走访对象： - {{ data.name }} + + {{ data.name }} + {{ data.menuLevel3Name }} + +
@@ -99,6 +103,14 @@ export default { font-size: 28px; color: #d7e3f3; margin-top: 16px; + .tags { + display: inline-block; + padding: 0 12px; + height: 40px; + border-radius: 4px; + border: 1px solid #FFFFFF; + margin-left: 16px; + } } } diff --git a/src/sass/AppAskForm/AppAskForm.vue b/src/sass/AppAskForm/AppAskForm.vue index b2a0387e..03f36a9a 100644 --- a/src/sass/AppAskForm/AppAskForm.vue +++ b/src/sass/AppAskForm/AppAskForm.vue @@ -39,7 +39,7 @@ export default { document.title = "问卷表单" this.$refs?.TabPage?.show() this.$nextTick(() => { - this.injectJWeixin(['sendChatMessage', 'selectEnterpriseContact', 'shareAppMessage', 'shareWechatMessage']).then(() => { + this.injectJWeixin(['sendChatMessage', 'shareAppMessage', 'shareWechatMessage']).then(() => { this.$dict.load(['questionnaireStatus', 'questionnaireType', 'questionnaireFieldType']) }) }) diff --git a/src/sass/AppAskForm/Result.vue b/src/sass/AppAskForm/Result.vue index 4da4bc8f..b2eb18da 100644 --- a/src/sass/AppAskForm/Result.vue +++ b/src/sass/AppAskForm/Result.vue @@ -40,7 +40,7 @@ export default { } }, mounted() { - this.injectJWeixin(['sendChatMessage', 'selectEnterpriseContact']) + this.injectJWeixin(['sendChatMessage']) }, methods: { ...mapActions(['injectJWeixin', 'wxInvoke']), diff --git a/src/sass/AppMeetingNotice/addMeeting.vue b/src/sass/AppMeetingNotice/addMeeting.vue index eb5bc848..56b577bf 100644 --- a/src/sass/AppMeetingNotice/addMeeting.vue +++ b/src/sass/AppMeetingNotice/addMeeting.vue @@ -159,16 +159,16 @@ export default { } }, methods: { - ...mapActions(['selectEnterpriseContact']), + ...mapActions(['selectPrivilegedContact']), handleSelectUser() { if (this.clickedUserSelect) return this.$u.toast("正在打开人员选择器") this.clickedUserSelect = true - this.selectEnterpriseContact({ + this.selectPrivilegedContact({ fromDepartmentId: 0, - type: ["user"], - selectedUserIds: this.form.attendees?.map(e => e.id) + selectedOpenUserIds: this.form.attendees?.map(e => e.id) }).then(res => { this.change(res?.userList || []) + this.form.ticket = res?.selectedTicket || "" this.clickedUserSelect = false }).catch(() => { this.clickedUserSelect = false diff --git a/src/sass/AppNotification/add.vue b/src/sass/AppNotification/add.vue index 0bc718c0..a6e15e4a 100644 --- a/src/sass/AppNotification/add.vue +++ b/src/sass/AppNotification/add.vue @@ -105,16 +105,16 @@ export default { }, methods: { - ...mapActions(['selectEnterpriseContact']), + ...mapActions(['selectPrivilegedContact']), handleSelectUser() { if (this.clickedUserSelect) return this.$u.toast("正在打开人员选择器") this.clickedUserSelect = true - this.selectEnterpriseContact({ + this.selectPrivilegedContact({ fromDepartmentId: 0, - type: ["user"], - selectedUserIds: this.form.persons?.map(e => e.id) + selectedOpenUserIds: this.form.persons?.map(e => e.id) }).then(res => { this.form.persons = res?.userList || [] + this.form.ticket = res?.selectedTicket this.clickedUserSelect = false }).catch(() => { this.clickedUserSelect = false diff --git a/src/store/index.js b/src/store/index.js index 5813b384..57cd43b5 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -351,6 +351,27 @@ const store = new Vuex.Store({ }) }) }, + selectPrivilegedContact(state, params) { + return new Promise(resolve => { + state.dispatch("injectJWeixin", "selectPrivilegedContact").then(() => { + setTimeout(() => { + let sdk = typeof wx?.invoke == 'function' ? wx : jWeixin + sdk?.invoke("selectEnterpriseContact", { + fromDepartmentId: -1, + mode: "multi", + ...params + }, res => { + if (res.err_msg == "selectPrivilegedContact:ok") { + if (typeof res.result == 'string') { + res.result = JSON.parse(res.result) + } + resolve(res.result) + } + }) + }, 500) + }) + }) + }, }, getters: { getDict: state => key => {