From d479df70774ef8272222b8d7c4076b47d4ba8a33 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 13 Mar 2023 17:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82/=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E5=A4=B1=E7=8B=AC=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E7=89=B9=E6=89=B6=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/resi-category-map.js       |   2 +-
 src/views/components/resiForm.vue             |   2 +-
 src/views/dataBoard/cpts/resi-details.vue     |   2 +-
 src/views/modules/base/resi.vue               |   2 +-
 .../communityService/commonDemand/addForm.vue |   2 +-
 .../modules/communityService/gxxq/addForm.vue | 756 ++++++++++++++++++
 .../modules/communityService/gxxq/index.vue   | 429 ++++++++++
 src/views/modules/shequ/chaxun.vue            |   2 +-
 .../shequzhili/event/cpts/event-detail.vue    |   2 +-
 9 files changed, 1192 insertions(+), 7 deletions(-)
 create mode 100644 src/views/modules/communityService/gxxq/addForm.vue
 create mode 100644 src/views/modules/communityService/gxxq/index.vue

diff --git a/src/views/business/resi-category-map.js b/src/views/business/resi-category-map.js
index e84dd535c..7a125a8a0 100644
--- a/src/views/business/resi-category-map.js
+++ b/src/views/business/resi-category-map.js
@@ -10,7 +10,7 @@ export default {
   VOLUNTEER_FLAG: "志愿者",
   OLD_PEOPLE_FLAG: "老年人",
   EMPTY_NESTER_FLAG: "空巢老人",
-  BEREAVED_PERSON_FLAG: "失独人员",
+  BEREAVED_PERSON_FLAG: "特扶人员",
   DISABLED_FLAG: "失能老人",
   DEMENTED_FLAG: "失智老人",
   DISABILITY_FLAG: "残疾",
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index c330573fb..7acb09064 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -378,7 +378,7 @@ export default {
           {label:'统战人员',value:'0', formName:"unitedFrontFlag"},
           {label:'信访人员',value:'0', formName:"petitionOfficerFlag"},
           {label:'志愿者',value:'0', formName:"volunteerFlag"},
-          {label:'失独人员',value:'0', formName:"bereavedPersonFlag"},
+          {label:'特扶人员',value:'0', formName:"bereavedPersonFlag"},
           {label:'租户',value:'0', formName:"tenantFlag"},
           {label:'流动人口',value:'0', formName:"floatingFlag"},
           {label:'特殊人群',value:'0', formName:"specialCrowdFlag"},
diff --git a/src/views/dataBoard/cpts/resi-details.vue b/src/views/dataBoard/cpts/resi-details.vue
index 238a039b2..6a8b04819 100644
--- a/src/views/dataBoard/cpts/resi-details.vue
+++ b/src/views/dataBoard/cpts/resi-details.vue
@@ -84,7 +84,7 @@
 								<span v-if="info.ufs">统战人员</span>
 								<span v-if="info.petitioner">信访人员</span>
 								<span v-if="info.volunteer">志愿者</span>
-								<span v-if="info.in_person">失独人员</span>
+								<span v-if="info.in_person">特扶人员</span>
 								<span v-if="info.tenant">租户</span>
 								<span v-if="info.float_popu">流动人口</span>
 								<span v-if="info.special_popu">特殊人群</span>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 0ed681b5d..ebd90775b 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -210,7 +210,7 @@
 								{{
 									scope.row.categoryInfo.bereavedPersonFlag ==
 									1
-										? "失独人员 "
+										? "特扶人员 "
 										: ""
 								}}
 								{{
diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
index 2af3cd8f2..c4c9cdec4 100644
--- a/src/views/modules/communityService/commonDemand/addForm.vue
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -208,7 +208,7 @@
           v-show="formData.assignSwitch"
         >
          <input type="text" v-model="formData.resiSearchTagId" v-show="false">
-          <template  v-if="formData.resiSearchTagName">
+          <template  v-if="formData.resiSearchTagName" style="margin-right:10px;">
             <el-tag   @close="handleCloseTag"  closable >
             {{ formData.resiSearchTagName }}
           </el-tag>
diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue
new file mode 100644
index 000000000..03fffb3b8
--- /dev/null
+++ b/src/views/modules/communityService/gxxq/addForm.vue
@@ -0,0 +1,756 @@
+<template>
+  <div>
+    <div
+      class="dialog-h-content scroll-h"
+      :class="{ 'visiual-form': source === 'visiual' }"
+    >
+      <el-form
+        ref="ref_gxxq_form"
+        :inline="true"
+        :model="formData"
+        :rules="dataRule"
+        class="div_form"
+      >
+        <!-- 需求类别 -->
+        <el-form-item
+          label="需求类别"
+          style="display: block"
+          label-width="150px"
+          prop="commonServiceTypeId"
+        >
+          <el-select
+            class="u-item-width-communitycascader"
+            v-model="formData.serviceTypeLevel1Id"
+            placeholder="请选择"
+            clearable
+            @change="handleChangeServiceTypeLevel1"
+          >
+            <el-option
+              v-for="item in serviceTypesLevel1"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+          -
+          <el-select
+            class="u-item-width-communitycascader"
+            v-model="formData.commonServiceTypeId"
+            placeholder="请选择"
+            @change="handleChangeServiceTypeLevel2"
+            clearable
+          >
+            <el-option
+              v-for="item in serviceTypesLevel2"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
+          label="需求标题"
+          prop="title"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入服务事项"
+            v-model="formData.title"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="详细说明"
+          prop="content"
+          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.content"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="查找享受服务人员"
+          prop="resiSearchTagId"
+          :class="{ 'form-item': source === 'visiual' }"
+          label-width="150px"
+          style="display: block"
+        >
+          <template v-if="formData.resiSearchTagName">
+            <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
+              {{ formData.resiSearchTagName }}
+            </el-tag>
+          </template>
+
+          <el-button type="primary" @click="handleClickLabel" size="mini">
+            <span> <i class="el-icon-plus"></i> 按标签查找 </span>
+          </el-button>
+        </el-form-item>
+        <el-form-item label="指派服务" label-width="150px">
+          <el-switch
+            v-model="formData.assignFlag"
+           
+            @change="handelDisabledRules"
+          >
+          </el-switch>
+        </el-form-item>
+
+        <el-form-item
+          label="服务方"
+          label-width="150px"
+          style="display: block"
+          v-show="formData.assignFlag"
+        >
+          <!-- 表单验证是有的但是没有红色*先手写加上吧 -->
+          <!-- <el-form-label class="form_label_box">
+            <span class="verifyRed">服务方 : </span>
+        </el-form-label> -->
+          <el-select
+            v-model="formData.assignInfo.serverOrgType"
+            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.assignInfo.serverOrgId"
+            class="input-width-middle"
+            filterable
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in serviceOptiondList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="自动通知服务方"
+          label-width="150px"
+          style="display: block"
+          v-show="formData.assignFlag"
+        >
+          <el-checkbox-group v-model="formData.assignInfo.noticeApproches">
+            <el-checkbox label="1" >短信通知</el-checkbox>
+            <el-checkbox label="2" >微信公众号消息通知</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item
+          prop="serviceScopeList"
+          style="display: block"
+          v-show="formData.assignFlag"
+        >
+          <el-form-label class="form_label_box">
+            <span class="verifyRed">服务范围 :</span>
+          </el-form-label>
+          <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 prop="serviceTimeStart" v-show="formData.assignFlag">
+          <el-form-label class="form_label_box">
+            <span class="verifyRed">服务时间 :</span>
+            <!-- :picker-options="startPickerOptions" -->
+          </el-form-label>
+          <el-date-picker
+            v-model="formData.assignInfo.serviceTimeStart"
+            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>
+          <!-- :picker-options="endPickerOptions" -->
+          <span class="u-data-tag">至</span>
+          <el-date-picker
+            v-model="formData.assignInfo.serviceTimeEnd"
+            class="item_width_2 u-data-tag"
+            style="width: 220px"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd"
+            placeholder="结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+    </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="showLabelForm"
+      :visible.sync="showLabelForm"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'标签配置'"
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showLabelForm = false"
+    >
+      <label-form
+        ref="ref_label_form"
+        :ruleList="ruleList"
+        @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"
+      >
+        <!--    @handleOk="handleOk"
+          @handleClose="handleClose" -->
+      </label-form>
+    </el-dialog>
+  </div>
+</template>
+  
+    <script>
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost, requestGet } from "@/js/dai/request";
+import personList from "../policy/personList";
+import nextTick from "dai-js/tools/nextTick";
+import labelForm from "../labelConfig/addForm.vue";
+
+let loading; // 加载动画
+let map;
+
+export default {
+  props: {
+    defaultData: {
+      type: Object,
+      default: null,
+    },
+    serviceRecordId: {
+      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
+        commonServiceTypeId: "", // 公共服务（政策级别）二级分类id
+        assignFlag: false,
+        resiSearchTagId: "", //查找享受服务人员
+        resiSearchTagName: "", //享受服务人员名称
+        title: "", //服务名称
+        assignInfo: {
+          noticeApproches: [],
+          serviceScopeList: [], //
+          serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+          serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+          serverOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
+          serverOrgId: "", //服务组织Id
+        },
+        content: "", //
+      },
+      dataRule: {
+        commonServiceTypeId: [
+          { required: true, message: "政策类型不能为空", trigger: "change" },
+        ],
+        title: [
+          { required: true, message: "服务名称不能为空", trigger: "change" },
+        ],
+
+        // serviceTimeStart: [
+        //   { required: true, message: "服务时间不能为空", trigger: "change" },
+        // ],
+        // serviceScopeList : [
+        // { required: true, message: "服务范围不能为空", trigger: "change" },
+        // ],
+      },
+
+      //   endPickerOptions: {
+      //     disabledDate: endDisabledDate,
+      //   },
+      //   startPickerOptions: {
+      //     disabledDate: startDisabledDate,
+      //   },
+
+      serviceOptions: [],
+      serviceOptiondList: [],
+      policyList: [],
+
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+      ruleList: [],
+
+      showLabelForm: false,
+    };
+  },
+
+  computed: {},
+
+  watch: {
+    "formData.serviceTimeEnd": function (val) {
+      if (val && val != "") {
+        let arrayTemp = val.split(" ");
+        this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
+      }
+    },
+  },
+
+  components: { personList, labelForm },
+
+  async mounted() {
+    this.startLoading();
+    // 都已经重置了，还放在prop里干嘛，我不理解
+    // this.getCategrayList();
+    this.getDictOptions();
+    this.getPolicyList();
+
+    if (this.formType === "add") {
+      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;
+          console.log(res.data);
+        }
+      })
+      .catch(() => {
+        return this.$message.error("网络错误");
+      });
+  },
+
+  methods: {
+    handelDisabledRules(v) {
+      //   if (!v) {
+      //     delete this.dataRule.resiSearchTagId,this.dataRule.serviceTimeStart,this.dataRule.serviceScopeList;
+      //   } else {
+      //     var serviceOrgId = [
+      //     { required: true, message: "服务组织不能为空", trigger: "change" },
+      //     ];
+      //     var serviceTimeStart = [
+      //     { required: true, message: "服务时间不能为空", trigger: "change" },
+      //     ];
+      //     var serviceScopeList = [
+      //     { required: true, message: "服务范围不能为空", trigger: "change" },
+      //     ];
+      //     this.dataRule.serviceOrgId = serviceOrgId;
+      //     this.dataRule.serviceTimeStart = serviceTimeStart;
+      //     this.dataRule.serviceScopeList = serviceScopeList;
+      //   }
+      if (v) {
+        this.addRules();
+      } else {
+        this.romoveRules();
+      }
+      console.log(this.dataRule);
+    },
+    addRules() {
+      const newRules = [
+        { required: true, trigger: "change", message: "服务组织不能为空" },
+      ];
+      // 给rules对象添加规则
+      let arr = [
+        { required: true, trigger: "change", message: "服务组织不能为空" },
+      ];
+      this.dataRule = { ...this.dataRule, serviceOrgId: newRules };
+    },
+    romoveRules() {
+      this.$refs.ref_gxxq_form.clearValidate(["serviceOrgId"]);
+      this.rules = { ...this.rules, serviceOrgId: [] };
+    },
+    // 服务类型下拉框选中事件
+    handleChangeServiceTypeLevel1() {
+      this.formData.commonServiceTypeId = "";
+      this.$http
+        .get(
+          "/governance/commonServiceType/selectList/" +
+            this.formData.serviceTypeLevel1Id
+        )
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel2 = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    // 如果服务方有选择第一个的话让它更新一下
+    handleChangeServiceTypeLevel2() {
+      console.log(this.formData.serviceTypeLevel1Id);
+      console.log(this.formData.commonServiceTypeId);
+      if (this.formData.assignInfo.serviceOrgType) {
+        this.getServiceuserList(this.formData.assignInfo.serviceOrgType);
+      } else {
+        return;
+      }
+    },
+    handleClickLabel() {
+      this.showLabelForm = true;
+      this.$nextTick(() => {
+        this.$refs["ref_label_form"].initForm("info");
+      });
+    },
+    addFormOk(val) {
+      this.showLabelForm = false;
+      this.formData.resiSearchTagId = val.tagId;
+      this.formData.resiSearchTagName = val.tagName;
+    },
+    addFormCancle() {
+      this.showLabelForm = false;
+    },
+    handleCloseTag() {
+      this.formData.resiSearchTagId = "";
+      this.formData.resiSearchTagName = "";
+    },
+    async iniDefaultData() {
+      const { defaultData } = this;
+      console.log("iniDefaultData3", defaultData);
+      if (defaultData) {
+        const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
+        if (serviceOrgType) {
+          this.formData.assignInfo.serviceOrgType = serviceOrgType;
+          await this.getServiceuserList(serviceOrgType, "add_demand");
+        }
+        if (serviceOrgId) {
+          this.formData.assignInfo.serviceOrgId = serviceOrgId;
+        }
+        if (scopeIdArray) {
+          this.scopeIdArray = scopeIdArray;
+          await nextTick();
+          this.handleChangeScope();
+        }
+      }
+    },
+
+    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 handleServiceChange(type, val) {
+      console.log(val);
+      if (val === "social_org") {
+        if (type === "add") await this.getServiceuserList(val);
+        else this.getServiceuserList(val);
+      } else this.getServiceuserList(val);
+    },
+
+    async getServiceuserList(serverOrgType) {
+      if (!serverOrgType) return false;
+      if (this.formData.commonServiceTypeId == "") {
+        this.$message.error("请先选择需求类别!");
+        return;
+      }
+      const url = "/actual/base/serviceitem/listServerOrg";
+      let params = {
+        serviceTypeId: this.formData.commonServiceTypeId,
+        serverOrgType: serverOrgType,
+        businessType: "common_service",
+      };
+      let { data, code, msg } = await requestPost(url, params);
+      if (code == 0) {
+        this.serviceOptiondList = data;
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+
+    // 获取服务范围树
+    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.assignInfo.serviceScopeList = [];
+      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.assignInfo.serviceScopeList.push(obj);
+      });
+    },
+
+    async handleComfirm() {
+      if (this.formType === "add") {
+        this.handleAdd();
+      } else if (this.formType === "feedback") {
+      }
+    },
+
+    async handleAdd() {
+      this.btnDisable = true;
+      setTimeout(() => {
+        this.btnDisable = false;
+      }, 10000);
+      this.$refs["ref_gxxq_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;
+          }
+          this.addFuwu();
+        }
+      });
+    },
+
+    async addFuwu() {
+        if(this.formData.assignFlag){
+            this.formData.assignFlag = "1"
+        }else{
+            this.formData.assignFlag = "0"
+        }
+      const url = "/governance/commonDemand/save";
+      // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
+      let params = {
+        title:this.formData.title,
+        content:this.formData.content,
+        commonServiceTypeId:this.formData.commonServiceTypeId,
+        resiSearchTagId:this.formData.resiSearchTagId,
+        assignFlag:this.formData.assignFlag,
+        assignInfo:this.formData.assignInfo,
+    };
+      console.log(params);
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.$message.success("添加成功");
+        this.resetData();
+        this.$emit("handleOk");
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleCancle() {
+      this.resetData();
+      this.$emit("handleClose");
+    },
+
+    resetData() {
+      this.formData = {
+        serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
+        commonServiceTypeId: "", // 公共服务（政策级别）二级分类id
+        serviceScopeList: [], //
+        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+        content: "", //
+      };
+    },
+    // 开启加载动画
+    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;
+  }
+}
+.verifyRed::before {
+  content: "*";
+  color: #f56c6c;
+  margin-right: 4px;
+}
+.form_label_box {
+  width: 150px;
+  display: inline-block;
+  text-align: right;
+  padding-right: 12px;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue
new file mode 100644
index 000000000..8f6b1b244
--- /dev/null
+++ b/src/views/modules/communityService/gxxq/index.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="g-main">
+    <div class="m-search">
+      <el-form
+        :inline="true"
+        :model="formData"
+        ref="ref_searchform"
+        :label-width="'100px'"
+      >
+        <el-form-item prop="serviceType" label="需求类别">
+          <el-select
+            class="u-item-width-daterange"
+            v-model.trim="formData.serviceTypeLevel1Id"
+            placeholder="请选择"
+            size="small"
+            clearable
+          >
+            <el-option
+              v-for="item in serviceTypesLevel1"
+              @click.native="handleChangeServiceTypeLevel1"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+          <span class="u-data-tag"> -- </span>
+        </el-form-item>
+
+        <el-form-item prop="serviceType">
+          <el-select
+            class="u-item-width-daterange"
+            v-model.trim="formData.commonServiceTypeId"
+            placeholder="请选择"
+            size="small"
+            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>
+
+        <el-form-item label="需求标题" prop="title">
+          <el-input
+            v-model="formData.title"
+            class="u-item-width-normal"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="需求状态" prop="assignFlag">
+          <el-select
+            class="u-item-width-normal"
+            v-model="formData.assignFlag"
+            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="timeStart">
+          <el-date-picker
+            v-model="formData.timeStart"
+            class="u-item-width-daterange"
+            size="small"
+            type="date"
+            value-format="yyyy-MM-dd"
+            value="yyyy-MM-dd"
+            placeholder="开始时间"
+          >
+          </el-date-picker>
+          <span class="u-data-tag">至</span>
+          <el-date-picker
+            v-model="formData.timeEnd"
+            class="u-item-width-daterange u-data-tag"
+            size="small"
+            type="date"
+            value-format="yyyy-MM-dd"
+            value="yyyy-MM-dd"
+            placeholder="结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-row type="flex">
+          <el-col :span="24" align="right">
+            <el-button
+              style="margin-left: 30px"
+              size="small"
+              type="primary "
+              @click="handleSearch"
+              >查询</el-button
+            >
+            <el-button
+              style="margin-left: 10px"
+              is-plain
+              class="diy-button--white el-button--default"
+              size="small"
+              @click="resetSearch"
+              >重置</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="m-table">
+      <div class="div_btn">
+        <el-button
+          style="height: 32px"
+          size="small"
+          @click="handleAdd({}, 'add')"
+          type="primary"
+          icon="el-icon-plus"
+        >
+          添加需求</el-button
+        >
+      </div>
+      <el-table
+        ref="config_table"
+        border
+        :data="tableData"
+        v-loading="tableLoading"
+        style="width: 100%"
+        :height="tableHeight"
+      >
+        <el-table-column
+          label="需求类别"
+          prop="commonServiceTypeName"
+          fixed="left"
+          align="center"
+        />
+        <el-table-column
+          label="需求标题"
+          prop="title"
+          fixed="left"
+          align="center"
+        />
+
+        <el-table-column
+          label="指派服务"
+          prop="assignFlag"
+          fixed="left"
+          align="center"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.assignFlag == "0" ? "未指派" : "已指派" }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="需求发布时间"
+          prop="createdTime"
+          fixed="left"
+          align="center"
+        />
+        <el-table-column fixed="right" label="操作" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button
+              style="margin-right: 10px"
+              @click="handleAdd(scope.row, 'edit')"
+              size="small"
+              type="text"
+              >查看</el-button
+            >
+            <el-button
+              style="margin-right: 10px"
+              @click="handleAdd(scope.row, 'edit')"
+              size="small"
+              type="text"
+              >编辑</el-button
+            >
+            <template>
+              <el-popconfirm
+                title="删除之后无法回复，确认删除？"
+                @onConfirm="handleDel(scope.row)"
+              >
+                <el-button size="small" type="text" slot="reference"
+                  >删除</el-button
+                >
+              </el-popconfirm>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="div-flex">
+        <div class="m-page">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page.sync="pageNo"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="pageSize"
+            layout="sizes, prev, pager, next, total"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      destroy-on-close
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <add-form
+        v-if="formShow"
+        ref="gxxq_form"
+        :row-obj="rowObj"
+        :formType="formType"
+        @handleClose="addFormCancle"
+        @handleComfirm="addFormOk"
+      ></add-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+import { mapGetters } from "vuex";
+import addForm from "./addForm.vue";
+export default {
+  data() {
+    return {
+      // 公共服务分类
+      serviceTypesLevel1: [],
+      serviceTypesLevel2: [],
+      formType:"add",
+      formData: {
+        title: "",
+        serviceTypeLevel1Id: "",
+        commonServiceTypeId: "",
+        timeStart: "",
+        timeEnd: "",
+        assignFlag: "",
+      },
+      statusArray: [
+        {
+          value: 1,
+          label: "已指派服务",
+        },
+        {
+          value: 0,
+          label: "未指派服务",
+        },
+      ],
+      tableData: [],
+      pageNo: 1,
+      pageSize: 20,
+      tableLoading: true,
+      total: 0,
+      searchH: 172,
+      formShow: false,
+      formTitle: "",
+      rowObj: {},
+    };
+  },
+  created() {},
+  components: { addForm },
+  methods: {
+    async getCommonDemandList() {
+      const url = "/governance/commonDemand/list";
+      let params = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.formData,
+      };
+      let { data, msg, code } = await requestGet(url, params);
+      this.tableLoading = false;
+      if (code == 0) {
+        this.tableData = data.list;
+        this.total = data.total;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    addFormCancle() {
+      this.formShow = false;
+    },
+    addFormOk() {
+      this.formShow = false;
+      this.getCommonDemandList();
+    },
+    handleAdd(row, type) {
+      if (type == "add") {
+        this.formTitle = "添加需求";
+        this.formShow = true;
+        this.formType = 'add'
+        this.$nextTick(() => {
+        })
+      } else {
+        this.formTitle = "修改需求";
+        this.formShow = true;
+        console.log(row);
+        this.rowObj = row;
+        this.$nextTick(() => {
+          this.$refs.gxxq_form.initForm(type, row);
+        });
+      }
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.getCommonDemandList();
+    },
+    async handleDel(row) {
+      const url = `/governance/resiSearchTag/deleteResiSearchTag/${row.tagId}`;
+      let { code, msg } = await requestPost(url);
+      if (code == 0) {
+        this.$message.success("删除成功");
+      } else {
+        this.$message.error(msg);
+      }
+      this.getCommonDemandList();
+    },
+    handleSearch() {
+      console.log(this.formData);
+      this.getCommonDemandList();
+    },
+    resetSearch() {
+      this.formData = {
+        title: "",
+        serviceTypeLevel1Id: "",
+        commonServiceTypeId: "",
+        timeStart: "",
+        timeEnd: "",
+        assignFlag: "",
+      };
+
+      this.pageNo = 1;
+      this.getCommonDemandList();
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.getCommonDemandList();
+    },
+    diaClose() {
+      this.formShow = false;
+    },
+    // 获取服务组织
+    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("网络错误");
+        });
+    },
+    // 服务类型下拉框选中事件
+    handleChangeServiceTypeLevel1() {
+      this.formData.commonServiceTypeId = "";
+      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("网络错误");
+        });
+    },
+  },
+  mounted() {
+    this.getCommonDemandList();
+    this.getDictOptions();
+  },
+  computed: {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
+      const _h = this.clientHeight - 275 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
+    },
+  },
+  watch: {},
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+.div_btn {
+  margin-bottom: 12px;
+}
+</style>
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index 390ee23de..56be98604 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -438,7 +438,7 @@ export default {
           },
           {
             itemId: "20220422102809_1026",
-            label: "失独人员",
+            label: "特扶人员",
             columnName: "bereavedPersonFlag",
             itemType: "radio",
             width: 80,
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index 6da354356..15afd51b3 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -84,7 +84,7 @@
           <div v-if="info.satisfactionName"
                :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
             <span class="u-info-title-2">满意度：</span>
-            <div @click="handleToDemand">{{info.satisfactionName}}</div>
+            <div>{{info.satisfactionName}}</div>
           </div>
 
         </div>