From 1de58e0464d4a9ca950e94c6f7055ead05f8980f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 6 Jun 2022 15:27:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityService/fuwujilu/addForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue index 85d4d109c..1161f9417 100644 --- a/src/views/modules/communityService/fuwujilu/addForm.vue +++ b/src/views/modules/communityService/fuwujilu/addForm.vue @@ -440,8 +440,8 @@ export default { this.endLoading() - this.formData = JSON.parse(JSON.stringify(this.formDataTemp)); - this.feedbackFormData = { ...this.formData.feedback } + // this.formData = JSON.parse(JSON.stringify(this.formDataTemp)); + // this.feedbackFormData = { ...this.formData.feedback } }, From e2e4f274e8c72ec0f7d07df701e2adf63e6db545 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 7 Jun 2022 10:43:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/fuwujilu/addForm.vue | 51 ++++--------------- .../communityService/fuwujilu/fuwuList.vue | 5 ++ 2 files changed, 15 insertions(+), 41 deletions(-) diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue index 1161f9417..69c6f42b2 100644 --- a/src/views/modules/communityService/fuwujilu/addForm.vue +++ b/src/views/modules/communityService/fuwujilu/addForm.vue @@ -362,41 +362,6 @@ export default { address: '', attachmentList: [],// 附件列表 }, - formDataTemp: { - principalContact: "15111111111", - principalName: "31231", - remark: "4234234", - serviceCategoryKey: "01", - serviceOrgId: "1531105677127692289", - serviceProjectId: "1531514265581076482", - serviceScope: [ - { - objectId: "1479033225060757506", - objectName: "合肥路街道", - objectType: "street", - }, - { - objectId: "1514064686570147842", - objectName: "ss", - objectType: "street", - } - ], - serviceTimeEnd: "", - serviceTimeStart: "", - - feedback: { - address: "山东省青岛市市南区南京路73号", - latitude: 36.0722275, - longitude: 120.38945519, - satisfaction: "bad", - serviceEffect: "234234234", - serviceGoal: "234234", - servicePeopleNumber: 1, - serviceProjectId: "1531514265581076482", - serviceProjectName: "223", - serviceStatus: "completed", - } - }, projectList: [],//服务项目list orgList: [],//服务组织list @@ -430,18 +395,17 @@ export default { async mounted () { this.startLoading() this.initMap() + this.$refs.ref_form_feedback.resetFields(); if (this.formType === 'add') { this.$refs.ref_form.resetFields(); await this.loadScopeTree() - } - - this.$refs.ref_form_feedback.resetFields(); + } else { + this.$set(this.feedbackFormData, 'serviceProjectName', this.serviceProjectName) + } this.endLoading() - // this.formData = JSON.parse(JSON.stringify(this.formDataTemp)); - // this.feedbackFormData = { ...this.formData.feedback } }, @@ -598,7 +562,7 @@ export default { console.log(this.formData) // return false const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 - if (regPhone.test(this.formData.principalContact) === false) { + if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) { this.btnDisable = false this.$message({ type: 'warning', @@ -959,6 +923,11 @@ export default { type: String, required: '' }, + serviceProjectName: {//服务项目名称 + type: String, + required: false, + default: '' + }, formType: { //表单操作类型 add新增，edit编辑，detail详情,feedback反馈 type: String, required: '' diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue index de27fac60..3ce7a034c 100644 --- a/src/views/modules/communityService/fuwujilu/fuwuList.vue +++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue @@ -238,6 +238,7 @@ :statusArray="statusArray" :satisfyArray="satisfyArray" :serviceRecordId="serviceRecordId" + :serviceProjectName="serviceProjectName" @handleOk="handleOk" @handleClose="handleClose"> @@ -344,6 +345,7 @@ export default { disabledDate: startDisabledDate }, serviceRecordId: '', + serviceProjectName: '', showAdd: false, showDetail: false, @@ -411,6 +413,7 @@ export default { async handleDetail (row) { this.serviceRecordId = row.serviceRecordId + this.formType = 'detail' this.showDetail = true @@ -424,7 +427,9 @@ export default { //加载组织数据 async handleFeedback (row) { + this.serviceRecordId = row.serviceRecordId + this.serviceProjectName = row.serviceProjectName this.addDiaTitle = '服务反馈' this.formType = 'feedback' this.showAdd = true; From 212a1c0eb6deb7c65c5c2d6752559ed1b0db3239 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 7 Jun 2022 17:02:59 +0800 Subject: [PATCH 3/4] 111 --- .../modules/communityService/fuwujilu/addForm.vue | 12 ++++++------ .../shequzhili/event/cpts/process-form-demand.vue | 11 ++++++++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue index 69c6f42b2..8cb7c9c7e 100644 --- a/src/views/modules/communityService/fuwujilu/addForm.vue +++ b/src/views/modules/communityService/fuwujilu/addForm.vue @@ -122,10 +122,10 @@ style="display: block"> @@ -175,10 +175,10 @@ style="display: block"> diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index 3423c3d89..795668e7e 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -470,9 +470,14 @@ export default { handleServiceChange (type, val) { if (val === "social_org") { - if (type === "add") this.getServiceuserList(val, "add_demand"); - else this.getServiceuserList(val, "query_demand"); - } else this.getServiceuserList(val, ""); + if (type === "add") { + this.getServiceuserList(val, "add_demand"); + } else { + this.getServiceuserList(val, "query_demand"); + } + } else { + this.getServiceuserList(val, ""); + } }, async getServiceuserList (serviceType, query) { From c16e84f48cc798b8f979f0f28411357362ab9428 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 8 Jun 2022 13:41:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8D=A2=E8=A1=8Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/fuwuxiangmu/cpts/edit.vue | 10 +++++----- .../modules/communityService/fuwuzuzhi/cpts/edit.vue | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue b/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue index 26cbf4e3a..3331aa6df 100644 --- a/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue +++ b/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue @@ -29,7 +29,7 @@ > -
{{ fmData.serviceCategory || "--" }}
+
{{ fmData.serviceCategory || "--" }}
-
{{ fmData.serviceName || "--" }}
+
{{ fmData.serviceName || "--" }}
 -
{{ fmData.serviceContent || "--" }}
+
{{ fmData.serviceContent || "--" }}
 -
{{ fmData.policyLevelName || "--" }}
+
{{ fmData.policyLevelName || "--" }}
 -
{{ fmData.policyGround || "--" }}
+
{{ fmData.policyGround || "--" }}
 -
{{ fmData.serviceTypeName }}
+
{{ fmData.serviceTypeName }}
 -
{{ fmData.orgName || "--" }}
+
{{ fmData.orgName || "--" }}
 -
{{ fmData.orgDescribe || "--" }}
+
{{ fmData.orgDescribe || "--" }}
 -
{{ fmData.principalName || "--" }}
+
{{ fmData.principalName || "--" }}
 -
{{ fmData.principalMobile || "--" }}
+
{{ fmData.principalMobile || "--" }}
 -
{{ fmData.remark || "--" }}
+
{{ fmData.remark || "--" }}