From eb868b1996cc73efcc3e639ebd6e012143ac2c68 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 22 Nov 2022 13:49:20 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=B0=83=E6=9F=A5=E8=B5=B0=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/pingchang/AppWalkask/AppWalkask.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/project/pingchang/AppWalkask/AppWalkask.vue b/src/project/pingchang/AppWalkask/AppWalkask.vue index 8adf5d3c..ff1996e2 100644 --- a/src/project/pingchang/AppWalkask/AppWalkask.vue +++ b/src/project/pingchang/AppWalkask/AppWalkask.vue @@ -40,7 +40,7 @@
-

您还未添加过走访慰问
点击新增按钮试试吧

+

您还未添加过调查走访
点击新增按钮试试吧

@@ -69,7 +69,7 @@ import { mapState } from 'vuex' export default { name: 'AppWalkask', - appName: '走访慰问', + appName: '调查走访', components: {}, props: {}, data() { @@ -111,7 +111,7 @@ export default { }) }, onShow() { - document.title = '走访慰问' + document.title = '调查走访' }, mounted() {}, methods: { From 69ba2ed10e0a6eafacccdff46ef40786bb870b3b Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 22 Nov 2022 14:21:40 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=B0=83=E6=9F=A5=E8=B5=B0=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pingchang/AppWalkask/AppWalkask.vue | 4 +-- src/project/pingchang/AppWalkask/add.vue | 34 +++++-------------- src/project/pingchang/AppWalkask/detail.vue | 14 ++++---- 3 files changed, 18 insertions(+), 34 deletions(-) diff --git a/src/project/pingchang/AppWalkask/AppWalkask.vue b/src/project/pingchang/AppWalkask/AppWalkask.vue index ff1996e2..9216f87e 100644 --- a/src/project/pingchang/AppWalkask/AppWalkask.vue +++ b/src/project/pingchang/AppWalkask/AppWalkask.vue @@ -122,7 +122,7 @@ export default { }, getList() { this.$http - .post('/app/appvisitvondolence/list', null, { + .post('/app/appvisitvondolencepingchang/list', null, { params: { size: 10, current: this.current, @@ -181,7 +181,7 @@ export default { }, delet() { - this.$http.post(`/app/appvisitvondolence/delete?ids=${this.deletId}`).then((res) => { + this.$http.post(`/app/appvisitvondolencepingchang/delete?ids=${this.deletId}`).then((res) => { if (res.code == 0) { this.$u.toast('删除成功！') this.getListInit() diff --git a/src/project/pingchang/AppWalkask/add.vue b/src/project/pingchang/AppWalkask/add.vue index 76c02f7a..a59cbbf4 100644 --- a/src/project/pingchang/AppWalkask/add.vue +++ b/src/project/pingchang/AppWalkask/add.vue @@ -20,7 +20,7 @@
- + @@ -57,8 +57,8 @@
- - + + @@ -84,6 +84,7 @@ export default { optionId: '', name: '', + phone: '', residentId: '', address: '', lng: '', @@ -94,7 +95,7 @@ export default { applicationId: '', title: '', description: '', - images: [], + files: [], }, showAreaId: false, showStstus: false, @@ -164,7 +165,7 @@ export default { getDetail() { if (this.id) { - this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.id}`).then((res) => { + this.$http.post(`/app/appvisitvondolencepingchang/queryDetailById?id=${this.id}`).then((res) => { if (res?.data) { this.forms = res.data this.forms.create_user_name = res.data.name @@ -172,9 +173,6 @@ export default { this.forms.areaId = res.data.areaId this.forms.areaName = res.data.areaName this.forms.reality = this.$dict.getLabel('realityStatus', res.data.reality) - if (res.data.images) { - this.forms.images = JSON.parse(res.data.images || '[]') - } } }) } @@ -198,30 +196,16 @@ export default { return this.$u.toast('请输入入户走访事项') } - const imgs = [] - if (this.forms.images) { - this.forms.images.map((e) => { - imgs.push({ url: e.url, id: e.id }) - }) - } - this.flag = true this.$http - .post(`/app/appvisitvondolence/addOrUpdate`, { - areaId: this.forms.areaId, - applicationId: this.forms.applicationId, - name: this.forms.name, - visitTime: this.forms.visitTime, - residentId: this.forms.residentId, + .post(`/app/appvisitvondolencepingchang/addOrUpdate`, { + ...this.forms, // menuLevel3Name: this.forms.menuLevel3Name, - applicationId: this.forms.applicationId, + reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality, - title: this.forms.title, - description: this.forms.description, createUserId: this.user.id, createUserName: this.user.name, - images: JSON.stringify(imgs) || [], id: this.id, }) .then((res) => { diff --git a/src/project/pingchang/AppWalkask/detail.vue b/src/project/pingchang/AppWalkask/detail.vue index 8d3b3db9..1d476c9e 100644 --- a/src/project/pingchang/AppWalkask/detail.vue +++ b/src/project/pingchang/AppWalkask/detail.vue @@ -24,7 +24,7 @@
走访人员： - + {{data.createUserName}}
@@ -37,7 +37,7 @@
{{ data.description }}
- +
@@ -69,20 +69,20 @@ export default { mounted() {}, methods: { getDetail() { - this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.id}`).then((res) => { + this.$http.post(`/app/appvisitvondolencepingchang/queryDetailById?id=${this.id}`).then((res) => { if (res?.data) { this.data = res.data - if (this.data.images) { - this.data.images = JSON.parse(this.data.images || '[]') + if (this.data.files) { + this.data.files = JSON.parse(this.data.files || '[]') this.data.labelList = this.data.labels.split(',') || [] } } }) }, - previewImage(images, img) { + previewImage(files, img) { uni.previewImage({ - urls: images.map((v) => v.url), + urls: files.map((v) => v.url), current: img, }) }, From b3bff4dc02fc14236140f03bc4ae1b416461616d Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 22 Nov 2022 14:43:06 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=B0=83=E6=9F=A5=E8=B5=B0=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/pingchang/AppWalkask/AppWalkask.vue | 14 ++++++++++++++ src/project/pingchang/AppWalkask/add.vue | 7 ++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/project/pingchang/AppWalkask/AppWalkask.vue b/src/project/pingchang/AppWalkask/AppWalkask.vue index 9216f87e..6b26a6ef 100644 --- a/src/project/pingchang/AppWalkask/AppWalkask.vue +++ b/src/project/pingchang/AppWalkask/AppWalkask.vue @@ -7,7 +7,20 @@
+ +
+
+ + + {{ areaName }} + 请选择 + + +
+
@@ -128,6 +141,7 @@ export default { current: this.current, createUserId: this.currentTabs == 1 ? this.user.id : '', title: this.keyword, + areaId: this.areaId }, }) .then((res) => { diff --git a/src/project/pingchang/AppWalkask/add.vue b/src/project/pingchang/AppWalkask/add.vue index a59cbbf4..0083a7ea 100644 --- a/src/project/pingchang/AppWalkask/add.vue +++ b/src/project/pingchang/AppWalkask/add.vue @@ -11,12 +11,13 @@ - + + - +
From b1cd38242695f7cd98899349361a4921b9bd9670 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 22 Nov 2022 14:46:25 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=B0=83=E6=9F=A5=E8=B5=B0=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppWalkaskPc.vue} | 0 .../pingchang/{AppWalkask => AppWalkaskPc}/add.vue | 0 .../components/images/user.png | Bin .../{AppWalkask => AppWalkaskPc}/detail.vue | 0 .../{AppWalkask => AppWalkaskPc}/img/1.png | Bin .../{AppWalkask => AppWalkaskPc}/img/2.png | Bin .../{AppWalkask => AppWalkaskPc}/img/down-icon.png | Bin .../{AppWalkask => AppWalkaskPc}/img/local-icon.png | Bin .../img/search-icon.png | Bin .../{AppWalkask => AppWalkaskPc}/img/tx@2x.png | Bin .../{AppWalkask => AppWalkaskPc}/img/user-img.png | Bin .../{AppWalkask => AppWalkaskPc}/img/xz.png | Bin .../{AppWalkask => AppWalkaskPc}/img/xzh.png | Bin .../{AppWalkask => AppWalkaskPc}/selectType.vue | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename src/project/pingchang/{AppWalkask/AppWalkask.vue => AppWalkaskPc/AppWalkaskPc.vue} (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/add.vue (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/components/images/user.png (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/detail.vue (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/img/1.png (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/img/2.png (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/img/down-icon.png (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/img/local-icon.png (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/img/search-icon.png (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/img/tx@2x.png (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/img/user-img.png (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/img/xz.png (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/img/xzh.png (100%) rename src/project/pingchang/{AppWalkask => AppWalkaskPc}/selectType.vue (100%) diff --git a/src/project/pingchang/AppWalkask/AppWalkask.vue b/src/project/pingchang/AppWalkaskPc/AppWalkaskPc.vue similarity index 100% rename from src/project/pingchang/AppWalkask/AppWalkask.vue rename to src/project/pingchang/AppWalkaskPc/AppWalkaskPc.vue diff --git a/src/project/pingchang/AppWalkask/add.vue b/src/project/pingchang/AppWalkaskPc/add.vue similarity index 100% rename from src/project/pingchang/AppWalkask/add.vue rename to src/project/pingchang/AppWalkaskPc/add.vue diff --git a/src/project/pingchang/AppWalkask/components/images/user.png b/src/project/pingchang/AppWalkaskPc/components/images/user.png similarity index 100% rename from src/project/pingchang/AppWalkask/components/images/user.png rename to src/project/pingchang/AppWalkaskPc/components/images/user.png diff --git a/src/project/pingchang/AppWalkask/detail.vue b/src/project/pingchang/AppWalkaskPc/detail.vue similarity index 100% rename from src/project/pingchang/AppWalkask/detail.vue rename to src/project/pingchang/AppWalkaskPc/detail.vue diff --git a/src/project/pingchang/AppWalkask/img/1.png b/src/project/pingchang/AppWalkaskPc/img/1.png similarity index 100% rename from src/project/pingchang/AppWalkask/img/1.png rename to src/project/pingchang/AppWalkaskPc/img/1.png diff --git a/src/project/pingchang/AppWalkask/img/2.png b/src/project/pingchang/AppWalkaskPc/img/2.png similarity index 100% rename from src/project/pingchang/AppWalkask/img/2.png rename to src/project/pingchang/AppWalkaskPc/img/2.png diff --git a/src/project/pingchang/AppWalkask/img/down-icon.png b/src/project/pingchang/AppWalkaskPc/img/down-icon.png similarity index 100% rename from src/project/pingchang/AppWalkask/img/down-icon.png rename to src/project/pingchang/AppWalkaskPc/img/down-icon.png diff --git a/src/project/pingchang/AppWalkask/img/local-icon.png b/src/project/pingchang/AppWalkaskPc/img/local-icon.png similarity index 100% rename from src/project/pingchang/AppWalkask/img/local-icon.png rename to src/project/pingchang/AppWalkaskPc/img/local-icon.png diff --git a/src/project/pingchang/AppWalkask/img/search-icon.png b/src/project/pingchang/AppWalkaskPc/img/search-icon.png similarity index 100% rename from src/project/pingchang/AppWalkask/img/search-icon.png rename to src/project/pingchang/AppWalkaskPc/img/search-icon.png diff --git a/src/project/pingchang/AppWalkask/img/tx@2x.png b/src/project/pingchang/AppWalkaskPc/img/tx@2x.png similarity index 100% rename from src/project/pingchang/AppWalkask/img/tx@2x.png rename to src/project/pingchang/AppWalkaskPc/img/tx@2x.png diff --git a/src/project/pingchang/AppWalkask/img/user-img.png b/src/project/pingchang/AppWalkaskPc/img/user-img.png similarity index 100% rename from src/project/pingchang/AppWalkask/img/user-img.png rename to src/project/pingchang/AppWalkaskPc/img/user-img.png diff --git a/src/project/pingchang/AppWalkask/img/xz.png b/src/project/pingchang/AppWalkaskPc/img/xz.png similarity index 100% rename from src/project/pingchang/AppWalkask/img/xz.png rename to src/project/pingchang/AppWalkaskPc/img/xz.png diff --git a/src/project/pingchang/AppWalkask/img/xzh.png b/src/project/pingchang/AppWalkaskPc/img/xzh.png similarity index 100% rename from src/project/pingchang/AppWalkask/img/xzh.png rename to src/project/pingchang/AppWalkaskPc/img/xzh.png diff --git a/src/project/pingchang/AppWalkask/selectType.vue b/src/project/pingchang/AppWalkaskPc/selectType.vue similarity index 100% rename from src/project/pingchang/AppWalkask/selectType.vue rename to src/project/pingchang/AppWalkaskPc/selectType.vue From 848fd17f26484dfce9ce4c722814cd42d0abf2e1 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 22 Nov 2022 14:47:31 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=88=91=E6=94=B6=E5=88=B0=E7=9A=84?= =?UTF-8?q?=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCommentsReceived.vue | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/project/pingchang/AppCommentsReceived/AppCommentsReceived.vue diff --git a/src/project/pingchang/AppCommentsReceived/AppCommentsReceived.vue b/src/project/pingchang/AppCommentsReceived/AppCommentsReceived.vue new file mode 100644 index 00000000..f9af385c --- /dev/null +++ b/src/project/pingchang/AppCommentsReceived/AppCommentsReceived.vue @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file From 8ffa8fe83b087fd81a3d6f9d75991b2b7e79fb00 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 22 Nov 2022 15:23:15 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=9F=A5=E8=B5=B0=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/pingchang/AppWalkaskPc/add.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/pingchang/AppWalkaskPc/add.vue b/src/project/pingchang/AppWalkaskPc/add.vue index 0083a7ea..e6fda0ac 100644 --- a/src/project/pingchang/AppWalkaskPc/add.vue +++ b/src/project/pingchang/AppWalkaskPc/add.vue @@ -4,7 +4,7 @@
- +
From 206e7d7d87e41c04c894eecc3707eb7ee28d2e7d Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 22 Nov 2022 15:33:29 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E7=8E=B0=E5=AE=9E?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/pingchang/AppWalkaskPc/add.vue | 4 ++-- src/project/pingchang/AppWalkaskPc/detail.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/project/pingchang/AppWalkaskPc/add.vue b/src/project/pingchang/AppWalkaskPc/add.vue index e6fda0ac..4a15625a 100644 --- a/src/project/pingchang/AppWalkaskPc/add.vue +++ b/src/project/pingchang/AppWalkaskPc/add.vue @@ -35,13 +35,13 @@
- + diff --git a/src/project/pingchang/AppWalkaskPc/detail.vue b/src/project/pingchang/AppWalkaskPc/detail.vue index 1d476c9e..a9d748ba 100644 --- a/src/project/pingchang/AppWalkaskPc/detail.vue +++ b/src/project/pingchang/AppWalkaskPc/detail.vue @@ -17,10 +17,10 @@ 联系方式： {{ data.phone }}
-
+
走访人员： From 65227716a523e461cac3306268819356f8d95a1a Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 22 Nov 2022 15:51:52 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=B0=83=E6=9F=A5=E8=B5=B0=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/pingchang/AppWalkaskPc/add.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/pingchang/AppWalkaskPc/add.vue b/src/project/pingchang/AppWalkaskPc/add.vue index 4a15625a..4240ef9b 100644 --- a/src/project/pingchang/AppWalkaskPc/add.vue +++ b/src/project/pingchang/AppWalkaskPc/add.vue @@ -4,7 +4,7 @@
- +