diff --git a/.env.production.sit b/.env.production.sit
index 393de85b5..4c51f6da4 100644
--- a/.env.production.sit
+++ b/.env.production.sit
@@ -1,7 +1,7 @@
 NODE_ENV=production
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =  http://192.168.1.140/api
-VUE_APP_API_SERVER =  http://192.168.1.144/api
+VUE_APP_API_SERVER =  http://219.146.91.110:30801/api
 VUE_APP_BIPASS_API_SERVER =  http://bipaas.elinkservice.cn/linkdata/linkdata-gateway/route
 VUE_APP_NODE_ENV=prod:sit
 VUE_APP_PUBLIC_PATH=epmet-oper
diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue
index 6a2dd0280..b54561fe4 100644
--- a/src/views/components/resiInfo.vue
+++ b/src/views/components/resiInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="g-main ">
+  <div class="g-main" >
        <div class=" title-small title_postion" >基础信息 </div>
          <el-row type="flex" class="f-m-top29">
              <el-col :span="12" class="f-flex">
@@ -444,7 +444,7 @@
                               </el-col>
                           </el-row>
                       </el-tab-pane>
-                      <el-tab-pane label="迁出" >
+                      <el-tab-pane label="迁出" v-if="qcShowStatus">
                         <el-row>
                               <el-col :span="8">
                                 <div class="f-flex f-bto16 f-top24">
@@ -864,9 +864,8 @@
 <script>
 
 import { requestPost, requestGet } from '@/js/dai/request'
-import { nextTick } from 'vue'
 export default {
-  name: 'resiForm',
+  name: 'resInfo',
   props: {
     resiId: {
         type: String,
@@ -1140,6 +1139,19 @@ export default {
           }
           return flag
         },
+        qcShowStatus(){
+          let flag = false
+          if(this.resiDetailObj.houseInfo.moveOutFlag){
+              if(this.resiDetailObj.houseInfo.moveOutFlag==1){
+                flag = true
+              }else{
+                flag = false
+              }
+          }else{
+            flag = false
+          }
+          return flag
+        },
         bzfShowStatus(){
           let flag = false
           if(this.resiDetailObj.categoryInfo){
@@ -1248,7 +1260,6 @@ export default {
        }).catch(err =>{
           console.log(err);
        })
-  
       },
       handleFilterSpan(row, item) {
       let _val = "";
diff --git a/src/views/components/scoreRecord.vue b/src/views/components/scoreRecord.vue
index 191a7336c..1ba828ea2 100644
--- a/src/views/components/scoreRecord.vue
+++ b/src/views/components/scoreRecord.vue
@@ -169,8 +169,8 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/heart/userdemand/recordList"
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/userdemand/recordList"
+      const url = "/governance/userdemand/recordList"
+      // const url = "http://yapi.elinkservice.cn/mock/245/governance/userdemand/recordList"
       let params = {
         serviceType: this.serviceType,
         serviceId: this.serviceId,
diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
new file mode 100644
index 000000000..2ef6e9b37
--- /dev/null
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -0,0 +1,1255 @@
+<template>
+    <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="服务分类"
+            prop="serviceCategoryKey"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            style="display: block"
+          >
+            <el-select
+              v-model="formData.serviceCategoryKey"
+              class="item_width_1"
+              placeholder="请选择"
+              clearable
+            >
+              <el-option
+                v-for="item in categrayOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>-->
+          <!-- 服务类别 -->
+          <el-form-item label="服务类别"
+                        style="display: block"
+                        label-width="150px"
+                        prop="serviceType">
+            <div class="f-flex">
+              <el-form-item prop="serviceType"
+                            class="u-item-width-communitycascader f-bto0"
+                            :rules="dataRule.serviceType" >
+                <el-select class="cell-width-1"
+                           v-model.trim="formData.serviceTypeLevel1Id"
+                           placeholder="请选择"
+                           clearable>
+                  <el-option v-for="item in serviceTypesLevel1"
+                             @click.native="handleChangeServiceTypeLevel1"
+                             :key="item.id"
+                             :label="item.name"
+                             :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item prop="serviceType"
+                            class="u-item-width-communitycascader f-bto0"
+                            :rules="dataRule.serviceType" >
+                <el-select class="cell-width-1"
+                           v-model.trim="formData.serviceTypeLevel2Id"
+                           placeholder="请选择"
+                           clearable>
+                  <el-option v-for="item in serviceTypesLevel2"
+                             @click.native=""
+                             :key="item.id"
+                             :label="item.name"
+                             :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </div>
+          </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="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>
+          </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="服务方"
+              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.value"
+                  :label="item.label"
+                  :value="item.value"
+              >
+              </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
+            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>
+
+      <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>
+    </div>
+  </template>
+
+  <script>
+  import { mapGetters } from "vuex";
+  import { Loading } from "element-ui"; // 引入Loading服务
+  import { requestPost } from "@/js/dai/request";
+  import personList from "../policy/personList";
+  import 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: "",
+      },
+      serviceCategoryKey: {
+        type: String,
+        required: "",
+      },
+      serviceProjectName: {
+        //服务项目名称
+        type: String,
+        required: false,
+        default: "",
+      },
+      formType: {
+        //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+        type: String,
+        required: "",
+      },
+      categrayArray: {
+        type: Array,
+        default() {
+          return [];
+        },
+      },
+      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,
+        },
+
+        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: {}, //反馈。允许发起服务的时候直接填写反馈，完成服务。
+        },
+        feedbackFormData: {
+          serviceGoal: "", //	服务目标
+          serviceEffect: "", //	服务效果
+          servicePeopleNumber: null, //	服务人数
+          serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+          satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+          longitude: "", //	经度
+          latitude: "", //	维度
+          address: "",
+          fileList: [], //	附件列表
+        },
+
+        endPickerOptions: {
+          // disabledDate: endDisabledDate,
+        },
+        startPickerOptions: {
+          // disabledDate: startDisabledDate,
+        },
+
+        showFeedback: false,
+        serviceOptions: [],
+        serviceOptiondList: [],
+        policyList: [],
+
+        fileList: [],
+        uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+
+        policyId: "",
+        showPersonList: false,
+        ruleList: [],
+
+        firstInitMap: true,
+
+        categrayOptions: [],
+        statusArray: [
+          {
+            value: "in_service",
+            label: "进行中",
+          },
+          {
+            value: "completed",
+            label: "已完成",
+          },
+        ],
+        satisfyArray: [
+          {
+            value: "bad",
+            label: "不满意",
+          },
+          {
+            value: "good",
+            label: "基本满意",
+          },
+          {
+            value: "perfect",
+            label: "非常满意",
+          },
+        ],
+      };
+    },
+
+    computed: {
+      dataRule() {
+        return {
+          serviceType: [
+            { required: true, message: '政策类型不能为空', trigger: 'blur' }
+          ],
+          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";
+        }
+      },
+    },
+
+    components: { personList },
+
+    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();
+      }
+
+      if (this.formType === "add") {
+        this.$refs.ref_form.resetFields();
+        await this.loadScopeTree();
+      } else {
+      }
+
+      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;
+            }
+          })
+          .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("网络错误");
+            })
+      },
+      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();
+          }
+        }
+      },
+
+      //加载组织数据
+      async handlePersonList() {
+        if (!this.formData.policyId) {
+          this.$message.info("请先选择政策");
+          return false;
+        }
+
+        this.policyId = this.formData.policyId;
+        await this.loadRuleList();
+
+        this.showPersonList = true;
+      },
+
+      async loadRuleList() {
+        const url = "/governance/policy/rulelist/" + this.policyId;
+
+        let params = {};
+
+        const { data, code, msg } = await requestPost(url, params);
+
+        if (code === 0) {
+          this.ruleList = data;
+        } else {
+          this.$message.error(msg);
+        }
+      },
+
+      handleClose() {
+        this.showPersonList = false;
+      },
+      handleOk() {
+        this.showPersonList = false;
+      },
+
+      async getPolicyList() {
+        const url = "/governance/policy/policyListSelect";
+
+        let params = {};
+
+        const { data, code, msg } = await requestPost(url, params);
+
+        if (code === 0) {
+          this.policyList = data;
+        } else {
+          this.$message.error(msg);
+        }
+      },
+      async 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",
+        };
+
+        const { data, code, msg } = await requestPost(url, params);
+
+        if (code === 0) {
+          this.categrayOptions = data;
+        } else {
+          this.$message.error(msg);
+        }
+      },
+      handleServiceChange(type, val) {
+        if (val === "social_org") {
+          if (type === "add") this.getServiceuserList(val, "add_demand");
+          else this.getServiceuserList(val, "query_demand");
+        } else this.getServiceuserList(val, "");
+      },
+
+      async getServiceuserList(serviceType, query) {
+        if (!serviceType) return false;
+
+        const params = {
+          serviceName: "",
+          serviceType: serviceType,
+          queryPurpose: query,
+        };
+        await this.$http
+          .post("/governance/userdemand/servicelist", params)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg);
+            } else {
+              this.serviceOptiondList = res.data;
+            }
+          })
+          .catch(() => {
+            return this.$message.error("网络错误");
+          });
+      },
+      handleChangeFeedback(val) {
+        this.showFeedback = val;
+
+        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 = {};
+
+        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);
+        }
+      },
+
+      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 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;
+          } 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();
+            }
+          }
+        });
+      },
+
+      async addFuwu() {
+        if (this.showFeedback) {
+          this.feedbackFormData.fileList = [];
+          this.feedbackFormData.fileList = [...this.fileList];
+          this.formData.feedback = { ...this.feedbackFormData };
+        } else {
+          this.formData.feedback = null;
+        }
+
+        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,
+        };
+
+        const { data, code, msg } = await requestPost(url, params);
+
+        if (code === 0) {
+          this.$message.success("发起成功");
+          this.resetData();
+          this.$emit("handleOk");
+        } else {
+          this.$message.error(msg);
+        }
+      },
+
+      async handleFeedback() {
+        this.btnDisable = true;
+        setTimeout(() => {
+          this.btnDisable = false;
+        }, 10000);
+
+        this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
+          if (!valid) {
+            app.util.validateRule(messageObj);
+            this.btnDisable = false;
+          } else {
+            this.addFeecback();
+          }
+        });
+      },
+
+      async addFeecback() {
+        this.feedbackFormData.fileList = [];
+        this.feedbackFormData.fileList = [...this.fileList];
+        this.feedbackFormData.serviceRecordId = this.serviceRecordId;
+
+        console.log(this.feedbackFormData);
+        // return false
+
+        const url = "/governance/icServiceFeedbackV2/add";
+
+        let params = {
+          ...this.feedbackFormData,
+        };
+
+        const { data, code, msg } = await requestPost(url, params);
+
+        if (code === 0) {
+          this.$message.success("反馈成功");
+          this.resetData();
+          this.$emit("handleOk");
+        } else {
+          this.$message.error(msg);
+        }
+      },
+
+      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;
+        }
+      },
+
+      handleFileRemove(file) {
+        if (file && file.status === "success") {
+          this.fileList.splice(
+            this.fileList.findIndex((item) => item.uid === file.uid),
+            1
+          );
+        }
+      },
+
+      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.url = res.data.url;
+          file.type = fileType;
+
+          file.name = file.name;
+          file.type = file.type;
+          file.url = file.url;
+
+          this.fileList.push(file);
+          console.log(this.fileList);
+        } else this.$message.error(res.msg);
+      },
+
+      //下载
+      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");
+      },
+
+      // 地图初始化函数，本例取名为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.on("dragend", (e) => {
+          this.handleMoveCenter(e);
+        });
+
+        map.setCenter(latitude, longitude);
+        map.setMarker(latitude, longitude);
+      },
+
+      async handleMoveCenter() {
+        //修改地图中心点
+        const { lat, lng } = map.getCenter();
+        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("未检索到相关位置坐标");
+        }
+      },
+
+      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();
+        }
+      },
+    },
+  };
+  </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 {
+    color: #fff;
+  }
+  .form-item {
+    .el-radio {
+      color: #fff;
+    }
+
+    .el-checkbox {
+      color: #fff;
+    }
+  }
+  </style>
diff --git a/src/views/modules/communityService/commonDemand/detailForm.vue b/src/views/modules/communityService/commonDemand/detailForm.vue
new file mode 100644
index 000000000..dfc14d2c9
--- /dev/null
+++ b/src/views/modules/communityService/commonDemand/detailForm.vue
@@ -0,0 +1,377 @@
+<template>
+    <div>
+      <div class="dialog-h-content scroll-h">
+        <div v-if="initLoading" class="m-row">
+          <div class="m-info">
+            <div class="info-prop">
+              <span class="info-title-2">服务名称：</span>
+              <span>{{ formData.serviceName || "--" }}</span>
+            </div>
+
+            <div class="info-prop">
+              <span class="info-title-2">服务组织：</span>
+              <span>{{ serviceOrgName || "--" }}</span>
+            </div>
+
+            <div class="info-prop">
+              <span class="info-title-2">服务范围：</span>
+              <span>{{ formData.gridIdListName || "--" }}</span>
+            </div>
+
+            <div class="info-prop">
+              <span class="info-title-2">政策依据：</span>
+              <span>{{ formData.policyTitle || "--" }}</span>
+              <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>
+              <span>{{ formData.principalName || "--" }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">联系方式：</span>
+              <span>{{ formData.principalContact || "--" }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">服务时间：</span>
+              <span>{{ formData.serviceTimeStart || "--" }}</span
+              >至
+              <span>{{ formData.serviceTimeEnd || "--" }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">备注：</span>
+              <span>{{ formData.remark || "--" }}</span>
+            </div>
+
+            <div v-show="formData.serviceStatus === 'completed'">
+              <h3 class="d-h3">反馈内容</h3>
+
+              <div class="info-prop">
+                <span class="info-title-2">服务目标：</span>
+                <span>{{ feedbackFormData.serviceGoal || "--" }}</span>
+              </div>
+              <div class="info-prop">
+                <span class="info-title-2">服务效果：</span>
+                <span>{{ feedbackFormData.serviceEffect || "--" }}</span>
+              </div>
+              <div class="info-prop">
+                <span class="info-title-2">服务人数：</span>
+                <span>{{ feedbackFormData.servicePeopleNumber || 0 }}</span>
+              </div>
+
+              <div class="info-prop">
+                <span class="info-title-2">服务状态：</span>
+                <span>{{ feedbackFormData.serviceStatusShow || "--" }}</span>
+              </div>
+              <div class="info-prop">
+                <span class="info-title-2">满意度：</span>
+                <span>{{ feedbackFormData.satisfactionShow || "--" }}</span>
+              </div>
+
+              <div class="info-prop">
+                <span class="info-title-2">地理位置：</span>
+                <span>{{ feedbackFormData.address || "--" }}</span>
+              </div>
+
+              <div class="info-prop">
+                <span class="info-title-2">地图位置：</span>
+                <div class="div_map">
+                  <div id="app_detail"></div>
+                </div>
+              </div>
+
+              <div class="info-prop">
+                <span class="info-title-2">附件：</span>
+                <file-list
+                  v-if="fileList.length > 0"
+                  :fileList="fileList"
+                ></file-list>
+                <span v-else>--</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="div-btn">
+        <el-button size="small" @click="handleCancle">关 闭</el-button>
+      </div>
+
+      <el-dialog
+        v-if="showPersonList"
+        :visible.sync="showPersonList"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :title="'政策预览'"
+        width="1150px"
+        top="5vh"
+        class="dialog-h"
+        @closed="showPersonList = false"
+      >
+        <person-list
+          ref="ref_detail_form"
+          :policyId="policyId"
+          :ruleList="ruleList"
+          @handleOk="handleOk"
+          @handleClose="handleClose"
+        >
+        </person-list>
+      </el-dialog>
+    </div>
+  </template>
+
+  <script>
+  import { mapGetters } from "vuex";
+  import { Loading } from "element-ui"; // 引入Loading服务
+  import { requestPost } from "@/js/dai/request";
+  import personList from "../policy/personList";
+  import fileList from "@/views/components/fileList";
+  import daiMap from "@/utils/dai-map";
+
+  var map;
+  let loading; // 加载动画
+
+  export default {
+    data() {
+      return {
+        initLoading: false,
+
+        keyWords: "",
+        formData: {},
+
+        feedbackFormData: {
+          serviceProjectId: "", //	服务项目id
+          serviceName: "",
+          serviceGoal: "", //	服务目标
+          serviceEffect: "", //	服务效果
+          servicePeopleNumber: null, //	服务人数
+          serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+          satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+          longitude: "", //	经度
+          latitude: "", //	维度
+          address: "",
+          fileList: [], //	附件列表
+        },
+
+        policyId: "",
+        showPersonList: false,
+        ruleList: [],
+        policyList: [],
+      };
+    },
+    components: { personList, fileList },
+    async mounted() {
+      await this.getPolicyList();
+      // if (this.serviceRecordId) {//详情
+      await this.loadInfo();
+      this.initLoading = true;
+
+      if (
+        this.formData.serviceStatus === "completed" &&
+        this.feedbackFormData.latitude
+      ) {
+        this.$nextTick(() => {
+          this.initMap();
+        });
+      }
+    },
+
+    methods: {
+      diaDestroy() {},
+
+      //加载组织数据
+      async handlePersonList() {
+        if (!this.formData.policyId) {
+          this.$message.info("请先选择政策");
+          return false;
+        }
+
+        this.policyId = this.formData.policyId;
+        await this.loadRuleList();
+
+        this.showPersonList = true;
+      },
+
+      async loadRuleList() {
+        const url = "/governance/policy/rulelist/" + this.policyId;
+
+        let params = {};
+
+        const { data, code, msg } = await requestPost(url, params);
+
+        if (code === 0) {
+          this.ruleList = data;
+        } else {
+          this.$message.error(msg);
+        }
+      },
+
+      handleClose() {
+        this.showPersonList = false;
+      },
+
+      async getPolicyList() {
+        const url = "/governance/policy/policyListSelect";
+
+        let params = {};
+
+        const { data, code, msg } = await requestPost(url, params);
+
+        if (code === 0) {
+          this.policyList = data;
+        } else {
+          this.$message.error(msg);
+        }
+      },
+      //加载组织
+      async loadInfo() {
+        const url = "/governance/icServiceRecordV2/detail";
+
+        let params = {
+          serviceRecordId: this.serviceRecordId,
+        };
+
+        const { data, code, msg } = await requestPost(url, params);
+
+        if (code === 0) {
+          this.formData = { ...data };
+          this.formData.serviceRecordId = this.serviceRecordId;
+          this.feedbackFormData = { ...data.feedback };
+          this.formData.policyName = "";
+          this.formData.gridIdListName = "";
+          this.feedbackFormData.serviceStatusShow = "";
+          this.feedbackFormData.satisfactionShow = "";
+
+          let arr = [];
+          this.formData.gridIdList.forEach((element) => {
+            arr.push(element.objectName);
+          });
+          this.formData.gridIdListName = arr.join(",");
+          this.statusArray.forEach((element) => {
+            if (this.formData.serviceStatus === element.value) {
+              this.feedbackFormData.serviceStatusShow = element.label;
+            }
+          });
+          this.satisfyArray.forEach((element) => {
+            if (this.feedbackFormData.satisfaction === element.value) {
+              this.feedbackFormData.satisfactionShow = element.label;
+            }
+          });
+          this.policyList.forEach((element) => {
+            if (this.formData.policyId === element.policyId) {
+              this.formData.policyName = element.title;
+            }
+          });
+
+          this.fileList = [];
+          if (
+            data.feedback &&
+            data.feedback.fileList &&
+            data.feedback.fileList.length > 0
+          ) {
+            data.feedback.fileList.forEach((element) => {
+              let obj = {
+                name: element.name,
+                format: element.format,
+                url: element.url,
+                type: element.type,
+              };
+              this.fileList.push(obj);
+            });
+          }
+        } else {
+          this.$message.error(msg);
+        }
+      },
+
+      handleCancle() {
+        this.resetData();
+        this.$emit("diaDetailClose");
+      },
+
+      // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+      initMap() {
+        let { latitude, longitude } = this.feedbackFormData;
+
+        map = new daiMap(
+          document.getElementById("app_detail"),
+          { latitude, longitude },
+          {
+            zoom: 16.2, // 设置地图缩放级别
+            pitch: 43.5, // 设置俯仰角
+            rotation: 45, // 设置地图旋转角度
+          }
+        );
+
+        map.setCenter(latitude, longitude);
+        map.setMarker(latitude, longitude);
+      },
+
+      handleOk() {
+        this.showPersonList = false;
+      },
+
+      resetData() {
+        this.formData = {};
+      },
+      // 开启加载动画
+      startLoading() {
+        loading = Loading.service({
+          lock: true, // 是否锁定
+          text: "正在加载……", // 加载中需要显示的文字
+          background: "rgba(0,0,0,.7)", // 背景颜色
+        });
+      },
+      // 结束加载动画
+      endLoading() {
+        // clearTimeout(timer);
+        if (loading) {
+          loading.close();
+        }
+      },
+    },
+    computed: {
+      dataRule() {
+        return {
+          serviceTimeStart: [
+            { required: true, message: "服务时间不能为空", trigger: "blur" },
+          ],
+        };
+      },
+    },
+    props: {
+      serviceRecordId: {
+        type: String,
+        required: true,
+      },
+      serviceOrgName: {
+        type: String,
+        required: true,
+      },
+
+      satisfyArray: {
+        type: Array,
+        default() {
+          return [];
+        },
+      },
+      statusArray: {
+        type: Array,
+        default() {
+          return [];
+        },
+      },
+    },
+  };
+  </script>
+
+  <style lang="scss" scoped>
+  @import "@/assets/scss/modules/management/detail-main.scss";
+  </style>
diff --git a/src/views/modules/communityService/commonDemand/editForm.vue b/src/views/modules/communityService/commonDemand/editForm.vue
new file mode 100644
index 000000000..1f262bac8
--- /dev/null
+++ b/src/views/modules/communityService/commonDemand/editForm.vue
@@ -0,0 +1,747 @@
+<template>
+    <div>
+      <div class="dialog-h-content scroll-h">
+
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="formData"
+                 :rules="dataRule"
+                 class="div_form">
+
+          <el-form-item label="服务名称"
+                        prop="serviceName"
+                        label-width="150px"
+                        style="display: block">
+            <span>{{formData.serviceName}}</span>
+            <!-- <el-select class="item_width_1"
+                       v-model="formData.serviceProjectId"
+                       placeholder="请选择"
+                       filterable
+                       clearable>
+              <el-option v-for="(item,index) in projectList"
+                         @click.native="hancleClickProject(index)"
+                         :key="item.serviceProjectId"
+                         :label="item.serviceName"
+                         :value="item.serviceProjectId">
+              </el-option>
+            </el-select> -->
+
+          </el-form-item>
+          <el-form-item label="服务组织"
+                        prop="serviceOrgId"
+                        label-width="150px"
+                        style="display: block">
+            <span>{{serviceOrgName}}</span>
+            <!-- <el-select class="item_width_1"
+                       v-model="formData.serviceOrgId"
+                       placeholder="请选择"
+                       filterable
+                       clearable>
+              <el-option v-for="item in orgList"
+                         :key="item.icServiceOrgId"
+                         :label="item.orgName"
+                         :value="item.icServiceOrgId">
+              </el-option>
+            </el-select> -->
+
+          </el-form-item>
+
+          <el-form-item label="服务范围"
+                        prop="gridIdList"
+                        label-width="150px"
+                        style="display: block">
+            <div v-for="item in formData.gridIdList"
+                 :key="item.objectId">
+              <div>{{item.objectName}}</div>
+            </div>
+            <!-- <el-cascader class="item_width_1"
+                         ref="myCascader"
+                         v-model="scopeIdArray"
+                         :key="iscascaderShow"
+                         :options="casOptions"
+                         :props="optionProps"
+                         :show-all-levels="false"
+                         @change="handleChangeScope"></el-cascader> -->
+          </el-form-item>
+
+          <el-form-item label="政策依据"
+                        prop="policyId"
+                        label-width="150px"
+                        style="display: block">
+            <el-select :disabled="formType==='detail'"
+                       v-model="formData.policyId"
+                       class="input-width-small"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in policyList"
+                         :key="item.policyId"
+                         :label="item.title"
+                         :value="item.policyId">
+              </el-option>
+            </el-select>
+
+            <el-button style="margin-left: 10px"
+                       type="primary"
+                       size="small"
+                       @click="handlePersonList">预览</el-button>
+          </el-form-item>
+
+          <el-form-item label="经办人"
+                        prop="principalName"
+                        label-width="150px"
+                        style="display: block">
+            <el-input :disabled="formType==='detail'"
+                      class="item_width_1"
+                      placeholder="请输入经办人姓名"
+                      v-model="formData.principalName">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="联系方式"
+                        prop="principalContact"
+                        label-width="150px"
+                        style="display: block">
+            <el-input :disabled="formType==='detail'"
+                      class="item_width_1"
+                      placeholder="请输入联系方式"
+                      v-model="formData.principalContact">
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="服务时间"
+                        label-width="150px"
+                        prop="serviceTimeStart">
+            <el-date-picker :disabled="formType==='detail'"
+                            v-model="formData.serviceTimeStart"
+                            :picker-options="startPickerOptions"
+                            class="item_width_2"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            value="yyyy-MM-dd"
+                            placeholder="开始时间">
+            </el-date-picker>
+            <span class="data-tag">至</span>
+            <el-date-picker :disabled="formType==='detail'"
+                            v-model="formData.serviceTimeEnd"
+                            :picker-options="endPickerOptions"
+                            class="item_width_2 data-tag"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            value="yyyy-MM-dd"
+                            placeholder="结束时间">
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="备注"
+                        prop="remark"
+                        label-width="150px"
+                        style="display: block">
+            <el-input :disabled="formType==='detail'"
+                      class="item_width_1"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入备注，不超过500字"
+                      v-model="formData.remark"></el-input>
+          </el-form-item>
+
+        </el-form>
+
+        <div v-show="formData.serviceStatus==='completed'">
+          <h3 class="d-h3">反馈内容</h3>
+
+          <el-form ref="ref_form_feedback"
+                   :inline="true"
+                   :disabled="true"
+                   :model="feedbackFormData"
+                   class="div_form">
+
+            <el-form-item label="服务目标"
+                          prop="serviceGoal"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_1"
+                        type="textarea"
+                        maxlength="1000"
+                        show-word-limit
+                        :rows="3"
+                        placeholder="请输入服务目标，不超过1000字"
+                        v-model="feedbackFormData.serviceGoal"></el-input>
+            </el-form-item>
+
+            <el-form-item label="服务效果"
+                          prop="serviceEffect"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_1"
+                        type="textarea"
+                        maxlength="1000"
+                        show-word-limit
+                        :rows="3"
+                        placeholder="请输入服务效果，不超过1000字"
+                        v-model="feedbackFormData.serviceEffect"></el-input>
+            </el-form-item>
+
+            <el-form-item label="服务人数"
+                          style="display: block"
+                          prop="servicePeopleNumber"
+                          label-width="150px">
+              <el-input-number class="item_width_2"
+                               v-model="feedbackFormData.servicePeopleNumber"
+                               :min="0"
+                               :max="9999"
+                               label="服务人数"></el-input-number>
+            </el-form-item>
+
+            <el-form-item label="服务状态"
+                          label-width="150px"
+                          style="display: block"
+                          prop="serviceStatus">
+              <span>已完成</span>
+              <!-- <el-select class="item_width_1"
+                         v-model="feedbackFormData.serviceStatus"
+                         placeholder="全部"
+                         clearable>
+                <el-option v-for="item in statusArray"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select> -->
+
+            </el-form-item>
+            <el-form-item label="满意度"
+                          style="display: block"
+                          label-width="150px"
+                          prop="satisfaction">
+              <el-select class="item_width_2"
+                         v-model="feedbackFormData.satisfaction"
+                         placeholder="全部"
+                         clearable>
+                <el-option v-for="item in satisfyArray"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+
+            </el-form-item>
+            <el-form-item label="地址"
+                          prop="address"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_1"
+                        v-model="feedbackFormData.address"></el-input>
+            </el-form-item>
+            <!-- <el-form-item label="地图位置"
+                          label-width="150px"
+                          style="display: block">
+              <div style="width:500px">
+
+                <div class="div_map">
+                  <div id="map_app">
+
+                  </div>
+                  <div class="div_searchmap">
+                    <el-input maxlength="50"
+                              size="mini"
+                              placeholder="请输入关键字"
+                              v-model="keyWords">
+                    </el-input>
+                    <el-button style="margin-left: 10px"
+                               type="primary"
+                               size="mini"
+                               @click="handleSearchMap">查询</el-button>
+                  </div>
+                </div>
+
+              </div>
+            </el-form-item> -->
+
+            <el-form-item class="block"
+                          label="附件"
+                          label-width="150px"
+                          prop="attach">
+              <!-- <el-upload :headers="$getElUploadHeaders()"  v-if="feedbackFormData.fileList&&feedbackFormData.fileList.length>0"
+                         class="upload-demo"
+                         :on-preview="handleFileDownload"
+                         accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+                         :limit="3"
+                         :file-list="fileList">
+
+              </el-upload> -->
+              <div v-if="feedbackFormData.fileList&&feedbackFormData.fileList.length>0"
+                   class="attachement-list">
+                <a :href="att.url"
+                   target="_blank"
+                   :key="att.url"
+                   v-for="att in feedbackFormData.fileList">
+                  <i class="el-icon-folder-opened"></i>
+                  {{ att.name }}
+                </a>
+              </div>
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-form>
+        </div>
+
+      </div>
+
+      <div class="div_btn">
+        <el-button size="small"
+                   @click="handleCancle">取 消</el-button>
+        <el-button size="small"
+                   v-if="formType != 'detail'"
+                   type="primary"
+                   :disabled="btnDisable"
+                   @click="handleComfirm">确 定</el-button>
+      </div>
+
+      <el-dialog v-if="showPersonList"
+                 :visible.sync="showPersonList"
+                 :append-to-body="true"
+                 :close-on-click-modal="false"
+                 :close-on-press-escape="false"
+                 :title="'政策预览'"
+                 width="1150px"
+                 top="5vh"
+                 class="dialog-h"
+                 @closed="showPersonList = false">
+        <person-list ref="ref_detail_form"
+                     :policyId="policyId"
+                     :ruleList="ruleList"
+                     @handleOk="handleOk"
+                     @handleClose="handleClose">
+        </person-list>
+      </el-dialog>
+    </div>
+  </template>
+
+  <script>
+  import { mapGetters } from 'vuex'
+  import { Loading } from 'element-ui' // 引入Loading服务
+  import { requestPost } from '@/js/dai/request'
+  import personList from "../policy/personList";
+
+
+  var map
+  var search
+  var markers
+  var infoWindowList
+  var geocoder // 新建一个正逆地址解析类
+
+  let loading // 加载动画
+  export default {
+    data () {
+      let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+        let nowData = Date.now()
+        if (this.formData.serviceTimeStart) {
+          let serviceTimeStart = new Date(this.formData.serviceTimeStart)
+          return time.getTime() > 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 {
+
+
+        btnDisable: false,
+
+        keyWords: '',
+        formData: {},
+
+        feedbackFormData: {
+          serviceProjectId: '',//	服务项目id
+          serviceName: '',
+          serviceGoal: '',//	服务目标
+          serviceEffect: '',//	服务效果
+          servicePeopleNumber: null,//	服务人数
+          serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成
+          satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect
+          longitude: '',//	经度
+          latitude: '',//	维度
+          address: '',
+          fileList: [],//	附件列表
+        },
+        serviceList: [],//服务list
+
+        endPickerOptions: {
+          disabledDate: endDisabledDate
+        },
+        startPickerOptions: {
+          disabledDate: startDisabledDate
+        },
+        policyList: [],
+        projectList: [],
+        fileList: [],
+        uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+
+        policyId: '',
+        showPersonList: false,
+        ruleList: []
+      }
+    },
+    components: { personList },
+    mounted () {
+      this.getPolicyList()
+      if (this.serviceRecordId) {//详情
+        this.loadInfo()
+
+      }
+      // this.initMap()
+
+    },
+
+
+    methods: {
+      //加载组织数据
+      async handlePersonList () {
+        if (!this.formData.policyId) {
+          this.$message.info('请先选择政策')
+          return false
+        }
+
+        this.policyId = this.formData.policyId
+        await this.loadRuleList()
+
+        this.showPersonList = true;
+      },
+
+      async loadRuleList () {
+
+        const url = "/governance/policy/rulelist/" + this.policyId
+
+        let params = {}
+
+        const { data, code, msg } = await requestPost(url, params)
+
+        if (code === 0) {
+          this.ruleList = data
+
+        } else {
+          this.$message.error(msg)
+        }
+
+      },
+
+      handleClose () {
+        this.showPersonList = false
+
+
+      },
+      handleOk () {
+        this.showPersonList = false
+
+
+      },
+
+      async getPolicyList () {
+        const url = '/governance/policy/policyListSelect'
+
+        let params = {}
+
+        const { data, code, msg } = await requestPost(url, params)
+
+        if (code === 0) {
+          this.policyList = data
+        } else {
+          this.$message.error(msg)
+        }
+      },
+      //加载组织
+      async loadInfo () {
+        const url = '/governance/icServiceRecordV2/detail'
+
+        let params = {
+          serviceRecordId: this.serviceRecordId
+        }
+
+        const { data, code, msg } = await requestPost(url, params)
+
+        if (code === 0) {
+          this.formData = { ...data }
+          this.formData.serviceRecordId = this.serviceRecordId
+          this.feedbackFormData = { ...data.feedback }
+
+          this.fileList = []
+          if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
+            data.feedback.fileList.forEach(element => {
+              let obj = {
+                name: element.name,
+                format: element.format,
+                url: element.url,
+              }
+              this.fileList.push(obj)
+            });
+          }
+
+
+        } else {
+          this.$message.error(msg)
+        }
+      },
+
+      async handleComfirm () {
+
+        this.btnDisable = true
+        setTimeout(() => {
+          this.btnDisable = false
+        }, 10000)
+        this.$refs['ref_form'].validate((valid, messageObj) => {
+          if (!valid) {
+            app.util.validateRule(messageObj)
+            this.btnDisable = false
+          } else {
+            this.editFuwu()
+          }
+
+        })
+
+
+      },
+      async editFuwu () {
+        const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+        if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) {
+          this.btnDisable = false
+          this.$message({
+            type: 'warning',
+            message: '请输入正确的手机号码'
+          })
+          return false;
+        }
+
+        let url = '/governance/icServiceRecordV2/edit'
+        // let url = "http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/update"
+
+
+        const { data, code, msg } = await requestPost(url, this.formData)
+
+        if (code === 0) {
+          this.$message({
+            type: 'success',
+            message: '操作成功'
+          })
+          this.resetData()
+
+          this.$emit('handleOk')
+        } else {
+          this.btnDisable = false
+          this.$message.error(msg)
+        }
+
+      },
+
+      handleCancle () {
+        this.resetData()
+        this.$emit('handleClose')
+
+      },
+
+      //下载
+      handleFileDownload (file) {
+
+        var a = document.createElement('a');
+        var event = new MouseEvent('click');
+        a.download = file.name;
+        console.log(a)
+        a.href = file.url;
+        a.dispatchEvent(event);
+
+
+      },
+
+      // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+      initMap () {
+        // 定义地图中心点坐标
+        var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+        // 定义map变量，调用 TMap.Map() 构造函数创建地图
+        map = new window.TMap.Map(document.getElementById('app'), {
+          center: center, // 设置地图中心点坐标
+          zoom: 17.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45 // 设置地图旋转角度
+        })
+
+        search = new window.TMap.service.Search({ pageSize: 10 })
+        // 新建一个地点搜索类
+        markers = new TMap.MultiMarker({
+          map: map,
+          geometries: []
+        })
+        infoWindowList = Array(10)
+
+        geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+        // 监听地图平移结束
+        map.on('panend', () => {
+          this.handleMoveCenter()
+        })
+        this.handleMoveCenter()
+        this.convert()
+      },
+
+      setMarker (lat, lng) {
+        markers.setGeometries([])
+        markers.add([
+          {
+            id: '4',
+            styleId: 'marker',
+            position: new TMap.LatLng(lat, lng),
+            properties: {
+              title: 'marker4'
+            }
+          }
+        ])
+      },
+
+      handleSearchMap () {
+        infoWindowList.forEach((infoWindow) => {
+          infoWindow.close()
+        })
+        infoWindowList.length = 0
+        markers.setGeometries([])
+        // 在地图显示范围内以给定的关键字搜索地点
+        search
+          .searchNearby({
+            keyword: this.keyWords,
+            radius: 1000,
+            autoExtend: true,
+            center: map.getCenter(),
+          })
+          .then((result) => {
+            let { data } = result
+            if (Array.isArray(data) && data.length > 0) {
+              const {
+                location: { lat, lng }
+              } = data[0]
+
+
+              map.setCenter(new TMap.LatLng(lat, lng))
+              this.setMarker(lat, lng)
+              this.formData.latitude = lat
+              this.formData.longitude = lng
+              this.convert()
+            } else {
+              this.$message.error('未检索到相关位置坐标')
+            }
+          })
+      },
+
+      handleMoveCenter () {
+        //修改地图中心点
+        const center = map.getCenter()
+        const lat = center.getLat()
+        const lng = center.getLng()
+        this.formData.latitude = lat
+        this.formData.longitude = lng
+        this.setMarker(lat, lng)
+        this.convert(lat, lng)
+      },
+
+      convert (lat, lng) {
+        markers.setGeometries([]);
+        // var input = document.getElementById('location').value.split(',');
+        let location
+        if (lat && lng) {
+          location = new TMap.LatLng(lat, lng);
+        } else {
+          location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+        }
+
+        // map.setCenter(location);
+        markers.updateGeometries([
+          {
+            id: 'main', // 点标注数据数组
+            position: location,
+          },
+        ]);
+        geocoder
+          .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+          .then((result) => {
+            this.formData.address = result.result.address
+            // 显示搜索到的地址
+          });
+      },
+
+
+      resetData () {
+        this.formData = {}
+      },
+      // 开启加载动画
+      startLoading () {
+        loading = Loading.service({
+          lock: true, // 是否锁定
+          text: '正在加载……', // 加载中需要显示的文字
+          background: 'rgba(0,0,0,.7)' // 背景颜色
+        })
+      },
+      // 结束加载动画
+      endLoading () {
+        // clearTimeout(timer);
+        if (loading) {
+          loading.close()
+        }
+      }
+    },
+    computed: {
+      dataRule () {
+        return {
+
+
+          serviceTimeStart: [
+            { required: true, message: '服务时间不能为空', trigger: 'blur' }
+          ],
+
+
+        }
+      },
+    },
+    props: {
+
+      serviceRecordId: {
+        type: String,
+        required: true
+      },
+      serviceOrgName: {
+        type: String,
+        required: true
+      },
+      formType: {//表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+        type: String,
+        required: true
+      },
+
+      satisfyArray: {
+        type: Array,
+        default () {
+          return []
+        }
+      },
+    }
+  }
+  </script>
+
+
+  <style lang="scss" scoped >
+  @import "@/assets/scss/modules/management/form-main.scss";
+
+  .attachement-list {
+    // padding-left: 20px;
+    a {
+      display: block;
+      cursor: pointer;
+      // color: #4df0ff;
+      font-size: 14px;
+
+      i {
+        color: #333;
+      }
+    }
+  }
+  </style>
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
new file mode 100644
index 000000000..d8f8f764f
--- /dev/null
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -0,0 +1,796 @@
+<template>
+    <div class="div_main">
+      <div>
+        <div class="div_search">
+          <el-form :inline="true"
+                   :model="formData"
+                   ref="ref_searchform"
+                   :label-width="'80px'">
+            <div>
+
+              <el-form-item label="服务类别"
+
+                            prop="serviceType">
+                <div class="f-flex">
+                  <el-form-item prop="serviceType"
+                                class="u-item-width-communitycascader f-bto0">
+                    <el-select class="cell-width-1"
+                               v-model.trim="formData.serviceTypeLevel1Id"
+                               placeholder="请选择"
+                               clearable>
+                      <el-option v-for="item in serviceTypesLevel1"
+                                 @click.native="handleChangeServiceTypeLevel1"
+                                 :key="item.id"
+                                 :label="item.name"
+                                 :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="serviceType"
+                                class="u-item-width-communitycascader f-bto0">
+                    <el-select class="cell-width-1"
+                               v-model.trim="formData.serviceTypeLevel2Id"
+                               placeholder="请选择"
+                               clearable>
+                      <el-option v-for="item in serviceTypesLevel2"
+                                 @click.native=""
+                                 :key="item.id"
+                                 :label="item.name"
+                                 :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </div>
+              </el-form-item>
+
+              <el-form-item label="服务时间"
+                            prop="serviceTimeStart">
+                <el-date-picker v-model="formData.serviceTimeStart"
+                                :picker-options="startPickerOptions"
+                                class="item_width_2"
+                                size="small"
+                                type="date"
+                                value-format="yyyy-MM-dd"
+                                value="yyyy-MM-dd"
+                                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"
+                                size="small"
+                                type="date"
+                                value-format="yyyy-MM-dd"
+                                value="yyyy-MM-dd"
+                                placeholder="结束时间">
+                </el-date-picker>
+              </el-form-item>
+
+
+              <el-form-item label="服务事项"
+                            prop="serviceName">
+                <el-input v-model="formData.serviceName"
+                          class="item_width_1"
+                          size="small"
+                          clearable
+                          placeholder="请输入">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item label="服务组织"
+                            prop="serviceOrgType">
+                <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.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+
+
+              <el-form-item label="服务状态"
+                            prop="serviceStatus">
+                <el-select class="item_width_2"
+                           v-model="formData.serviceStatus"
+                           placeholder="全部"
+                           size="small"
+                           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="satisfaction">
+                <el-select class="item_width_2"
+                           v-model="formData.satisfaction"
+                           placeholder="全部"
+                           size="small"
+                           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-button style="margin-left:30px"
+                         size="small"
+                         class="diy-button--search"
+                         @click="handleSearch">查询</el-button>
+              <el-button style="margin-left:10px"
+                         size="small"
+                         class="diy-button--reset"
+                         @click="resetSearch">重置</el-button>
+            </div>
+          </el-form>
+        </div>
+
+        <div class="div_table">
+
+          <div class="div_btn">
+            <el-button class="diy-button--add"
+                       size="small"
+                       @click="handleAdd">发起服务</el-button>
+
+            <!-- <el-button @click="handleExport"
+                       class="diy-button--reset"
+                       size="small">导出</el-button> -->
+          </div>
+
+          <el-table :data="tableData"
+                    border
+                    v-loading="tableLoading"
+                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                    class="table"
+                    style="width: 100%"
+                    :height="maxTableHeight">
+            <el-table-column label="序号"
+                             fixed="left"
+                             type="index"
+                             align="center"
+                             width="50" />
+
+            <el-table-column prop="serviceName"
+                             label="服务名称"
+                             align="center"
+                             :show-overflow-tooltip="true">
+            </el-table-column>
+
+            <el-table-column prop="serviceOrgName"
+                             align="center"
+                             min-width="150"
+                             label="服务组织名称"
+                             :show-overflow-tooltip="true">
+
+            </el-table-column>
+
+            <el-table-column prop="serviceTimeStart"
+                             align="center"
+                             width="300"
+                             :show-overflow-tooltip="true"
+                             label="服务时间">
+              <template slot-scope="scope">
+                <span>{{scope.row.serviceTimeStart}}-{{scope.row.serviceTimeEnd}}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="serviceStatus"
+                             align="center"
+                             width="100"
+                             label="服务状态"
+                             :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span>{{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="servicePeopleNumber"
+                             align="center"
+                             width="110"
+                             label="服务人数"
+                             :show-overflow-tooltip="true">
+            </el-table-column>
+
+            <el-table-column fixed="right"
+                             label="操作"
+                             align="center"
+                             width="220">
+              <template slot-scope="scope">
+                <el-button @click="handleDetail(scope.row)"
+                           type="text"
+                           size="small"
+                           class="div-table-button--detail">查看</el-button>
+                <el-button v-if="scope.row.serviceStatus==='in_service'"
+                           @click="handleEdit(scope.row)"
+                           type="text"
+                           size="small"
+                           class="div-table-button--edit">编辑</el-button>
+                <el-button v-if="scope.row.serviceStatus==='in_service'"
+                           @click="handleFeedback(scope.row)"
+                           type="text"
+                           size="small"
+                           class="div-table-button--edit">反馈</el-button>
+                <el-button v-if="scope.row.policyId"
+                           @click="handlePersonList(scope.row)"
+                           type="text"
+                           size="small"
+                           class="div-table-button--edit">人员名单</el-button>
+                <el-button v-if="scope.row.serviceStatus==='in_service'"
+                           @click="handleDel(scope.row)"
+                           type="text"
+                           size="small"
+                           class="div-table-button--delete">取消</el-button>
+
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <div>
+            <el-pagination @size-change="handleSizeChange"
+                           @current-change="handleCurrentChange"
+                           :current-page.sync="pageNo"
+                           :page-sizes="[20, 50, 100, 200]"
+                           :page-size="parseInt(pageSize)"
+                           layout="sizes, prev, pager, next, total"
+                           :total="total">
+            </el-pagination>
+          </div>
+
+        </div>
+
+      </div>
+      <el-dialog v-if="showAdd"
+                 :visible.sync="showAdd"
+                 :close-on-click-modal="false"
+                 :close-on-press-escape="false"
+                 :title="addDiaTitle"
+                 :modal-append-to-body="false"
+                 width="850px"
+                 top="5vh"
+                 class="dialog-h"
+                 @closed="showAdd = false">
+        <add-form ref="ref_add_form"
+                  :formType="formType"
+                  :serviceCategoryKey="serviceCategoryKey"
+                  :statusArray="statusArray"
+                  :satisfyArray="satisfyArray"
+                  :serviceRecordId="serviceRecordId"
+                  :serviceName="serviceName"
+                  @handleOk="handleOk"
+                  @handleClose="handleClose"></add-form>
+      </el-dialog>
+      <el-dialog v-if="showEdit"
+                 :visible.sync="showEdit"
+                 :close-on-click-modal="false"
+                 :close-on-press-escape="false"
+                 :title="'编辑'"
+                 :modal-append-to-body="false"
+                 width="850px"
+                 top="5vh"
+                 class="dialog-h"
+                 @closed="showEdit = false">
+        <edit-form ref="ref_edit_form"
+                   :serviceRecordId="serviceRecordId"
+                   :serviceOrgName="serviceOrgName"
+                   :satisfyArray="satisfyArray"
+                   :statusArray="statusArray"
+                   @handleOk="handleOk"
+                   @handleClose="handleClose"
+                   :formType="formType">
+        </edit-form>
+      </el-dialog>
+      <el-dialog v-if="showDetail"
+                 :visible.sync="showDetail"
+                 :close-on-click-modal="false"
+                 :close-on-press-escape="false"
+                 :title="detailDiaTitle"
+                 :modal-append-to-body="false"
+                 width="850px"
+                 top="5vh"
+                 class="dialog-h"
+                 @closed="diaDetailClose">
+        <detail-form ref="ref_detail_form"
+                     :serviceRecordId="serviceRecordId"
+                     :serviceOrgName="serviceOrgName"
+                     :satisfyArray="satisfyArray"
+                     :statusArray="statusArray"
+                     @diaDetailClose="diaDetailClose">
+        </detail-form>
+      </el-dialog>
+      <el-dialog v-if="showPersonList"
+                 :visible.sync="showPersonList"
+                 :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"
+                     :formType="formType">
+        </person-list>
+      </el-dialog>
+
+    </div>
+  </template>
+
+  <script>
+  import { requestPost } from "@/js/dai/request";
+  import nextTick from "dai-js/tools/nextTick";
+  import { mapGetters } from "vuex";
+  // import eventInfo from "./cpts/event-info";
+  import axios from "axios";
+  import addForm from "./addForm";
+  import detailForm from "./detailForm";
+  import editForm from "./editForm";
+  import feedBackForm from "./addForm";
+  import personList from "../policy/personList";
+
+  export default {
+    components: { addForm, detailForm, feedBackForm, personList, editForm },
+
+    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:[],
+        tableLoading: false,
+        user: {},
+        agencyId: '',
+
+        tableData: [],
+
+        statusArray: [
+          {
+            value: "in_service",
+            label: "进行中",
+          },
+          {
+            value: "completed",
+            label: "已完成",
+          },
+        ],
+        satisfyArray: [
+          {
+            value: "bad",
+            label: "不满意",
+          },
+          {
+            value: "good",
+            label: "基本满意",
+          },
+          {
+            value: "perfect",
+            label: "非常满意",
+          },
+
+        ],
+
+        formData: {
+          serviceTypeLevel1Id:'',// 公共服务（政策级别）一级分类id
+          serviceTypeLevel2Id:'',// 公共服务（政策级别）二级分类id
+          serviceName: '',//项目名称
+          serviceOrgType: '',//服务组织类型
+          serviceOrgId: '',//服务组织Id
+          serviceTimeStart: '',//服务开始时间yyyy-MM-dd
+          serviceTimeEnd: '',//服务结束时间yyyy-MM-dd
+          serviceStatus: '',//服务状态。in_service服务中；completed:已完成
+          satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect
+
+        },
+        pageNo: 1,
+        pageSize: window.localStorage.getItem("pageSize") || 20,
+        total: 1,
+        endPickerOptions: {
+          disabledDate: endDisabledDate
+        },
+        startPickerOptions: {
+          disabledDate: startDisabledDate
+        },
+        serviceRecordId: '',
+        serviceName: '',
+        serviceOrgName: '',
+
+        showAdd: false,
+        showEdit: false,
+        showDetail: false,
+        showFeedback: false,
+        formType: 'add',
+        addDiaTitle: '发起服务',
+        detailDiaTitle: '服务详情',
+
+        serviceOptions: [],
+        serviceOptiondList: [],
+
+        policyId: '',
+        showPersonList: false,
+        ruleList: []
+      };
+    },
+    computed: {
+      maxTableHeight () {
+        return this.$store.state.inIframe
+          ? this.clientHeight - 410 + this.iframeHeigh
+          : this.clientHeight - 410;
+      },
+      ...mapGetters(["clientHeight", "iframeHeight"]),
+    },
+    watch: {
+      // "formData.serviceTimeEnd": function (val) {
+      //   if (val && val != '') {
+      //     let arrayTemp = val.split(' ')
+      //     this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
+      //   }
+
+      // },
+    },
+    mounted () {
+      console.log(this.$store.state)
+      this.user = this.$store.state.user
+      this.agencyId = this.user.agencyId
+      this.getDictOptions()
+      this.getTableData();
+    },
+    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("网络错误");
+            })
+      },
+
+      handleSearch (val) {
+        console.log(this.formData);
+        this.pageNo = 1;
+        this.getTableData();
+      },
+      // 获取服务组织
+      async getDictOptions () {
+        const url = "/sys/dict/data/dictlist"
+
+        let params = {
+          dictType: 'user_demand_service_type'
+        }
+
+        const { data, code, msg } = await requestPost(url, params)
+
+        if (code === 0) {
+          this.serviceOptions = data;
+        } else {
+          this.$message.error(msg)
+        }
+
+        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;
+              }
+            })
+            .catch(() => {
+              return this.$message.error("网络错误");
+            });
+      },
+
+      handleServiceChange (type, val) {
+        this.formData.serviceOrgId = ''
+        if (val === "social_org") {
+          if (type === "add") {
+            this.getServiceuserList(val, "add_demand");
+          } else {
+            this.getServiceuserList(val, "query_demand");
+          }
+        } else {
+          this.getServiceuserList(val, "");
+        }
+      },
+
+      async getServiceuserList (serviceType, query) {
+        if (!serviceType) return false;
+
+        const params = {
+          serviceName: "",
+          serviceType: serviceType,
+          queryPurpose: query,
+        };
+        await this.$http
+          .post("/governance/userdemand/servicelist", params)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg);
+            } else {
+              this.serviceOptiondList = res.data
+            }
+          })
+          .catch(() => {
+            return this.$message.error("网络错误");
+          });
+      },
+      //加载组织数据
+      async handlePersonList (row) {
+
+        this.policyId = row.policyId
+        await this.loadRuleList()
+        this.formType = 'personList'
+        this.showPersonList = true;
+      },
+
+      async loadRuleList () {
+
+        const url = "/governance/policy/rulelist/" + this.policyId
+
+        let params = {}
+
+        const { data, code, msg } = await requestPost(url, params)
+
+        if (code === 0) {
+          this.ruleList = data
+
+        } else {
+          this.$message.error(msg)
+        }
+
+      },
+
+
+      async handleAdd () {
+        this.addDiaTitle = '发起服务'
+        this.formType = 'add'
+        this.showAdd = true;
+      },
+
+      async handleDetail (row) {
+        this.detailDiaTitle = "服务详情"
+        this.serviceRecordId = row.serviceRecordId
+        this.serviceOrgName = row.serviceOrgName
+
+        // this.formType = 'detail'
+        this.showDetail = true
+
+      },
+      diaDetailClose () {
+        console.log(this.$refs.ref_detail)
+        this.$refs.ref_detail_form.diaDestroy()
+        this.showDetail = false
+      },
+      async handleEdit (row) {
+        // this.detailDiaTitle = "编辑服务"
+        this.serviceRecordId = row.serviceRecordId
+        this.serviceOrgName = row.serviceOrgName
+        this.formType = 'edit'
+        this.showEdit = true
+
+      },
+
+      //加载组织数据
+      async handleFeedback (row) {
+
+        this.serviceRecordId = row.serviceRecordId
+        this.serviceName = row.serviceName
+        this.addDiaTitle = '服务反馈'
+        this.formType = 'feedback'
+        this.showAdd = true;
+      },
+
+
+      handleClose () {
+        this.serviceRecordId = ""
+        this.formType = ''
+
+        this.showAdd = false
+        this.showDetail = false
+        this.showEdit = false
+
+
+      },
+      handleOk () {
+        this.handleClose()
+        this.pageNo = 1
+        this.getTableData()
+
+      },
+
+
+      async handleDel (row) {
+
+        this.serviceRecordId = row.serviceRecordId
+
+        this.$confirm("确认取消服务?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.cancelFuwu()
+          })
+          .catch(err => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+
+          });
+
+      },
+
+      async cancelFuwu () {
+
+        const url = '/governance/icServiceRecordV2/cancel';
+        let params = {
+          serviceRecordId: this.serviceRecordId
+        }
+
+        const { data, code, msg } = await requestPost(url, params);
+
+        if (code === 0) {
+          this.$message.success("取消成功！");
+          this.getTableData();
+        } else {
+          this.$message.error("操作失败！");
+        }
+      },
+
+      async getTableData () {
+        this.tableLoading = true
+        const url = "/governance/icServiceRecordV2/list";
+
+        const { pageSize, pageNo, formData } = this;
+        const { data, code, msg } = await requestPost(url, {
+          pageSize,
+          pageNo,
+          serviceCategoryKey: this.serviceCategoryKey,
+          ...formData,
+        });
+
+        this.tableLoading = false
+        if (code === 0) {
+
+          this.total = data.total || 0;
+          this.tableData = data.list
+
+
+
+        } else {
+          this.$message.error(msg);
+        }
+      },
+
+      async handleExport () {
+        const url = "/gov/project/icEvent/export";
+        const { pageSize, pageNo, formData } = this;
+        axios({
+          url: window.SITE_CONFIG["apiURL"] + url,
+          method: "post",
+          data: {
+            pageSize,
+            pageNo,
+            ...formData,
+          },
+          responseType: "blob",
+        })
+          .then((res) => {
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          })
+          .catch((err) => {
+            console.log("获取导出情失败", err);
+            return this.$message.error("网络错误");
+          });
+      },
+
+      handleSizeChange (val) {
+
+        this.pageSize = val;
+        window.localStorage.setItem("pageSize", val);
+        this.getTableData();
+      },
+      handleCurrentChange (val) {
+
+        this.pageNo = val;
+        this.getTableData();
+      },
+
+      resetSearch () {
+        this.formData = {
+          serviceTypeLevel1Id:'',// 公共服务（政策级别）一级分类id
+          serviceTypeLevel2Id:'',// 公共服务（政策级别）二级分类id
+          serviceName: '',//项目名称
+          serviceOrgType: '',//服务组织类型
+          serviceOrgId: '',//服务组织Id
+          serviceTimeStart: '',//服务开始时间yyyy-MM-dd
+          serviceTimeEnd: '',//服务结束时间yyyy-MM-dd
+          serviceStatus: '',//服务状态。in_service服务中；completed:已完成
+          satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect
+        }
+
+
+        this.pageNo = 1
+        this.getTableData()
+      },
+    },
+
+    props: {
+
+      serviceCategoryKey: {
+        type: String,
+        required: 'true'
+      },
+
+    }
+  };
+  </script>
+
+  <style lang="scss" scoped>
+  @import "@/assets/scss/buttonstyle.scss";
+  @import "@/assets/scss/modules/management/list-main.scss";
+  @import "@/assets/scss/modules/shequzhili/event-info.scss";
+  </style>
diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
index 79ae83ab4..4eaa6d64b 100644
--- a/src/views/modules/communityService/fuwujilu/addForm.vue
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -693,7 +693,7 @@ export default {
         queryPurpose: query,
       };
       await this.$http
-        .post("/heart/userdemand/servicelist", params)
+        .post("/governance/userdemand/servicelist", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index 85320aa94..7aa7a436b 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -478,7 +478,7 @@ export default {
         queryPurpose: query,
       };
       await this.$http
-        .post("/heart/userdemand/servicelist", params)
+        .post("/governance/userdemand/servicelist", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index df5062b29..8cffaf27a 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -1002,7 +1002,7 @@ export default {
         ...this.form,
       };
       await this.$http
-        .post("/heart/userdemand/add", _form)
+        .post("/governance/userdemand/add", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -1023,7 +1023,7 @@ export default {
         serverId: this.form.serverId,
       };
       await this.$http
-        .post("/heart/userdemand/assign", _form)
+        .post("/governance/userdemand/assign", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -1049,7 +1049,7 @@ export default {
         score: reportType == "self_help" ? 0 : this.form.score,
       };
       await this.$http
-        .post("/heart/userdemand/finish", _form)
+        .post("/governance/userdemand/finish", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -1082,7 +1082,7 @@ export default {
         ...this.form,
       };
       await this.$http
-        .post("/heart/userdemand/update", _form)
+        .post("/governance/userdemand/update", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -1116,7 +1116,7 @@ export default {
       };
       console.log("row1", row);
       this.$http
-        .post("/heart/userdemand/cancel", params)
+        .post("/governance/userdemand/cancel", params)
         .then(({ data: res }) => {
           console.log("row2", row);
           if (res.code !== 0) {
@@ -1232,7 +1232,7 @@ export default {
         queryPurpose: query,
       };
       await this.$http
-        .post("/heart/userdemand/servicelist", params)
+        .post("/governance/userdemand/servicelist", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -1297,7 +1297,7 @@ export default {
         pageSize: this.pageSize,
       };
       await this.$http
-        .post("/heart/userdemand/pagelist", params)
+        .post("/governance/userdemand/pagelist", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue
index ea841984f..e7c354833 100644
--- a/src/views/modules/communityService/measure/info.vue
+++ b/src/views/modules/communityService/measure/info.vue
@@ -701,7 +701,7 @@ export default {
         serverId: this.form.serverId,
       };
       await this.$http
-        .post("/heart/userdemand/assign", _form)
+        .post("/governance/userdemand/assign", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -730,7 +730,7 @@ export default {
         score: reportType == "self_help" ? 0 : this.form.score,
       };
       await this.$http
-        .post("/heart/userdemand/finish", _form)
+        .post("/governance/userdemand/finish", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -766,7 +766,7 @@ export default {
         ...this.form,
       };
       await this.$http
-        .post("/heart/userdemand/update", _form)
+        .post("/governance/userdemand/update", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -804,7 +804,7 @@ export default {
         ...this.form,
       };
       await this.$http
-        .post("/heart/userdemand/add", _form)
+        .post("/governance/userdemand/add", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -824,7 +824,7 @@ export default {
         demandRecId: this.demandRecId,
       };
       this.$http
-        .post("/heart/userdemand/cancel", params)
+        .post("/governance/userdemand/cancel", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -944,7 +944,7 @@ export default {
         queryPurpose: query,
       };
       await this.$http
-        .post("/heart/userdemand/servicelist", params)
+        .post("/governance/userdemand/servicelist", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -1010,7 +1010,7 @@ export default {
         demandRecId: this.demandRecId,
       };
       await this.$http
-        .post("/heart/userdemand/demandDetail", params)
+        .post("/governance/userdemand/demandDetail", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue
index 6a72359a2..34f44ef42 100644
--- a/src/views/modules/communityService/policy/addPolicy.vue
+++ b/src/views/modules/communityService/policy/addPolicy.vue
@@ -8,25 +8,56 @@
                :rules="dataRule"
                :disabled="formType==='detail'"
                class="div_form">
+        <!-- 政策类型 -->
+        <el-form-item label="政策类型"
+              style="display: block"
+              label-width="150px"
+              prop="serviceType">
+          <div class="f-flex">
+            <el-form-item prop="serviceType" 
+                                    class="u-item-width-communitycascader f-bto0" 
+                                    :rules="dataRule.serviceType" >
+              <el-select class="cell-width-1"
+                        v-model.trim="formData.policyTypeLevel1Id"
+                        placeholder="请选择"
+                        clearable>
+                <el-option v-for="item in serviceTypesLevel1"
+                            @click.native="handleChangeServiceTypeLevel1"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="serviceType" 
+                                    class="u-item-width-communitycascader f-bto0" 
+                                    :rules="dataRule.serviceType" >
+              <el-select class="cell-width-1"
+                        v-model.trim="formData.policyTypeLevel2Id"
+                        placeholder="请选择"
+                        clearable>
+                <el-option v-for="item in serviceTypesLevel2"
+                            @click.native=""
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-form-item>
 
-        <el-form-item label="政策级别"
-                      style="display: block"
+        <el-form-item label="政策标题"
+                      prop="title"
                       label-width="150px"
-                      prop="policyLevel">
-          <el-select class="item_width_2"
-                     v-model="formData.policyLevel"
-                     placeholder="全部"
-                     clearable>
-            <el-option v-for="item in policyLevelArray"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入政策标题"
+                    v-model="formData.title">
+          </el-input>
         </el-form-item>
 
-        <el-form-item label="政策日期"
+        <el-form-item label="政策有效期"
                       style="display: block"
                       label-width="150px"
                       prop="startDate">
@@ -47,14 +78,21 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="政策标题"
-                      prop="title"
+        <el-form-item label="政策级别"
+                      style="display: block"
                       label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入政策标题"
-                    v-model="formData.title">
-          </el-input>
+                      prop="policyLevel">
+          <el-select class="item_width_2"
+                     v-model="formData.policyLevel"
+                     placeholder="全部"
+                     clearable>
+            <el-option v-for="item in policyLevelArray"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
         </el-form-item>
 
         <el-form-item label="政策内容"
@@ -70,7 +108,7 @@
                     v-model="formData.content"></el-input>
         </el-form-item>
 
-        <div v-for="(item,index) in formData.ruleList"
+        <!-- <div v-for="(item,index) in formData.ruleList"
              :key="index"
              style="margin-bottom:15px">
 
@@ -101,15 +139,15 @@
                   :index="index"></rule>
           </div>
 
-        </div>
+        </div> -->
 
-        <div class="btn-add-rule">
+        <!-- <div class="btn-add-rule">
           <el-button type="primary"
                      size="mini"
                      @click="addRule">增加细则</el-button>
-        </div>
+        </div> -->
 
-        <el-form-item label="匹配资源类型"
+        <!-- <el-form-item label="匹配资源类型"
                       prop="serviceScope"
                       label-width="150px"
                       style="display: block">
@@ -119,7 +157,7 @@
                        :options="demandOptions"
                        :props="optionProps"
                        @change="handleCateSlect"></el-cascader>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item class="block"
                       label="附件"
@@ -187,16 +225,19 @@ export default {
 
     return {
 
-      ruleList: [
-        {
-          ruleName: '',
-          resiRuleList: [],
-          houseRuleList: [],
-          statRuleList: []
-        }
-      ],
+      // ruleList: [
+      //   {
+      //     ruleName: '',
+      //     resiRuleList: [],
+      //     houseRuleList: [],
+      //     statRuleList: []
+      //   }
+      // ],
 
       policyLevelArray: [],
+      // 公共服务分类
+      serviceTypesLevel1:[],
+      serviceTypesLevel2:[],
 
       btnDisable: false,
       demandOptions: [],
@@ -211,6 +252,8 @@ export default {
       },
 
       formData: {
+        policyTypeLevel1Id:'',// 公共服务（政策级别）一级分类id
+        policyTypeLevel2Id:'',// 公共服务（政策级别）二级分类id
         policyLevel: '',//政府级别
         startDate: '',//起始时间yyyy-MM-dd	
         endDate: '',//截止时间yyyy-MM-dd	
@@ -218,14 +261,14 @@ export default {
         content: '',//
         categoryList: [],
         attachmentList: [],
-        ruleList: [
-          {
-            ruleName: '',
-            resiRuleList: [],
-            houseRuleList: [],
-            statRuleList: []
-          }
-        ],
+        // ruleList: [
+        //   {
+        //     ruleName: '',
+        //     resiRuleList: [],
+        //     houseRuleList: [],
+        //     statRuleList: []
+        //   }
+        // ],
 
       },
 
@@ -297,7 +340,7 @@ export default {
           let arr = element.codePath.split(',')
           this.demandIdArray.push(arr)
         });
-        this.formData.ruleList = data.ruleList
+        // this.formData.ruleList = data.ruleList
 
 
         this.formData = data
@@ -324,6 +367,7 @@ export default {
 
     async getDictOptions () {
 
+      // 政策级别下拉
       this.$http
         .post("/sys/dict/data/dictlist", {
           dictType: "policy_level",
@@ -339,6 +383,19 @@ export default {
           return this.$message.error("网络错误");
         });
 
+        // 政策分类下拉（其实是获取的共性服务分类）
+        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;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
     },
 
 
@@ -656,6 +713,8 @@ export default {
     resetData () {
       this.ruleList = []
       this.formData = {
+        serviceTypeLevel1Id:'',
+        serviceTypeLevel2Id:'',
         policyLevel: '',//政府级别
         startDate: '',//起始时间yyyy-MM-dd	
         endDate: '',//截止时间yyyy-MM-dd	
@@ -680,6 +739,23 @@ export default {
       if (loading) {
         loading.close()
       }
+    },
+
+    // 服务类型下拉框选中事件
+    handleChangeServiceTypeLevel1() {
+      this.formData.policyTypeLevel2Id = ''
+      this.$http
+        .get("/governance/commonServiceType/selectList/" + this.formData.policyTypeLevel1Id)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel2 = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        })
     }
   },
   computed: {
@@ -697,7 +773,9 @@ export default {
 
 
       return {
-
+        serviceType: [
+          { required: true, message: '政策类型不能为空', trigger: 'blur' }
+        ],
         policyLevel: [
           { required: true, message: '政策级别不能为空', trigger: 'change' }
         ],
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index 33f8a5ec3..b892fe562 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -401,7 +401,7 @@ export default {
 
     async getTableData () {
       this.tableLoading = true
-      const url = "/heart/policy/list";
+      const url = "/governance/policy/list";
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 02299d258..7111c51eb 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -553,21 +553,22 @@ export default {
         });
     },
     async handleLook(row) {
-      if (row.agencyId !== "") {
-        const url = "/gov/org/grid/griddetail";
-        let params = {
-          gridId: row.agencyId,
-        };
-        const { data, code, msg } = await requestPost(url, params);
-        if (code === 0) {
-          this.lookInfo.gridName = data.gridName;
-        } else {
-          this.$message.error(msg);
-        }
-      } else {
-        this.lookInfo.gridName = "";
-      }
-      this.lookInfo.resiId = row.icUserId;
+      // 这个地方先注释掉了,明天核实下为啥要调这个接口
+      // if (row.agencyId !== "") {
+      //   const url = "/gov/org/grid/griddetail";
+      //   let params = {
+      //     gridId: row.agencyId,
+      //   };
+      //   const { data, code, msg } = await requestPost(url, params);
+      //   if (code === 0) {
+      //     this.lookInfo.gridName = data.gridName;
+      //   } else {
+      //     this.$message.error(msg);
+      //   }
+      // } else {
+      //   this.lookInfo.gridName = "";
+      // }
+      this.lookInfo.resiId = row.resiId;
       this.showedResiInfo = true;
     },
     handleCancleLook() {
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 1e9825252..e12eb91aa 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -1029,7 +1029,7 @@ export default {
     },
 
     async getSearchXuqiu() {
-      const url = "/heart/userdemand/search";
+      const url = "/governance/userdemand/search";
       const {
         searchData: { keyword },
         searchXuqiu: { pageSize, pageNo },
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
index 35fc6c645..528621a91 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
@@ -524,7 +524,7 @@ export default {
       };
 
 
-      const url = "/heart/userdemand/servicelist"
+      const url = "/governance/userdemand/servicelist"
 
 
       const { data, code, msg } = await requestPost(url, params)
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue
index f3717652f..36bc7b763 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue
@@ -236,7 +236,7 @@ export default {
     },
     //加载组织数据
     async getInfo () {
-      const url = "/heart/userdemand/demandDetail";
+      const url = "/governance/userdemand/demandDetail";
 
       const { data, code, msg } = await requestPost(url, {
         demandRecId: this.demandRecId,
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index e9ed6b397..0904b1987 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -712,7 +712,7 @@ export default {
 
     //加载组织数据
     async getDemandData () {
-      const url = "/heart/userdemand/mydemand";
+      const url = "/governance/userdemand/mydemand";
       let params = {
         epmetUserIdList: this.info.epmetUserIdList,
         icResiUserId: this.userId,
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
index dfb584ae0..691b30b3f 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
@@ -175,7 +175,7 @@ export default {
     // 获取需求详情
     async getDemandDetail (id) {
       this.info = {}
-      const url = '/heart/userdemand/demandDetail'
+      const url = '/governance/userdemand/demandDetail'
       const params = {
         demandRecId: id, // 需求id
       }
diff --git a/src/views/modules/visual/communityParty/memberInfo.vue b/src/views/modules/visual/communityParty/memberInfo.vue
index dedf9f32c..f7aa88629 100644
--- a/src/views/modules/visual/communityParty/memberInfo.vue
+++ b/src/views/modules/visual/communityParty/memberInfo.vue
@@ -148,7 +148,7 @@ export default {
     async getDetail (id) {
       this.info = {}
       const _id = this.list[0].id
-      const url = "/heart/userdemand/demandDetail"
+      const url = "/governance/userdemand/demandDetail"
       let params = {
         demandRecId: id || _id
       }
diff --git a/src/views/modules/visual/measure/dialogInfo.vue b/src/views/modules/visual/measure/dialogInfo.vue
index 6cca94f7d..7b9f41c17 100644
--- a/src/views/modules/visual/measure/dialogInfo.vue
+++ b/src/views/modules/visual/measure/dialogInfo.vue
@@ -241,7 +241,7 @@ export default {
     },
     async getInfo (demandId) {
       // const url = "/gov/org/customeragency/staffinagencylist";
-      const url = "/heart/userdemand/demandDetail";
+      const url = "/governance/userdemand/demandDetail";
       let params = {
         demandRecId: demandId,
       };
@@ -284,7 +284,7 @@ export default {
         queryPurpose: query,
       };
       await this.$http
-        .post("/heart/userdemand/servicelist", params)
+        .post("/governance/userdemand/servicelist", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -312,7 +312,7 @@ export default {
         serverId: this.form.serverId,
       };
       await this.$http
-        .post("/heart/userdemand/assign", _form)
+        .post("/governance/userdemand/assign", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -333,7 +333,7 @@ export default {
     async getAnalyse (demandId) {
       // const url = "/gov/org/customeragency/staffinagencylist";
       this.loading = true;
-      const url = "/heart/userdemand/demand-research-analysis";
+      const url = "/governance/userdemand/demand-research-analysis";
       let params = {
         firstCategoryCode: this.info.firstCategoryCode,
         demandRecId: demandId,
diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
index 6929b4855..51796f5e3 100644
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@@ -320,7 +320,7 @@ export default {
 
     },
     async getServicePie(orgId, orgType) {
-      const url = "/heart/userdemand/category-analysis";
+      const url = "/governance/userdemand/category-analysis";
       let params = {
         orgId,
         orgType,
@@ -361,7 +361,7 @@ export default {
       this.visibleLoading = false;
     },
     async getServiceList(orgId, orgType, _code) {
-      const url = "/heart/userdemand/pagelist-analysis";
+      const url = "/governance/userdemand/pagelist-analysis";
       let params = {
         orgId,
         orgType,
@@ -445,7 +445,7 @@ export default {
       }
       // .post('epmetuser/icresiuser/exportExcel', params)
       axios({
-        url: window.SITE_CONFIG['apiURL'] + '/heart/userdemand/analysis-export',
+        url: window.SITE_CONFIG['apiURL'] + '/governance/userdemand/analysis-export',
         // url: 'epmetuser/icresiuser/exportExcel',
         method: 'post',
         data: params,
diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue
index 26b98b41b..02f2f2cc3 100644
--- a/src/views/modules/visual/plugin/power/organization.vue
+++ b/src/views/modules/visual/plugin/power/organization.vue
@@ -265,7 +265,7 @@ export default {
       }
     },
     async getVolunteerTeamNum () {
-      const url = "/heart/userdemand/servicelist"
+      const url = "/governance/userdemand/servicelist"
       let params = {
         serviceType: 'community_org'
       }