diff --git a/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue b/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
index a9d144b1..96ee1ecb 100644
--- a/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
@@ -29,7 +29,7 @@
             >
             </el-option>
           </el-select>
-          <div v-else>{{ fmData.serviceCategory }}</div>
+          <div v-else>{{ fmData.serviceCategory || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -47,7 +47,7 @@
             v-model="fmData.serviceName"
           >
           </el-input>
-          <div v-else>{{ fmData.serviceName }}</div>
+          <div v-else>{{ fmData.serviceName || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -66,7 +66,7 @@
             placeholder="请输入服务内容，不超过1000字"
             v-model="fmData.serviceContent"
           ></el-input>
-          <div v-else>{{ fmData.serviceContent }}</div>
+          <div v-else>{{ fmData.serviceContent || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -89,7 +89,7 @@
             >
             </el-option>
           </el-select>
-          <div v-else>{{ fmData.policyLevelName }}</div>
+          <div v-else>{{ fmData.policyLevelName || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -108,7 +108,7 @@
             placeholder="请输入政策依据，不超过1000字"
             v-model="fmData.policyGround"
           ></el-input>
-          <div v-else>{{ fmData.policyGround }}</div>
+          <div v-else>{{ fmData.policyGround || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -118,30 +118,17 @@
           prop="attachmentList"
         >
           <el-upload
-            v-if="formType == 'add' || formType == 'edit'"
             class="avatar-uploader"
             :action="uploadUrl"
             :data="{ customerId: customerId }"
             :show-file-list="true"
+            :file-list="fmData.attachmentList"
             :on-success="handleImgSuccess"
             :on-remove="handleImgRemove"
             :before-upload="beforeImgUpload"
           >
             <i class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
-          <div v-else>
-            <div class="attachement-list">
-              <a
-                :href="att.url"
-                target="_blank"
-                :key="att.url"
-                v-for="att in this.fmData.attachmentList"
-              >
-                <i class="el-icon-folder-opened"></i>
-                {{ att.name }}
-              </a>
-            </div>
-          </div>
         </el-form-item>
       </el-form>
     </div>
@@ -241,7 +228,7 @@ export default {
   methods: {
     async initForm() {
       this.getCategoryOpitons();
-      if (this.formId) {
+      if (this.formId && this.formType != "add") {
         this.getInfo();
       }
     },
@@ -255,7 +242,7 @@ export default {
 
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
-        this.info = { ...this.info, ...data };
+        this.fmData = { ...this.fmData, ...data };
       } else {
         this.$message.error(msg);
       }
@@ -328,6 +315,11 @@ export default {
           (item) => item.url == file.response.data.url
         );
         this.fmData.attachmentList.splice(index, 1);
+      } else if (file.url) {
+        let index = this.fmData.attachmentList.findIndex(
+          (item) => item.url == file.url
+        );
+        this.fmData.attachmentList.splice(index, 1);
       }
     },
 
diff --git a/src/views/modules/communityService/fuwuxiangmu/index.vue b/src/views/modules/communityService/fuwuxiangmu/index.vue
index 35941109..1ef96efa 100644
--- a/src/views/modules/communityService/fuwuxiangmu/index.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/index.vue
@@ -151,7 +151,7 @@
             fixed="right"
             label="操作"
             align="center"
-            width="100"
+            width="200"
           >
             <template slot-scope="scope">
               <el-button
@@ -162,19 +162,27 @@
                 >查看</el-button
               >
               <el-button
-                @click="handleDispose(scope.row)"
+                @click="handleEdit(scope.row)"
                 type="text"
                 size="small"
                 class="div-table-button--edit"
                 >编辑</el-button
               >
-              <el-button
-                @click="handleDelete(scope.row)"
-                type="text"
-                size="small"
-                class="div-table-button--delete"
-                >删除</el-button
+
+              <el-popconfirm
+                title="删除之后无法回复，确认删除？"
+                @onConfirm="handleDelete(scope.row, scope.$index)"
+                @confirm="handleDelete(scope.row, scope.$index)"
               >
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="small"
+                  style="margin-left: 10px"
+                  class="div-table-button--delete"
+                  >删除</el-button
+                >
+              </el-popconfirm>
             </template>
           </el-table-column>
         </el-table>
@@ -196,6 +204,7 @@
 
     <!-- 修改弹出框 -->
     <el-dialog
+      v-if="formShow"
       :visible.sync="formShow"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -274,6 +283,7 @@ export default {
 
     this.agencyId = this.user.agencyId;
 
+    this.getCategoryOpitons();
     this.getTableData();
   },
   methods: {
@@ -334,7 +344,7 @@ export default {
     handleEdit(row) {
       this.formType = "edit";
       this.formId = row.serviceProjectId;
-      this.formTitle = "查看";
+      this.formTitle = "编辑";
       this.formShow = true;
     },
 
@@ -347,7 +357,7 @@ export default {
       this.getTableData();
     },
 
-    async handleDel(rowData, rowIndex) {
+    async handleDelete(rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url = "/heart/icServiceProject/serviceProjectEnabled";
       const { tableData } = this;
diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
index 1ef0f5eb..65444c3d 100644
--- a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
@@ -16,7 +16,7 @@
           style="display: block"
         >
           <el-select
-            v-if="formType == 'add'"
+            v-if="formType == 'add' || formType == 'edit'"
             v-model="fmData.serviceTypeArr"
             placeholder="请选择"
             clearable
@@ -48,7 +48,7 @@
             v-model="fmData.orgName"
           >
           </el-input>
-          <div v-else>{{ fmData.orgName }}</div>
+          <div v-else>{{ fmData.orgName || '--' }}</div>
         </el-form-item>
 
         <el-form-item
@@ -67,7 +67,7 @@
             placeholder="请输入服务内容，不超过1000字"
             v-model="fmData.orgDescribe"
           ></el-input>
-          <div v-else>{{ fmData.orgDescribe }}</div>
+          <div v-else>{{ fmData.orgDescribe || '--' }}</div>
         </el-form-item>
 
         <el-form-item
@@ -84,7 +84,7 @@
             placeholder="请输入负责人姓名"
             v-model="fmData.principalName"
           ></el-input>
-          <div v-else>{{ fmData.principalName }}</div>
+          <div v-else>{{ fmData.principalName || '--' }}</div>
         </el-form-item>
 
         <el-form-item
@@ -101,7 +101,7 @@
             placeholder="请输入联系方式"
             v-model="fmData.principalMobile"
           ></el-input>
-          <div v-else>{{ fmData.principalMobile }}</div>
+          <div v-else>{{ fmData.principalMobile || '--' }}</div>
         </el-form-item>
 
         <el-form-item
@@ -154,6 +154,7 @@
           style="display: block"
         >
           <el-input
+            v-if="formType == 'add' || formType == 'edit'"
             class="item_width_1"
             type="textarea"
             maxlength="500"
@@ -162,6 +163,7 @@
             placeholder="请输入备注，不超过500字"
             v-model="fmData.remark"
           ></el-input>
+          <div v-else>{{ fmData.remark || '--' }}</div>
         </el-form-item>
       </el-form>
     </div>
@@ -254,7 +256,8 @@ export default {
     async initForm() {
       this.initMap();
       this.getCategoryOpitons();
-      if (this.formId) {
+
+      if (this.formId && this.formType != "add") {
         this.getInfo();
       }
     },
@@ -347,8 +350,8 @@ export default {
 
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
-        this.info = {
-          ...this.info,
+        this.fmData = {
+          ...this.fmData,
           ...data,
           serviceTypeArr: data.serviceType.split(","),
         };
diff --git a/src/views/modules/communityService/fuwuzuzhi/index.vue b/src/views/modules/communityService/fuwuzuzhi/index.vue
index 7fe8f503..d51cc0f5 100644
--- a/src/views/modules/communityService/fuwuzuzhi/index.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/index.vue
@@ -143,6 +143,7 @@
             prop="principalMobile"
             align="center"
             label="联系方式"
+            width="90"
             :show-overflow-tooltip="true"
           >
           </el-table-column>
@@ -151,7 +152,7 @@
             fixed="right"
             label="操作"
             align="center"
-            width="100"
+            width="200"
           >
             <template slot-scope="scope">
               <el-button
@@ -162,19 +163,26 @@
                 >查看</el-button
               >
               <el-button
-                @click="handleDispose(scope.row)"
+                @click="handleEdit(scope.row)"
                 type="text"
                 size="small"
                 class="div-table-button--edit"
                 >编辑</el-button
               >
-              <el-button
-                @click="handleDelete(scope.row)"
-                type="text"
-                size="small"
-                class="div-table-button--delete"
-                >删除</el-button
+              <el-popconfirm
+                title="删除之后无法回复，确认删除？"
+                @onConfirm="handleDelete(scope.row, scope.$index)"
+                @confirm="handleDelete(scope.row, scope.$index)"
               >
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="small"
+                  style="margin-left: 10px"
+                  class="div-table-button--delete"
+                  >删除</el-button
+                >
+              </el-popconfirm>
             </template>
           </el-table-column>
         </el-table>
@@ -196,6 +204,7 @@
 
     <!-- 修改弹出框 -->
     <el-dialog
+      v-if="formShow"
       :visible.sync="formShow"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -280,6 +289,8 @@ export default {
     handleSearch(val) {
       console.log(this.searchData);
       this.pageNo = 1;
+
+      this.getCategoryOpitons();
       this.getTableData();
     },
 
@@ -334,7 +345,7 @@ export default {
     handleEdit(row) {
       this.formType = "edit";
       this.formId = row.icServiceOrgId;
-      this.formTitle = "查看";
+      this.formTitle = "编辑";
       this.formShow = true;
     },
 
@@ -347,14 +358,14 @@ export default {
       this.getTableData();
     },
 
-    async handleDel(rowData, rowIndex) {
+    async handleDelete(rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url = "/heart/icServiceOrg/del";
       const { tableData } = this;
 
-      const { data, code, msg } = await requestPost(url, [
-        tableData[rowIndex].serviceProjectId,
-      ]);
+      const { data, code, msg } = await requestPost(url, {
+        icServiceOrgId: tableData[rowIndex].icServiceOrgId,
+      });
 
       if (code === 0) {
         this.$message.success("删除成功！");