From 04ef27f3f96d292a18ec63ab19e6e73437d7ea57 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Jun 2022 11:35:00 +0800 Subject: [PATCH 01/24] BUG 30090 --- src/project/beta/AppGridManagement/AddUser.vue | 1 - src/project/beta/AppGridManagement/SelectGird.vue | 12 +++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/project/beta/AppGridManagement/AddUser.vue b/src/project/beta/AppGridManagement/AddUser.vue index 52f25e7e..1bad91f6 100644 --- a/src/project/beta/AppGridManagement/AddUser.vue +++ b/src/project/beta/AppGridManagement/AddUser.vue @@ -21,7 +21,6 @@ *所属网格
- {{selectGird.girdName}} 请选择
diff --git a/src/project/beta/AppGridManagement/SelectGird.vue b/src/project/beta/AppGridManagement/SelectGird.vue index 06d66eef..2afef034 100644 --- a/src/project/beta/AppGridManagement/SelectGird.vue +++ b/src/project/beta/AppGridManagement/SelectGird.vue @@ -53,13 +53,15 @@ export default { }, isGridMember() { return this.user.girdCheckType > 0 - } + }, + //是否是网格员申报 + isApply: v => v.$route.query.formType == 2 }, onLoad(option) { if (option.isFormMap) { this.isFormMap = option.isFormMap } - this.isGridMember ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格长') + this.isGridMember || this.isApply ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格长') }, methods: { getAllGrids() { @@ -67,6 +69,10 @@ export default { let {girdMemberId} = this.user, url = `/app/appgirdinfo/queryAppGirdInfoByGirdLevel`, params = {girdMemberId} + if (this.isApply) { + url = `/app/appgirdinfo/listByInfo` + params = {} + } if (this.isMyGirds) { url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser` params = {} @@ -81,7 +87,7 @@ export default { }, treeInit(isClick) { let last = uni.getStorageSync("lastSelectedGrid") - if (!isClick && last) { + if (!isClick && last && !this.isApply) { this.$http.post("/app/appgirdinfo/listFatherGirdInfo", null, { params: {girdId: last} }).then(res => { From 42fbe2fcbb341318507348ab89244b750576bfad Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Jun 2022 11:36:21 +0800 Subject: [PATCH 02/24] BUG 30082 --- src/project/beta/AppGridManagement/gridMembers.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/project/beta/AppGridManagement/gridMembers.vue b/src/project/beta/AppGridManagement/gridMembers.vue index f1f07f14..bad74aa6 100644 --- a/src/project/beta/AppGridManagement/gridMembers.vue +++ b/src/project/beta/AppGridManagement/gridMembers.vue @@ -2,7 +2,7 @@
{{ detail.girdName }}
- +
@@ -12,9 +12,10 @@
责任家庭
- +
+
删除网格 编辑网格 From 37340e04af6ed02c2f51f0cd6b4d31c0c81f3ad8 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Jun 2022 11:37:33 +0800 Subject: [PATCH 03/24] BUG 30076 --- src/project/beta/AppGridManagement/SetGird.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/project/beta/AppGridManagement/SetGird.vue b/src/project/beta/AppGridManagement/SetGird.vue index edc2facf..240bc9fa 100644 --- a/src/project/beta/AppGridManagement/SetGird.vue +++ b/src/project/beta/AppGridManagement/SetGird.vue @@ -21,8 +21,8 @@
添加下级网格
-
编辑网格
-
删除网格
+
编辑网格
+
删除网格
From a85429a9892f1678d8a00820b20f52df2f3afeed Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Jun 2022 11:38:27 +0800 Subject: [PATCH 04/24] BUG 30076 --- src/project/beta/AppGridManagement/SetGird.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/beta/AppGridManagement/SetGird.vue b/src/project/beta/AppGridManagement/SetGird.vue index 240bc9fa..20328c4f 100644 --- a/src/project/beta/AppGridManagement/SetGird.vue +++ b/src/project/beta/AppGridManagement/SetGird.vue @@ -21,7 +21,7 @@
添加下级网格
-
编辑网格
+
编辑网格
删除网格
From d50e2bf91f46b49e1d0779de8fc974d69849ca74 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Jun 2022 11:41:45 +0800 Subject: [PATCH 05/24] BUG 30080 --- src/project/beta/AppGridManagement/SetGird.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/project/beta/AppGridManagement/SetGird.vue b/src/project/beta/AppGridManagement/SetGird.vue index 20328c4f..ac6dab06 100644 --- a/src/project/beta/AppGridManagement/SetGird.vue +++ b/src/project/beta/AppGridManagement/SetGird.vue @@ -74,11 +74,11 @@ export default { uni.navigateTo({url: `./AddGird?id=${this.detail.id}&fromType=edit`}) }, handleDelete() { - this.$confirm('删除网格后，会清除网格内网格员和责任家庭信息，如有下级网格，会同步删除下级网格所有数据', `您确认要删除该网格？`).then(() => { + this.$confirm('删除网格后，会清除网格内网格员的责任家庭信息，如有下级网格，会同步删除下级网格所有数据', `您确认要删除该网格？`).then(() => { this.$http.post(`/app/appgirdinfo/delete?ids=${this.detail.id}`).then((res) => { if (res?.code == 0) { this.$u.toast('删除成功!') - this.getDetail() + uni.navigateBack({}) } }) }) From 227990b9cb84b2bbea78cc29c826a4684d9e79e9 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Jun 2022 11:44:13 +0800 Subject: [PATCH 06/24] BUG 30081 --- src/project/beta/AppGridManagement/AppGridManagement.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/beta/AppGridManagement/AppGridManagement.vue b/src/project/beta/AppGridManagement/AppGridManagement.vue index a30f9df6..bde8f712 100644 --- a/src/project/beta/AppGridManagement/AppGridManagement.vue +++ b/src/project/beta/AppGridManagement/AppGridManagement.vue @@ -10,7 +10,7 @@
- 网格配置 + 网格配置
From b95c8cb291f411296a98f989ffd1e8455040b58d Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Jun 2022 14:31:55 +0800 Subject: [PATCH 07/24] BUG 30075 --- src/project/beta/AppGridManagement/AddGird.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/project/beta/AppGridManagement/AddGird.vue b/src/project/beta/AppGridManagement/AddGird.vue index 4d88f200..dd9bd7c0 100644 --- a/src/project/beta/AppGridManagement/AddGird.vue +++ b/src/project/beta/AppGridManagement/AddGird.vue @@ -20,7 +20,7 @@ -
{{ fromType == 'add' ? '确认添加' : '确认修改' }}
+
{{ fromType == 'add' ? '确认添加' : '确认修改' }}
@@ -86,7 +86,6 @@ export default { name: item.name } }) - uni.showLoading({mask: true}) this.$http.post(`/app/appgirdinfo/addOrUpdateByEw`, {...this.form, girdMemberManageList, girdMemberList}).then((res) => { if (res?.code == 0) { this.$u.toast('提交成功') @@ -97,8 +96,7 @@ export default { } }).catch((err) => { this.$u.toast(err) - }).finally(() => uni.hideLoading()) - + }) }, getArrayLabel(arr, key = 'name', separation = '，') { return arr?.map(e => e[key])?.join(separation) From 4ecfaa0e28fbdb3d101528a094fd9a8ca035930b Mon Sep 17 00:00:00 2001 From: liuye Date: Wed, 8 Jun 2022 14:32:51 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppMessageNotification.vue | 30 +-- .../police/AppPeopleList/DetailCard.vue | 8 +- .../police/AppPeopleList/DetailPeople.vue | 2 +- .../AppResidentFile/AppResidentFile.vue | 183 +----------------- .../AppResidentFile/components/document.vue | 7 +- .../AppResidentFile/components/info.vue | 2 - 6 files changed, 26 insertions(+), 206 deletions(-) diff --git a/src/project/police/AppMessageNotification/AppMessageNotification.vue b/src/project/police/AppMessageNotification/AppMessageNotification.vue index 19d35faa..d58a30e8 100644 --- a/src/project/police/AppMessageNotification/AppMessageNotification.vue +++ b/src/project/police/AppMessageNotification/AppMessageNotification.vue @@ -48,7 +48,15 @@

图片

- + +
+
+

视频

+ +
+
+

附件

+
@@ -68,14 +76,6 @@
-
-

视频

- -
-
-

附件

- -

小程序标题

@@ -150,7 +150,8 @@ export default { accessTitle: '', accessUrl: '', accessAppid: '', - file: {} + file: {}, + mediaId: '' }, areaIdList: [], tagIdList: [], @@ -162,7 +163,8 @@ export default { hour: true, minute: true, second: true - } + }, + fileData: null } }, computed: {...mapState(['user'])}, @@ -196,7 +198,7 @@ export default { if(!this.form.content) { return this.$u.toast('请输入文本内容') } - if(this.form.contentType == 'image' && !this.formData.imgList.length) { + if(this.form.contentType == 'image' && !this.formData.fileList.length) { return this.$u.toast('请上传图片') } if(this.form.contentType == 'video' && !this.formData.fileList.length) { @@ -208,9 +210,7 @@ export default { if(this.formData.fileList.length) { this.formData.file = this.formData.fileList[0] this.formData.accessUrl = this.formData.fileList[0].url - } - if(this.formData.imgList.length) { - this.formData.accessUrl = this.formData.imgList[0].url + this.formData.mediaId = this.fileData.media.mediaId } var params = { ...this.form, diff --git a/src/project/police/AppPeopleList/DetailCard.vue b/src/project/police/AppPeopleList/DetailCard.vue index 8ba8735a..a776af71 100644 --- a/src/project/police/AppPeopleList/DetailCard.vue +++ b/src/project/police/AppPeopleList/DetailCard.vue @@ -7,7 +7,10 @@
- {{resident.currentAreaName}}{{resident.currentAddress || ''}} + {{resident.currentAreaName}} + {{resident.currentAddressGroup}}组 + {{resident.currentAddressNo}}户 +
@@ -121,9 +124,6 @@ export default { } .areaHint { margin-top: 38px; - span { - margin-left: 14px; - } } } diff --git a/src/project/police/AppPeopleList/DetailPeople.vue b/src/project/police/AppPeopleList/DetailPeople.vue index 50cb2582..61581191 100644 --- a/src/project/police/AppPeopleList/DetailPeople.vue +++ b/src/project/police/AppPeopleList/DetailPeople.vue @@ -108,7 +108,7 @@
现住详细地址 - {{ data.resident.currentAddress }} + {{ data.resident.currentAddressGroup }}组{{ data.resident.currentAddressNo }}户
diff --git a/src/project/police/AppResidentFile/AppResidentFile.vue b/src/project/police/AppResidentFile/AppResidentFile.vue index 2652b965..8653c2c1 100644 --- a/src/project/police/AppResidentFile/AppResidentFile.vue +++ b/src/project/police/AppResidentFile/AppResidentFile.vue @@ -76,88 +76,11 @@ export default {