diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
index d9079db12..bb478d401 100644
--- a/src/views/modules/communityService/commonDemand/addForm.vue
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -197,22 +197,30 @@
         </el-form-item>
 
         <el-form-item label="指派服务" label-width="150px">
-          <el-switch v-model="formData.assignSwitch" @change="handelDisabledRules"> </el-switch>
+          <el-switch
+            v-model="formData.assignSwitch"
+            @change="handelDisabledRules"
+          >
+          </el-switch>
         </el-form-item>
 
         <el-form-item
           label="查找享受服务人员"
           prop="resiSearchTagId"
           :class="{ 'form-item': source === 'visiual' }"
-           label-width="150px"
+          label-width="150px"
           style="display: block"
           v-if="formData.assignSwitch"
         >
-         <input type="text" v-model="formData.resiSearchTagId" v-show="false">
-          <template  v-if="formData.resiSearchTagName">
-            <el-tag   @close="handleCloseTag"  closable  style="margin-right:10px;">
-            {{ formData.resiSearchTagName }}
-          </el-tag>
+          <input
+            type="text"
+            v-model="formData.resiSearchTagId"
+            v-show="false"
+          />
+          <template v-if="formData.resiSearchTagName">
+            <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
+              {{ formData.resiSearchTagName }}
+            </el-tag>
           </template>
 
           <el-button type="primary" @click="handleClickLabel" size="mini">
@@ -344,7 +352,7 @@
             prop="serviceStatus"
           >
             <span>已完成</span> -->
-            <!-- <el-select class="item_width_1"
+          <!-- <el-select class="item_width_1"
                          v-model="feedbackFormData.serviceStatus"
                          placeholder="全部"
                          clearable>
@@ -384,7 +392,7 @@
             label-width="150px"
             style="display: block"
           >
-          <el-input
+            <el-input
               class="item_width_1"
               type="textarea"
               maxlength="1000"
@@ -392,7 +400,6 @@
               :rows="3"
               v-model="feedbackFormData.serviceGoal"
             ></el-input>
-           
           </el-form-item>
           <!-- <el-form-item label="详细位置" label-width="150px">
              <el-input
@@ -574,11 +581,11 @@ export default {
       if (this.formData.serviceTimeStart) {
         let serviceTimeStart = new Date(this.formData.serviceTimeStart);
         return (
-          time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
-          time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
+          time.getTime() < serviceTimeStart - 24 * 60 * 60 * 1000 ||
+          time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000
         );
       } else {
-        return (time.getTime() > nowData || time.getTime() === nowData) ;
+        return time.getTime() > nowData || time.getTime() === nowData;
       }
     };
     let startDisabledDate = (time) => {
@@ -587,7 +594,6 @@ export default {
       return time.getTime() < nowData;
     };
 
-
     return {
       // 公共服务分类
       serviceTypesLevel1: [],
@@ -613,8 +619,8 @@ export default {
         serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
         serviceCategoryKey: "",
         assignSwitch: false,
-        resiSearchTagId:"",//查找享受服务人员
-        resiSearchTagName:"",//享受服务人员名称
+        resiSearchTagId: "", //查找享受服务人员
+        resiSearchTagName: "", //享受服务人员名称
         serviceName: "", //服务名称
         serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
         serviceOrgId: "", //服务组织Id
@@ -689,7 +695,6 @@ export default {
   },
 
   computed: {
-
     feedbackDataRule() {
       return {
         // serviceGoal: [
@@ -711,9 +716,9 @@ export default {
         address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
       };
     },
-    dataRule(){
-        return {
-          serviceTypeLevel2Id: [
+    dataRule() {
+      return {
+        serviceTypeLevel2Id: [
           { required: true, message: "政策类型不能为空", trigger: "change" },
         ],
         serviceName: [
@@ -729,11 +734,14 @@ export default {
         objList: [
           { required: true, message: "服务范围不能为空", trigger: "change" },
         ],
-        resiSearchTagId:[
-          { required: true, message: "享受服务人员不能为空", trigger: "change"  }
-        ]
-        }
-     
+        resiSearchTagId: [
+          {
+            required: true,
+            message: "享受服务人员不能为空",
+            trigger: "change",
+          },
+        ],
+      };
     },
   },
 
@@ -787,12 +795,18 @@ export default {
   },
 
   methods: {
-    handelDisabledRules(v){
-      if(!v){
-        delete this.dataRule.resiSearchTagId
-      }else{
-        var arr = [{ required: true, message: "享受服务人员不能为空", trigger: "change" }]
-        this.dataRule.resiSearchTagId = arr
+    handelDisabledRules(v) {
+      if (!v) {
+        delete this.dataRule.resiSearchTagId;
+      } else {
+        var arr = [
+          {
+            required: true,
+            message: "享受服务人员不能为空",
+            trigger: "change",
+          },
+        ];
+        this.dataRule.resiSearchTagId = arr;
       }
       console.log(this.dataRule);
     },
@@ -840,9 +854,9 @@ export default {
     addFormCancle() {
       this.showLabelForm = false;
     },
-    handleCloseTag(){
-      this.formData.resiSearchTagId ='';
-      this.formData.resiSearchTagName = '';
+    handleCloseTag() {
+      this.formData.resiSearchTagId = "";
+      this.formData.resiSearchTagName = "";
     },
     async iniDefaultData() {
       const { defaultData } = this;
@@ -1062,7 +1076,12 @@ export default {
       } else {
         this.formData.feedback = null;
       }
-
+      this.formData.resiSearchTagId = this.assignSwitch
+        ? this.formData.resiSearchTagId
+        : "";
+      this.formData.resiSearchTagName = this.assignSwitch
+        ? this.formData.resiSearchTagName
+        : "";
       console.log(this.formData);
       // return false
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
diff --git a/src/views/modules/communityService/commonDemand/editForm.vue b/src/views/modules/communityService/commonDemand/editForm.vue
index 6e2c7b97f..4db9b3abd 100644
--- a/src/views/modules/communityService/commonDemand/editForm.vue
+++ b/src/views/modules/communityService/commonDemand/editForm.vue
@@ -1,19 +1,21 @@
 <template>
-    <div>
-      <div class="dialog-h-content scroll-h">
-
-        <el-form ref="ref_form"
-                 :inline="true"
-                 :model="formData"
-                 :rules="dataRule"
-                 class="div_form">
-
-          <el-form-item label="服务名称"
-                        prop="serviceName"
-                        label-width="150px"
-                        style="display: block">
-            <span>{{formData.serviceName}}</span>
-            <!-- <el-select class="item_width_1"
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="formData"
+        :rules="dataRule"
+        class="div_form"
+      >
+        <el-form-item
+          label="服务名称"
+          prop="serviceName"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ formData.serviceName }}</span>
+          <!-- <el-select class="item_width_1"
                        v-model="formData.serviceProjectId"
                        placeholder="请选择"
                        filterable
@@ -25,14 +27,15 @@
                          :value="item.serviceProjectId">
               </el-option>
             </el-select> -->
-
-          </el-form-item>
-          <el-form-item label="服务组织"
-                        prop="serviceOrgId"
-                        label-width="150px"
-                        style="display: block">
-            <span>{{serviceOrgName}}</span>
-            <!-- <el-select class="item_width_1"
+        </el-form-item>
+        <el-form-item
+          label="服务组织"
+          prop="serviceOrgId"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ serviceOrgName }}</span>
+          <!-- <el-select class="item_width_1"
                        v-model="formData.serviceOrgId"
                        placeholder="请选择"
                        filterable
@@ -43,18 +46,18 @@
                          :value="item.icServiceOrgId">
               </el-option>
             </el-select> -->
+        </el-form-item>
 
-          </el-form-item>
-
-          <el-form-item label="服务范围"
-                        prop="gridIdList"
-                        label-width="150px"
-                        style="display: block">
-            <div v-for="item in formData.gridIdList"
-                 :key="item.objectId">
-              <div>{{item.objectName}}</div>
-            </div>
-            <!-- <el-cascader class="item_width_1"
+        <el-form-item
+          label="服务范围"
+          prop="gridIdList"
+          label-width="150px"
+          style="display: block"
+        >
+          <div v-for="item in formData.gridIdList" :key="item.objectId">
+            <div>{{ item.objectName }}</div>
+          </div>
+          <!-- <el-cascader class="item_width_1"
                          ref="myCascader"
                          v-model="scopeIdArray"
                          :key="iscascaderShow"
@@ -62,165 +65,207 @@
                          :props="optionProps"
                          :show-all-levels="false"
                          @change="handleChangeScope"></el-cascader> -->
-          </el-form-item>
+        </el-form-item>
 
-          <el-form-item label="政策依据"
-                        prop="policyId"
-                        label-width="150px"
-                        style="display: block">
-            <el-select :disabled="formType==='detail'"
-                       v-model="formData.policyId"
-                       class="input-width-small"
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in policyList"
-                         :key="item.policyId"
-                         :label="item.title"
-                         :value="item.policyId">
-              </el-option>
-            </el-select>
-<!-- 
+        <el-form-item
+          label="政策依据"
+          prop="policyId"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            :disabled="formType === 'detail'"
+            v-model="formData.policyId"
+            class="input-width-small"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in policyList"
+              :key="item.policyId"
+              :label="item.title"
+              :value="item.policyId"
+            >
+            </el-option>
+          </el-select>
+          <!-- 
             <el-button style="margin-left: 10px"
                        type="primary"
                        size="small"
                        @click="handlePersonList">预览</el-button> -->
-          </el-form-item>
+        </el-form-item>
 
-          <el-form-item label="经办人"
-                        prop="principalName"
-                        label-width="150px"
-                        style="display: block">
-            <el-input :disabled="formType==='detail'"
-                      class="item_width_1"
-                      placeholder="请输入经办人姓名"
-                      v-model="formData.principalName">
-            </el-input>
-          </el-form-item>
-          <el-form-item label="联系方式"
-                        prop="principalContact"
-                        label-width="150px"
-                        style="display: block">
-            <el-input :disabled="formType==='detail'"
-                      class="item_width_1"
-                      placeholder="请输入联系方式"
-                      v-model="formData.principalContact">
-            </el-input>
-          </el-form-item>
-          <el-form-item label="指派服务" label-width="150px">
-             <el-switch v-model="assignSwitch"> </el-switch>
-           </el-form-item>
+        <el-form-item
+          label="经办人"
+          prop="principalName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            :disabled="formType === 'detail'"
+            class="item_width_1"
+            placeholder="请输入经办人姓名"
+            v-model="formData.principalName"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          label="联系方式"
+          prop="principalContact"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            :disabled="formType === 'detail'"
+            class="item_width_1"
+            placeholder="请输入联系方式"
+            v-model="formData.principalContact"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="指派服务" label-width="150px">
+          <el-switch v-model="assignSwitch"> </el-switch>
+        </el-form-item>
 
-            <el-form-item
-            label="查找享受服务人员"
-            prop="principalContact"
-            label-width="150px"
-            style="display: block"
-            v-show="this.assignSwitch"
-             >
-             <input type="text" v-model="formData.resiSearchTagId" v-show="false">
-              <template  v-if="this.resiSearchTagName">
-                <el-tag   @close="handleCloseTag"  closable style="margin-right:10px;">
-                {{this.resiSearchTagName }}
-              </el-tag>
-              </template>
+        <el-form-item
+          label="查找享受服务人员"
+          prop="resiSearchTagId"
+          label-width="150px"
+          style="display: block"
+          v-if="this.assignSwitch"
+        >
+          <input
+            type="text"
+            v-model="formData.resiSearchTagId"
+            v-show="false"
+          />
+          <template v-if="this.resiSearchTagName">
+            <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
+              {{ this.resiSearchTagName }}
+            </el-tag>
+          </template>
 
           <el-button type="primary" @click="handleClickLabel" size="mini">
             <span> <i class="el-icon-plus"></i> 按标签查找 </span>
           </el-button>
         </el-form-item>
-          <el-form-item label="服务时间"
-                        label-width="150px"
-                        prop="serviceTimeStart"
-                        style="display: block">
-            <el-date-picker :disabled="formType==='detail'"
-                            v-model="formData.serviceTimeStart"
-                            :picker-options="startPickerOptions"
-                            class="item_width_2"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            value="yyyy-MM-dd"
-                            placeholder="开始时间">
-            </el-date-picker>
-            <span class="u-data-tag">至</span>
-            <el-date-picker :disabled="formType==='detail'"
-                            v-model="formData.serviceTimeEnd"
-                            :picker-options="endPickerOptions"
-                            class="item_width_2 u-data-tag"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            value="yyyy-MM-dd"
-                            placeholder="结束时间">
-            </el-date-picker>
-          </el-form-item>
+        <el-form-item
+          label="服务时间"
+          label-width="150px"
+          prop="serviceTimeStart"
+          style="display: block"
+        >
+          <el-date-picker
+            :disabled="formType === 'detail'"
+            v-model="formData.serviceTimeStart"
+            :picker-options="startPickerOptions"
+            class="item_width_2"
+            type="date"
+            value-format="yyyy-MM-dd"
+            value="yyyy-MM-dd"
+            placeholder="开始时间"
+          >
+          </el-date-picker>
+          <span class="u-data-tag">至</span>
+          <el-date-picker
+            :disabled="formType === 'detail'"
+            v-model="formData.serviceTimeEnd"
+            :picker-options="endPickerOptions"
+            class="item_width_2 u-data-tag"
+            type="date"
+            value-format="yyyy-MM-dd"
+            value="yyyy-MM-dd"
+            placeholder="结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
 
-          <el-form-item label="服务内容"
-                        prop="remark"
-                        label-width="150px"
-                        style="display: block">
-            <el-input :disabled="formType==='detail'"
-                      class="item_width_1"
-                      type="textarea"
-                      maxlength="500"
-                      show-word-limit
-                      :rows="3"
-                      placeholder="请输入服务内容，不超过500字"
-                      v-model="formData.remark"></el-input>
+        <el-form-item
+          label="服务内容"
+          prop="remark"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            :disabled="formType === 'detail'"
+            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>
+
+      <div v-show="formData.serviceStatus === 'completed'">
+        <h3 class="d-h3">反馈内容</h3>
+
+        <el-form
+          ref="ref_form_feedback"
+          :inline="true"
+          :disabled="true"
+          :model="feedbackFormData"
+          class="div_form"
+        >
+          <el-form-item
+            label="服务目标"
+            prop="serviceGoal"
+            label-width="150px"
+            style="display: block"
+          >
+            <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>
-
-        <div v-show="formData.serviceStatus==='completed'">
-          <h3 class="d-h3">反馈内容</h3>
+          <el-form-item
+            label="服务效果"
+            prop="serviceEffect"
+            label-width="150px"
+            style="display: block"
+          >
+            <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 ref="ref_form_feedback"
-                   :inline="true"
-                   :disabled="true"
-                   :model="feedbackFormData"
-                   class="div_form">
+          <el-form-item
+            label="服务人数"
+            style="display: block"
+            prop="servicePeopleNumber"
+            label-width="150px"
+          >
+            <el-input-number
+              class="item_width_2"
+              v-model="feedbackFormData.servicePeopleNumber"
+              :min="0"
+              :max="9999"
+              label="服务人数"
+            ></el-input-number>
+          </el-form-item>
 
-            <el-form-item label="服务目标"
-                          prop="serviceGoal"
-                          label-width="150px"
-                          style="display: block">
-              <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">
-              <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">
-              <el-input-number class="item_width_2"
-                               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"
+          <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>
@@ -230,32 +275,40 @@
                            :value="item.value">
                 </el-option>
               </el-select> -->
-
-            </el-form-item>
-            <el-form-item label="满意度"
-                          style="display: block"
-                          label-width="150px"
-                          prop="satisfaction">
-              <el-select class="item_width_2"
-                         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">
-              <el-input class="item_width_1"
-                        v-model="feedbackFormData.address"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="地图位置"
+          </el-form-item>
+          <el-form-item
+            label="满意度"
+            style="display: block"
+            label-width="150px"
+            prop="satisfaction"
+          >
+            <el-select
+              class="item_width_2"
+              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"
+          >
+            <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">
@@ -280,11 +333,13 @@
               </div>
             </el-form-item> -->
 
-            <el-form-item class="block"
-                          label="附件"
-                          label-width="150px"
-                          prop="attach">
-              <!-- <el-upload :headers="$getElUploadHeaders()"  v-if="feedbackFormData.fileList&&feedbackFormData.fileList.length>0"
+          <el-form-item
+            class="block"
+            label="附件"
+            label-width="150px"
+            prop="attach"
+          >
+            <!-- <el-upload :headers="$getElUploadHeaders()"  v-if="feedbackFormData.fileList&&feedbackFormData.fileList.length>0"
                          class="upload-demo"
                          :on-preview="handleFileDownload"
                          accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
@@ -292,51 +347,63 @@
                          :file-list="fileList">
 
               </el-upload> -->
-              <div v-if="feedbackFormData.fileList&&feedbackFormData.fileList.length>0"
-                   class="attachement-list">
-                <a :href="att.url"
-                   target="_blank"
-                   :key="att.url"
-                   v-for="att in feedbackFormData.fileList">
-                  <i class="el-icon-folder-opened"></i>
-                  {{ att.name }}
-                </a>
-              </div>
-              <span v-else>无附件</span>
-            </el-form-item>
-          </el-form>
-        </div>
-
+            <div
+              v-if="
+                feedbackFormData.fileList &&
+                feedbackFormData.fileList.length > 0
+              "
+              class="attachement-list"
+            >
+              <a
+                :href="att.url"
+                target="_blank"
+                :key="att.url"
+                v-for="att in feedbackFormData.fileList"
+              >
+                <i class="el-icon-folder-opened"></i>
+                {{ att.name }}
+              </a>
+            </div>
+            <span v-else>无附件</span>
+          </el-form-item>
+        </el-form>
       </div>
+    </div>
 
-      <div class="div_btn">
-        <el-button size="small"
-                   @click="handleCancle">取 消</el-button>
-        <el-button size="small"
-                   v-if="formType != 'detail'"
-                   type="primary"
-                   :disabled="btnDisable"
-                   @click="handleComfirm">确 定</el-button>
-      </div>
+    <div class="div_btn">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        size="small"
+        v-if="formType != 'detail'"
+        type="primary"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
+    </div>
 
-      <el-dialog v-if="showPersonList"
-                 :visible.sync="showPersonList"
-                 :append-to-body="true"
-                 :close-on-click-modal="false"
-                 :close-on-press-escape="false"
-                 :title="'标签查找'"
-                 width="1150px"
-                 top="5vh"
-                 class="dialog-h"
-                 @closed="showPersonList = false">
-        <person-list ref="ref_detail_form"
-                     :policyId="policyId"
-                     :ruleList="ruleList"
-                     @handleOk="handleOk"
-                     @handleClose="handleClose">
-        </person-list>
-      </el-dialog>
-      <el-dialog
+    <el-dialog
+      v-if="showPersonList"
+      :visible.sync="showPersonList"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'标签查找'"
+      width="1150px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showPersonList = false"
+    >
+      <person-list
+        ref="ref_detail_form"
+        :policyId="policyId"
+        :ruleList="ruleList"
+        @handleOk="handleOk"
+        @handleClose="handleClose"
+      >
+      </person-list>
+    </el-dialog>
+    <el-dialog
       v-if="showLabelForm"
       :visible.sync="showLabelForm"
       :append-to-body="true"
@@ -359,37 +426,37 @@
         @handleClose="handleClose" -->
       </label-form>
     </el-dialog>
-    </div>
-  </template>
+  </div>
+</template>
 
   <script>
-  import { mapGetters } from 'vuex'
-  import { Loading } from 'element-ui' // 引入Loading服务
-  import { requestPost } from '@/js/dai/request'
-  import personList from "../policy/personList";
-  import labelForm from "../labelConfig/addForm.vue";
-import { nextTick } from 'vue';
-
-  var map
-  var search
-  var markers
-  var infoWindowList
-  var geocoder // 新建一个正逆地址解析类
-
-  let loading // 加载动画
-  export default {
-    data () {
-      let endDisabledDate = (time) => {
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import personList from "../policy/personList";
+import labelForm from "../labelConfig/addForm.vue";
+import { nextTick } from "vue";
+
+var map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+
+let loading; // 加载动画
+export default {
+  data() {
+    let endDisabledDate = (time) => {
       //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
       let nowData = Date.now();
       if (this.formData.serviceTimeStart) {
         let serviceTimeStart = new Date(this.formData.serviceTimeStart);
         return (
-          time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
-          time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
+          time.getTime() < serviceTimeStart - 24 * 60 * 60 * 1000 ||
+          time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000
         );
       } else {
-        return (time.getTime() > nowData || time.getTime() === nowData) ;
+        return time.getTime() > nowData || time.getTime() === nowData;
       }
     };
     let startDisabledDate = (time) => {
@@ -398,432 +465,429 @@ import { nextTick } from 'vue';
       return time.getTime() < nowData;
     };
 
-      return {
-        btnDisable: false,
-
-        keyWords: '',
-        assignSwitch: true,
-        formData: {
-        },
-        showLabelForm: false,
-        resiSearchTagName:'',
-        feedbackFormData: {
-          serviceProjectId: '',//	服务项目id
-          serviceName: '',
-          serviceGoal: '',//	服务目标
-          serviceEffect: '',//	服务效果
-          servicePeopleNumber: null,//	服务人数
-          serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成
-          satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect
-          longitude: '',//	经度
-          latitude: '',//	维度
-          address: '',
-          fileList: [],//	附件列表
-        },
-        serviceList: [],//服务list
-
-        endPickerOptions: {
-          disabledDate: endDisabledDate
-        },
-        startPickerOptions: {
-          disabledDate: startDisabledDate
-        },
-        policyList: [],
-        projectList: [],
-        fileList: [],
-        uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
-
-        policyId: '',
-        showPersonList: false,
-        ruleList: []
-      }
-    },
-    components: { personList ,labelForm},
-    mounted () {
-      this.getPolicyList()
-      if (this.serviceRecordId) {//详情
-        this.loadInfo()
-      }
-      // this.initMap()
-
-    },
-
-
-    methods: {
-      //加载组织数据
-      async handlePersonList () {
-        if (!this.formData.policyId) {
-          this.$message.info('请先选择政策')
-          return false
-        }
-
-        this.policyId = this.formData.policyId
-        await this.loadRuleList()
-
-        this.showPersonList = true;
+    return {
+      btnDisable: false,
+
+      keyWords: "",
+      assignSwitch: false,
+      formData: {},
+      showLabelForm: false,
+      resiSearchTagName: "",
+      feedbackFormData: {
+        serviceProjectId: "", //	服务项目id
+        serviceName: "",
+        serviceGoal: "", //	服务目标
+        serviceEffect: "", //	服务效果
+        servicePeopleNumber: null, //	服务人数
+        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+        longitude: "", //	经度
+        latitude: "", //	维度
+        address: "",
+        fileList: [], //	附件列表
       },
+      serviceList: [], //服务list
 
-      async loadRuleList () {
-
-        const url = "/governance/policy/rulelist/" + this.policyId
-
-        let params = {}
-
-        const { data, code, msg } = await requestPost(url, params)
-
-        if (code === 0) {
-          this.ruleList = data
+      endPickerOptions: {
+        disabledDate: endDisabledDate,
+      },
+      startPickerOptions: {
+        disabledDate: startDisabledDate,
+      },
+      policyList: [],
+      projectList: [],
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+
+      policyId: "",
+      showPersonList: false,
+      ruleList: [],
+    };
+  },
+  components: { personList, labelForm },
+  mounted() {
+    this.getPolicyList();
+    if (this.serviceRecordId) {
+      //详情
+      this.loadInfo();
+    }
+    // this.initMap()
+  },
+
+  methods: {
+    //加载组织数据
+    async handlePersonList() {
+      if (!this.formData.policyId) {
+        this.$message.info("请先选择政策");
+        return false;
+      }
 
-        } else {
-          this.$message.error(msg)
-        }
+      this.policyId = this.formData.policyId;
+      await this.loadRuleList();
 
-      },
+      this.showPersonList = true;
+    },
 
-      handleClose () {
-        this.showPersonList = false
+    async loadRuleList() {
+      const url = "/governance/policy/rulelist/" + this.policyId;
 
+      let params = {};
 
-      },
-      handleOk () {
-        this.showPersonList = false
+      const { data, code, msg } = await requestPost(url, params);
 
+      if (code === 0) {
+        this.ruleList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
 
-      },
-      handleClickLabel() {
+    handleClose() {
+      this.showPersonList = false;
+    },
+    handleOk() {
+      this.showPersonList = false;
+    },
+    handleClickLabel() {
       this.showLabelForm = true;
       this.$nextTick(() => {
         this.$refs["ref_label_form"].initForm("info");
       });
     },
-      async getPolicyList () {
-        const url = '/governance/policy/policyListSelect'
-
-        let params = {}
-
-        const { data, code, msg } = await requestPost(url, params)
-
-        if (code === 0) {
-          this.policyList = data
-        } else {
-          this.$message.error(msg)
-        }
-      },
-      //加载组织
-      async loadInfo () {
-        const url = '/governance/icServiceRecordV2/detail'
-
-        let params = {
-          serviceRecordId: this.serviceRecordId
-        }
-
-        const { data, code, msg } = await requestPost(url, params)
-
-        if (code === 0) {
-          this.formData = { ...data }
-          this.formData.serviceRecordId = this.serviceRecordId
-          this.feedbackFormData = { ...data.feedback }
-          await this.getTagName()
-          this.fileList = []
-          if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
-            data.feedback.fileList.forEach(element => {
-              let obj = {
-                name: element.name,
-                format: element.format,
-                url: element.url,
-              }
-              this.fileList.push(obj)
-            });
-          }
+    async getPolicyList() {
+      const url = "/governance/policy/policyListSelect";
 
+      let params = {};
 
-        } else {
-          this.$message.error(msg)
-        }
-      },
-      async getTagName() {
-        const url = "/governance/resiSearchTag/listResiSearchTags";
-        let params = {
-          pageSize: 99,
-        };
-        let { data, msg, code } = await requestPost(url, params);
-        if (code == 0) {
-          let showAddProduct = data.list.filter(item=>{
-             return [this.formData.resiSearchTagId].includes(item.tagId)
-            })
-          this.resiSearchTagName = showAddProduct[0].tagName
-          this.assignSwitch = true
-        } else {
-          this.$message.error(msg);
-        }
-      },
-    
-      async handleComfirm () {
-
-        this.btnDisable = true
-        setTimeout(() => {
-          this.btnDisable = false
-        }, 10000)
-        this.$refs['ref_form'].validate((valid, messageObj) => {
-          if (!valid) {
-            app.util.validateRule(messageObj)
-            this.btnDisable = false
-          } else {
-            this.editFuwu()
-          }
+      const { data, code, msg } = await requestPost(url, params);
 
-        })
-
-
-      },
-      async editFuwu () {
-        const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
-        if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) {
-          this.btnDisable = false
-          this.$message({
-            type: 'warning',
-            message: '请输入正确的联系电话'
-          })
-          return false;
+      if (code === 0) {
+        this.policyList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    //加载组织
+    async loadInfo() {
+      const url = "/governance/icServiceRecordV2/detail";
+
+      let params = {
+        serviceRecordId: this.serviceRecordId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.formData = { ...data };
+        this.formData.serviceRecordId = this.serviceRecordId;
+        this.feedbackFormData = { ...data.feedback };
+        await this.getTagName();
+        this.fileList = [];
+        if (
+          data.feedback &&
+          data.feedback.fileList &&
+          data.feedback.fileList.length > 0
+        ) {
+          data.feedback.fileList.forEach((element) => {
+            let obj = {
+              name: element.name,
+              format: element.format,
+              url: element.url,
+            };
+            this.fileList.push(obj);
+          });
         }
-        console.log(this.formData);
-        let url = '/governance/icServiceRecordV2/edit'
-        // let url = "http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/update"
-
-
-        const { data, code, msg } = await requestPost(url, this.formData)
-
-        if (code === 0) {
-          this.$message({
-            type: 'success',
-            message: '操作成功'
-          })
-          this.resetData()
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getTagName() {
+      const url = "/governance/resiSearchTag/listResiSearchTags";
+      let params = {
+        pageSize: 99,
+      };
+      let { data, msg, code } = await requestPost(url, params);
+      if (code == 0) {
+        let showAddProduct = data.list.filter((item) => {
+          return [this.formData.resiSearchTagId].includes(item.tagId);
+        });
+        this.resiSearchTagName = showAddProduct[0].tagName;
+        this.assignSwitch = this.resiSearchTagName ? true : false;
+      } else {
+        this.$message.error(msg);
+      }
+    },
 
-          this.$emit('handleOk')
+    async handleComfirm() {
+      this.btnDisable = true;
+      setTimeout(() => {
+        this.btnDisable = false;
+      }, 10000);
+      this.$refs["ref_form"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
+          this.btnDisable = false;
         } else {
-          this.btnDisable = false
-          this.$message.error(msg)
+          this.editFuwu();
         }
+      });
+    },
+    async editFuwu() {
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
+      if (
+        this.formData.principalContact &&
+        regPhone.test(this.formData.principalContact) === false
+      ) {
+        this.btnDisable = false;
+        this.$message({
+          type: "warning",
+          message: "请输入正确的联系电话",
+        });
+        return false;
+      }
+      console.log(this.formData);
+      this.formData.resiSearchTagId = this.assignSwitch
+        ? this.formData.resiSearchTagId
+        : "";
+      this.formData.resiSearchTagName = this.assignSwitch
+        ? this.formData.resiSearchTagName
+        : "";
+      let url = "/governance/icServiceRecordV2/edit";
+      // let url = "http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/update"
+
+      const { data, code, msg } = await requestPost(url, this.formData);
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功",
+        });
+        this.resetData();
+
+        this.$emit("handleOk");
+      } else {
+        this.btnDisable = false;
+        this.$message.error(msg);
+      }
+    },
 
-      },
-
-      handleCancle () {
-        this.resetData()
-        this.$emit('handleClose')
-
-      },
-      addFormOk(val) {
+    handleCancle() {
+      this.resetData();
+      this.$emit("handleClose");
+    },
+    addFormOk(val) {
       this.showLabelForm = false;
       this.formData.resiSearchTagId = val.tagId;
       this.resiSearchTagName = val.tagName;
-      },
-      addFormCancle() {
-        this.showLabelForm = false;
-      },
-      handleCloseTag(){
-        this.resiSearchTagName = ''
-        this.formData.resiSearchTagId = ''
-      },
-      //下载
-      handleFileDownload (file) {
-
-        var a = document.createElement('a');
-        var event = new MouseEvent('click');
-        a.download = file.name;
-        console.log(a)
-        a.href = file.url;
-        a.dispatchEvent(event);
+    },
+    addFormCancle() {
+      this.showLabelForm = false;
+    },
+    handleCloseTag() {
+      this.resiSearchTagName = "";
+      this.formData.resiSearchTagId = "";
+    },
+    //下载
+    handleFileDownload(file) {
+      var a = document.createElement("a");
+      var event = new MouseEvent("click");
+      a.download = file.name;
+      console.log(a);
+      a.href = file.url;
+      a.dispatchEvent(event);
+    },
 
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap() {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519);
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById("app"), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45, // 设置地图旋转角度
+      });
 
-      },
+      search = new window.TMap.service.Search({ pageSize: 10 });
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: [],
+      });
+      infoWindowList = Array(10);
 
-      // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-      initMap () {
-        // 定义地图中心点坐标
-        var center = new window.TMap.LatLng(36.0722275, 120.38945519)
-        // 定义map变量，调用 TMap.Map() 构造函数创建地图
-        map = new window.TMap.Map(document.getElementById('app'), {
-          center: center, // 设置地图中心点坐标
-          zoom: 17.2, // 设置地图缩放级别
-          pitch: 43.5, // 设置俯仰角
-          rotation: 45 // 设置地图旋转角度
-        })
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
 
-        search = new window.TMap.service.Search({ pageSize: 10 })
-        // 新建一个地点搜索类
-        markers = new TMap.MultiMarker({
-          map: map,
-          geometries: []
-        })
-        infoWindowList = Array(10)
+      // 监听地图平移结束
+      map.on("panend", () => {
+        this.handleMoveCenter();
+      });
+      this.handleMoveCenter();
+      this.convert();
+    },
 
-        geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+    setMarker(lat, lng) {
+      markers.setGeometries([]);
+      markers.add([
+        {
+          id: "4",
+          styleId: "marker",
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: "marker4",
+          },
+        },
+      ]);
+    },
 
-        // 监听地图平移结束
-        map.on('panend', () => {
-          this.handleMoveCenter()
+    handleSearchMap() {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close();
+      });
+      infoWindowList.length = 0;
+      markers.setGeometries([]);
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchNearby({
+          keyword: this.keyWords,
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
-        this.handleMoveCenter()
-        this.convert()
-      },
-
-      setMarker (lat, lng) {
-        markers.setGeometries([])
-        markers.add([
-          {
-            id: '4',
-            styleId: 'marker',
-            position: new TMap.LatLng(lat, lng),
-            properties: {
-              title: 'marker4'
-            }
+        .then((result) => {
+          let { data } = result;
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng },
+            } = data[0];
+
+            map.setCenter(new TMap.LatLng(lat, lng));
+            this.setMarker(lat, lng);
+            this.formData.latitude = lat;
+            this.formData.longitude = lng;
+            this.convert();
+          } else {
+            this.$message.error("未检索到相关位置坐标");
           }
-        ])
-      },
+        });
+    },
 
-      handleSearchMap () {
-        infoWindowList.forEach((infoWindow) => {
-          infoWindow.close()
-        })
-        infoWindowList.length = 0
-        markers.setGeometries([])
-        // 在地图显示范围内以给定的关键字搜索地点
-        search
-          .searchNearby({
-            keyword: this.keyWords,
-            radius: 1000,
-            autoExtend: true,
-            center: map.getCenter(),
-          })
-          .then((result) => {
-            let { data } = result
-            if (Array.isArray(data) && data.length > 0) {
-              const {
-                location: { lat, lng }
-              } = data[0]
-
-
-              map.setCenter(new TMap.LatLng(lat, lng))
-              this.setMarker(lat, lng)
-              this.formData.latitude = lat
-              this.formData.longitude = lng
-              this.convert()
-            } else {
-              this.$message.error('未检索到相关位置坐标')
-            }
-          })
-      },
+    handleMoveCenter() {
+      //修改地图中心点
+      const center = map.getCenter();
+      const lat = center.getLat();
+      const lng = center.getLng();
+      this.formData.latitude = lat;
+      this.formData.longitude = lng;
+      this.setMarker(lat, lng);
+      this.convert(lat, lng);
+    },
 
-      handleMoveCenter () {
-        //修改地图中心点
-        const center = map.getCenter()
-        const lat = center.getLat()
-        const lng = center.getLng()
-        this.formData.latitude = lat
-        this.formData.longitude = lng
-        this.setMarker(lat, lng)
-        this.convert(lat, lng)
-      },
+    convert(lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(',');
+      let location;
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(
+          this.formData.latitude,
+          this.formData.longitude
+        );
+      }
 
-      convert (lat, lng) {
-        markers.setGeometries([]);
-        // var input = document.getElementById('location').value.split(',');
-        let location
-        if (lat && lng) {
-          location = new TMap.LatLng(lat, lng);
-        } else {
-          location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
-        }
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: "main", // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+          this.formData.address = result.result.address;
+          // 显示搜索到的地址
+        });
+    },
 
-        // map.setCenter(location);
-        markers.updateGeometries([
+    resetData() {
+      this.formData = {};
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+  computed: {
+    dataRule() {
+      return {
+        resiSearchTagId: [
           {
-            id: 'main', // 点标注数据数组
-            position: location,
+            required: true,
+            message: "享受服务人员不能为空",
+            trigger: "change",
           },
-        ]);
-        geocoder
-          .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-          .then((result) => {
-            this.formData.address = result.result.address
-            // 显示搜索到的地址
-          });
-      },
+        ],
 
-
-      resetData () {
-        this.formData = {}
-      },
-      // 开启加载动画
-      startLoading () {
-        loading = Loading.service({
-          lock: true, // 是否锁定
-          text: '正在加载……', // 加载中需要显示的文字
-          background: 'rgba(0,0,0,.7)' // 背景颜色
-        })
-      },
-      // 结束加载动画
-      endLoading () {
-        // clearTimeout(timer);
-        if (loading) {
-          loading.close()
-        }
-      }
+        serviceTimeStart: [
+          { required: true, message: "服务时间不能为空", trigger: "blur" },
+        ],
+      };
     },
-    computed: {
-      dataRule () {
-        return {
-
-
-          serviceTimeStart: [
-            { required: true, message: '服务时间不能为空', trigger: 'blur' }
-          ],
-
-
-        }
-      },
+  },
+  props: {
+    serviceRecordId: {
+      type: String,
+      required: true,
+    },
+    serviceOrgName: {
+      type: String,
+      required: true,
+    },
+    formType: {
+      //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+      type: String,
+      required: true,
     },
-    props: {
-
-      serviceRecordId: {
-        type: String,
-        required: true
-      },
-      serviceOrgName: {
-        type: String,
-        required: true
-      },
-      formType: {//表单操作类型 add新增，edit编辑，detail详情,feedback反馈
-        type: String,
-        required: true
-      },
 
-      satisfyArray: {
-        type: Array,
-        default () {
-          return []
-        }
+    satisfyArray: {
+      type: Array,
+      default() {
+        return [];
       },
-    }
-  }
-  </script>
+    },
+  },
+};
+</script>
 
 
   <style lang="scss" scoped >
-  @import "@/assets/scss/modules/management/form-main.scss";
-
-  .attachement-list {
-    // padding-left: 20px;
-    a {
-      display: block;
-      cursor: pointer;
-      // color: #4df0ff;
-      font-size: 14px;
-
-      i {
-        color: #333;
-      }
+@import "@/assets/scss/modules/management/form-main.scss";
+
+.attachement-list {
+  // padding-left: 20px;
+  a {
+    display: block;
+    cursor: pointer;
+    // color: #4df0ff;
+    font-size: 14px;
+
+    i {
+      color: #333;
     }
   }
-  </style>
+}
+</style>