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 diff --git a/src/project/pingchang/AppWalkask/AppWalkask.vue b/src/project/pingchang/AppWalkaskPc/AppWalkaskPc.vue similarity index 87% rename from src/project/pingchang/AppWalkask/AppWalkask.vue rename to src/project/pingchang/AppWalkaskPc/AppWalkaskPc.vue index 8adf5d3c..6b26a6ef 100644 --- a/src/project/pingchang/AppWalkask/AppWalkask.vue +++ b/src/project/pingchang/AppWalkaskPc/AppWalkaskPc.vue @@ -7,7 +7,20 @@
+ +
+
+ + + {{ areaName }} + 请选择 + + +
+
@@ -40,7 +53,7 @@
-

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

+

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

@@ -69,7 +82,7 @@ import { mapState } from 'vuex' export default { name: 'AppWalkask', - appName: '走访慰问', + appName: '调查走访', components: {}, props: {}, data() { @@ -111,7 +124,7 @@ export default { }) }, onShow() { - document.title = '走访慰问' + document.title = '调查走访' }, mounted() {}, methods: { @@ -122,12 +135,13 @@ export default { }, getList() { this.$http - .post('/app/appvisitvondolence/list', null, { + .post('/app/appvisitvondolencepingchang/list', null, { params: { size: 10, current: this.current, createUserId: this.currentTabs == 1 ? this.user.id : '', title: this.keyword, + areaId: this.areaId }, }) .then((res) => { @@ -181,7 +195,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/AppWalkaskPc/add.vue similarity index 84% rename from src/project/pingchang/AppWalkask/add.vue rename to src/project/pingchang/AppWalkaskPc/add.vue index 76c02f7a..4240ef9b 100644 --- a/src/project/pingchang/AppWalkask/add.vue +++ b/src/project/pingchang/AppWalkaskPc/add.vue @@ -4,23 +4,24 @@
- +
- + + - +
- + @@ -34,13 +35,13 @@
- + @@ -57,8 +58,8 @@
- - + +
@@ -84,6 +85,7 @@ export default { optionId: '', name: '', + phone: '', residentId: '', address: '', lng: '', @@ -94,7 +96,7 @@ export default { applicationId: '', title: '', description: '', - images: [], + files: [], }, showAreaId: false, showStstus: false, @@ -164,7 +166,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 +174,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 +197,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/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 84% rename from src/project/pingchang/AppWalkask/detail.vue rename to src/project/pingchang/AppWalkaskPc/detail.vue index 8d3b3db9..a9d748ba 100644 --- a/src/project/pingchang/AppWalkask/detail.vue +++ b/src/project/pingchang/AppWalkaskPc/detail.vue @@ -17,14 +17,14 @@ 联系方式: {{ data.phone }} -
+
走访人员: - + {{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, }) }, 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