diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
index 764f7712e..2af3cd8f2 100644
--- a/src/views/modules/communityService/commonDemand/addForm.vue
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -1,1236 +1,1321 @@
 <template>
-    <div>
-      <div
-        class="dialog-h-content scroll-h"
-        :class="{ 'visiual-form': source === 'visiual' }"
+  <div>
+    <div
+      class="dialog-h-content scroll-h"
+      :class="{ 'visiual-form': source === 'visiual' }"
+    >
+      <el-form
+        v-if="formType === 'add'"
+        ref="ref_form"
+        :inline="true"
+        :model="formData"
+        :rules="dataRule"
+        class="div_form"
       >
+        <!-- 服务类别 -->
+        <el-form-item
+          label="服务类别"
+          style="display: block"
+          label-width="150px"
+          prop="serviceTypeLevel2Id"
+        >
+          <el-select
+            class="u-item-width-communitycascader"
+            v-model="formData.serviceTypeLevel1Id"
+            placeholder="请选择"
+            clearable
+            @change="handleChangeServiceTypeLevel1"
+          >
+            <el-option
+              v-for="item in serviceTypesLevel1"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+          -
+          <el-select
+            class="u-item-width-communitycascader"
+            v-model="formData.serviceTypeLevel2Id"
+            placeholder="请选择"
+            @change="handleChangeServiceTypeLevel2"
+            clearable
+          >
+            <el-option
+              v-for="item in serviceTypesLevel2"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
+          label="服务事项"
+          prop="serviceName"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入服务事项"
+            v-model="formData.serviceName"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="服务内容"
+          prop="remark"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            maxlength="1000"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入备注，不超过1000字"
+            v-model="formData.remark"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="服务范围"
+          prop="objList"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <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="服务时间"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          prop="serviceTimeStart"
+        >
+          <el-date-picker
+            v-model="formData.serviceTimeStart"
+            :picker-options="startPickerOptions"
+            class="item_width_2"
+            style="width: 220px"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd"
+            placeholder="开始时间"
+          >
+          </el-date-picker>
+          <span class="u-data-tag">至</span>
+          <el-date-picker
+            v-model="formData.serviceTimeEnd"
+            :picker-options="endPickerOptions"
+            class="item_width_2 u-data-tag"
+            style="width: 220px"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd"
+            placeholder="结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item
+          label="政策依据"
+          prop="policyId"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-select
+            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
+          label="经办人"
+          prop="principalName"
+          :class="{ 'form-item': source === 'visiual' }"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入联系人姓名"
+            v-model="formData.principalName"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          label="联系方式"
+          prop="principalContact"
+          :class="{ 'form-item': source === 'visiual' }"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            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="formData.assignSwitch" @change="handelDisabledRules"> </el-switch>
+        </el-form-item>
+
+        <el-form-item
+          label="查找享受服务人员"
+          prop="resiSearchTagId"
+          :class="{ 'form-item': source === 'visiual' }"
+          label-width="150px"
+          style="display: block"
+          v-show="formData.assignSwitch"
+        >
+         <input type="text" v-model="formData.resiSearchTagId" v-show="false">
+          <template  v-if="formData.resiSearchTagName">
+            <el-tag   @close="handleCloseTag"  closable >
+            {{ formData.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="服务方"
+          prop="serviceOrgId"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-select
+            v-model="formData.serviceOrgType"
+            class="input-width-small"
+            placeholder="请选择"
+            clearable
+            @change="handleServiceChange('add', $event)"
+          >
+            <el-option
+              v-for="item in serviceOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          -
+          <el-select
+            v-model="formData.serviceOrgId"
+            class="input-width-middle"
+            filterable
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in serviceOptiondList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
+          label="直接反馈"
+          prop="remark"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-checkbox
+            :label="'是'"
+            v-model="showFeedback"
+            @change="handleChangeFeedback"
+          ></el-checkbox>
+        </el-form-item>
+      </el-form>
+      <div v-show="formType === 'feedback' || showFeedback">
+        <!-- <h3 class="d-h3">反馈内容</h3> -->
+
         <el-form
-          v-if="formType === 'add'"
-          ref="ref_form"
+          ref="ref_form_feedback"
           :inline="true"
-          :model="formData"
-          :rules="dataRule"
+          :model="feedbackFormData"
+          :rules="feedbackDataRule"
           class="div_form"
         >
-          <!-- 服务类别 -->
-          <el-form-item label="服务类别"
-                        style="display: block"
-                        label-width="150px"
-                        prop="serviceTypeLevel2Id"
-                    >
-                <el-select class="u-item-width-communitycascader"
-                           v-model="formData.serviceTypeLevel1Id"
-                           placeholder="请选择"
-                           clearable
-                           @change="handleChangeServiceTypeLevel1"
-                           >
-                  <el-option v-for="item in serviceTypesLevel1"
-                             :key="item.id"
-                             :label="item.name"
-                             :value="item.id">
-                  </el-option>
-                </el-select>
-                -
-                <el-select class="u-item-width-communitycascader"
-                           v-model="formData.serviceTypeLevel2Id"
-                           placeholder="请选择"
-                           @change="handleChangeServiceTypeLevel2"
-                           clearable>
-                  <el-option v-for="item in serviceTypesLevel2"
-                             :key="item.id"
-                             :label="item.name"
-                             :value="item.id">
-                  </el-option>
-                </el-select>
-          </el-form-item>
-         
           <el-form-item
-            label="服务事项"
-            prop="serviceName"
-            label-width="150px"
+            label="服务目标"
+            prop="serviceGoal"
             :class="{ 'form-item': source === 'visiual' }"
+            label-width="150px"
             style="display: block"
           >
             <el-input
               class="item_width_1"
-              placeholder="请输入服务事项"
-              v-model="formData.serviceName"
-            >
-            </el-input>
+              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="remark"
-              label-width="150px"
-              :class="{ 'form-item': source === 'visiual' }"
-              style="display: block"
+            label="服务效果"
+            prop="serviceEffect"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            style="display: block"
           >
             <el-input
-                class="item_width_1"
-                type="textarea"
-                maxlength="1000"
-                show-word-limit
-                :rows="3"
-                placeholder="请输入备注，不超过1000字"
-                v-model="formData.remark"
+              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="服务范围"
-              prop="objList"
-              label-width="150px"
-              :class="{ 'form-item': source === 'visiual' }"
-              style="display: block"
+            label="服务人数"
+            style="display: block"
+            :class="{ 'form-item': source === 'visiual' }"
+            prop="servicePeopleNumber"
+            label-width="150px"
           >
-            <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-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"
-              :class="{ 'form-item': source === 'visiual' }"
-              prop="serviceTimeStart"
+            label="服务状态"
+            style="display: block"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            prop="serviceStatus"
           >
-            <el-date-picker
-                v-model="formData.serviceTimeStart"
-                :picker-options="startPickerOptions"
-                class="item_width_2"
-                style="width: 220px"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                value="yyyy-MM-dd"
-                placeholder="开始时间"
-            >
-            </el-date-picker>
-            <span class="data-tag">至</span>
-            <el-date-picker
-                v-model="formData.serviceTimeEnd"
-                :picker-options="endPickerOptions"
-                class="item_width_2 data-tag"
-                style="width: 220px"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                value="yyyy-MM-dd"
-                placeholder="结束时间"
-            >
-            </el-date-picker>
+            <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="政策依据"
-            prop="policyId"
+            label="满意度"
+            style="display: block"
             label-width="150px"
             :class="{ 'form-item': source === 'visiual' }"
-            style="display: block"
+            prop="satisfaction"
           >
             <el-select
-              v-model="formData.policyId"
-              class="input-width-small"
-              placeholder="请选择"
+              class="item_width_2"
+              v-model="feedbackFormData.satisfaction"
+              placeholder="全部"
               clearable
             >
               <el-option
-                v-for="item in policyList"
-                :key="item.policyId"
-                :label="item.title"
-                :value="item.policyId"
+                v-for="item in satisfyArray"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
               >
               </el-option>
             </el-select>
-
-            <el-button
-              style="margin-left: 10px"
-              type="primary"
-              size="small"
-              @click="handlePersonList"
-              >预览</el-button
-            >
           </el-form-item>
-
           <el-form-item
-            label="经办人"
-            prop="principalName"
+            label="地址"
+            prop="address"
             :class="{ 'form-item': source === 'visiual' }"
             label-width="150px"
             style="display: block"
           >
             <el-input
               class="item_width_1"
-              placeholder="请输入联系人姓名"
-              v-model="formData.principalName"
-            >
-            </el-input>
+              v-model="feedbackFormData.address"
+            ></el-input>
           </el-form-item>
           <el-form-item
-            label="联系方式"
-            prop="principalContact"
-            :class="{ 'form-item': source === 'visiual' }"
+            label="地图位置"
             label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
             style="display: block"
           >
-            <el-input
-              class="item_width_1"
-              placeholder="请输入联系人电话"
-              v-model="formData.principalContact"
-            >
-            </el-input>
+            <div style="width: 500px">
+              <div class="div_map">
+                <div id="map_app"></div>
+                <div class="div_searchmap">
+                  <el-input
+                    maxlength="50"
+                    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
-              label="服务方"
-              prop="serviceOrgId"
-              label-width="150px"
-              :class="{ 'form-item': source === 'visiual' }"
-              style="display: block"
+            class="block"
+            label="附件"
+            :class="{ 'form-item': source === 'visiual' }"
+            label-width="150px"
+            prop="attach"
           >
-            <el-select
-                v-model="formData.serviceOrgType"
-                class="input-width-small"
-                placeholder="请选择"
-                clearable
-                @change="handleServiceChange('add', $event)"
-            >
-              <el-option
-                  v-for="item in serviceOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              >
-              </el-option>
-            </el-select>
-            -
-            <el-select
-                v-model="formData.serviceOrgId"
-                class="input-width-middle"
-                filterable
-                placeholder="请选择"
-                clearable
+            <el-upload
+              :headers="$getElUploadHeaders()"
+              class="upload-demo"
+              :action="uploadUlr"
+              accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+              :on-success="handleFileSuccess"
+              :on-remove="handleFileRemove"
+              :limit="3"
+              :before-upload="beforeUpload"
+              :file-list="fileList"
             >
-              <el-option
-                  v-for="item in serviceOptiondList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
+              <el-button
+                size="small"
+                :disabled="fileList.length === 3"
+                type="primary"
+                >点击上传</el-button
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-
-          <el-form-item
-            label="直接反馈"
-            prop="remark"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            style="display: block"
-          >
-            <el-checkbox
-              :label="'是'"
-              v-model="showFeedback"
-              @change="handleChangeFeedback"
-            ></el-checkbox>
+              <div slot="tip" class="el-upload__tip">支持图片、word、pdf</div>
+            </el-upload>
           </el-form-item>
         </el-form>
-        <div v-show="formType === 'feedback' || showFeedback">
-          <!-- <h3 class="d-h3">反馈内容</h3> -->
-
-          <el-form
-            ref="ref_form_feedback"
-            :inline="true"
-            :model="feedbackFormData"
-            :rules="feedbackDataRule"
-            class="div_form"
-          >
-            <el-form-item
-              label="服务目标"
-              prop="serviceGoal"
-              :class="{ 'form-item': source === 'visiual' }"
-              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"
-              :class="{ 'form-item': source === 'visiual' }"
-              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"
-              :class="{ 'form-item': source === 'visiual' }"
-              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="服务状态"
-              style="display: block"
-              label-width="150px"
-              :class="{ 'form-item': source === 'visiual' }"
-              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"
-              :class="{ 'form-item': source === 'visiual' }"
-              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"
-              :class="{ 'form-item': source === 'visiual' }"
-              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"
-              :class="{ 'form-item': source === 'visiual' }"
-              style="display: block"
-            >
-              <div style="width: 500px">
-                <div class="div_map">
-                  <div id="map_app"></div>
-                  <div class="div_searchmap">
-                    <el-input
-                      maxlength="50"
-                      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="附件"
-              :class="{ 'form-item': source === 'visiual' }"
-              label-width="150px"
-              prop="attach"
-            >
-              <el-upload
-                :headers="$getElUploadHeaders()"
-                class="upload-demo"
-                :action="uploadUlr"
-                accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
-                :on-success="handleFileSuccess"
-                :on-remove="handleFileRemove"
-                :limit="3"
-                :before-upload="beforeUpload"
-                :file-list="fileList"
-              >
-                <el-button
-                  size="small"
-                  :disabled="fileList.length === 3"
-                  type="primary"
-                  >点击上传</el-button
-                >
-                <div slot="tip" class="el-upload__tip">支持图片、word、pdf</div>
-              </el-upload>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-
-      <div class="div_btn">
-        <el-button size="small" @click="handleCancle">取 消</el-button>
-        <el-button
-          size="small"
-          type="primary"
-          :disabled="btnDisable"
-          @click="handleComfirm"
-          >确 定</el-button
-        >
       </div>
+    </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"
+    <div class="div_btn">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        size="small"
+        type="primary"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
       >
-        <person-list
-          ref="ref_detail_form"
-          :policyId="policyId"
-          :ruleList="ruleList"
-          @handleOk="handleOk"
-          @handleClose="handleClose"
-        >
-        </person-list>
-      </el-dialog>
     </div>
-  </template>
+
+    <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"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'标签配置'"
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showLabelForm = false"
+    >
+      <label-form
+        ref="ref_label_form"
+        :policyId="policyId"
+        :ruleList="ruleList"
+        @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"
+      >
+        <!--    @handleOk="handleOk"
+        @handleClose="handleClose" -->
+      </label-form>
+    </el-dialog>
+  </div>
+</template>
 
   <script>
-  import { mapGetters } from "vuex";
-  import { Loading } from "element-ui"; // 引入Loading服务
-  import { requestPost,requestGet } from "@/js/dai/request";
-  import personList from "../policy/personList";
-  import nextTick from "dai-js/tools/nextTick";
-  import daiMap from "@/utils/dai-map";
-
-  let loading; // 加载动画
-  let map;
-
-  export default {
-    props: {
-      defaultData: {
-        type: Object,
-        default: null,
-      },
-      serviceRecordId: {
-        type: String,
-        required: "",
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost, requestGet } from "@/js/dai/request";
+import personList from "../policy/personList";
+import nextTick from "dai-js/tools/nextTick";
+import labelForm from "../labelConfig/addForm.vue";
+import daiMap from "@/utils/dai-map";
+
+let loading; // 加载动画
+let map;
+
+export default {
+  props: {
+    defaultData: {
+      type: Object,
+      default: null,
+    },
+    serviceRecordId: {
+      type: String,
+      required: "",
+    },
+    serviceCategoryKey: {
+      type: String,
+      required: "",
+    },
+    serviceProjectName: {
+      //服务项目名称
+      type: String,
+      required: false,
+      default: "",
+    },
+    formType: {
+      //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+      type: String,
+      required: "",
+    },
+    categrayArray: {
+      type: Array,
+      default() {
+        return [];
       },
-      serviceCategoryKey: {
-        type: String,
-        required: "",
+    },
+    source: {
+      //展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: "manage",
+    },
+  },
+
+  data() {
+    let endDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now();
+      if (this.formData.serviceTimeStart) {
+        let serviceTimeStart = new Date(this.formData.serviceTimeStart);
+        return (
+          time.getTime() > nowData ||
+          time.getTime() < serviceTimeStart ||
+          time.getTime() === serviceTimeStart
+        );
+      } else {
+        return time.getTime() > nowData;
+      }
+    };
+
+    let startDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now();
+      return time.getTime() > nowData;
+    };
+
+    return {
+      // 公共服务分类
+      serviceTypesLevel1: [],
+      serviceTypesLevel2: [],
+
+      btnDisable: false,
+      casOptions: [],
+      scopeIdArray: [],
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: true,
+        value: "objectId",
+        label: "objectName",
+        children: "children",
+        checkStrictly: true,
+        emitPath: false,
       },
-      serviceProjectName: {
-        //服务项目名称
-        type: String,
-        required: false,
-        default: "",
+
+      keyWords: "",
+      formData: {
+        serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
+        serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
+        serviceCategoryKey: "",
+        assignSwitch: false,
+        resiSearchTagId:"",//查找享受服务人员
+        resiSearchTagName:"",//享受服务人员名称
+        serviceName: "", //服务名称
+        serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
+        serviceOrgId: "", //服务组织Id
+        objList: [], //
+        policyId: "",
+        principalName: "", //经办人(责任人)姓名
+        principalContact: "", //经办人联系方式
+        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+        remark: "", //
+        feedback: {}, //反馈。允许发起服务的时候直接填写反馈，完成服务。
       },
-      formType: {
-        //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
-        type: String,
-        required: "",
+      dataRule:{
+        serviceTypeLevel2Id: [
+          { required: true, message: "政策类型不能为空", trigger: "change" },
+        ],
+        serviceName: [
+          { required: true, message: "服务名称不能为空", trigger: "change" },
+        ],
+        serviceOrgId: [
+          { required: true, message: "服务组织不能为空", trigger: "change" },
+        ],
+
+        serviceTimeStart: [
+          { required: true, message: "服务时间不能为空", trigger: "change" },
+        ],
+        objList: [
+          { required: true, message: "服务范围不能为空", trigger: "change" },
+        ],
+     
+    },
+      feedbackFormData: {
+        serviceGoal: "", //	服务目标
+        serviceEffect: "", //	服务效果
+        servicePeopleNumber: null, //	服务人数
+        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+        longitude: "", //	经度
+        latitude: "", //	维度
+        address: "",
+        fileList: [], //	附件列表
       },
-      categrayArray: {
-        type: Array,
-        default() {
-          return [];
-        },
+
+      endPickerOptions: {
+        // disabledDate: endDisabledDate,
       },
-      source: {
-        //展示来源：manage  管理平台    visiual  可视化平台
-        type: String,
-        default: "manage",
+      startPickerOptions: {
+        // disabledDate: startDisabledDate,
       },
-    },
 
-    data() {
-      let endDisabledDate = (time) => {
-        //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-        let nowData = Date.now();
-        if (this.formData.serviceTimeStart) {
-          let serviceTimeStart = new Date(this.formData.serviceTimeStart);
-          return (
-            time.getTime() > nowData ||
-            time.getTime() < serviceTimeStart ||
-            time.getTime() === serviceTimeStart
-          );
-        } else {
-          return time.getTime() > nowData;
-        }
-      };
-      let startDisabledDate = (time) => {
-        //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-        let nowData = Date.now();
-        return time.getTime() > nowData;
-      };
+      showFeedback: false,
+      serviceOptions: [],
+      serviceOptiondList: [],
+      policyList: [],
 
-      return {
-        // 公共服务分类
-        serviceTypesLevel1:[],
-        serviceTypesLevel2:[],
-
-        btnDisable: false,
-        casOptions: [],
-        scopeIdArray: [],
-        iscascaderShow: 0,
-
-        optionProps: {
-          multiple: true,
-          value: "objectId",
-          label: "objectName",
-          children: "children",
-          checkStrictly: true,
-          emitPath: false,
-        },
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+
+      policyId: "",
+      showPersonList: false,
+      ruleList: [],
+      firstInitMap: true,
 
-        keyWords: "",
-        formData: {
-          serviceTypeLevel1Id:'',// 公共服务（政策级别）一级分类id
-          serviceTypeLevel2Id:'',// 公共服务（政策级别）二级分类id
-          serviceCategoryKey: "",
-          serviceName: "", //服务名称
-          serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
-          serviceOrgId: "", //服务组织Id
-          objList: [], //
-          policyId: "",
-          principalName: "", //经办人(责任人)姓名
-          principalContact: "", //经办人联系方式
-          serviceTimeStart: "", //服务起始时间yyyy-MM-dd
-          serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
-          remark: "", //
-          feedback: {}, //反馈。允许发起服务的时候直接填写反馈，完成服务。
+      categrayOptions: [],
+      statusArray: [
+        {
+          value: "in_service",
+          label: "进行中",
         },
-        feedbackFormData: {
-          serviceGoal: "", //	服务目标
-          serviceEffect: "", //	服务效果
-          servicePeopleNumber: null, //	服务人数
-          serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
-          satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
-          longitude: "", //	经度
-          latitude: "", //	维度
-          address: "",
-          fileList: [], //	附件列表
+        {
+          value: "completed",
+          label: "已完成",
         },
-
-        endPickerOptions: {
-          // disabledDate: endDisabledDate,
+      ],
+      satisfyArray: [
+        {
+          value: "bad",
+          label: "不满意",
+        },
+        {
+          value: "good",
+          label: "基本满意",
         },
-        startPickerOptions: {
-          // disabledDate: startDisabledDate,
+        {
+          value: "perfect",
+          label: "非常满意",
         },
+      ],
+      showLabelForm: false,
+    };
+  },
 
-        showFeedback: false,
-        serviceOptions: [],
-        serviceOptiondList: [],
-        policyList: [],
+  computed: {
 
-        fileList: [],
-        uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+    feedbackDataRule() {
+      return {
+        serviceGoal: [
+          { required: true, message: "服务目标不能为空", trigger: "blur" },
+        ],
 
-        policyId: "",
-        showPersonList: false,
-        ruleList: [],
-
-        firstInitMap: true,
-
-        categrayOptions: [],
-        statusArray: [
-          {
-            value: "in_service",
-            label: "进行中",
-          },
-          {
-            value: "completed",
-            label: "已完成",
-          },
+        serviceEffect: [
+          { required: true, message: "服务效果不能为空", trigger: "blur" },
+        ],
+        servicePeopleNumber: [
+          { required: true, message: "服务人数不能为空", trigger: "blur" },
         ],
-        satisfyArray: [
-          {
-            value: "bad",
-            label: "不满意",
-          },
-          {
-            value: "good",
-            label: "基本满意",
-          },
-          {
-            value: "perfect",
-            label: "非常满意",
-          },
+        serviceStatus: [
+          { required: true, message: "服务状态不能为空", trigger: "blur" },
         ],
+        satisfaction: [
+          { required: true, message: "满意度不能为空", trigger: "blur" },
+        ],
+        address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
       };
     },
+  },
 
-    computed: {
-      dataRule() {
-        return {
-          serviceTypeLevel2Id: [
-            { required: true, message: '政策类型不能为空', trigger: 'change' }
-          ],
-          serviceName: [
-            { required: true, message: "服务名称不能为空", trigger: "change" },
-          ],
-          serviceOrgId: [
-            { required: true, message: "服务组织不能为空", trigger: "change" },
-          ],
-
-          serviceTimeStart: [
-            { required: true, message: "服务时间不能为空", trigger: "change" },
-          ],
-          objList: [
-            { required: true, message: "服务范围不能为空", trigger: "change" },
-          ],
-        };
-      },
-      feedbackDataRule() {
-        return {
-          serviceGoal: [
-            { required: true, message: "服务目标不能为空", trigger: "blur" },
-          ],
-
-          serviceEffect: [
-            { required: true, message: "服务效果不能为空", trigger: "blur" },
-          ],
-          servicePeopleNumber: [
-            { required: true, message: "服务人数不能为空", trigger: "blur" },
-          ],
-          serviceStatus: [
-            { required: true, message: "服务状态不能为空", trigger: "blur" },
-          ],
-          satisfaction: [
-            { required: true, message: "满意度不能为空", trigger: "blur" },
-          ],
-          address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
-        };
-      },
+  watch: {
+    "formData.serviceTimeEnd": function (val) {
+      if (val && val != "") {
+        let arrayTemp = val.split(" ");
+        this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
+      }
     },
+  },
 
-    watch: {
-      "formData.serviceTimeEnd": function (val) {
-        if (val && val != "") {
-          let arrayTemp = val.split(" ");
-          this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
-        }
-      },
-    },
+  components: { personList, labelForm },
 
-    components: { personList },
+  async mounted() {
+    this.startLoading();
+    // 都已经重置了，还放在prop里干嘛，我不理解
+    this.categrayOptions = this.categrayArray;
 
-    async mounted() {
-      this.startLoading();
-      // 都已经重置了，还放在prop里干嘛，我不理解
-      this.categrayOptions = this.categrayArray;
+    // this.getCategrayList();
+    this.getDictOptions();
+    this.getPolicyList();
+    if (this.formType === "feedback" || this.showFeedback) {
+      this.initMap();
+      this.$refs.ref_form_feedback.resetFields();
+    }
 
-      // this.getCategrayList();
-      this.getDictOptions();
-      this.getPolicyList();
-      if (this.formType === "feedback" || this.showFeedback) {
-        this.initMap();
-        this.$refs.ref_form_feedback.resetFields();
-      }
+    if (this.formType === "add") {
+      this.$refs.ref_form.resetFields();
+      await this.loadScopeTree();
+    } else {
+    }
 
-      if (this.formType === "add") {
-        this.$refs.ref_form.resetFields();
-        await this.loadScopeTree();
-      } else {
-      }
+    await this.iniDefaultData();
 
-      await this.iniDefaultData();
+    this.endLoading();
+    // 服务分类下拉（其实是获取的共性服务分类）
+    this.$http
+      .get("/governance/commonServiceType/selectList/0")
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.serviceTypesLevel1 = res.data;
+          console.log(res.data);
+        }
+      })
+      .catch(() => {
+        return this.$message.error("网络错误");
+      });
+  },
+
+  methods: {
+    handelDisabledRules(v){
+      if(!v){
+        delete this.dataRule.resiSearchTagId
+      }else{
+        var arr = [{ required: true, message: "享受服务人员不能为空", trigger: "change" }]
+        this.dataRule.resiSearchTagId = arr
+      }
+      console.log(this.dataRule);
+    },
 
-      this.endLoading();
-      // 服务分类下拉（其实是获取的共性服务分类）
+    // 服务类型下拉框选中事件
+    handleChangeServiceTypeLevel1() {
+      this.formData.serviceTypeLevel2Id = "";
       this.$http
-          .get("/governance/commonServiceType/selectList/0")
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg);
-            } else {
-              this.serviceTypesLevel1 = res.data;
-              console.log( res.data);
-            }
-          })
-          .catch(() => {
-            return this.$message.error("网络错误");
-          });
+        .get(
+          "/governance/commonServiceType/selectList/" +
+            this.formData.serviceTypeLevel1Id
+        )
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel2 = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
     },
-
-    methods: {
-      // 服务类型下拉框选中事件
-      handleChangeServiceTypeLevel1() {
-        this.formData.serviceTypeLevel2Id = ''
-        this.$http
-            .get("/governance/commonServiceType/selectList/" + this.formData.serviceTypeLevel1Id)
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                return this.$message.error(res.msg);
-              } else {
-                this.serviceTypesLevel2 = res.data;
-              }
-            })
-            .catch(() => {
-              return this.$message.error("网络错误");
-            })
-      },
-      // 如果服务方有选择第一个的话让它更新一下
-      handleChangeServiceTypeLevel2(){
-        console.log(this.formData.serviceTypeLevel1Id);
-        console.log(this.formData.serviceTypeLevel2Id);
-        if(this.formData.serviceOrgType){
-          this.getServiceuserList(this.formData.serviceOrgType)
-        }else{
-          return
+    // 如果服务方有选择第一个的话让它更新一下
+    handleChangeServiceTypeLevel2() {
+      console.log(this.formData.serviceTypeLevel1Id);
+      console.log(this.formData.serviceTypeLevel2Id);
+      if (this.formData.serviceOrgType) {
+        this.getServiceuserList(this.formData.serviceOrgType);
+      } else {
+        return;
+      }
+    },
+    handleClickLabel() {
+      this.showLabelForm = true;
+      this.$nextTick(() => {
+        this.$refs["ref_label_form"].initForm("info");
+      });
+    },
+    addFormOk(val) {
+      this.showLabelForm = false;
+      this.formData.resiSearchTagId = val.tagId;
+      this.formData.resiSearchTagName = val.tagName;
+    },
+    addFormCancle() {
+      this.showLabelForm = false;
+    },
+    handleCloseTag(){
+      this.formData.resiSearchTagId ='';
+      this.formData.resiSearchTagName = '';
+    },
+    async iniDefaultData() {
+      const { defaultData } = this;
+      console.log("iniDefaultData3", defaultData);
+      if (defaultData) {
+        const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
+        if (serviceOrgType) {
+          this.formData.serviceOrgType = serviceOrgType;
+          await this.getServiceuserList(serviceOrgType, "add_demand");
         }
-      },  
-      async iniDefaultData() {
-        const { defaultData } = this;
-        console.log("iniDefaultData3", defaultData);
-        if (defaultData) {
-          const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
-          if (serviceOrgType) {
-            this.formData.serviceOrgType = serviceOrgType;
-            await this.getServiceuserList(serviceOrgType, "add_demand");
-          }
-          if (serviceOrgId) {
-            this.formData.serviceOrgId = serviceOrgId;
-          }
-          if (scopeIdArray) {
-            this.scopeIdArray = scopeIdArray;
-            await nextTick();
-            this.handleChangeScope();
-          }
+        if (serviceOrgId) {
+          this.formData.serviceOrgId = serviceOrgId;
         }
-      },
-
-      //加载组织数据
-      async handlePersonList() {
-        if (!this.formData.policyId) {
-          this.$message.info("请先选择政策");
-          return false;
+        if (scopeIdArray) {
+          this.scopeIdArray = scopeIdArray;
+          await nextTick();
+          this.handleChangeScope();
         }
+      }
+    },
 
-        this.policyId = this.formData.policyId;
-        await this.loadRuleList();
+    //加载组织数据
+    async handlePersonList() {
+      if (!this.formData.policyId) {
+        this.$message.info("请先选择政策");
+        return false;
+      }
 
-        this.showPersonList = true;
-      },
+      this.policyId = this.formData.policyId;
+      await this.loadRuleList();
 
-      async loadRuleList() {
-        const url = "/governance/policy/rulelist/" + this.policyId;
+      this.showPersonList = true;
+    },
 
-        let params = {};
+    async loadRuleList() {
+      const url = "/governance/policy/rulelist/" + this.policyId;
 
-        const { data, code, msg } = await requestPost(url, params);
+      let params = {};
 
-        if (code === 0) {
-          this.ruleList = data;
-        } else {
-          this.$message.error(msg);
-        }
-      },
+      const { data, code, msg } = await requestPost(url, params);
 
-      handleClose() {
-        this.showPersonList = false;
-      },
-      handleOk() {
-        this.showPersonList = false;
-      },
+      if (code === 0) {
+        this.ruleList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
 
-      async getPolicyList() {
-        const url = "/governance/policy/policyListSelect";
+    handleClose() {
+      this.showPersonList = false;
+    },
+    handleOk() {
+      this.showPersonList = false;
+    },
 
-        let params = {};
+    async getPolicyList() {
+      const url = "/governance/policy/policyListSelect";
 
-        const { data, code, msg } = await requestPost(url, params);
+      let params = {};
 
-        if (code === 0) {
-          this.policyList = data;
-        } else {
-          this.$message.error(msg);
-        }
-      },
-      async getDictOptions() {
-        this.$http
-          .post("/sys/dict/data/dictlist", {
-            dictType: "user_demand_service_type",
-          })
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg);
-            } else {
-              this.serviceOptions = res.data;
-            }
-          })
-          .catch(() => {
-            return this.$message.error("网络错误");
-          });
-      },
+      const { data, code, msg } = await requestPost(url, params);
 
-      // 字典
-      // async getCategrayList() {
-      //   const url = "/sys/dict/data/dictlist";
+      if (code === 0) {
+        this.policyList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getDictOptions() {
+      this.$http
+        .post("/sys/dict/data/dictlist", {
+          dictType: "user_demand_service_type",
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceOptions = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+
+    // 字典
+    // async getCategrayList() {
+    //   const url = "/sys/dict/data/dictlist";
 
-      //   let params = {
-      //     dictType: "ic_service_type",
-      //   };
+    //   let params = {
+    //     dictType: "ic_service_type",
+    //   };
 
-      //   const { data, code, msg } = await requestPost(url, params);
+    //   const { data, code, msg } = await requestPost(url, params);
 
-      //   if (code === 0) {
-      //     this.categrayOptions = data;
-      //   } else {
-      //     this.$message.error(msg);
-      //   }
-      // },
-     async handleServiceChange(type, val) {
+    //   if (code === 0) {
+    //     this.categrayOptions = data;
+    //   } else {
+    //     this.$message.error(msg);
+    //   }
+    // },
+    async handleServiceChange(type, val) {
       console.log(val);
-        if (val === "social_org") {
-          if (type === "add") await this.getServiceuserList(val);
-          else this.getServiceuserList(val);
-        } else this.getServiceuserList(val);
-      },
+      if (val === "social_org") {
+        if (type === "add") await this.getServiceuserList(val);
+        else this.getServiceuserList(val);
+      } else this.getServiceuserList(val);
+    },
 
-      async getServiceuserList(serverOrgType) {
-        if (!serverOrgType) return false;
-        if(this.formData.serviceTypeLevel2Id == ""){
-          this.$message.error('请先选择服务类别!')
-          return
-        }
-        const url = "/actual/base/serviceitem/listServerOrg"
-        let params = {
-          serviceTypeId:this.formData.serviceTypeLevel2Id,
-          serverOrgType:serverOrgType,
-          businessType: "common_service",
-        };
-        let {data,code,msg} = await requestPost(url,params)
-        if(code == 0){
-          this.serviceOptiondList = data;
-        }else if(code >= 8000){
-          this.$message.error(msg);
-        }
-      },
-      handleChangeFeedback(val) {
-        this.showFeedback = val;
+    async getServiceuserList(serverOrgType) {
+      if (!serverOrgType) return false;
+      if (this.formData.serviceTypeLevel2Id == "") {
+        this.$message.error("请先选择服务类别!");
+        return;
+      }
+      const url = "/actual/base/serviceitem/listServerOrg";
+      let params = {
+        serviceTypeId: this.formData.serviceTypeLevel2Id,
+        serverOrgType: serverOrgType,
+        businessType: "common_service",
+      };
+      let { data, code, msg } = await requestPost(url, params);
+      if (code == 0) {
+        this.serviceOptiondList = data;
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+    handleChangeFeedback(val) {
+      this.showFeedback = val;
 
-        if (this.firstInitMap) {
-          this.$nextTick(() => {
-            this.initMap();
-          });
-        }
-      },
+      if (this.firstInitMap) {
+        this.$nextTick(() => {
+          this.initMap();
+        });
+      }
+    },
 
-      // 获取服务范围树
-      async loadScopeTree() {
-        const url = "/gov/org/icServiceProject/service/serviceScopeTree";
-        // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-        let params = {};
+    // 获取服务范围树
+    async loadScopeTree() {
+      const url = "/gov/org/icServiceProject/service/serviceScopeTree";
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {};
 
-        const { data, code, msg } = await requestPost(url, params);
+      const { data, code, msg } = await requestPost(url, params);
 
-        if (code === 0) {
-          ++this.iscascaderShow;
-          this.casOptions = [];
-          this.scopeIdArray = [];
-          this.casOptions.push(data);
-        } else {
-          this.$message.error(rspMsg);
-        }
-      },
+      if (code === 0) {
+        ++this.iscascaderShow;
+        this.casOptions = [];
+        this.scopeIdArray = [];
+        this.casOptions.push(data);
+      } else {
+        this.$message.error(rspMsg);
+      }
+    },
 
-      handleChangeScope(value) {
-        this.formData.objList = [];
-        let selArray = this.$refs["myCascader"].getCheckedNodes();
-        console.log("handleChangeScope", selArray);
-        selArray.forEach((element) => {
-          let obj = {
-            objectType:
-              element.data.objectType === "grid"
-                ? "grid"
-                : element.data.objectType === "neighborhood"
-                ? "neighborhood"
-                : "agency",
-            objectId: element.data.objectId,
-            objectName: element.data.objectName,
-          };
-          this.formData.objList.push(obj);
-        });
-      },
+    handleChangeScope(value) {
+      this.formData.objList = [];
+      let selArray = this.$refs["myCascader"].getCheckedNodes();
+      console.log("handleChangeScope", selArray);
+      selArray.forEach((element) => {
+        let obj = {
+          objectType:
+            element.data.objectType === "grid"
+              ? "grid"
+              : element.data.objectType === "neighborhood"
+              ? "neighborhood"
+              : "agency",
+          objectId: element.data.objectId,
+          objectName: element.data.objectName,
+        };
+        this.formData.objList.push(obj);
+      });
+    },
 
-      async handleComfirm() {
-        if (this.formType === "add") {
-          this.handleAdd();
-        } else if (this.formType === "feedback") {
-          this.handleFeedback();
-        }
-      },
+    async handleComfirm() {
+      if (this.formType === "add") {
+        this.handleAdd();
+      } else if (this.formType === "feedback") {
+        this.handleFeedback();
+      }
+    },
 
-      async handleAdd() {
-        this.btnDisable = true;
-        setTimeout(() => {
+    async handleAdd() {
+      this.btnDisable = true;
+      setTimeout(() => {
+        this.btnDisable = false;
+      }, 10000);
+      this.$refs["ref_form"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
           this.btnDisable = false;
-        }, 10000);
-        this.$refs["ref_form"].validate((valid, messageObj) => {
-          if (!valid) {
-            app.util.validateRule(messageObj);
-            this.btnDisable = false;
-          } else {
-            var oDate1 = new Date(this.formData.serviceTimeStart);
-            var oDate2 = new Date(this.formData.serviceTimeEnd);
-            if (oDate1.getTime() > oDate2.getTime()) {
-              this.$message.error("服务截止时间必须大于服务开始时间");
-              return false;
-            }
-
-            if (this.showFeedback) {
-              this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
-                if (!valid) {
-                  app.util.validateRule(messageObj);
-                  this.btnDisable = false;
-                } else {
-                  this.formData.feedback = { ...this.feedbackFormData };
-                  this.addFuwu();
-                }
-              });
-            } else {
-              this.addFuwu();
-            }
+        } else {
+          var oDate1 = new Date(this.formData.serviceTimeStart);
+          var oDate2 = new Date(this.formData.serviceTimeEnd);
+          if (oDate1.getTime() > oDate2.getTime()) {
+            this.$message.error("服务截止时间必须大于服务开始时间");
+            return false;
           }
-        });
-      },
 
-      async addFuwu() {
-        if (this.showFeedback) {
-          this.feedbackFormData.fileList = [];
-          this.feedbackFormData.fileList = [...this.fileList];
-          this.formData.feedback = { ...this.feedbackFormData };
-        } else {
-          this.formData.feedback = null;
+          if (this.showFeedback) {
+            this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
+              if (!valid) {
+                app.util.validateRule(messageObj);
+                this.btnDisable = false;
+              } else {
+                this.formData.feedback = { ...this.feedbackFormData };
+                this.addFuwu();
+              }
+            });
+          } else {
+            this.addFuwu();
+          }
         }
+      });
+    },
 
-        console.log(this.formData);
-        // return false
-        const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+    async addFuwu() {
+      if (this.showFeedback) {
+        this.feedbackFormData.fileList = [];
+        this.feedbackFormData.fileList = [...this.fileList];
+        this.formData.feedback = { ...this.feedbackFormData };
+      } else {
+        this.formData.feedback = null;
+      }
 
-        if (
-          this.formData.principalContact &&
-          regPhone.test(this.formData.principalContact) === false
-        ) {
-          this.btnDisable = false;
-          this.$message({
-            type: "warning",
-            message: "请输入正确的手机号码",
-          });
-          return false;
-        }
+      console.log(this.formData);
+      // return false
+      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 (this.source === "manage") {
-          this.formData.serviceCategoryKey = this.serviceCategoryKey;
-        }
-        const url = "/governance/icServiceRecordV2/add";
-        // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
-        let params = {
-          ...this.formData,
-        };
+      if (this.source === "manage") {
+        this.formData.serviceCategoryKey = this.serviceCategoryKey;
+      }
+      const url = "/governance/icServiceRecordV2/add";
+      // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
+      let params = {
+        ...this.formData,
+      };
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.$message.success("发起成功");
+        this.resetData();
+        this.$emit("handleOk");
+      } else {
+        this.$message.error(msg);
+      }
+    },
 
-        const { data, code, msg } = await requestPost(url, params);
+    async handleFeedback() {
+      this.btnDisable = true;
+      setTimeout(() => {
+        this.btnDisable = false;
+      }, 10000);
 
-        if (code === 0) {
-          this.$message.success("发起成功");
-          this.resetData();
-          this.$emit("handleOk");
+      this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
+          this.btnDisable = false;
         } else {
-          this.$message.error(msg);
+          this.addFeecback();
         }
-      },
+      });
+    },
 
-      async handleFeedback() {
-        this.btnDisable = true;
-        setTimeout(() => {
-          this.btnDisable = false;
-        }, 10000);
+    async addFeecback() {
+      this.feedbackFormData.fileList = [];
+      this.feedbackFormData.fileList = [...this.fileList];
+      this.feedbackFormData.serviceRecordId = this.serviceRecordId;
 
-        this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
-          if (!valid) {
-            app.util.validateRule(messageObj);
-            this.btnDisable = false;
-          } else {
-            this.addFeecback();
-          }
-        });
-      },
+      console.log(this.feedbackFormData);
+      // return false
 
-      async addFeecback() {
-        this.feedbackFormData.fileList = [];
-        this.feedbackFormData.fileList = [...this.fileList];
-        this.feedbackFormData.serviceRecordId = this.serviceRecordId;
+      const url = "/governance/icServiceFeedbackV2/add";
 
-        console.log(this.feedbackFormData);
-        // return false
+      let params = {
+        ...this.feedbackFormData,
+      };
 
-        const url = "/governance/icServiceFeedbackV2/add";
+      const { data, code, msg } = await requestPost(url, params);
 
-        let params = {
-          ...this.feedbackFormData,
-        };
+      if (code === 0) {
+        this.$message.success("反馈成功");
+        this.resetData();
+        this.$emit("handleOk");
+      } else {
+        this.$message.error(msg);
+      }
+    },
 
-        const { data, code, msg } = await requestPost(url, params);
+    beforeUpload(file) {
+      const array = file.name.split(".");
+      const extension = array[array.length - 1];
+
+      const formatarray = [
+        "jpg",
+        "png",
+        "jpeg",
+        "bmp",
+        "mp4",
+        "wma",
+        "m4a",
+        "mp3",
+        "doc",
+        "docx",
+        "xls",
+        "xlsx",
+        "pdf",
+      ];
+
+      if (formatarray.indexOf(extension) === -1) {
+        this.$message.error("只支持图片、word、pdf");
+        return false;
+      }
+    },
 
-        if (code === 0) {
-          this.$message.success("反馈成功");
-          this.resetData();
-          this.$emit("handleOk");
-        } else {
-          this.$message.error(msg);
-        }
-      },
+    handleFileRemove(file) {
+      if (file && file.status === "success") {
+        this.fileList.splice(
+          this.fileList.findIndex((item) => item.uid === file.uid),
+          1
+        );
+      }
+    },
 
-      beforeUpload(file) {
+    handleFileSuccess(res, file) {
+      if (res.code === 0 && res.msg === "success") {
         const array = file.name.split(".");
-        const extension = array[array.length - 1];
-
-        const formatarray = [
-          "jpg",
-          "png",
-          "jpeg",
-          "bmp",
-          "mp4",
-          "wma",
-          "m4a",
-          "mp3",
-          "doc",
-          "docx",
-          "xls",
-          "xlsx",
-          "pdf",
-        ];
-
-        if (formatarray.indexOf(extension) === -1) {
-          this.$message.error("只支持图片、word、pdf");
-          return false;
+        const fileType = array[array.length - 1];
+
+        const picArray = ["jpg", "png", "jpeg", "bmp"];
+        const videoarray = ["mp4", "wma", "m4a"];
+        const docArray = ["doc", "docx", "xls", "xlsx", "pdf"];
+        const mp3Array = ["mp3"];
+
+        if (picArray.indexOf(fileType) > -1) {
+          file.format = "image";
+        } else if (videoarray.indexOf(fileType) > -1) {
+          file.format = "video";
+        } else if (docArray.indexOf(fileType) > -1) {
+          file.format = "doc";
+        } else if (mp3Array.indexOf(fileType) > -1) {
+          file.format = "voice";
         }
-      },
 
-      handleFileRemove(file) {
-        if (file && file.status === "success") {
-          this.fileList.splice(
-            this.fileList.findIndex((item) => item.uid === file.uid),
-            1
-          );
-        }
-      },
+        file.url = res.data.url;
+        file.type = fileType;
 
-      handleFileSuccess(res, file) {
-        if (res.code === 0 && res.msg === "success") {
-          const array = file.name.split(".");
-          const fileType = array[array.length - 1];
-
-          const picArray = ["jpg", "png", "jpeg", "bmp"];
-          const videoarray = ["mp4", "wma", "m4a"];
-          const docArray = ["doc", "docx", "xls", "xlsx", "pdf"];
-          const mp3Array = ["mp3"];
-
-          if (picArray.indexOf(fileType) > -1) {
-            file.format = "image";
-          } else if (videoarray.indexOf(fileType) > -1) {
-            file.format = "video";
-          } else if (docArray.indexOf(fileType) > -1) {
-            file.format = "doc";
-          } else if (mp3Array.indexOf(fileType) > -1) {
-            file.format = "voice";
-          }
+        file.name = file.name;
+        file.type = file.type;
+        file.url = file.url;
 
-          file.url = res.data.url;
-          file.type = fileType;
+        this.fileList.push(file);
+        console.log(this.fileList);
+      } else this.$message.error(res.msg);
+    },
 
-          file.name = file.name;
-          file.type = file.type;
-          file.url = file.url;
+    //下载
+    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);
+    },
+    handleCancle() {
+      this.resetData();
+      this.$emit("handleClose");
+    },
 
-          this.fileList.push(file);
-          console.log(this.fileList);
-        } else this.$message.error(res.msg);
-      },
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap() {
+      let { latitude, longitude } = this.$store.state.user;
+
+      map = new daiMap(
+        document.getElementById("map_app"),
+        { latitude, longitude },
+        {
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
+        }
+      );
 
-      //下载
-      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);
-      },
-      handleCancle() {
-        this.resetData();
-        this.$emit("handleClose");
-      },
+      // 监听地图平移结束
+      map.on("dragend", (e) => {
+        this.handleMoveCenter(e);
+      });
 
-      // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-      initMap() {
-        let { latitude, longitude } = this.$store.state.user;
-
-        map = new daiMap(
-          document.getElementById("map_app"),
-          { latitude, longitude },
-          {
-            zoom: 16.2, // 设置地图缩放级别
-            pitch: 43.5, // 设置俯仰角
-            rotation: 45, // 设置地图旋转角度
-          }
-        );
+      map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
+    },
 
-        // 监听地图平移结束
-        map.on("dragend", (e) => {
-          this.handleMoveCenter(e);
-        });
+    async handleMoveCenter() {
+      //修改地图中心点
+      const { lat, lng } = map.getCenter();
+      this.feedbackFormData.latitude = lat;
+      this.feedbackFormData.longitude = lng;
+      map.setMarker(lat, lng);
 
-        map.setCenter(latitude, longitude);
-        map.setMarker(latitude, longitude);
-      },
+      let { msg, data } = await map.getAddress(lat, lng);
+      if (msg == "success") {
+        this.feedbackFormData.address = data.address;
+      }
+    },
 
-      async handleMoveCenter() {
-        //修改地图中心点
-        const { lat, lng } = map.getCenter();
+    async handleSearchMap() {
+      const { msg, data } = await map.searchNearby(this.keyWords);
+      if (msg == "success") {
+        const { lat, lng } = data;
+        map.setCenter(lat, lng);
+        map.setMarker(lat, lng);
         this.feedbackFormData.latitude = lat;
         this.feedbackFormData.longitude = lng;
-        map.setMarker(lat, lng);
-
-        let { msg, data } = await map.getAddress(lat, lng);
-        if (msg == "success") {
-          this.feedbackFormData.address = data.address;
-        }
-      },
-
-      async handleSearchMap() {
-        const { msg, data } = await map.searchNearby(this.keyWords);
-        if (msg == "success") {
-          const { lat, lng } = data;
-          map.setCenter(lat, lng);
-          map.setMarker(lat, lng);
-          this.feedbackFormData.latitude = lat;
-          this.feedbackFormData.longitude = lng;
-        } else {
-          this.$message.error("未检索到相关位置坐标");
-        }
-      },
+      } else {
+        this.$message.error("未检索到相关位置坐标");
+      }
+    },
 
-      resetData() {
-        this.formData = {
-          serviceTypeLevel1Id:'',// 公共服务（政策级别）一级分类id
-          serviceTypeLevel2Id:'',// 公共服务（政策级别）二级分类id
-          objList: [], //
-          principalName: "", //经办人(责任人)姓名
-          principalContact: "", //经办人联系方式
-          serviceTimeStart: "", //服务起始时间yyyy-MM-dd
-          serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
-          remark: "", //
-          feedback: {}, //反馈。允许发起服务的时候直接填写反馈，完成服务。
-        };
-        this.feedbackFormData = {
-          serviceGoal: "", //	服务目标
-          serviceEffect: "", //	服务效果
-          servicePeopleNumber: null, //	服务人数
-          serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
-          satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
-          longitude: "", //	经度
-          latitude: "", //	维度
-          address: "",
-          fileList: [], //	附件列表
-        };
-      },
-      // 开启加载动画
-      startLoading() {
-        loading = Loading.service({
-          lock: true, // 是否锁定
-          text: "正在加载……", // 加载中需要显示的文字
-          background: "rgba(0,0,0,.7)", // 背景颜色
-        });
-      },
-      // 结束加载动画
-      endLoading() {
-        // clearTimeout(timer);
-        if (loading) {
-          loading.close();
-        }
-      },
+    resetData() {
+      this.formData = {
+        serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
+        serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
+        objList: [], //
+        principalName: "", //经办人(责任人)姓名
+        principalContact: "", //经办人联系方式
+        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+        remark: "", //
+        feedback: {}, //反馈。允许发起服务的时候直接填写反馈，完成服务。
+      };
+      this.feedbackFormData = {
+        serviceGoal: "", //	服务目标
+        serviceEffect: "", //	服务效果
+        servicePeopleNumber: null, //	服务人数
+        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+        longitude: "", //	经度
+        latitude: "", //	维度
+        address: "",
+        fileList: [], //	附件列表
+      };
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
-  };
-  </script>
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+};
+</script>
 
   <style lang="scss" scoped>
-  @import "@/assets/scss/modules/management/form-main.scss";
-  @import "@/assets/scss/modules/visual/a_customize.scss";
-
-  .form-item::v-deep .el-form-item__label {
+@import "@/assets/scss/modules/management/form-main.scss";
+@import "@/assets/scss/modules/visual/a_customize.scss";
+
+.form-item::v-deep .el-form-item__label {
+  color: #fff;
+}
+.form-item {
+  .el-radio {
     color: #fff;
   }
-  .form-item {
-    .el-radio {
-      color: #fff;
-    }
 
-    .el-checkbox {
-      color: #fff;
-    }
+  .el-checkbox {
+    color: #fff;
   }
-  </style>
+}
+</style>
diff --git a/src/views/modules/communityService/commonDemand/detailForm.vue b/src/views/modules/communityService/commonDemand/detailForm.vue
index d63d60806..033ec19e5 100644
--- a/src/views/modules/communityService/commonDemand/detailForm.vue
+++ b/src/views/modules/communityService/commonDemand/detailForm.vue
@@ -21,14 +21,14 @@
             <div class="info-prop">
               <span class="info-title-2">政策依据：</span>
               <span>{{ formData.policyTitle || "--" }}</span>
-              <el-button
+              <!-- <el-button
                 v-if="formData.policyId"
                 style="margin-left: 10px"
                 type="primary"
                 size="small"
                 @click="handlePersonList"
                 >预览</el-button
-              >
+              > -->
             </div>
             <div class="info-prop">
               <span class="info-title-2">经办人：</span>
@@ -44,6 +44,11 @@
               >至
               <span>{{ formData.serviceTimeEnd || "--" }}</span>
             </div>
+            <div class="info-prop">
+              <span class="info-title-2">享受服务人员: </span>
+              <span>{{ resiSearchTagName }}</span>
+            </div>
+
             <div class="info-prop">
               <span class="info-title-2">备注：</span>
               <span>{{ formData.remark || "--" }}</span>
@@ -148,7 +153,7 @@
 
         keyWords: "",
         formData: {},
-
+        resiSearchTagName:"",
         feedbackFormData: {
           serviceProjectId: "", //	服务项目id
           serviceName: "",
@@ -251,7 +256,7 @@
           this.formData.gridIdListName = "";
           this.feedbackFormData.serviceStatusShow = "";
           this.feedbackFormData.satisfactionShow = "";
-
+          await this.getTagName()
           let arr = [];
           this.formData.gridIdList.forEach((element) => {
             arr.push(element.objectName);
@@ -293,7 +298,26 @@
           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)
+            })
+          if(this.formData.resiSearchTagId){
+            this.resiSearchTagName = showAddProduct[0].tagName
+          }else{
+           this.resiSearchTagName = '--'
+          }
+         
+        } else {
+          this.$message.error(msg);
+        }
+      },
       handleCancle() {
         this.resetData();
         this.$emit("diaDetailClose");
@@ -348,6 +372,15 @@
           ],
         };
       },
+      // resiSearchTagNameText(){
+      //   let text = ""
+      //   if(this.resiSearchTagName){
+      //     text = this.resiSearchTagName
+      //   }else {
+      //     text = '--'
+      //   }
+      //   return text
+      // },
     },
     props: {
       serviceRecordId: {
diff --git a/src/views/modules/communityService/commonDemand/editForm.vue b/src/views/modules/communityService/commonDemand/editForm.vue
index 1f262bac8..ad9432599 100644
--- a/src/views/modules/communityService/commonDemand/editForm.vue
+++ b/src/views/modules/communityService/commonDemand/editForm.vue
@@ -79,11 +79,11 @@
                          :value="item.policyId">
               </el-option>
             </el-select>
-
+<!-- 
             <el-button style="margin-left: 10px"
                        type="primary"
                        size="small"
-                       @click="handlePersonList">预览</el-button>
+                       @click="handlePersonList">预览</el-button> -->
           </el-form-item>
 
           <el-form-item label="经办人"
@@ -106,10 +106,32 @@
                       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-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">
+                        prop="serviceTimeStart"
+                        style="display: block">
             <el-date-picker :disabled="formType==='detail'"
                             v-model="formData.serviceTimeStart"
                             :picker-options="startPickerOptions"
@@ -119,11 +141,11 @@
                             value="yyyy-MM-dd"
                             placeholder="开始时间">
             </el-date-picker>
-            <span class="data-tag">至</span>
+            <span class="u-data-tag">至</span>
             <el-date-picker :disabled="formType==='detail'"
                             v-model="formData.serviceTimeEnd"
                             :picker-options="endPickerOptions"
-                            class="item_width_2 data-tag"
+                            class="item_width_2 u-data-tag"
                             type="date"
                             value-format="yyyy-MM-dd"
                             value="yyyy-MM-dd"
@@ -302,7 +324,7 @@
                  :append-to-body="true"
                  :close-on-click-modal="false"
                  :close-on-press-escape="false"
-                 :title="'政策预览'"
+                 :title="'标签查找'"
                  width="1150px"
                  top="5vh"
                  class="dialog-h"
@@ -314,6 +336,29 @@
                      @handleClose="handleClose">
         </person-list>
       </el-dialog>
+      <el-dialog
+      v-if="showLabelForm"
+      :visible.sync="showLabelForm"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'标签配置'"
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showLabelForm = false"
+    >
+      <label-form
+        ref="ref_label_form"
+        :policyId="policyId"
+        :ruleList="ruleList"
+        @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"
+      >
+        <!--    @handleOk="handleOk"
+        @handleClose="handleClose" -->
+      </label-form>
+    </el-dialog>
     </div>
   </template>
 
@@ -322,7 +367,8 @@
   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
@@ -349,13 +395,14 @@
       }
 
       return {
-
-
         btnDisable: false,
 
         keyWords: '',
-        formData: {},
-
+        assignSwitch: true,
+        formData: {
+        },
+        showLabelForm: false,
+        resiSearchTagName:'',
         feedbackFormData: {
           serviceProjectId: '',//	服务项目id
           serviceName: '',
@@ -387,7 +434,7 @@
         ruleList: []
       }
     },
-    components: { personList },
+    components: { personList ,labelForm},
     mounted () {
       this.getPolicyList()
       if (this.serviceRecordId) {//详情
@@ -440,7 +487,12 @@
 
 
       },
-
+      handleClickLabel() {
+      this.showLabelForm = true;
+      this.$nextTick(() => {
+        this.$refs["ref_label_form"].initForm("info");
+      });
+    },
       async getPolicyList () {
         const url = '/governance/policy/policyListSelect'
 
@@ -468,7 +520,7 @@
           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 => {
@@ -486,7 +538,23 @@
           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
@@ -515,7 +583,7 @@
           })
           return false;
         }
-
+        console.log(this.formData);
         let url = '/governance/icServiceRecordV2/edit'
         // let url = "http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/update"
 
@@ -542,7 +610,18 @@
         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) {
 
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index 4e7e36e48..e1e593f2f 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -229,16 +229,17 @@
                            type="text"
                            size="small"
                            >编辑</el-button>
-                <el-button v-if="scope.row.serviceStatus==='in_service'"
+                           <!-- 临时去掉人员名单与反馈 -->
+                <!-- <el-button v-if="scope.row.serviceStatus==='in_service'"
                            @click="handleFeedback(scope.row)"
                            type="text"
                            size="small"
-                           >反馈</el-button>
-                <el-button v-if="scope.row.policyId"
+                           >反馈</el-button> -->
+                <!-- <el-button v-if="scope.row.policyId"
                            @click="handlePersonList(scope.row)"
                            type="text"
                            size="small"
-                           >人员名单</el-button>
+                           >人员名单</el-button> -->
                 <el-button v-if="scope.row.serviceStatus==='in_service'"
                            @click="handleDel(scope.row)"
                            type="text"
diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue
index 6c263a8d5..574f81564 100644
--- a/src/views/modules/communityService/labelConfig/addForm.vue
+++ b/src/views/modules/communityService/labelConfig/addForm.vue
@@ -1,188 +1,238 @@
 <template>
-    <div>
-        <el-form
-           ref="label_form"
-          :inline="true"
-          :model="formData"
-          class="div_form"
-          :rules="rules"
-        >
-            <el-form-item
-            label="标签名称"
-            label-width="100px"
-            prop="tagName"
+  <div>
+    <el-form
+      ref="label_form"
+      :inline="true"
+      :model="formData"
+      class="div_form"
+      :rules="rules"
+    >
+      <el-form-item
+        label="标签名称"
+        label-width="100px"
+        prop="tagName"
+        v-if="!infoType"
+      >
+        <el-input
+          v-model="formData.tagName"
+          placeholder="请输入内容"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <!-- -------------------------------------------------------------------------------------------------------------------------------- -->
+      <el-form-item label="标签名称" label-width="100px" prop="tagName" v-else>
+        <el-autocomplete
+          v-model="formData.tagName"
+          value-key="tagName"
+          :fetch-suggestions="querySearchAsync"
+          placeholder="请输入内容进行搜索"
+          @select="handleSelect"
+        ></el-autocomplete>
+      </el-form-item>
+    </el-form>
+    <p style="margin-left: 15px"><b style="color: #f56c6c">*</b> 匹配数据</p>
+    <el-table border :data="tableData" style="width: 100%" height="200">
+      <el-table-column label="选择数据源" align="center" width="120">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.dataSource"
+            placeholder="请选择"
+            :disabled="infoType"
+            @change="handleChangeSource(scope.row, scope.$index)"
+            clearable
+          >
+            <el-option
+              v-for="item in dataSourceOpction"
+              :label="item.label"
+              :value="item.value"
+              :key="item.value"
             >
-                <el-input v-model="formData.tagName" placeholder="请输入内容"  clearable ></el-input>
-
-            </el-form-item>
-         
-        </el-form>
-        <p style="margin-left: 15px;"> <b style="color:#F56C6C">*</b> 匹配数据</p>
-        <el-table
-             border
-            :data="tableData"
-             style="width: 100%"
-             height="200"
-             >  
-             <el-table-column  label="选择数据源" align="center" width="120">
-                    <template slot-scope="scope">
-                            <el-select
-                            v-model="scope.row.dataSource"
-                            placeholder="请选择"
-                            @change="handleChangeSource(scope.row,scope.$index)"
-                            clearable
-                            >
-                                <el-option
-                                v-for="item in dataSourceOpction" 
-                                :label="item.label" 
-                                :value="item.value"
-                                :key="item.value"
-                                >
-                                </el-option>
-                            </el-select>
-                    </template>
-             </el-table-column>
-               <!-- || scope.$index == scope._self._data.tableData.length-1  -->
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <!-- || scope.$index == scope._self._data.tableData.length-1  -->
 
-             <el-table-column  label="字段类别" align="center" width="120">
-                    <template slot-scope="scope" v-if="scope.row.dataSource=='resi'">
-                            <el-select
-                            v-model="scope.row.itemGroupId"
-                            placeholder="请选择"
-                            clearable
-                            @change="handleChangeFieldsType(scope.row,scope.$index)"
-                            >
-                                <el-option
-                                v-for="item in scope.row.itemGroupIdOpction" 
-                                :label="item.label" 
-                                :value="item.id"
-                                :key="item.id"
-                                >
-                                </el-option>
-                            </el-select>
-                    </template>
-                    <!-- <template v-else>
-                        <el-select
-                            :placeholder="scope.row.dataSource=='house'?'房屋信息':'统计信息'"
-                            :disabled="true"
-                            >
-                            </el-select>
-                    </template> -->
-             </el-table-column>
-             <el-table-column  label="字段名称" align="center" width="120">
-                    <template slot-scope="scope">
-                            <el-select
-                            v-model="scope.row.itemId"
-                            placeholder="请选择"
-                            @change="handleChangeFieldsName(scope.row,scope.$index)"
-                            @clear="handleClearItemId(scope.row,scope.$index)"
-                            clearable
-                            >
-                                <el-option
-                                v-for="item in scope.row.itemIdOpction" 
-                                :label="item.label" 
-                                :value="scope.row.dataSource=='resi'?item.itemId:item.colKey"
-                                :key="scope.row.dataSource=='resi'?item.itemId:item.colKey"
-                                >
-                                </el-option>
-                            </el-select>
-                    </template>
-             </el-table-column>
-             <el-table-column  label="比较符" align="center" width="120">
-                    <template slot-scope="scope">
-                            <el-select
-                            v-model="scope.row.queryType"
-                            placeholder="请选择"
-                            clearable
-                            >
-                                <el-option
-                                v-for="item in queryTypeOpction" 
-                                :label="item.label" 
-                                :value="item.value"
-                                :key="item.value"
-                                >
-                                </el-option>
-                            </el-select>
-                    </template>
-             </el-table-column>
-             <el-table-column  label="对应值" align="center" width="155">
-                    <template slot-scope="scope"    >
-                        <template v-for="item in scope.row.correspondingOpction" >
-                            <el-select
-                            v-if="item.itemType == 'select'||item.itemType == 'radio'||item.itemType =='checkbox'"
-                           v-model="scope.row.colVal"
-                           placeholder="请选择"
-                           clearable
-                           >
-                               <el-option
-                               v-for="items in item.options"
-                               :label="items.label" 
-                               :value="items.value"
-                               :key="items.label"
-                               >
-                               </el-option>
-                           </el-select>
-                           <el-input
-                            v-else-if="item.itemType === 'input'||item.itemType === 'textarea'"
-                           v-model="scope.row.colVal"
-                           placeholder="请输入"
-                           clearable
-                           >
-                           </el-input>
-                           <el-input-number v-else-if="item.itemType==='inputNum'"
-                           class="item_width_2"
-                           v-model="scope.row.colVal"
-                           :min="0"
-                           size="mini"
-                           label="请输入"></el-input-number>
-                        <el-date-picker v-else-if="item.itemType==='datepicker'||item.itemType==='date'"
-                                        v-model="scope.row.colVal"
-                                        class="item_width_2"
-                                        type="datetime"
-                                        value-format="yyyy-MM-dd HH:mm:ss"
-                                        value="yyyy-MM-dd HH:mm:ss"
-                                        placeholder="开始时间">
-                        </el-date-picker>
-                        <el-input v-else
-                        class="item_width_2"
-                        size="mini"
-                        placeholder="请输入"
-                        v-model="personItem.colVal">
-                       </el-input>
-                        </template>
-                          
-                    </template>
-             </el-table-column>
-             <el-table-column  label="条件关系" align="center" width="120">
-                    <template slot-scope="scope" v-if="scope.$index!=tableData.length-1">
-                            <el-select
-                            v-model="scope.row.nextLogicalRel"
-                            placeholder="请选择"
-                            clearable
-                            >
-                                <el-option
-                                v-for="item in nextLogicalRelOpction" 
-                                :label="item.label" 
-                                :value="item.value"
-                                :key="item.value"
-                                >
-                                </el-option>
-                            </el-select>
-                    </template>
-             </el-table-column>
-            <el-table-column fixed="right" label="操作" align="center" width="120">
-                    <template slot-scope="scope">
-                        <img src="@/assets/img/icon-del.png"  
-                          v-show="scope.$index!=tableData.length-1"
-                          @click="handleClickDelete(scope.$index)" 
-                          class="imgBtn"
-                          >
+      <el-table-column label="字段类别" align="center" width="120">
+        <template slot-scope="scope" v-if="scope.row.dataSource == 'resi'">
+          <el-select
+            v-model="scope.row.itemGroupId"
+            placeholder="请选择"
+            :disabled="infoType"
+            clearable
+            @change="handleChangeFieldsType(scope.row, scope.$index)"
+          >
+            <el-option
+              v-for="item in scope.row.itemGroupIdOpction"
+              :label="item.label"
+              :value="item.id"
+              :key="item.id"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="字段名称" align="center" width="120">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.itemId"
+            :disabled="infoType"
+            placeholder="请选择"
+            @change="handleChangeFieldsName(scope.row, scope.$index)"
+            @clear="handleClearItemId(scope.row, scope.$index)"
+            clearable
+          >
+            <el-option
+              v-for="item in scope.row.itemIdOpction"
+              :label="item.label"
+              :value="
+                scope.row.dataSource == 'resi' ? item.itemId : item.colKey
+              "
+              :key="scope.row.dataSource == 'resi' ? item.itemId : item.colKey"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="比较符" align="center" width="120">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.queryType"
+            placeholder="请选择"
+            :disabled="infoType"
+            clearable
+          >
+            <el-option
+              v-for="item in queryTypeOpction"
+              :label="item.label"
+              :value="item.value"
+              :key="item.value"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="对应值" align="center" width="155">
+        <template slot-scope="scope">
+          <template v-for="item in scope.row.correspondingOpction">
+            <el-select
+              v-if="
+                item.itemType == 'select' ||
+                item.itemType == 'radio' ||
+                item.itemType == 'checkbox'
+              "
+              v-model="scope.row.colVal"
+              :disabled="infoType"
+              placeholder="请选择"
+              clearable
+            >
+              <el-option
+                v-for="items in item.options"
+                :label="items.label"
+                :value="items.value"
+                :key="items.label"
+              >
+              </el-option>
+            </el-select>
+            <el-input
+              v-else-if="
+                item.itemType === 'input' || item.itemType === 'textarea'
+              "
+              v-model="scope.row.colVal"
+              :disabled="infoType"
+              placeholder="请输入"
+              clearable
+            >
+            </el-input>
+            <el-input-number
+              v-else-if="item.itemType === 'inputNum'"
+              class="item_width_2"
+              v-model="scope.row.colVal"
+              :disabled="infoType"
+              :min="0"
+              size="mini"
+              label="请输入"
+            ></el-input-number>
+            <el-date-picker
+              v-else-if="
+                item.itemType === 'datepicker' || item.itemType === 'date'
+              "
+              v-model="scope.row.colVal"
+              class="item_width_2"
+              :disabled="infoType"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              value="yyyy-MM-dd HH:mm:ss"
+              placeholder="开始时间"
+            >
+            </el-date-picker>
+            <el-input
+              v-else
+              class="item_width_2"
+              size="mini"
+              :disabled="infoType"
+              placeholder="请输入"
+              v-model="personItem.colVal"
+            >
+            </el-input>
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column label="条件关系" align="center" width="120">
+        <template
+          slot-scope="scope"
+          v-if="scope.$index != tableData.length - 1"
+        >
+          <el-select
+            v-model="scope.row.nextLogicalRel"
+            placeholder="请选择"
+            :disabled="infoType"
+            clearable
+          >
+            <el-option
+              v-for="item in nextLogicalRelOpction"
+              :label="item.label"
+              :value="item.value"
+              :key="item.value"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" align="center" width="120">
+        <template slot-scope="scope">
+          <!-- <img
+            src="@/assets/img/icon-del.png"
+            v-show="scope.$index != tableData.length - 1"
+            @click="handleClickDelete(scope.$index)"
+            class="imgBtn"
+          /> -->
+          <el-button
+            type="primary"
+            @click="handleClickAddRow"
+            v-if="scope.$index == tableData.length - 1"
+            size="small"
+            :disabled="infoType"
+            icon="el-icon-plus"
+            circle
+          ></el-button>
 
-                        <img src="@/assets/img/icon-add.png"
-                          @click="handleClickAddRow"
-                          v-show="scope.$index==tableData.length-1"
-                          class="imgBtn">
-                        <!-- <el-button
+          <el-button
+            type="danger"
+            @click="handleClickDelete(scope.$index)"
+            v-if="scope.$index != tableData.length - 1"
+            size="small"
+            :disabled="infoType"
+            icon="el-icon-minus"
+            circle
+          ></el-button>
+          <!-- <img
+            src="@/assets/img/icon-add.png"
+            @click="handleClickAddRow"
+            v-show="scope.$index == tableData.length - 1"
+            class="imgBtn"
+          /> -->
+          <!-- <el-button
                             
                             size="small"
                             type="text"
@@ -196,381 +246,456 @@
                             @click="handleClickDelete(scope.$index)"
                             >删除</el-button
                         > -->
-                    </template>
-                 </el-table-column>
-
-         </el-table> 
-        <div class="div_btn">
-        <el-button size="small" @click="handleCancle">取 消</el-button>
-        <el-button
-          size="small"
-          type="primary"
-          @click="handleComfirm"
-          >确 定</el-button
-        >
-      </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="div_btn">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button size="small" type="primary" @click="handleComfirm"
+        >确 定</el-button
+      >
     </div>
+  </div>
 </template>
 
 <script>
-  import { requestPost,requestGet } from "@/js/dai/request";
-  export default {
-    data() {
-        return {
-            formData:{
-                tagName:"",
-            },
-            FormType:"",
-            rules:{
-            tagName:[{ required: true, message: '请输入标签名称', trigger: 'change' }]
-            },
-            tableData:[{
-                dataSource:"",//数据源
-                itemGroupId:"",//字段类别
-                itemId:"",//字段名称
-                queryType:"",//比较符
-                colVal:"",//对应值
-                nextLogicalRel:"",//条件关系,
-                tableName:"",//数据库表名
-                colKey:"",
-                itemIdOpction:[],
-                itemGroupIdOpction:[],
-                correspondingOpction:[]
-            }],
-            formType:'',
-            dataSourceOpction:[{label:'人员信息',value:'resi'},{label:'房屋信息',value:'house'},{label:'统计信息',value:'stat'}],
-            queryTypeOpction:[{}],
-            nextLogicalRelOpction:[{label:'并且',value:'and'},{label:'或者',value:'or'}],
-        };
-    },
-    created() {},
-    methods: {
-        async initForm(type,row) {
-            console.log(type);
-            this.FormType = type
-            await this.getFormEdit(row.tagId)
-            this.tagId = row.tagId
-            console.log( this.tableData);
-            this.formType = type
-            for(let i in this.tableData){
-                this.handleChangeSource(this.tableData[i],[i],type)
-                this.handleChangeFieldsType(this.tableData[i],[i],type)
-                setTimeout(() => {
-                this.handleChangeFieldsName(this.tableData[i],[i],type)
-                }, 300);
-            }
-           this.formData.tagName = row.tagName
+import { requestPost, requestGet } from "@/js/dai/request";
+export default {
+  data() {
+    return {
+      formData: {
+        tagName: "",
+      },
+      formType: "",
+      rules: {
+        tagName: [
+          { required: true, message: "请输入标签名称", trigger: "change" },
+        ],
+      },
+      timeout: null,
+      tagObj:{},
+      searchList: [],
+      tableData: [
+        {
+          dataSource: "", //数据源
+          itemGroupId: "", //字段类别
+          itemId: "", //字段名称
+          queryType: "", //比较符
+          colVal: "", //对应值
+          nextLogicalRel: "", //条件关系,
+          tableName: "", //数据库表名
+          colKey: "",
+          itemIdOpction: [],
+          itemGroupIdOpction: [],
+          correspondingOpction: [],
         },
-      
-        // 选择数据源
-        async handleChangeSource(row,index,type){
-        console.log(row);
-            if(row.dataSource == 'resi'){
-                let url = "/oper/customize/icformitemgroup/list"
-                let params={
-                    formCode: "resi_base_info",
-                    policyFlag: "1"
-                }
-                let {data,code,msg} = await requestPost(url,params)
-                if(code == 0){
-                    this.$set(this.tableData[index],'itemGroupIdOpction',data)
-                    console.log(this.tableData[index].itemGroupIdOpction);
-                }else {
-                this.$message.error(msg) 
-                }
-                this.hadeleClearForm(this.tableData[index],index)
-                if(!type){
-                    this.tableData[index].itemGroupId = ""
-                    this.tableData[index].itemId = ""
-                    this.tableData[index].colKey = ""
-                    this.tableData[index].colVal = ""
-                    this.tableData[index].nextLogicalRel = ""
-                    this.tableData[index].queryType = ""
-                    this.tableData[index].itemIdOpction = []
-                }
-            }else if( row.dataSource == 'house') {
-                let url = "/governance/policy/item-list/house"
-                let params={}
-                let {data,code,msg} = await requestPost(url,params)
-                if(code == 0){
-                    this.tableData[index].itemIdOpction = data
+      ],
+      formType: "",
+      dataSourceOpction: [
+        { label: "人员信息", value: "resi" },
+        { label: "房屋信息", value: "house" },
+        { label: "统计信息", value: "stat" },
+      ],
+      infoType:false,
+      queryTypeOpction: [{}],
+      nextLogicalRelOpction: [
+        { label: "并且", value: "and" },
+        { label: "或者", value: "or" },
+      ],
+    };
+  },
+  created() {},
+  async mounted() {
+    await this.getLabelList();
+  },
+  methods: {
+    async initForm(type, row) {
+      this.formType = type;
+      if(type == 'info'){
+        this.infoType = true
+      }
+      await this.getFormEdit(row.tagId);
+      this.tagId = row.tagId;
+      this.tagObj = row
+      for (let i in this.tableData) {
+        this.handleChangeSource(this.tableData[i], [i], type);
+        this.handleChangeFieldsType(this.tableData[i], [i], type);
+        setTimeout(() => {
+          this.handleChangeFieldsName(this.tableData[i], [i], type);
+        }, 300);
+      }
+      this.formData.tagName = row.tagName;
+    },
+    querySearchAsync(val, cb) {
+      console.log(this.searchList);
+      var searchList = this.searchList;
+      console.log(val);
+      var results = val
+        ? searchList.filter(this.createStateFilter(val))
+        : searchList;
+      clearTimeout(this.timeout);
+      this.timeout = setTimeout(() => {
+        cb(results);
+      }, 3000 * Math.random());
+    },
+    createStateFilter(val) {
+      return (state) => {
+        return state.tagName.toLowerCase().indexOf(val.toLowerCase()) === 0;
+      };
+    },
+    async handleSelect(item) {
+      await this.initForm("info", item);
+    },
+    async getLabelList() {
+      const url = "/governance/resiSearchTag/listResiSearchTags";
+      let params = {
+        pageSize: 99,
+      };
+      let { data, msg, code } = await requestPost(url, params);
+      if (code == 0) {
+        this.searchList = data.list;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    // 选择数据源
+    async handleChangeSource(row, index, type) {
+      console.log(row);
+      if (row.dataSource == "resi") {
+        let url = "/oper/customize/icformitemgroup/list";
+        let params = {
+          formCode: "resi_base_info",
+          policyFlag: "1",
+        };
+        let { data, code, msg } = await requestPost(url, params);
+        if (code == 0) {
+          this.$set(this.tableData[index], "itemGroupIdOpction", data);
+          console.log(this.tableData[index].itemGroupIdOpction);
+        } else {
+          this.$message.error(msg);
+        }
+        this.hadeleClearForm(this.tableData[index], index);
+        if (!type) {
+          this.tableData[index].itemGroupId = "";
+          this.tableData[index].itemId = "";
+          this.tableData[index].colKey = "";
+          this.tableData[index].colVal = "";
+          this.tableData[index].nextLogicalRel = "";
+          this.tableData[index].queryType = "";
+          this.tableData[index].itemIdOpction = [];
+        }
+      } else if (row.dataSource == "house") {
+        let url = "/governance/policy/item-list/house";
+        let params = {};
+        let { data, code, msg } = await requestPost(url, params);
+        if (code == 0) {
+          this.tableData[index].itemIdOpction = data;
+        } else {
+          this.$message.error(msg);
+        }
+        this.hadeleClearForm(this.tableData[index], index);
+        if (!type) {
+          this.tableData[index].itemGroupId = "";
+          this.tableData[index].itemId = "";
+          this.tableData[index].colKey = "";
+          this.tableData[index].colVal = "";
+          this.tableData[index].nextLogicalRel = "";
+          this.tableData[index].queryType = "";
+        }
+      } else if (row.dataSource == "stat") {
+        let url = "/governance/policy/item-list/stat";
+        let params = {};
+        let { data, code, msg } = await requestPost(url, params);
+        if (code == 0) {
+          this.tableData[index].itemIdOpction = data;
+        } else {
+          this.$message.error(msg);
+        }
+        this.hadeleClearForm(this.tableData[index], index);
+        if (!type) {
+          this.tableData[index].itemGroupId = "";
+          this.tableData[index].itemId = "";
+          this.tableData[index].colKey = "";
+          this.tableData[index].colVal = "";
+          this.tableData[index].nextLogicalRel = "";
+          this.tableData[index].queryType = "";
+        }
+      } else {
+        this.hadeleClearForm(this.tableData[index], index);
+        this.tableData[index].itemGroupId = "";
+        this.tableData[index].itemId = "";
+        this.tableData[index].colKey = "";
+        this.tableData[index].colVal = "";
+        this.tableData[index].nextLogicalRel = "";
+        this.tableData[index].queryType = "";
+        this.tableData[index].itemIdOpction = [];
+      }
 
-                }else{
-                    this.$message.error(msg)
-                }
-                this.hadeleClearForm(this.tableData[index],index)
-                if(!type){
-                    this.tableData[index].itemGroupId = ""
-                    this.tableData[index].itemId = ""
-                    this.tableData[index].colKey = ""
-                    this.tableData[index].colVal = ""
-                    this.tableData[index].nextLogicalRel = ""
-                    this.tableData[index].queryType = ""
-                }
-            } else if(row.dataSource == "stat"){
-                let url = "/governance/policy/item-list/stat"
-                let params={}
-                let {data,code,msg} = await requestPost(url,params)
-                if(code == 0){
-                    this.tableData[index].itemIdOpction = data
+      this.getCompareList();
+    },
 
-                }else{
-                    this.$message.error(msg)
-                }
-                this.hadeleClearForm(this.tableData[index],index)
-                if(!type){
-                    this.tableData[index].itemGroupId = ""
-                    this.tableData[index].itemId = ""
-                    this.tableData[index].colKey = ""
-                    this.tableData[index].colVal = ""
-                    this.tableData[index].nextLogicalRel = ""
-                    this.tableData[index].queryType = ""
-                }
-            }else{
-                this.hadeleClearForm(this.tableData[index],index)
-                    this.tableData[index].itemGroupId = ""
-                    this.tableData[index].itemId = ""
-                    this.tableData[index].colKey = ""
-                    this.tableData[index].colVal = ""
-                    this.tableData[index].nextLogicalRel = ""
-                    this.tableData[index].queryType = ""
-                    this.tableData[index].itemIdOpction = []
-            }
+    // 字段类别修改
+    async handleChangeFieldsType(row, index, type) {
+      console.log(row, index, "字段类别row");
+      if (row.dataSource != "resi") return;
+      const url = "/oper/customize/icformitem/getItemListV2";
+      let params = {
+        groupId: row.itemGroupId,
+        policyFlag: "1",
+      };
+      this.hadeleClearForm(this.tableData[index], index);
+      if (!type) {
+        this.tableData[index].itemId = "";
+        this.tableData[index].colKey = "";
+        this.tableData[index].colVal = "";
+        this.tableData[index].nextLogicalRel = "";
+        this.tableData[index].queryType = "";
+        this.tableData[index].itemIdOpction = [];
+      }
+      let { data, code, msg } = await requestPost(url, params);
+      if (code == 0) {
+        this.$set(this.tableData[index], "itemIdOpction", data);
+        console.log(this.tableData[index].itemIdOpction, "see");
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    // 字段名称修改
+    async handleChangeFieldsName(row, index, type) {
+      console.log(row, "字段名称row");
+      var arr = [];
+      // 人的信息中colKey的字段是columnName要做一下判断
+      if (row.dataSource == "house" || row.dataSource == "stat") {
+        arr = row.itemIdOpction.filter((item) => item.colKey == row.itemId);
+        this.tableData[index].tableName = arr[0].tableName;
+        this.tableData[index].colKey = arr[0].colKey;
+        if (!type) {
+          this.tableData[index].colVal = "";
+          this.tableData[index].nextLogicalRel = "";
+          this.tableData[index].queryType = "";
+        }
+        // this.tableData[index].colVal = ''
+        // this.tableData[index].queryType = ''
+      } else if (row.dataSource == "resi" && row.itemId != "") {
+        arr = row.itemIdOpction.filter((item) => item.itemId == row.itemId);
+        this.tableData[index].tableName = arr[0].tableName;
+        this.tableData[index].colKey = arr[0].columnName;
+        if (!type) {
+          this.tableData[index].colVal = "";
+          this.tableData[index].nextLogicalRel = "";
+          this.tableData[index].queryType = "";
+        }
+        // this.tableData[index].colVal = ''
+        // this.tableData[index].queryType = ''
+      }
+      console.log(arr, "arr是筛选出来的");
+      if (row.itemId == "") return;
+      //  列表对应值的option有的是通过接口获取的就需要再通过optionSourceType判断下
+      console.log(arr[0].optionSourceType);
+      if (arr[0].optionSourceType == "remote") {
+        let url = "";
+        let params = {};
+        if (row.dataSource == "house") {
+          url = arr[0].optionSourceUrl;
+          params = JSON.parse(arr[0].optionSourceParam);
+        } else {
+          url = arr[0].optionSourceValue;
+        }
 
-            this.getCompareList()
-           
-        },
-       
-        // 字段类别修改
-        async handleChangeFieldsType(row,index,type){
-            console.log(row,index,'字段类别row');
-            if(row.dataSource != "resi") return
-            const url = "/oper/customize/icformitem/getItemListV2"
-            let params={
-                groupId: row.itemGroupId,
-                policyFlag: "1"
-            }
-            this.hadeleClearForm(this.tableData[index],index)
-            if(!type){
-                    this.tableData[index].itemId = ""
-                    this.tableData[index].colKey = ""
-                    this.tableData[index].colVal = ""
-                    this.tableData[index].nextLogicalRel = ""
-                    this.tableData[index].queryType = ""
-                    this.tableData[index].itemIdOpction = []
-                }
-            let {data,code,msg} = await requestPost(url,params)
-            if(code == 0){
-                this.$set(this.tableData[index],'itemIdOpction',data)
-                console.log(this.tableData[index].itemIdOpction ,'see');
-            }else {
-               this.$message.error(msg) 
-            }
-        },
-        // 字段名称修改
-        async handleChangeFieldsName(row,index,type){
-            console.log(row,'字段名称row');
-            var arr = []
-            // 人的信息中colKey的字段是columnName要做一下判断
-            if(row.dataSource == 'house' || row.dataSource == 'stat'){
-                arr =  row.itemIdOpction.filter(item=>item.colKey == row.itemId)
-                this.tableData[index].tableName = arr[0].tableName
-                this.tableData[index].colKey = arr[0].colKey
-                if(!type){
-                    this.tableData[index].colVal = ""
-                    this.tableData[index].nextLogicalRel = ""
-                    this.tableData[index].queryType = ""
-                }
-                // this.tableData[index].colVal = ''
-                // this.tableData[index].queryType = ''
-            }else if(row.dataSource == 'resi'&&row.itemId!=""){
-                    arr =  row.itemIdOpction.filter(item=>item.itemId == row.itemId)
-                    this.tableData[index].tableName = arr[0].tableName
-                    this.tableData[index].colKey = arr[0].columnName
-                    if(!type){
-                    this.tableData[index].colVal = ""
-                    this.tableData[index].nextLogicalRel = ""
-                    this.tableData[index].queryType = ""
-                }
-                    // this.tableData[index].colVal = ''
-                    // this.tableData[index].queryType = ''
-            }
-             console.log(arr,'arr是筛选出来的');
-             if(row.itemId=="")return
-            //  列表对应值的option有的是通过接口获取的就需要再通过optionSourceType判断下
-            console.log(arr[0].optionSourceType);
-             if(arr[0].optionSourceType== "remote"){
-                let url = ""
-                let params = {}
-                if(row.dataSource == 'house'){
-                    url = arr[0].optionSourceUrl
-                    params = JSON.parse(arr[0].optionSourceParam) 
-                }else{
-                    url = arr[0].optionSourceValue
-                }
-               
-                const { data, code, msg } = await requestPost(url, params)
-               if(code == 0 ){
-                arr[0].options = data
-                this.$set( this.tableData[index],'correspondingOpction',arr)
-               }else{
-                this.$message.error(msg)
-               }
-             }else{
-                this.$set( this.tableData[index],'correspondingOpction',arr)
-             }
+        const { data, code, msg } = await requestPost(url, params);
+        if (code == 0) {
+          arr[0].options = data;
+          this.$set(this.tableData[index], "correspondingOpction", arr);
+        } else {
+          this.$message.error(msg);
+        }
+      } else {
+        this.$set(this.tableData[index], "correspondingOpction", arr);
+      }
 
-             console.log( this.tableData);
-          
-        },
-        async getCompareList(){
-            const url = "/sys/dict/data/dictlist"
-            let params = {
-                dictType: "sql_query_type"
-            }
-            let {data,code,msg} = await requestPost(url,params)
-            if(code == 0){
-                this.queryTypeOpction = data
-            }else if(code>=8000){
-                this.$message.error(msg)
-            }
-        },
-         // 选中标签其他清空
-        hadeleClearForm(row,index){
-            let obj = {}
-             obj = {
-                            dataSource:row.dataSource?row.dataSource:'',
-                            itemId:row.itemId?row.itemId:'',
-                            queryType:row.queryType?row.queryType:'',
-                            colVal:row.colVal?row.colVal:'',
-                            colKey:row.colKey?row.colKey:'',
-                            nextLogicalRel:row.nextLogicalRel?row.nextLogicalRel:'',
-                            tableName:row.tableName?row.tableName:'',
-                            itemGroupId:row.itemGroupId?row.itemGroupId:'',
-                            itemIdOpction:row.itemIdOpction?row.itemIdOpction:[],
-                            itemGroupIdOpction:row.itemGroupIdOpction?row.itemGroupIdOpction:[]
-                        }
-            this.$set(this.tableData,index,obj)
-        },
-        async getFormEdit(id){
-            const url = `/governance/resiSearchTag/listResiSearchRulesByTagId?tagId=${id}`
-            let {code,msg,data} = await requestGet(url)
-            if(code == 0){
-                console.log(data,'获取到的详情信息');
-               this.tableData = data
-            }else if(code>=8000){
-                this.$message.error(msg)
-            }
-        },
-        async handleComfirm(){
-          this.$refs.label_form.validate((flag)=>{
-            if(flag){
-                let messageObj = {}
-                messageObj =  this.validateRule(this.tableData)
-                console.log(messageObj);
-                if(messageObj){
-                    this.$message.error(messageObj)
-                    return
-                }
-              for(let i in this.tableData){
-                    for(let j in this.tableData[i]){
-                        if(typeof this.tableData[i][j] != "string"&&typeof this.tableData[i][j] != "number"){
-                            this.$delete(this.tableData[i],j)
-                        }
-                    }
-                 }
-                 this.addSubmit()
-            }else{
-                return false
+      console.log(this.tableData);
+    },
+    async getCompareList() {
+      const url = "/sys/dict/data/dictlist";
+      let params = {
+        dictType: "sql_query_type",
+      };
+      let { data, code, msg } = await requestPost(url, params);
+      if (code == 0) {
+        this.queryTypeOpction = data;
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+    // 选中标签其他清空
+    hadeleClearForm(row, index) {
+      let obj = {};
+      obj = {
+        dataSource: row.dataSource ? row.dataSource : "",
+        itemId: row.itemId ? row.itemId : "",
+        queryType: row.queryType ? row.queryType : "",
+        colVal: row.colVal ? row.colVal : "",
+        colKey: row.colKey ? row.colKey : "",
+        nextLogicalRel: row.nextLogicalRel ? row.nextLogicalRel : "",
+        tableName: row.tableName ? row.tableName : "",
+        itemGroupId: row.itemGroupId ? row.itemGroupId : "",
+        itemIdOpction: row.itemIdOpction ? row.itemIdOpction : [],
+        itemGroupIdOpction: row.itemGroupIdOpction
+          ? row.itemGroupIdOpction
+          : [],
+      };
+      this.$set(this.tableData, index, obj);
+    },
+    async getFormEdit(id) {
+      const url = `/governance/resiSearchTag/listResiSearchRulesByTagId?tagId=${id}`;
+      let { code, msg, data } = await requestGet(url);
+      if (code == 0) {
+        console.log(data, "获取到的详情信息");
+        this.tableData = data;
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+    async handleComfirm() {
+      if (this.formType != "info") {
+        this.$refs.label_form.validate((flag) => {
+          if (flag) {
+            let messageObj = {};
+            messageObj = this.validateRule(this.tableData);
+            console.log(messageObj);
+            if (messageObj) {
+              this.$message.error(messageObj);
+              return;
             }
-          })
-               
-        },
-       async addSubmit(){
-               let url = ""
-               let params = {
-                }
-                 if(this.FormType == "edit"){
-                    url = "/governance/resiSearchTag/updateResiSearchTag"
-                    params = {
-                        tagName:this.formData.tagName,
-                        rules: this.tableData,
-                        tagId:this.tagId
-                    }
-                 }else {
-                    url = "/governance/resiSearchTag/addResiSearchTag"
-                    params = {
-                        tagName:this.formData.tagName,
-                        rules: this.tableData,
-                    }
-                 }
-              
-                let {data,msg,code} = await requestPost(url,params)
-                if(code==0){
-                    this.$message.success('新增成功')
-                    this.$emit('dialogOk')
-                }else if(code>=8000){
-                    this.$message.error(msg)
-                } 
-        },
-        handleCancle(){
-            this.$emit('dialogCancle')
-        },
-        validateRule(tabList){
-            console.log(tabList);
-            let message = ""
-            tabList.forEach((item,index)=>{
-                if (item.itemGroupId === '' && item.dataSource=='resi'||
-                    item.itemId === '' ||
-                    item.queryType === '' ||
-                    item.colKey === ''
+            for (let i in this.tableData) {
+              for (let j in this.tableData[i]) {
+                if (
+                  typeof this.tableData[i][j] != "string" &&
+                  typeof this.tableData[i][j] != "number"
                 ) {
-
-                    message = `匹配规则${item.dataSource=='resi'?'人员':item.dataSource=='house'?'房屋':item.dataSource=='stat'?'统计':''}信息不完整，请填写完整 !`
-                    return message
-                }
-                if ((index != this.tableData.length - 1) && item.nextLogicalRel === '') {
-                    message = `匹配规则${item.dataSource=='resi'?'人员':item.dataSource=='house'?'房屋':item.dataSource=='stat'?'统计':''}信息不完整，请填写完整 !`
-                    console.log(item);
-                    return message
-                }
-                if ((item.queryType !== 'is_null' && item.queryType !== 'is_not_null') && item.colVal === '') {
-                    message = `匹配规则${item.dataSource=='resi'?'人员':item.dataSource=='house'?'房屋':item.dataSource=='stat'?'统计':''}信息不完整，请填写完整 !`
-
-                    return message
+                  this.$delete(this.tableData[i], j);
                 }
-
-            })
-            return message
-        },
-        handleClickAddRow(){
-            if(this.tableData == undefined){
-                this.tableData = []
+              }
             }
-            let obj = {}
-                obj.dataSource="";
-                obj.itemGroupId="";
-                obj.itemId="";
-                obj.queryType="";
-                obj.colVal="";
-                obj.nextLogicalRel=""
-                obj.itemIdOpction = []
-                this.tableData.push(obj)
+            this.addSubmit();
+          } else {
+            return false;
+          }
+        });
+      } else {
+        this.$emit("dialogOk",this.tagObj);
+        return this.tagId;
+      }
+    },
+    async addSubmit() {
+      let url = "";
+      let params = {};
+      if (this.formType == "edit") {
+        url = "/governance/resiSearchTag/updateResiSearchTag";
+        params = {
+          tagName: this.formData.tagName,
+          rules: this.tableData,
+          tagId: this.tagId,
+        };
+      } else if(this.formType == "add"){
+        url = "/governance/resiSearchTag/addResiSearchTag";
+        params = {
+          tagName: this.formData.tagName,
+          rules: this.tableData,
+        };
+      }
+      let { data, msg, code } = await requestPost(url, params);
+      if (code == 0) {
+        this.$message.success("操作成功");
+        this.$emit("dialogOk");
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+    handleCancle() {
+      this.$emit("dialogCancle");
+    },
+    validateRule(tabList) {
+      console.log(tabList);
+      let message = "";
+      tabList.forEach((item, index) => {
+        if (
+          (item.itemGroupId === "" && item.dataSource == "resi") ||
+          item.itemId === "" ||
+          item.queryType === "" ||
+          item.colKey === ""
+        ) {
+          message = `匹配规则${
+            item.dataSource == "resi"
+              ? "人员"
+              : item.dataSource == "house"
+              ? "房屋"
+              : item.dataSource == "stat"
+              ? "统计"
+              : ""
+          }信息不完整，请填写完整 !`;
+          return message;
+        }
+        if (index != this.tableData.length - 1 && item.nextLogicalRel === "") {
+          message = `匹配规则${
+            item.dataSource == "resi"
+              ? "人员"
+              : item.dataSource == "house"
+              ? "房屋"
+              : item.dataSource == "stat"
+              ? "统计"
+              : ""
+          }信息不完整，请填写完整 !`;
+          console.log(item);
+          return message;
+        }
+        if (
+          item.queryType !== "is_null" &&
+          item.queryType !== "is_not_null" &&
+          item.colVal === ""
+        ) {
+          message = `匹配规则${
+            item.dataSource == "resi"
+              ? "人员"
+              : item.dataSource == "house"
+              ? "房屋"
+              : item.dataSource == "stat"
+              ? "统计"
+              : ""
+          }信息不完整，请填写完整 !`;
 
-        },
-        // 删除一行
-        handleClickDelete(index){
-            this.tableData.splice(index,1)
-        },
-        handleClearItemId(row,index){
-            this.tableData[index].colVal = ''
-            this.tableData[index].queryType = ''
-        },
+          return message;
+        }
+      });
+      return message;
     },
-    props:{},
-    computed:{},
-    watch: {},
-}
+    handleClickAddRow() {
+      if (this.tableData == undefined) {
+        this.tableData = [];
+      }
+      let obj = {};
+      obj.dataSource = "";
+      obj.itemGroupId = "";
+      obj.itemId = "";
+      obj.queryType = "";
+      obj.colVal = "";
+      obj.nextLogicalRel = "";
+      obj.itemIdOpction = [];
+      this.tableData.push(obj);
+    },
+    // 删除一行
+    handleClickDelete(index) {
+      this.tableData.splice(index, 1);
+    },
+    handleClearItemId(row, index) {
+      this.tableData[index].colVal = "";
+      this.tableData[index].queryType = "";
+    },
+  },
+  props: {},
+  computed: {},
+  watch: {},
+};
 </script>
 
 <style lang="scss" scoped>
@@ -581,10 +706,10 @@
   margin-top: 3px;
   cursor: pointer;
 }
-.div_btn{
-    display: flex;
-    justify-content: right;
-    margin-right: 16px;
-    margin-top: 10px;
+.div_btn {
+  display: flex;
+  justify-content: right;
+  margin-right: 16px;
+  margin-top: 10px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/modules/communityService/policy/personListItem.vue b/src/views/modules/communityService/policy/personListItem.vue
index fb1d5d308..8f27dbadf 100644
--- a/src/views/modules/communityService/policy/personListItem.vue
+++ b/src/views/modules/communityService/policy/personListItem.vue
@@ -286,7 +286,7 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/data/aggregator/icuser/listByPolicyRules"
+      const url = "actual/base/residentBaseInfo/listByTag"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
       let params = {
         pageSize: this.pageSize,