diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index 5ed9abe5..e32fcd64 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -139,6 +139,138 @@
 
       </el-form>
 
+      <div v-show="formData.serviceStatus==='completed'">
+        <h3 class="d-h3">反馈内容</h3>
+
+        <el-form ref="ref_form_feedback"
+                 :inline="true"
+                 :model="feedbackFormData"
+                 class="div_form">
+
+          <el-form-item label="服务目标"
+                        prop="serviceGoal"
+                        label-width="150px"
+                        style="display: block">
+            <span>{{feedbackFormData.serviceGoal}}</span>
+            <!-- <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="1000"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入服务目标，不超过1000字"
+                      v-model="feedbackFormData.serviceGoal"></el-input> -->
+          </el-form-item>
+
+          <el-form-item label="服务效果"
+                        prop="serviceEffect"
+                        label-width="150px"
+                        style="display: block">
+            <span>{{feedbackFormData.serviceEffect}}</span>
+            <!-- <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="1000"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入服务效果，不超过1000字"
+                      v-model="feedbackFormData.serviceEffect"></el-input> -->
+          </el-form-item>
+
+          <el-form-item label="服务人数"
+                        style="display: block"
+                        prop="servicePeopleNumber"
+                        label-width="150px">
+            <span>{{feedbackFormData.servicePeopleNumber}}</span>
+            <!-- <el-input-number class="item_width_1"
+                             v-model="feedbackFormData.servicePeopleNumber"
+                             :min="0"
+                             :max="9999"
+                             label="服务人数"></el-input-number> -->
+          </el-form-item>
+
+          <el-form-item label="服务状态"
+                        label-width="150px"
+                        style="display: block"
+                        prop="serviceStatus">
+            <span>已完成</span>
+            <!-- <el-select class="item_width_1"
+                       v-model="feedbackFormData.serviceStatus"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in statusArray"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select> -->
+
+          </el-form-item>
+          <el-form-item label="满意度"
+                        style="display: block"
+                        label-width="150px"
+                        prop="satisfaction">
+            <span>{{feedbackFormData.satisfactionShow}}</span>
+            <!-- <el-select class="item_width_1"
+                       v-model="feedbackFormData.satisfaction"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in satisfyArray"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select> -->
+
+          </el-form-item>
+          <el-form-item label="地址"
+                        prop="address"
+                        label-width="150px"
+                        style="display: block">
+            <span>{{feedbackFormData.address}}</span>
+            <!-- <el-input class="item_width_1"
+                      v-model="feedbackFormData.address"></el-input> -->
+          </el-form-item>
+          <el-form-item label="地图位置"
+                        label-width="150px"
+                        style="display: block">
+            <div style="width:500px">
+
+              <div class="div_map">
+                <div id="map_app">
+
+                </div>
+                <div class="div_searchmap">
+                  <el-input maxlength="50"
+                            size="mini"
+                            placeholder="请输入关键字"
+                            v-model="keyWords">
+                  </el-input>
+                  <el-button style="margin-left: 10px"
+                             type="primary"
+                             size="mini"
+                             @click="handleSearchMap">查询</el-button>
+                </div>
+              </div>
+
+            </div>
+          </el-form-item>
+
+          <el-form-item class="block"
+                        label="附件"
+                        label-width="150px"
+                        prop="attach">
+            <el-upload v-if="feedbackFormData.attachmentList&&feedbackFormData.attachmentList.length>0"
+                       class="upload-demo"
+                       :action="uploadUlr"
+                       accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+                       :limit="3"
+                       :file-list="fileList">
+
+            </el-upload>
+            <span v-else>无附件</span>
+          </el-form-item>
+        </el-form>
+      </div>
+
     </div>
 
     <div class="div_btn">
@@ -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 []
+      }
+    },
   }
 }
 </script>
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">
       <detail-form ref="ref_detail_form"
                    :serviceRecordId="serviceRecordId"
+                   :satisfyArray="satisfyArray"
                    :categrayArray="categrayArray"
                    @handleOk="handleOk"
                    @handleClose="handleClose"