diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue index 1161f941..69c6f42b 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 de27fac6..3ce7a034 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;