@@ -185,8 +317,6 @@ export default {
}
return {
-
-
btnDisable: false,
keyWords: '',
@@ -202,6 +332,20 @@ export default {
longitude: 36.0722275, //经度
latitude: 120.38945519 //纬度
},
+
+ feedbackFormData: {
+ serviceProjectId: '',// 服务项目id
+ serviceProjectName: '',
+ serviceGoal: '',// 服务目标
+ serviceEffect: '',// 服务效果
+ servicePeopleNumber: null,// 服务人数
+ serviceStatus: 'completed',// 服务状态。in_service服务中；completed:已完成
+ satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect
+ longitude: '',// 经度
+ latitude: '',// 维度
+ address: '',
+ attachmentList: [],// 附件列表
+ },
serviceList: [],//服务list
endPickerOptions: {
@@ -211,17 +355,18 @@ export default {
disabledDate: startDisabledDate
},
-
projectList: [],
-
+ fileList: [],
+ uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
}
},
components: {},
mounted () {
if (this.serviceRecordId) {//详情
this.loadInfo()
+
}
- // this.initMap()
+ this.initMap()
console.log('mounted')
},
@@ -240,13 +385,25 @@ export default {
if (code === 0) {
this.formData = { ...data }
this.formData.serviceRecordId = this.serviceRecordId
+ this.feedbackFormData = { ...data.feedBack }
+ this.feedbackFormData.servicePeopleNumber = this.formData.servicePeopleNumber
+ this.feedbackFormData.satisfactionShow = this.feedbackFormData.satisfaction === 'perfect' ? '非常满意' : this.feedbackFormData.satisfaction === 'good' ? '基本满意' : '不满意'
+ this.fileList = []
+ data.feedBack.attachmentList.forEach(element => {
+ let obj = {
+ name: element.attachmentName,
+ format: element.attachmentFormat,
+ url: element.attachmentUrl,
+ }
+ this.fileList.push(obj)
+ });
+
+
} else {
this.$message.error(msg)
}
},
-
-
async handleComfirm () {
this.btnDisable = true
@@ -265,6 +422,7 @@ export default {
},
+
async editFuwu () {
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
if (regPhone.test(this.formData.principalContact) === false) {
@@ -409,7 +567,7 @@ export default {
geocoder
.getAddress({ location: location }) // 将给定的坐标位置转换为地址
.then((result) => {
- this.formData.address = result.result.address
+ // this.formData.address = result.result.address
// 显示搜索到的地址
});
},
@@ -448,7 +606,6 @@ export default {
computed: {
dataRule () {
return {
-
serviceCategoryKey: [
{ required: true, message: '服务类别不能为空', trigger: 'blur' },
],
@@ -485,7 +642,13 @@ export default {
default () {
return []
}
- }
+ },
+ satisfyArray: {
+ type: Array,
+ default () {
+ return []
+ }
+ },
}
}
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index 3ce7a034..2309bd62 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -253,6 +253,7 @@
@closed="showDetail = false">
Date: Thu, 9 Jun 2022 09:13:30 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../communityService/fuwujilu/detailForm.vue | 104 ++++++++++++------
1 file changed, 69 insertions(+), 35 deletions(-)
diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index e32fcd64..6125199c 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -144,6 +144,7 @@
@@ -151,45 +152,41 @@
prop="serviceGoal"
label-width="150px"
style="display: block">
- {{feedbackFormData.serviceGoal}}
-
+ v-model="feedbackFormData.serviceGoal">
- {{feedbackFormData.serviceEffect}}
-
+ v-model="feedbackFormData.serviceEffect">
- {{feedbackFormData.servicePeopleNumber}}
-
+ label="服务人数">
已完成
+
- {{feedbackFormData.address}}
-
+
-
@@ -252,20 +246,30 @@