diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index 718b50f9..982eb426 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -5,18 +5,19 @@
       <el-form ref="ref_form"
                :inline="true"
                :model="formData"
+               :disabled="formType==='detail'"
                :rules="dataRule"
-               :disabled="formType === 'detail'"
-               class="form">
+               class="div_form">
 
         <el-form-item label="服务分类"
+                      label-width="150px"
                       prop="serviceCategoryId">
           <el-select v-model="formData.serviceCategoryId"
                      placeholder="请选择"
-                     size="small"
                      clearable
-                     class="item_width_2">
-            <el-option v-for="item in categrayArray"
+                     class="item_width_1">
+            <el-option v-for="(item,index) in categrayArray"
+                       @click.native="hancleClickCategray(index)"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
@@ -25,77 +26,80 @@
         </el-form-item>
 
         <el-form-item label="服务项目"
-                      prop="type"
+                      prop="serviceProjectId"
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.type"
+                     v-model="formData.serviceProjectId"
                      placeholder="请选择"
                      filterable
                      clearable>
-            <el-option v-for="item in typeList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+            <el-option v-for="(item,index) in projectList"
+                       @click.native="hancleClickProject(index)"
+                       :key="item.serviceProjectId"
+                       :label="item.serviceName"
+                       :value="item.serviceProjectId">
             </el-option>
           </el-select>
 
         </el-form-item>
         <el-form-item label="服务组织"
-                      prop="type"
+                      prop="serviceOrgId"
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.type"
+                     v-model="formData.serviceOrgId"
                      placeholder="请选择"
                      filterable
                      clearable>
-            <el-option v-for="item in typeList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+            <el-option v-for="item in orgList"
+                       :key="item.icServiceOrgId"
+                       :label="item.orgName"
+                       :value="item.icServiceOrgId">
             </el-option>
           </el-select>
 
         </el-form-item>
 
         <el-form-item label="服务范围"
-                      prop="unitName"
+                      prop="serviceScope"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入单位名称"
-                    v-model="formData.unitName">
-          </el-input>
+          <el-cascader class="item_width_1"
+                       ref="myCascader"
+                       v-model="scopeIdArray"
+                       :key="iscascaderShow"
+                       :options="casOptions"
+                       :props="optionProps"
+                       :show-all-levels="false"
+                       @change="handleChangeScope"></el-cascader>
         </el-form-item>
 
         <el-form-item label="经办人"
-                      prop="contact"
+                      prop="principalName"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人姓名"
-                    v-model="formData.contact">
+                    v-model="formData.principalName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
-                      prop="contactMobile"
+                      prop="principalConcat"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人电话"
-                    v-model="formData.contactMobile">
+                    v-model="formData.principalConcat">
           </el-input>
         </el-form-item>
 
         <el-form-item label="服务时间"
+                      label-width="150px"
                       prop="serviceTimeStart">
           <el-date-picker v-model="formData.serviceTimeStart"
                           :picker-options="startPickerOptions"
                           class="item_width_2"
-                          size="small"
                           type="date"
                           value-format="yyyy-MM-dd"
                           value="yyyy-MM-dd"
@@ -105,7 +109,6 @@
           <el-date-picker v-model="formData.serviceTimeEnd"
                           :picker-options="endPickerOptions"
                           class="item_width_2 data-tag"
-                          size="small"
                           type="date"
                           value-format="yyyy-MM-dd"
                           value="yyyy-MM-dd"
@@ -125,153 +128,17 @@
                     placeholder="请输入备注，不超过500字"
                     v-model="formData.remark"></el-input>
         </el-form-item>
-
-      </el-form>
-
-      <h3>反馈内容</h3>
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               :disabled="formType === 'detail'"
-               class="form">
-
-        <el-form-item label="分类"
-                      prop="type"
-                      label-width="150px"
-                      style="display: block">
-          <el-select class="item_width_1"
-                     v-model="formData.type"
-                     placeholder="请选择"
-                     filterable
-                     clearable>
-            <el-option v-for="item in typeList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-
-        <el-form-item label="单位名称"
-                      prop="unitName"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入单位名称"
-                    v-model="formData.unitName">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="服务事项"
-                      prop="serviceMatterList"
-                      label-width="150px"
-                      style="display: block">
-          <el-checkbox-group class="item_width_1"
-                             style="display:flex;flex-wrap:wrap"
-                             v-model="formData.serviceMatterList">
-            <el-checkbox v-for="item in serviceList"
-                         :key="item.value"
-                         :label="item.value">{{item.label}}</el-checkbox>
-
-          </el-checkbox-group>
-
-        </el-form-item>
-        <el-form-item label="联系人"
-                      prop="contact"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人姓名"
-                    v-model="formData.contact">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="联系电话"
-                      prop="contactMobile"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人电话"
-                    v-model="formData.contactMobile">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="在职党员"
-                      style="display: block"
-                      prop="memberCount"
-                      label-width="150px">
-          <el-input-number class="item_width_4"
-                           v-model="formData.memberCount"
-                           :min="0"
-                           :max="9999"
-                           label="在职党员"></el-input-number>
-        </el-form-item>
-        <el-form-item label="备注"
+        <el-form-item label="直接反馈"
                       prop="remark"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    maxlength="500"
-                    show-word-limit
-                    :rows="3"
-                    placeholder="请输入备注，不超过500字"
-                    v-model="formData.remark"></el-input>
-        </el-form-item>
-        <el-form-item label="位置坐标"
-                      prop="longitude"
-                      label-width="150px"
-                      style="display: block">
-          <div style="width:500px">
-
-            <div class="div_map">
-              <div id="app">
-
-              </div>
-              <div class="div_searchmap">
-                <el-input class="item_width_4"
-                          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 style="margin-top: 10px">
-              <span>经度</span>
-              <el-input class="item_width_3"
-                        maxlength="50"
-                        placeholder="请输入经度"
-                        v-model="formData.longitude">
-              </el-input>
-              <span style="margin-left: 20px">纬度</span>
-              <el-input class="item_width_3"
-                        maxlength="50"
-                        placeholder="请输入纬度"
-                        v-model="formData.latitude">
-              </el-input>
-            </div>
-          </div>
+          <el-checkbox :label="'是'"
+                       v-model="showFeedback"
+                       @change="handleChangeFeedback"></el-checkbox>
         </el-form-item>
 
-        <el-form-item label="地理位置"
-                      prop="address"
-                      label-width="150px"
-                      style="display: block">
-
-          <el-input class="item_width_1"
-                    v-model="formData.address">
-          </el-input>
-
-        </el-form-item>
       </el-form>
+
     </div>
 
     <div class="div_btn">
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index d9ad515a..c96b532f 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -198,7 +198,7 @@
                          size="small"
                          class="div-table-button--edit">反馈</el-button>
               <el-button v-if="scope.row.serviceStatus==='in_service'"
-                         @click="handleCancel(scope.row)"
+                         @click="handleDel(scope.row)"
                          type="text"
                          size="small"
                          class="div-table-button--delete">取消</el-button>
@@ -225,7 +225,7 @@
                :visible.sync="showAdd"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="'新增记录'"
+               :title="addDiaTitle"
                width="850px"
                top="5vh"
                class="dialog-h"
@@ -241,7 +241,7 @@
     <el-dialog :visible.sync="showDetail"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="'记录详情'"
+               :title="detailDiaTitle"
                width="850px"
                top="5vh"
                class="dialog-h"
@@ -340,7 +340,9 @@ export default {
       showAdd: false,
       showDetail: false,
       showFeedback: false,
-      formType: 'add'
+      formType: 'add',
+      addDiaTitle: '发起服务',
+      detailDiaTitle: '服务详情',
 
     };
   },
@@ -394,6 +396,7 @@ export default {
 
 
     async handleAdd () {
+      this.addDiaTitle = '发起服务'
       this.formType = 'add'
       this.showAdd = true;
     },
@@ -401,27 +404,22 @@ export default {
     async handleDetail (row) {
       this.serviceRecordId = row.serviceRecordId
       this.formType = 'detail'
-      // this.showDetail = true
-      this.showAdd = true;
+      this.showDetail = true
+
+    },
+    async handleEdit (row) {
+      this.serviceRecordId = row.serviceRecordId
+      this.formType = 'edit'
+      this.showDetail = true
+
     },
 
     //加载组织数据
     async handleDispose (row) {
       this.serviceRecordId = row.serviceRecordId
-      const url = "/gov/project/icEvent/detail";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
-
-      const { data, code, msg } = await requestPost(url, {
-        serviceRecordId: this.serviceRecordId,
-      });
-
-      if (code === 0) {
-
-        this.eventDetailData = { ...data };
-
-      } else {
-        this.$message.error(msg);
-      }
+      this.addDiaTitle = '服务反馈'
+      this.formType = 'dispose'
+      this.showAdd = true;
     },
 
 
@@ -444,18 +442,15 @@ export default {
       this.getTableData();
     },
 
-    async handleDel (rowData, rowIndex) {
-      console.log(rowData, rowIndex);
-      const url =
-        "/heart/iccommunityselforganization/delcommunityselforganization";
-      const { tableData } = this;
+    async handleDel (row) {
+      this.serviceRecordId = row.serviceRecordId
+      const url = "/heart/icServiceProject/service/cancel/" + row.serviceRecordId;
 
-      const { data, code, msg } = await requestPost(url, {
-        orgId: tableData[rowIndex].orgId,
-      });
+
+      const { data, code, msg } = await requestPost(url, {});
 
       if (code === 0) {
-        this.$message.success("删除成功！");
+        this.$message.success("取消成功！");
         this.getTableData();
       } else {
         this.$message.error("操作失败！");