From c9b8f02b9bb724ffa22c0fdaa5931e70f0c964f7 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 27 May 2022 17:39:55 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwujilu/fuwuList.vue    | 574 ++++++++++++++++++
 1 file changed, 574 insertions(+)
 create mode 100644 src/views/modules/communityService/fuwujilu/fuwuList.vue

diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
new file mode 100644
index 00000000..e3bb3607
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -0,0 +1,574 @@
+<template>
+  <div class="div_main">
+    <div v-show="pageType == 'list'">
+      <div class="div_search">
+        <el-form :inline="true"
+                 :model="formData"
+                 ref="ref_searchform"
+                 :label-width="'80px'">
+          <div>
+
+            <el-form-item label="服务类别"
+                          prop="sourceType">
+              <el-select v-model="formData.sourceType"
+                         placeholder="请选择"
+                         size="small"
+                         clearable
+                         class="item_width_2">
+                <el-option v-for="item in qudaoArray"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="服务项目"
+                          prop="eventContent">
+              <el-input v-model="formData.eventContent"
+                        class="item_width_1"
+                        size="small"
+                        clearable
+                        placeholder="请输入">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="服务组织"
+                          prop="name">
+              <el-input v-model="formData.name"
+                        class="item_width_2"
+                        size="small"
+                        clearable
+                        placeholder="请输入">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="服务时间"
+                          prop="startTime">
+              <el-date-picker v-model="formData.startTime"
+                              :picker-options="startPickerOptions"
+                              class="item_width_2"
+                              size="small"
+                              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.endTime"
+                              :picker-options="endPickerOptions"
+                              class="item_width_2 data-tag"
+                              size="small"
+                              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="status">
+              <el-select class="item_width_2"
+                         v-model="formData.status"
+                         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="status">
+              <el-select class="item_width_2"
+                         v-model="formData.status"
+                         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-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
+                  :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="gridName"
+                           align="center"
+                           label="服务类别"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="eventContent"
+                           label="服务项目"
+                           align="center"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="sourceTypeName"
+                           align="center"
+                           width="110"
+                           label="服务组织名称"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="address"
+                           align="center"
+                           width="140"
+                           :show-overflow-tooltip="true"
+                           label="服务时间">
+          </el-table-column>
+
+          <el-table-column prop="name"
+                           align="center"
+                           width="100"
+                           label="服务状态"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="mobile"
+                           align="center"
+                           width="110"
+                           label="服务人数"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column fixed="right"
+                           label="操作"
+                           align="center"
+                           width="100">
+            <template slot-scope="scope">
+
+              <el-button v-if="scope.row.status==='processing'&&!scope.row.operationId "
+                         @click="handleDispose(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--edit">处理</el-button>
+
+              <!-- <el-button v-else-if="scope.row.status==='closed_case' && !scope.row.satisfactionName && user.id===scope.row.createdUserId"
+                         @click="handleSatisfy(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--edit">评价</el-button> -->
+              <el-button v-else
+                         @click="handleWatch(scope.row)"
+                         type="text"
+                         size="small">查看</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>
+    <div v-if="pageType == 'dispose' || pageType == 'info'|| pageType == 'add'">
+      <!-- <event-info ref="eleEditForm"
+                  :pageType="pageType"
+                  :eventId="eventId"
+                  :eventDetailData="eventDetailData"
+                  @handleClose="handleClose"
+                  @handleOk="handleOk"
+                  @dialogOk="handleEditSuccess" /> -->
+    </div>
+
+    <el-dialog :title="'播放语音'"
+               :visible.sync="showVoice"
+               width="40%"
+               top="5vh"
+               append-to-body
+               class="dialog-h"
+               :close-on-click-modal="false">
+      <div class="dialog-h-content scroll-h">
+        <div style="display:flex;justify-content:center;margin:50px">
+
+          <audio controls>
+            <source :src="selVoiceUrl"
+                    type="" />
+          </audio>
+        </div>
+      </div>
+
+      <div class="resi-btns">
+        <el-button size="small"
+                   @click="showVoice=false">取消</el-button>
+
+      </div>
+    </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";
+
+export default {
+  components: {},
+
+  data () {
+    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      if (this.formData.startTime) {
+        let startTime = new Date(this.formData.startTime)
+        return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
+      } else {
+        return time.getTime() > nowData
+      }
+
+    }
+    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      return time.getTime() > nowData
+    }
+
+    return {
+      pageType: "list", // 列表list 新增add  处理dispose 详情info 
+      user: {},
+      agencyId: '',
+
+      tableData: [],
+
+      statusArray: [
+        {
+          value: "processing",
+          label: "处理中",
+        },
+        {
+          value: "closed_case",
+          label: "已完成",
+        },
+      ],
+      qudaoArray: [
+        {
+          value: "0",
+          label: "随手拍/随时讲",
+        },
+        {
+          value: "1",
+          label: "多媒体反应",
+        },
+        {
+          value: "2",
+          label: "社区电话",
+        },
+        {
+          value: "3",
+          label: "12345",
+        },
+        {
+          value: "4",
+          label: "网络员手持终端",
+        },
+      ],
+
+      formData: {
+        gridId: '',
+        sourceType: '',
+        eventContent: '',
+        name: '',
+        mobile: '',
+        startTime: '',
+        endTime: '',
+        status: '',
+
+      },
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+      endPickerOptions: {
+        disabledDate: endDisabledDate
+      },
+      startPickerOptions: {
+        disabledDate: startDisabledDate
+      },
+      eventId: '',
+
+      eventDetailData: {},
+
+
+      showVoice: false,
+      selVoiceUrl: '',
+    };
+  },
+  computed: {
+    maxTableHeight () {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 410 + this.iframeHeigh
+        : this.clientHeight - 410;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {
+    "formData.endTime": function (val) {
+      if (val && val != '') {
+        let arrayTemp = val.split(' ')
+        this.formData.endTime = arrayTemp[0] + ' 23:59:59'
+      }
+
+    },
+  },
+  mounted () {
+    console.log(this.$store.state)
+    this.user = this.$store.state.user
+
+    this.agencyId = this.user.agencyId
+
+    this.getTableData();
+  },
+  methods: {
+
+    handleSearch (val) {
+      console.log(this.formData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+
+
+    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("网络错误");
+        });
+    },
+
+    async handleAdd () {
+
+      this.pageType = "add";
+    },
+
+    async handleWatch (row) {
+      this.eventId = row.icEventId
+
+      this.eventId = row.icEventId
+      const url = "/gov/project/icEvent/detail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        icEventId: this.eventId,
+      });
+
+      if (code === 0) {
+
+        this.eventDetailData = { ...data };
+        this.pageType = "info";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async handleDispose (row) {
+      this.eventId = row.icEventId
+      const url = "/gov/project/icEvent/detail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        icEventId: this.eventId,
+      });
+
+      if (code === 0) {
+
+        this.eventDetailData = { ...data };
+        this.pageType = "dispose";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //显示语音窗口
+    handleShowVoice (url) {
+      this.selVoiceUrl = url
+      this.showVoice = true
+    },
+
+    handleClose () {
+      this.pageType = "list";
+      this.eventId = ""
+      this.getTableData()
+
+    },
+    handleOk () {
+      this.pageType = "list";
+      this.eventId = ""
+      this.pageNo = 1
+      this.getTableData()
+
+
+    },
+
+    handleEditSuccess () {
+      this.handleClose();
+      this.getTableData();
+    },
+
+    async handleDel (rowData, rowIndex) {
+      console.log(rowData, rowIndex);
+      const url =
+        "/heart/iccommunityselforganization/delcommunityselforganization";
+      const { tableData } = this;
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: tableData[rowIndex].orgId,
+      });
+
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+
+    async getTableData () {
+      const url = "/gov/project/icEvent/list";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/list";
+      const { pageSize, pageNo, formData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...formData,
+      });
+      if (code === 0) {
+
+        this.total = data.total || 0;
+        this.tableData = data.list
+          ? data.list.map((item) => {
+            return item;
+          })
+          : [];
+
+        this.tableData.forEach(item => {
+          if (item.operationType === '2') {
+            item.operationTypeShow = '已转需求'
+          }
+          if (item.operationType === '1') {
+            item.operationTypeShow = '已立项'
+          }
+          if (item.operationType === '0') {
+            item.operationTypeShow = '已回复'
+          }
+
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleSizeChange (val) {
+
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange (val) {
+
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    resetSearch () {
+      this.formData = {
+        gridId: '',
+        sourceType: '',
+        eventContent: '',
+        name: '',
+        mobile: '',
+        startTime: '',
+        endTime: '',
+        status: '',
+      }
+
+
+      // this.pageNo = 1
+      // this.loadTable()
+    },
+  },
+};
+</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>

From f3788722c9d3bc2dd2c0807bf660316483b1211c Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 27 May 2022 17:41:34 +0800
Subject: [PATCH 02/13] 111

---
 .../communityService/fuwujilu/fuwuList.vue    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index e3bb3607..d45e9a17 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -176,22 +176,22 @@
                            align="center"
                            width="100">
             <template slot-scope="scope">
-
-              <el-button v-if="scope.row.status==='processing'&&!scope.row.operationId "
-                         @click="handleDispose(scope.row)"
+              <el-button @click="handleDispose(scope.row)"
                          type="text"
                          size="small"
-                         class="div-table-button--edit">处理</el-button>
-
-              <!-- <el-button v-else-if="scope.row.status==='closed_case' && !scope.row.satisfactionName && user.id===scope.row.createdUserId"
-                         @click="handleSatisfy(scope.row)"
+                         class=".div-table-button--detail">查看</el-button>
+              <el-button @click="handleDispose(scope.row)"
                          type="text"
                          size="small"
-                         class="div-table-button--edit">评价</el-button> -->
-              <el-button v-else
-                         @click="handleWatch(scope.row)"
+                         class="div-table-button--edit">编辑</el-button>
+              <el-button @click="handleDispose(scope.row)"
                          type="text"
-                         size="small">查看</el-button>
+                         size="small"
+                         class="div-table-button--edit">反馈</el-button>
+              <el-button @click="handleDispose(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--delete">删除</el-button>
 
             </template>
           </el-table-column>

From 1dd208656e1311f79800c6b8ccbeddcd11e47434 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 30 May 2022 17:21:34 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fuwuxiangmu/cpts/edit.vue                 | 421 ++++++++++++++++
 .../communityService/fuwuxiangmu/index.vue    | 424 ++++++++++++++++
 .../communityService/fuwuzuzhi/cpts/edit.vue  | 464 ++++++++++++++++++
 .../communityService/fuwuzuzhi/index.vue      | 424 ++++++++++++++++
 .../shequzhili/xiangmu/cpts/project-info.vue  |   4 +-
 5 files changed, 1735 insertions(+), 2 deletions(-)
 create mode 100644 src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
 create mode 100644 src/views/modules/communityService/fuwuxiangmu/index.vue
 create mode 100644 src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
 create mode 100644 src/views/modules/communityService/fuwuzuzhi/index.vue

diff --git a/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue b/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
new file mode 100644
index 00000000..a9d144b1
--- /dev/null
+++ b/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
@@ -0,0 +1,421 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="fmData"
+        :rules="dataRule"
+        :disabled="formType === 'watch'"
+        class="form"
+      >
+        <el-form-item
+          label="服务类别	"
+          prop="serviceCategoryKey"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-if="formType == 'add'"
+            v-model="fmData.serviceCategoryKey"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in categoryOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <div v-else>{{ fmData.serviceCategory }}</div>
+        </el-form-item>
+
+        <el-form-item
+          label="项目名称"
+          prop="serviceName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            v-if="formType == 'add' || formType == 'edit'"
+            class="item_width_1"
+            maxlength="100"
+            show-word-limit
+            placeholder="请输入项目名称"
+            v-model="fmData.serviceName"
+          >
+          </el-input>
+          <div v-else>{{ fmData.serviceName }}</div>
+        </el-form-item>
+
+        <el-form-item
+          label="服务内容"
+          prop="serviceContent"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            v-if="formType == 'add' || formType == 'edit'"
+            class="item_width_1"
+            type="textarea"
+            maxlength="1000"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入服务内容，不超过1000字"
+            v-model="fmData.serviceContent"
+          ></el-input>
+          <div v-else>{{ fmData.serviceContent }}</div>
+        </el-form-item>
+
+        <el-form-item
+          label="政策级别	"
+          prop="policyLevel"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-if="formType == 'add' || formType == 'edit'"
+            v-model="fmData.policyLevel"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in levelOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <div v-else>{{ fmData.policyLevelName }}</div>
+        </el-form-item>
+
+        <el-form-item
+          label="政策依据"
+          prop="policyGround"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            v-if="formType == 'add' || formType == 'edit'"
+            class="item_width_1"
+            type="textarea"
+            maxlength="1000"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入政策依据，不超过1000字"
+            v-model="fmData.policyGround"
+          ></el-input>
+          <div v-else>{{ fmData.policyGround }}</div>
+        </el-form-item>
+
+        <el-form-item
+          label="图片/附件"
+          label-width="150px"
+          style="display: block"
+          prop="attachmentList"
+        >
+          <el-upload
+            v-if="formType == 'add' || formType == 'edit'"
+            class="avatar-uploader"
+            :action="uploadUrl"
+            :data="{ customerId: customerId }"
+            :show-file-list="true"
+            :on-success="handleImgSuccess"
+            :on-remove="handleImgRemove"
+            :before-upload="beforeImgUpload"
+          >
+            <i class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+          <div v-else>
+            <div class="attachement-list">
+              <a
+                :href="att.url"
+                target="_blank"
+                :key="att.url"
+                v-for="att in this.fmData.attachmentList"
+              >
+                <i class="el-icon-folder-opened"></i>
+                {{ att.name }}
+              </a>
+            </div>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="div_btn resi-btns">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        v-if="formType != 'watch'"
+        type="primary"
+        size="small"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import { requestPost } from "@/js/dai/request";
+import formVltHelper from "dai-js/tools/formVltHelper";
+
+export default {
+  props: {
+    formId: {
+      type: String,
+      default: "",
+    },
+    formType: {
+      type: String,
+      default: "info",
+    },
+  },
+
+  data() {
+    return {
+      uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+      customerId: localStorage.getItem("customerId"),
+
+      btnDisable: false,
+
+      fmData: {
+        serviceCategoryKey: "",
+        serviceName: "",
+        serviceContent: "",
+        policyGround: "",
+        policyLevel: "",
+        attachmentList: [],
+      },
+
+      levelOptions: [
+        {
+          value: "0",
+          label: "市级",
+        },
+        {
+          value: "1",
+          label: "区级",
+        },
+        {
+          value: "2",
+          label: "街道级",
+        },
+      ],
+      categoryOptions: [],
+    };
+  },
+  components: {},
+  computed: {
+    dataRule() {
+      return {
+        serviceCategoryKey: [
+          { required: true, message: "服务类别不能为空", trigger: "blur" },
+        ],
+        serviceName: [
+          { required: true, message: "项目名称不能为空", trigger: "blur" },
+        ],
+        serviceContent: [
+          { required: true, message: "服务内容不能为空", trigger: "blur" },
+        ],
+        policyGround: [
+          { required: true, message: "政策依据不能为空", trigger: "blur" },
+        ],
+        policyLevel: [
+          { required: true, message: "政策级别不能为空", trigger: "blur" },
+        ],
+      };
+    },
+  },
+  watch: {},
+
+  async mounted() {
+    this.initForm();
+  },
+
+  methods: {
+    async initForm() {
+      this.getCategoryOpitons();
+      if (this.formId) {
+        this.getInfo();
+      }
+    },
+
+    async getInfo() {
+      const url = "/heart/icServiceProject/serviceProjectDetail";
+
+      const params = {
+        serviceProjectId: this.formId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.info = { ...this.info, ...data };
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getCategoryOpitons() {
+      const url = "/sys/dict/data/dictlist";
+      const params = {
+        dictType: "ic_service_type",
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.categoryOptions = data || [];
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    beforeImgUpload(file) {
+      console.log(file);
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      const srcType = file.type;
+      const format = file.name.split(".").pop();
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+        return false;
+      }
+      if (
+        srcType.indexOf("image") == -1 &&
+        srcType.indexOf("video") == -1 &&
+        ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf"].indexOf(format) ==
+          -1
+      ) {
+        this.$message.error("文档仅限pdf和office文件!");
+        return false;
+      }
+      return true;
+    },
+
+    handleImgSuccess(res, file, fileList) {
+      console.log("handleImgSuccess", file);
+      if (res.code === 0 && res.msg === "success") {
+        let format = file.name.split(".").pop();
+        let srcType = file.raw.type;
+        let type = "file";
+        console.log("==============================srcType: ", srcType);
+        if (srcType.indexOf("image") != -1) {
+          type = "image";
+        } else if (srcType.indexOf("video") != -1) {
+          type = "video";
+        }
+        this.fmData.attachmentList.push({
+          format,
+          name: file.name,
+          size: file.size,
+          type,
+          url: res.data.url,
+        });
+        console.log(this.fmData.attachmentList);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+
+    handleImgRemove(file) {
+      console.log("handleImgRemove", file);
+      if (file.response) {
+        let index = this.fmData.attachmentList.findIndex(
+          (item) => item.url == file.response.data.url
+        );
+        this.fmData.attachmentList.splice(index, 1);
+      }
+    },
+
+    watchImg(src) {
+      window.open(src);
+    },
+
+    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.submit();
+        }
+      });
+    },
+
+    async submit() {
+      let url = "";
+      let params = { ...this.fmData };
+      if (this.formType === "add") {
+        url = "/heart/icServiceProject/serviceProjectAdd";
+      } else {
+        url = "/heart/icServiceProject/serviceProjectEdit";
+
+        params.serviceProjectId = this.formId;
+      }
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功",
+        });
+        this.$emit("afterEdit");
+        this.btnDisable = false;
+      } else {
+        this.btnDisable = false;
+        this.$message.error(msg);
+      }
+    },
+
+    handleCancle() {
+      this.$emit("close");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  margin-top: 10px;
+}
+
+.div_btn {
+  // display: flex;
+  // justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+
+.attachement-list {
+}
+</style>
diff --git a/src/views/modules/communityService/fuwuxiangmu/index.vue b/src/views/modules/communityService/fuwuxiangmu/index.vue
new file mode 100644
index 00000000..35941109
--- /dev/null
+++ b/src/views/modules/communityService/fuwuxiangmu/index.vue
@@ -0,0 +1,424 @@
+<template>
+  <div class="div_main">
+    <div v-show="true">
+      <div class="div_search">
+        <el-form
+          :inline="true"
+          :model="searchData"
+          ref="ref_searchform"
+          :label-width="'80px'"
+        >
+          <div>
+            <el-form-item label="服务类别" prop="serviceCategory">
+              <el-select
+                v-model="searchData.serviceCategory"
+                placeholder="请选择"
+                size="small"
+                clearable
+                class="item_width_2"
+              >
+                <el-option
+                  v-for="item in categoryOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="服务名称" prop="serviceName">
+              <el-input
+                v-model="searchData.serviceName"
+                class="item_width_1"
+                size="small"
+                clearable
+                placeholder="请输入"
+              >
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="服务内容" prop="serviceContent">
+              <el-input
+                v-model="searchData.serviceContent"
+                class="item_width_2"
+                size="small"
+                clearable
+                placeholder="请输入"
+              >
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="政策依据" prop="policyGround">
+              <el-input
+                v-model="searchData.policyGround"
+                class="item_width_2"
+                size="small"
+                clearable
+                placeholder="请输入"
+              >
+              </el-input>
+            </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
+          :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="serviceCategory"
+            align="center"
+            label="服务类别"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="serviceName"
+            label="服务名称"
+            align="center"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="serviceContent"
+            align="center"
+            label="服务内容"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="policyGround"
+            align="center"
+            :show-overflow-tooltip="true"
+            label="政策依据"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="policyLevel"
+            align="center"
+            label="政策级别"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            fixed="right"
+            label="操作"
+            align="center"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button
+                @click="handleWatch(scope.row)"
+                type="text"
+                size="small"
+                class=".div-table-button--detail"
+                >查看</el-button
+              >
+              <el-button
+                @click="handleDispose(scope.row)"
+                type="text"
+                size="small"
+                class="div-table-button--edit"
+                >编辑</el-button
+              >
+              <el-button
+                @click="handleDelete(scope.row)"
+                type="text"
+                size="small"
+                class="div-table-button--delete"
+                >删除</el-button
+              >
+            </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
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <edit-form
+        ref="eleEditForm"
+        :formId="formId"
+        :formType="formType"
+        @close="handleClose"
+        @afterEdit="handleEditSuccess"
+      ></edit-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import axios from "axios";
+import editForm from "./cpts/edit";
+
+function iniSearchData() {
+  return {
+    serviceCategory: "",
+    serviceName: "",
+    serviceContent: "",
+    policyGround: "",
+  };
+}
+
+export default {
+  components: { editForm },
+
+  data() {
+    return {
+      tableData: [],
+
+      searchData: iniSearchData(),
+      categoryOptions: [],
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      formId: "",
+      formShow: false,
+      formTitle: "服务项目",
+      formType: "", // 列表list 新增add  修改edit 详情info
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 410 + this.iframeHeigh
+        : this.clientHeight - 410;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {
+    "searchData.endTime": function (val) {
+      if (val && val != "") {
+        let arrayTemp = val.split(" ");
+        this.searchData.endTime = arrayTemp[0] + " 23:59:59";
+      }
+    },
+  },
+  mounted() {
+    console.log(this.$store.state);
+    this.user = this.$store.state.user;
+
+    this.agencyId = this.user.agencyId;
+
+    this.getTableData();
+  },
+  methods: {
+    handleSearch(val) {
+      console.log(this.searchData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+
+    async handleExport() {
+      const url = "/gov/project/icEvent/export";
+      const { pageSize, pageNo, searchData } = this;
+      axios({
+        url: window.SITE_CONFIG["apiURL"] + url,
+        method: "post",
+        data: {
+          pageSize,
+          pageNo,
+          ...searchData,
+        },
+        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("网络错误");
+        });
+    },
+
+    handleAdd() {
+      this.formType = "add";
+      this.formTitle = "新增";
+      this.formShow = true;
+    },
+
+    handleWatch(row) {
+      this.formType = "watch";
+      this.formId = row.serviceProjectId;
+      this.formTitle = "查看";
+      this.formShow = true;
+    },
+
+    handleEdit(row) {
+      this.formType = "edit";
+      this.formId = row.serviceProjectId;
+      this.formTitle = "查看";
+      this.formShow = true;
+    },
+
+    handleClose() {
+      this.formShow = false;
+    },
+
+    handleEditSuccess() {
+      this.handleClose();
+      this.getTableData();
+    },
+
+    async handleDel(rowData, rowIndex) {
+      console.log(rowData, rowIndex);
+      const url = "/heart/icServiceProject/serviceProjectEnabled";
+      const { tableData } = this;
+
+      const { data, code, msg } = await requestPost(url, [
+        tableData[rowIndex].serviceProjectId,
+      ]);
+
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+
+    async getCategoryOpitons() {
+      const url = "/sys/dict/data/dictlist";
+
+      const { data, code, msg } = await requestPost(url, {
+        dictType: "ic_service_type",
+      });
+
+      if (code === 0) {
+        this.categoryOptions = data || [];
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getTableData() {
+      const url = "/heart/icServiceProject/serviceProjectList";
+
+      const { pageSize, pageNo, searchData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...searchData,
+      });
+
+      if (code === 0) {
+        this.total = data.total || 0;
+        this.tableData = data.list
+          ? data.list.map((item) => {
+              return item;
+            })
+          : [];
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleSizeChange(val) {
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    resetSearch() {
+      this.searchData = iniSearchData();
+    },
+  },
+};
+</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/fuwuzuzhi/cpts/edit.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
new file mode 100644
index 00000000..1ef0f5eb
--- /dev/null
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
@@ -0,0 +1,464 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="fmData"
+        :rules="dataRule"
+        :disabled="formType === 'watch'"
+        class="form"
+      >
+        <el-form-item
+          label="服务类别	"
+          prop="serviceTypeArr"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-if="formType == 'add'"
+            v-model="fmData.serviceTypeArr"
+            placeholder="请选择"
+            clearable
+            multiple
+          >
+            <el-option
+              v-for="item in categoryOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <div v-else>{{ fmData.serviceTypeName }}</div>
+        </el-form-item>
+
+        <el-form-item
+          label="服务组织名称"
+          prop="orgName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            v-if="formType == 'add' || formType == 'edit'"
+            class="item_width_1"
+            maxlength="100"
+            show-word-limit
+            placeholder="请输入项目名称"
+            v-model="fmData.orgName"
+          >
+          </el-input>
+          <div v-else>{{ fmData.orgName }}</div>
+        </el-form-item>
+
+        <el-form-item
+          label="组织描述"
+          prop="orgDescribe"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            v-if="formType == 'add' || formType == 'edit'"
+            class="item_width_1"
+            type="textarea"
+            maxlength="1000"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入服务内容，不超过1000字"
+            v-model="fmData.orgDescribe"
+          ></el-input>
+          <div v-else>{{ fmData.orgDescribe }}</div>
+        </el-form-item>
+
+        <el-form-item
+          label="负责人姓名"
+          prop="principalName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            v-if="formType == 'add' || formType == 'edit'"
+            class="item_width_1"
+            maxlength="100"
+            show-word-limit
+            placeholder="请输入负责人姓名"
+            v-model="fmData.principalName"
+          ></el-input>
+          <div v-else>{{ fmData.principalName }}</div>
+        </el-form-item>
+
+        <el-form-item
+          label="联系方式"
+          prop="principalMobile"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            v-if="formType == 'add' || formType == 'edit'"
+            class="item_width_1"
+            maxlength="100"
+            show-word-limit
+            placeholder="请输入联系方式"
+            v-model="fmData.principalMobile"
+          ></el-input>
+          <div v-else>{{ fmData.principalMobile }}</div>
+        </el-form-item>
+
+        <el-form-item
+          label="位置坐标"
+          prop="longitude"
+          label-width="150px"
+          style="display: block"
+        >
+          <div style="width: 500px">
+            <el-input
+              class="item_width_4"
+              maxlength="50"
+              placeholder="请输入关键字"
+              v-model="fmData.address"
+            >
+            </el-input>
+            <el-button
+              style="margin-left: 10px"
+              type="primary"
+              size="small"
+              @click="handleSearchMap"
+              >查询</el-button
+            >
+            <div id="app" class="div_map"></div>
+            <div style="margin-top: 10px">
+              <span>经度</span>
+              <el-input
+                class="item_width_3"
+                maxlength="50"
+                placeholder="请输入经度"
+                v-model="fmData.longitude"
+              >
+              </el-input>
+              <span style="margin-left: 20px">纬度</span>
+              <el-input
+                class="item_width_3"
+                maxlength="50"
+                placeholder="请输入纬度"
+                v-model="fmData.latitude"
+              >
+              </el-input>
+            </div>
+          </div>
+        </el-form-item>
+
+        <el-form-item
+          label="备注"
+          prop="remark"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            maxlength="500"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入备注，不超过500字"
+            v-model="fmData.remark"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="div_btn resi-btns">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        v-if="formType != 'watch'"
+        type="primary"
+        size="small"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import { requestPost } from "@/js/dai/request";
+import formVltHelper from "dai-js/tools/formVltHelper";
+
+var map;
+var search;
+var markers;
+var infoWindowList;
+
+export default {
+  props: {
+    formId: {
+      type: String,
+      default: "",
+    },
+    formType: {
+      type: String,
+      default: "info",
+    },
+  },
+
+  data() {
+    return {
+      uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+      customerId: localStorage.getItem("customerId"),
+
+      btnDisable: false,
+
+      fmData: {
+        serviceTypeArr: [],
+        serviceType: "",
+        orgName: "",
+        orgDescribe: "",
+        principalName: "",
+        principalMobile: "",
+        longitude: "",
+        latitude: "",
+        address: "",
+        remark: "",
+      },
+
+      categoryOptions: [],
+    };
+  },
+  components: {},
+  computed: {
+    dataRule() {
+      return {
+        serviceTypeArr: [
+          { required: true, message: "服务类别不能为空", trigger: "blur" },
+        ],
+        orgName: [
+          { required: true, message: "服务组织名称不能为空", trigger: "blur" },
+        ],
+        principalName: [
+          { required: true, message: "负责人姓名不能为空", trigger: "blur" },
+        ],
+        principalMobile: [
+          { required: true, message: "联系方式不能为空", trigger: "blur" },
+        ],
+      };
+    },
+  },
+  watch: {},
+
+  async mounted() {
+    this.initForm();
+  },
+
+  methods: {
+    async initForm() {
+      this.initMap();
+      this.getCategoryOpitons();
+      if (this.formId) {
+        this.getInfo();
+      }
+    },
+
+    // 地图初始化函数，本例取名为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);
+
+      // 监听地图平移结束
+      map.on("panend", () => {
+        this.handleMoveCenter();
+      });
+      this.handleMoveCenter();
+    },
+
+    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
+        .searchRectangle({
+          keyword: this.fmData.address,
+          bounds: map.getBounds(),
+        })
+        .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.fmData.latitude = lat;
+            this.fmData.longitude = lng;
+          } else {
+            this.$message.error("未检索到相关位置坐标");
+          }
+        });
+    },
+
+    handleMoveCenter() {
+      //修改地图中心点
+      const center = map.getCenter();
+      const lat = center.getLat();
+      const lng = center.getLng();
+      this.fmData.latitude = lat;
+      this.fmData.longitude = lng;
+      this.setMarker(lat, lng);
+    },
+
+    async getInfo() {
+      const url = "/heart/icServiceOrg/detail";
+
+      const params = {
+        icServiceOrgId: this.formId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.info = {
+          ...this.info,
+          ...data,
+          serviceTypeArr: data.serviceType.split(","),
+        };
+        map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getCategoryOpitons() {
+      const url = "/sys/dict/data/dictlist";
+      const params = {
+        dictType: "ic_service_type",
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.categoryOptions = data || [];
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    watchImg(src) {
+      window.open(src);
+    },
+
+    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.submit();
+        }
+      });
+    },
+
+    async submit() {
+      let url = "";
+      let params = {
+        ...this.fmData,
+        serviceType: this.fmData.serviceTypeArr.join(","),
+      };
+      if (this.formType === "add") {
+        url = "/heart/icServiceOrg/add";
+      } else {
+        url = "/heart/icServiceOrg/edit";
+
+        params.icServiceOrgId = this.formId;
+      }
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功",
+        });
+        this.$emit("afterEdit");
+        this.btnDisable = false;
+      } else {
+        this.btnDisable = false;
+        this.$message.error(msg);
+      }
+    },
+
+    handleCancle() {
+      this.$emit("close");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  margin-top: 10px;
+}
+
+.div_btn {
+  // display: flex;
+  // justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+
+.attachement-list {
+}
+</style>
diff --git a/src/views/modules/communityService/fuwuzuzhi/index.vue b/src/views/modules/communityService/fuwuzuzhi/index.vue
new file mode 100644
index 00000000..7fe8f503
--- /dev/null
+++ b/src/views/modules/communityService/fuwuzuzhi/index.vue
@@ -0,0 +1,424 @@
+<template>
+  <div class="div_main">
+    <div v-show="true">
+      <div class="div_search">
+        <el-form
+          :inline="true"
+          :model="searchData"
+          ref="ref_searchform"
+          :label-width="'80px'"
+        >
+          <div>
+            <el-form-item label="服务类别" prop="serviceType">
+              <el-select
+                v-model="searchData.serviceType"
+                placeholder="请选择"
+                size="small"
+                clearable
+                class="item_width_2"
+              >
+                <el-option
+                  v-for="item in categoryOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="服务组织" prop="orgName">
+              <el-input
+                v-model="searchData.orgName"
+                class="item_width_1"
+                size="small"
+                clearable
+                placeholder="请输入"
+              >
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="服务地址" prop="address">
+              <el-input
+                v-model="searchData.address"
+                class="item_width_2"
+                size="small"
+                clearable
+                placeholder="请输入"
+              >
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="searchData.remark"
+                class="item_width_2"
+                size="small"
+                clearable
+                placeholder="请输入"
+              >
+              </el-input>
+            </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
+          :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="serviceTypeName"
+            align="center"
+            label="服务类别"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="orgName"
+            label="服务组织名称"
+            align="center"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="address"
+            align="center"
+            label="地址"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="principalName"
+            align="center"
+            :show-overflow-tooltip="true"
+            label="负责人"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="principalMobile"
+            align="center"
+            label="联系方式"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            fixed="right"
+            label="操作"
+            align="center"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button
+                @click="handleWatch(scope.row)"
+                type="text"
+                size="small"
+                class=".div-table-button--detail"
+                >查看</el-button
+              >
+              <el-button
+                @click="handleDispose(scope.row)"
+                type="text"
+                size="small"
+                class="div-table-button--edit"
+                >编辑</el-button
+              >
+              <el-button
+                @click="handleDelete(scope.row)"
+                type="text"
+                size="small"
+                class="div-table-button--delete"
+                >删除</el-button
+              >
+            </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
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <edit-form
+        ref="eleEditForm"
+        :formId="formId"
+        :formType="formType"
+        @close="handleClose"
+        @afterEdit="handleEditSuccess"
+      ></edit-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import axios from "axios";
+import editForm from "./cpts/edit";
+
+function iniSearchData() {
+  return {
+    serviceType: "",
+    orgName: "",
+    address: "",
+    remark: "",
+  };
+}
+
+export default {
+  components: { editForm },
+
+  data() {
+    return {
+      tableData: [],
+
+      searchData: iniSearchData(),
+      categoryOptions: [],
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      formId: "",
+      formShow: false,
+      formTitle: "服务项目",
+      formType: "", // 列表list 新增add  修改edit 详情info
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 410 + this.iframeHeigh
+        : this.clientHeight - 410;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {
+    "searchData.endTime": function (val) {
+      if (val && val != "") {
+        let arrayTemp = val.split(" ");
+        this.searchData.endTime = arrayTemp[0] + " 23:59:59";
+      }
+    },
+  },
+  mounted() {
+    console.log(this.$store.state);
+    this.user = this.$store.state.user;
+
+    this.agencyId = this.user.agencyId;
+
+    this.getTableData();
+  },
+  methods: {
+    handleSearch(val) {
+      console.log(this.searchData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+
+    async handleExport() {
+      const url = "/gov/project/icEvent/export";
+      const { pageSize, pageNo, searchData } = this;
+      axios({
+        url: window.SITE_CONFIG["apiURL"] + url,
+        method: "post",
+        data: {
+          pageSize,
+          pageNo,
+          ...searchData,
+        },
+        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("网络错误");
+        });
+    },
+
+    handleAdd() {
+      this.formType = "add";
+      this.formTitle = "新增";
+      this.formShow = true;
+    },
+
+    handleWatch(row) {
+      this.formType = "watch";
+      this.formId = row.icServiceOrgId;
+      this.formTitle = "查看";
+      this.formShow = true;
+    },
+
+    handleEdit(row) {
+      this.formType = "edit";
+      this.formId = row.icServiceOrgId;
+      this.formTitle = "查看";
+      this.formShow = true;
+    },
+
+    handleClose() {
+      this.formShow = false;
+    },
+
+    handleEditSuccess() {
+      this.handleClose();
+      this.getTableData();
+    },
+
+    async handleDel(rowData, rowIndex) {
+      console.log(rowData, rowIndex);
+      const url = "/heart/icServiceOrg/del";
+      const { tableData } = this;
+
+      const { data, code, msg } = await requestPost(url, [
+        tableData[rowIndex].serviceProjectId,
+      ]);
+
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+
+    async getCategoryOpitons() {
+      const url = "/sys/dict/data/dictlist";
+
+      const { data, code, msg } = await requestPost(url, {
+        dictType: "ic_service_type",
+      });
+
+      if (code === 0) {
+        this.categoryOptions = data || [];
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getTableData() {
+      const url = "/heart/icServiceOrg/list";
+
+      const { pageSize, pageNo, searchData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...searchData,
+      });
+
+      if (code === 0) {
+        this.total = data.total || 0;
+        this.tableData = data.list
+          ? data.list.map((item) => {
+              return item;
+            })
+          : [];
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleSizeChange(val) {
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    resetSearch() {
+      this.searchData = iniSearchData();
+    },
+  },
+};
+</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/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 6707e7e0..3a4bd189 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -341,7 +341,7 @@
               >
                 <el-upload
                   class="avatar-uploader"
-                  :action="uploadUlr"
+                  :action="uploadUrl"
                   :data="{ customerId: customerId }"
                   :show-file-list="true"
                   :on-success="handleImgSuccess"
@@ -491,7 +491,7 @@ import dateFormat from "dai-js/tools/dateFormat";
 function iniData() {
   return {
     pageType: "info",
-    uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+    uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
 
     showedEvaluation: false,
 

From eb03b300d3e934bab41a3aae4be22f2297502539 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 30 May 2022 17:56:08 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/form-main.scss    |  83 ++
 .../communityService/fuwujilu/addForm.vue     | 850 ++++++++++++++++++
 .../communityService/fuwujilu/detailForm.vue  | 697 ++++++++++++++
 .../communityService/fuwujilu/fuwuList.vue    | 369 ++++----
 4 files changed, 1813 insertions(+), 186 deletions(-)
 create mode 100644 src/assets/scss/modules/management/form-main.scss
 create mode 100644 src/views/modules/communityService/fuwujilu/addForm.vue
 create mode 100644 src/views/modules/communityService/fuwujilu/detailForm.vue

diff --git a/src/assets/scss/modules/management/form-main.scss b/src/assets/scss/modules/management/form-main.scss
new file mode 100644
index 00000000..6e0cfa6f
--- /dev/null
+++ b/src/assets/scss/modules/management/form-main.scss
@@ -0,0 +1,83 @@
+
+
+.div_form {
+  width: 100%;
+  margin-top:20px;
+
+  .data-tag{
+    margin-left:10px;
+  }
+
+  .item_width_1{
+    width: 480px;
+  }
+  .item_width_2{
+    width: 220px;
+  }
+
+  .list_item_width_1 {
+    width: 165px;
+  }
+  .list_item_width_2 {
+    width: 135px;
+  }
+}
+
+
+.div-mult-form {
+  margin-top: 20px;
+
+  .div_person {
+    display: flex;
+    font-size: 14px;
+    padding-bottom: 20px;
+
+    .person_title {
+      text-align: right;
+      flex: 0 0 100px;
+
+      line-height: 36px;
+      padding: 0 12px 0 0;
+    }
+
+    .tag_item {
+      margin-right: 10px;
+      margin-top: 10px;
+    }
+    .tag_tip {
+      margin-top: 10px;
+      color: #9c9c9c;
+    }
+  }
+}
+
+
+
+.twoline {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+}
+
+.div_btn {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.d-h3{
+  margin-left:20px;
+}
+
+.div_map {
+  margin-top:10px;
+  position: relative;
+}
+.div_searchmap {
+  z-index: 1000;
+  position: absolute;
+  top: 5px;
+  left: 5px;
+  display: flex;
+  justify-content: flex-start;
+}
\ No newline at end of file
diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
new file mode 100644
index 00000000..52050dba
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -0,0 +1,850 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <el-form v-if="formType==='add'"
+               ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               class="div_form">
+
+        <el-form-item label="服务分类"
+                      label-width="150px"
+                      prop="serviceCategoryId">
+          <el-select v-model="formData.serviceCategoryId"
+                     placeholder="请选择"
+                     clearable
+                     class="item_width_1">
+            <el-option v-for="(item,index) in categrayArray"
+                       @click.native="hancleClickCategray(index)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="服务项目"
+                      prop="serviceProjectId"
+                      label-width="150px"
+                      style="display: block">
+          <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">
+          <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="serviceScope"
+                      label-width="150px"
+                      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="经办人"
+                      prop="principalName"
+                      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="principalConcat"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入联系人电话"
+                    v-model="formData.principalConcat">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="服务时间"
+                      label-width="150px"
+                      prop="serviceTimeStart">
+          <el-date-picker 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 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 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-item label="直接反馈"
+                      prop="remark"
+                      label-width="150px"
+                      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="serviceProjectName"
+                        label-width="150px"
+                        style="display: block">
+            <span v-if="feedbackFormData.serviceProjectName">{{feedbackFormData.serviceProjectName}}</span>
+            <span v-else>--</span>
+
+          </el-form-item>
+
+          <el-form-item label="服务目标"
+                        prop="serviceGoal"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入服务目标，不超过500字"
+                      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="500"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入服务效果，不超过500字"
+                      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_1"
+                             v-model="feedbackFormData.servicePeopleNumber"
+                             :min="0"
+                             :max="9999"
+                             label="服务人数"></el-input-number>
+          </el-form-item>
+
+          <el-form-item label="服务状态"
+                        label-width="150px"
+                        prop="serviceStatus">
+            <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="满意度"
+                        label-width="150px"
+                        prop="satisfaction">
+            <el-select class="item_width_1"
+                       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 class="upload-demo"
+                       :action="uploadUlr"
+                       accept=".doc,.pdf,.xls,.docx,.xlsx"
+                       :on-success="handleFileSuccess"
+                       :on-remove="handleFileRemove"
+                       :on-preview="handleFileDownload"
+                       :limit="3"
+                       :before-upload="beforeUpload"
+                       :file-list="fileList">
+              <el-button size="small"
+                         type="primary">点击上传</el-button>
+              <div slot="tip"
+                   class="el-upload__tip">只能上传word、excel、pdf文件</div>
+            </el-upload>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+
+
+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,
+      casOptions: [],
+      scopeIdArray: [],
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: true,
+        value: 'objectId',
+        label: 'objectName',
+        children: 'children',
+        checkStrictly: true
+      },
+
+      keyWords: '',
+      formData: {
+        serviceCategoryId: '',//服务分类id	
+        serviceProjectId: '',//服务项目id	
+        serviceOrgId: '',//服务组织id	
+        serviceScope: [],//
+        principalName: '',//经办人(责任人)姓名	
+        principalConcat: '',//经办人联系方式	
+        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
+        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
+        remark: '',//
+        feedback: {},//反馈。允许发起服务的时候直接填写反馈，完成服务。	
+
+      },
+      feedbackFormData: {
+        serviceProjectId: '',//	服务项目id	
+        serviceProjectName: '',
+        serviceGoal: '',//	服务目标	
+        serviceEffect: '',//	服务效果	
+        servicePeopleNumber: null,//	服务人数	
+        serviceStatus: '',//	服务状态。in_service服务中；completed:已完成	
+        satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
+        longitude: '',//	经度	
+        latitude: '',//	维度	
+        address: '',
+        attachmentList: [],//	附件列表
+      },
+
+      projectList: [],//服务项目list
+      orgList: [],//服务组织list
+
+      endPickerOptions: {
+        disabledDate: endDisabledDate
+      },
+      startPickerOptions: {
+        disabledDate: startDisabledDate
+      },
+
+      showFeedback: true,
+
+
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+
+    }
+  },
+
+  watch: {
+    // "formData.serviceTimeEnd": function (val) {
+    //   if (val && val != '') {
+    //     let arrayTemp = val.split(' ')
+    //     this.formData.serviceTimeEnd = arrayTemp[0] 
+    //   }
+
+    // },
+  },
+  components: {},
+  async mounted () {
+    this.startLoading()
+    this.initMap()
+    this.$refs.ref_form.resetFields();
+    this.$refs.ref_form_feedback.resetFields();
+    await this.loadScopeTree()
+    this.endLoading()
+  },
+
+
+  methods: {
+    handleChangeFeedback (val) {
+      this.showFeedback = val
+
+    },
+
+    hancleClickCategray () {
+      //获取服务项目
+      this.loadProjectList()
+      //获取服务组织
+      this.loadOrgList()
+    },
+
+    hancleClickProject (index) {
+      this.feedbackFormData.serviceProjectId = this.projectList[index].serviceProjectId
+      this.feedbackFormData.serviceProjectName = this.projectList[index].serviceName
+    },
+
+    // 获取服务范围树
+    loadScopeTree () {
+      // const url = '/gov/org/isServiceProject/service/serviceScopeTree'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {}
+      window.app.ajax.post(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          //组织级联数据
+          ++this.iscascaderShow
+          this.casOptions = []
+          this.scopeIdArray = []
+          this.casOptions.push(data)
+
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg)
+        }
+      )
+
+    },
+
+
+    handleChangeScope (value) {
+      this.formData.serviceScope = []
+      let selArray = this.$refs["myCascader"].getCheckedNodes()
+      selArray.forEach(element => {
+        let obj = {
+          objectType: element.objectType,
+          objectId: element.objectId,
+          objectName: element.objectName,
+        }
+        this.formData.serviceScope.push(obj)
+      });
+
+    },
+
+    //加载组织
+    async loadProjectList () {
+      // const url = '/heart/icServiceProject/serviceProjectList'
+      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/serviceProjectList'
+      let params = {
+        isPage: false,
+        serviceCategory: this.formData.serviceCategoryId,
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.projectList = data.list
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //加载组织
+    async loadOrgList () {
+      // const url = '/heart/icServiceOrg/selectlist'
+      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceOrg/selectlist'
+      let params = {
+        serviceType: this.formData.serviceCategoryId,
+
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.orgList = data
+      } 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 {
+
+          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 () {
+      console.log(this.formData)
+      return false
+      // const url = '/heart/icServiceProject/service/initiate'
+      const url = 'http://yapi.elinkservice.cn/mock/245/heart/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)
+      }
+    },
+
+    beforeUpload (file) {
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+
+      if (extension !== 'xls'
+        && extension !== 'xlsx'
+        && extension !== 'doc'
+        && extension !== 'docx'
+        && extension !== 'pdf') {
+        this.$message.error('只能上传word、excel、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]
+
+        file.url = res.data.url
+        file.type = fileType
+        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 () {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById('map_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
+        .searchRectangle({
+          keyword: this.keyWords,
+          bounds: map.getBounds()
+        })
+        .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.feedbackFormData.latitude = lat
+            this.feedbackFormData.longitude = lng
+            this.convert()
+          } else {
+            this.$message.error('未检索到相关位置坐标')
+          }
+        })
+    },
+
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter()
+      const lat = center.getLat()
+      const lng = center.getLng()
+      this.feedbackFormData.latitude = lat
+      this.feedbackFormData.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.feedbackFormData.latitude, this.feedbackFormData.longitude);
+      }
+
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: 'main', // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+
+          this.feedbackFormData.address = result.result.address
+          // 显示搜索到的地址
+        });
+    },
+
+
+    resetData () {
+      this.formData = {
+        serviceCategoryId: '',//服务分类id	
+        serviceProjectId: '',//服务项目id	
+        serviceOrgId: '',//服务组织id	
+        serviceScope: [],//
+        principalName: '',//经办人(责任人)姓名	
+        principalConcat: '',//经办人联系方式	
+        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
+        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
+        remark: '',//
+        feedback: {},//反馈。允许发起服务的时候直接填写反馈，完成服务。	
+
+      }
+      this.feedbackFormData = {
+        serviceProjectId: '',//	服务项目id	
+        serviceProjectName: '',
+        serviceGoal: '',//	服务目标	
+        serviceEffect: '',//	服务效果	
+        servicePeopleNumber: null,//	服务人数	
+        serviceStatus: '',//	服务状态。in_service服务中；completed:已完成	
+        satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
+        longitude: '',//	经度	
+        latitude: '',//	维度	
+        address: '',
+        attachmentList: [],//	附件列表
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+
+        serviceCategoryId: [
+          { required: true, message: '服务类别不能为空', trigger: 'blur' },
+        ],
+        serviceProjectId: [
+          { required: true, message: '服务项目不能为空', trigger: 'blur' }
+        ],
+
+        serviceOrgId: [
+          { required: true, message: '服务组织不能为空', trigger: 'blur' }
+        ],
+        serviceTimeStart: [
+          { required: true, message: '服务时间不能为空', trigger: 'blur' }
+        ],
+        serviceScope: [
+          { required: true, message: '服务范围不能为空', trigger: 'blur' }
+        ],
+
+      }
+    },
+    feedbackDataRule () {
+      return {
+
+        serviceProjectName: [
+          { required: true, message: '服务项目不能为空', trigger: 'blur' },
+        ],
+        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' }
+        ]
+      }
+    },
+
+  },
+  props: {
+
+    serviceRecordId: {
+      type: String,
+      required: ''
+    },
+    formType: { //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+      type: String,
+      required: ''
+    },
+    categrayArray: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
+    statusArray: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
+    satisfyArray: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/form-main.scss";
+</style>
diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
new file mode 100644
index 00000000..718b50f9
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -0,0 +1,697 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType === 'detail'"
+               class="form">
+
+        <el-form-item label="服务分类"
+                      prop="serviceCategoryId">
+          <el-select v-model="formData.serviceCategoryId"
+                     placeholder="请选择"
+                     size="small"
+                     clearable
+                     class="item_width_2">
+            <el-option v-for="item in categrayArray"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="服务项目"
+                      prop="type"
+                      label-width="150px"
+                      style="display: block">
+          <el-select class="item_width_1"
+                     v-model="formData.type"
+                     placeholder="请选择"
+                     filterable
+                     clearable>
+            <el-option v-for="item in typeList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <el-form-item label="服务组织"
+                      prop="type"
+                      label-width="150px"
+                      style="display: block">
+          <el-select class="item_width_1"
+                     v-model="formData.type"
+                     placeholder="请选择"
+                     filterable
+                     clearable>
+            <el-option v-for="item in typeList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="服务范围"
+                      prop="unitName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入单位名称"
+                    v-model="formData.unitName">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="经办人"
+                      prop="contact"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入联系人姓名"
+                    v-model="formData.contact">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="联系方式"
+                      prop="contactMobile"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入联系人电话"
+                    v-model="formData.contactMobile">
+          </el-input>
+        </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="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input 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>
+
+      <h3>反馈内容</h3>
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType === 'detail'"
+               class="form">
+
+        <el-form-item label="分类"
+                      prop="type"
+                      label-width="150px"
+                      style="display: block">
+          <el-select class="item_width_1"
+                     v-model="formData.type"
+                     placeholder="请选择"
+                     filterable
+                     clearable>
+            <el-option v-for="item in typeList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="单位名称"
+                      prop="unitName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入单位名称"
+                    v-model="formData.unitName">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="服务事项"
+                      prop="serviceMatterList"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox-group class="item_width_1"
+                             style="display:flex;flex-wrap:wrap"
+                             v-model="formData.serviceMatterList">
+            <el-checkbox v-for="item in serviceList"
+                         :key="item.value"
+                         :label="item.value">{{item.label}}</el-checkbox>
+
+          </el-checkbox-group>
+
+        </el-form-item>
+        <el-form-item label="联系人"
+                      prop="contact"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入联系人姓名"
+                    v-model="formData.contact">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="联系电话"
+                      prop="contactMobile"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入联系人电话"
+                    v-model="formData.contactMobile">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="在职党员"
+                      style="display: block"
+                      prop="memberCount"
+                      label-width="150px">
+          <el-input-number class="item_width_4"
+                           v-model="formData.memberCount"
+                           :min="0"
+                           :max="9999"
+                           label="在职党员"></el-input-number>
+        </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input 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-item label="位置坐标"
+                      prop="longitude"
+                      label-width="150px"
+                      style="display: block">
+          <div style="width:500px">
+
+            <div class="div_map">
+              <div id="app">
+
+              </div>
+              <div class="div_searchmap">
+                <el-input class="item_width_4"
+                          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 style="margin-top: 10px">
+              <span>经度</span>
+              <el-input class="item_width_3"
+                        maxlength="50"
+                        placeholder="请输入经度"
+                        v-model="formData.longitude">
+              </el-input>
+              <span style="margin-left: 20px">纬度</span>
+              <el-input class="item_width_3"
+                        maxlength="50"
+                        placeholder="请输入纬度"
+                        v-model="formData.latitude">
+              </el-input>
+            </div>
+          </div>
+        </el-form-item>
+
+        <el-form-item label="地理位置"
+                      prop="address"
+                      label-width="150px"
+                      style="display: block">
+
+          <el-input class="item_width_1"
+                    v-model="formData.address">
+          </el-input>
+
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+
+
+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 {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+
+      btnDisable: false,
+
+      unitId: '',
+      keyWords: '',
+      formData: {
+        unitName: '',
+        serviceMatterList: [],
+        type: '',
+        contact: '',
+        contactMobile: '',
+        memberCount: 0,
+        remark: '', //备注【最大500字】
+        address: '', //详细地址
+        longitude: 36.0722275, //经度
+        latitude: 120.38945519 //纬度
+      },
+      serviceList: [],//服务list
+
+      endPickerOptions: {
+        disabledDate: endDisabledDate
+      },
+      startPickerOptions: {
+        disabledDate: startDisabledDate
+      },
+
+      categrayArray: [],
+      projectList: [],
+
+    }
+  },
+  components: {},
+  mounted () {
+    if (this.serviceRecordId) {//详情
+
+    }
+    this.initMap()
+    console.log('mounted')
+  },
+  activated () {
+    console.log('activated')
+  },
+
+  methods: {
+
+    async initForm (type, unitId) {
+      this.startLoading()
+      this.$refs.ref_form.resetFields();
+
+      //获取服务事项
+      await this.loadService()
+
+      this.formType = type
+      if (unitId) {
+        this.unitId = unitId
+        this.formData.id = unitId
+        await this.loadFormData()
+      } else {
+        map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
+        this.setMarker(36.0722275, 120.38945519)
+      }
+
+      this.endLoading()
+
+    },
+
+    //获取服务事项下拉框
+    async loadService () {
+      const url = "/heart/serviceitem/dict-list"
+      let params = {
+        type: 'usable'
+        // parentCategoryCode: '1010'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.serviceList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //加载组织
+    async loadFormData () {
+      const url = '/heart/icpartyunit/detail'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
+      let params = {
+        id: this.unitId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) {
+          data.serviceMatterList = []
+        }
+
+        this.formData = { ...data }
+        map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+        this.setMarker(this.formData.latitude, this.formData.longitude)
+      } 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.addUnit()
+        }
+
+      })
+
+
+    },
+    async addUnit () {
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      if (regPhone.test(this.formData.contactMobile) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
+
+      let url = '/heart/icpartyunit/save'
+      // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
+      // if (this.formType === 'edit') {
+      //  this.formData.id = this.unitId
+      // } 
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    // 地图初始化函数，本例取名为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
+        .searchRectangle({
+          keyword: this.keyWords,
+          bounds: map.getBounds()
+        })
+        .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.unitId = ''
+      this.keyWords = ''
+      this.formData = {
+        unitName: '',
+        serviceMatterList: [],
+        type: '',
+        contact: '',
+        contactMobile: '',
+        memberCount: 0,
+        remark: '', //备注【最大500字】
+        address: '', //详细地址
+        longitude: '', //经度
+        latitude: '' //纬度
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+
+        unitName: [
+          { required: true, message: '单位名称不能为空', trigger: 'blur' },
+        ],
+        type: [
+          { required: true, message: '分类不能为空', trigger: 'blur' }
+        ],
+
+        contact: [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        contactMobile: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        ],
+        memberCount: [
+          { required: true, message: '在职党员数不能为空', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '详细地址不能为空', trigger: 'blur' }
+        ],
+        longitude: [
+          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+  },
+  props: {
+
+    serviceRecordId: {
+      type: String,
+      required: ''
+    },
+    formType: {
+      type: String,
+      required: ''
+    },
+    categrayArray: {
+      type: Array,
+      default () {
+        return []
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+.div_map {
+  position: relative;
+}
+.div_searchmap {
+  z-index: 5000;
+  position: absolute;
+  top: 5px;
+  left: 5px;
+}
+</style>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index d45e9a17..d9ad515a 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="div_main">
-    <div v-show="pageType == 'list'">
+    <div>
       <div class="div_search">
         <el-form :inline="true"
                  :model="formData"
@@ -8,14 +8,14 @@
                  :label-width="'80px'">
           <div>
 
-            <el-form-item label="服务类别"
-                          prop="sourceType">
-              <el-select v-model="formData.sourceType"
+            <el-form-item label="服务分类"
+                          prop="serviceCategoryId">
+              <el-select v-model="formData.serviceCategoryId"
                          placeholder="请选择"
                          size="small"
                          clearable
                          class="item_width_2">
-                <el-option v-for="item in qudaoArray"
+                <el-option v-for="item in categrayArray"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
@@ -23,8 +23,8 @@
               </el-select>
             </el-form-item>
             <el-form-item label="服务项目"
-                          prop="eventContent">
-              <el-input v-model="formData.eventContent"
+                          prop="serviceProjectName">
+              <el-input v-model="formData.serviceProjectName"
                         class="item_width_1"
                         size="small"
                         clearable
@@ -33,8 +33,8 @@
             </el-form-item>
 
             <el-form-item label="服务组织"
-                          prop="name">
-              <el-input v-model="formData.name"
+                          prop="serviceOrgName">
+              <el-input v-model="formData.serviceOrgName"
                         class="item_width_2"
                         size="small"
                         clearable
@@ -43,32 +43,32 @@
             </el-form-item>
 
             <el-form-item label="服务时间"
-                          prop="startTime">
-              <el-date-picker v-model="formData.startTime"
+                          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 HH:mm:ss"
+                              value-format="yyyy-MM-dd"
                               value="yyyy-MM-dd"
                               placeholder="开始时间">
               </el-date-picker>
               <span class="data-tag">至</span>
-              <el-date-picker v-model="formData.endTime"
+              <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 HH:mm:ss"
+                              value-format="yyyy-MM-dd"
                               value="yyyy-MM-dd"
                               placeholder="结束时间">
               </el-date-picker>
             </el-form-item>
 
             <el-form-item label="服务状态"
-                          prop="status">
+                          prop="serviceStatus">
               <el-select class="item_width_2"
-                         v-model="formData.status"
+                         v-model="formData.serviceStatus"
                          placeholder="全部"
                          size="small"
                          clearable>
@@ -81,13 +81,13 @@
 
             </el-form-item>
             <el-form-item label="满意度"
-                          prop="status">
+                          prop="satisfaction">
               <el-select class="item_width_2"
-                         v-model="formData.status"
+                         v-model="formData.satisfaction"
                          placeholder="全部"
                          size="small"
                          clearable>
-                <el-option v-for="item in statusArray"
+                <el-option v-for="item in satisfyArray"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
@@ -112,11 +112,11 @@
         <div class="div_btn">
           <el-button class="diy-button--add"
                      size="small"
-                     @click="handleAdd">新增</el-button>
+                     @click="handleAdd">发起服务</el-button>
 
-          <el-button @click="handleExport"
+          <!-- <el-button @click="handleExport"
                      class="diy-button--reset"
-                     size="small">导出</el-button>
+                     size="small">导出</el-button> -->
         </div>
 
         <el-table :data="tableData"
@@ -131,40 +131,47 @@
                            align="center"
                            width="50" />
 
-          <el-table-column prop="gridName"
+          <el-table-column prop="serviceCategoryName"
                            align="center"
                            label="服务类别"
                            :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column prop="eventContent"
+          <el-table-column prop="serviceProjectName"
                            label="服务项目"
                            align="center"
                            :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column prop="sourceTypeName"
+          <el-table-column prop="serviceTimeStart"
                            align="center"
                            width="110"
                            label="服务组织名称"
                            :show-overflow-tooltip="true">
+
           </el-table-column>
 
           <el-table-column prop="address"
                            align="center"
-                           width="140"
+                           min-width="210"
                            :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="name"
+          <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="mobile"
+          <el-table-column prop="servicePeopleNumber"
                            align="center"
                            width="110"
                            label="服务人数"
@@ -176,22 +183,25 @@
                            align="center"
                            width="100">
             <template slot-scope="scope">
-              <el-button @click="handleDispose(scope.row)"
+              <el-button @click="handleDetail(scope.row)"
                          type="text"
                          size="small"
-                         class=".div-table-button--detail">查看</el-button>
-              <el-button @click="handleDispose(scope.row)"
+                         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 @click="handleDispose(scope.row)"
+              <el-button v-if="scope.row.serviceStatus==='in_service'"
+                         @click="handleFreeBack(scope.row)"
                          type="text"
                          size="small"
                          class="div-table-button--edit">反馈</el-button>
-              <el-button @click="handleDispose(scope.row)"
+              <el-button v-if="scope.row.serviceStatus==='in_service'"
+                         @click="handleCancel(scope.row)"
                          type="text"
                          size="small"
-                         class="div-table-button--delete">删除</el-button>
+                         class="div-table-button--delete">取消</el-button>
 
             </template>
           </el-table-column>
@@ -211,38 +221,34 @@
       </div>
 
     </div>
-    <div v-if="pageType == 'dispose' || pageType == 'info'|| pageType == 'add'">
-      <!-- <event-info ref="eleEditForm"
-                  :pageType="pageType"
-                  :eventId="eventId"
-                  :eventDetailData="eventDetailData"
-                  @handleClose="handleClose"
-                  @handleOk="handleOk"
-                  @dialogOk="handleEditSuccess" /> -->
-    </div>
-
-    <el-dialog :title="'播放语音'"
-               :visible.sync="showVoice"
-               width="40%"
+    <el-dialog v-if="showAdd"
+               :visible.sync="showAdd"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'新增记录'"
+               width="850px"
                top="5vh"
-               append-to-body
                class="dialog-h"
-               :close-on-click-modal="false">
-      <div class="dialog-h-content scroll-h">
-        <div style="display:flex;justify-content:center;margin:50px">
-
-          <audio controls>
-            <source :src="selVoiceUrl"
-                    type="" />
-          </audio>
-        </div>
-      </div>
-
-      <div class="resi-btns">
-        <el-button size="small"
-                   @click="showVoice=false">取消</el-button>
-
-      </div>
+               @closed="showAdd = false">
+      <add-form ref="ref_add_form"
+                :formType="formType"
+                :categrayArray="categrayArray"
+                :statusArray="statusArray"
+                :satisfyArray="satisfyArray"
+                @handleOk="handleOk"
+                @handleClose="handleClose"></add-form>
+    </el-dialog>
+    <el-dialog :visible.sync="showDetail"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'记录详情'"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="showDetail = false">
+      <detail-form ref="ref_detail_form"
+                   :serviceRecordId="serviceRecordId">
+      </detail-form>
     </el-dialog>
 
   </div>
@@ -254,16 +260,19 @@ 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 feedBackForm from "./addForm";
 
 export default {
-  components: {},
+  components: { addForm, detailForm, feedBackForm },
 
   data () {
     let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
       let nowData = Date.now()
-      if (this.formData.startTime) {
-        let startTime = new Date(this.formData.startTime)
-        return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
+      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
       }
@@ -275,54 +284,46 @@ export default {
     }
 
     return {
-      pageType: "list", // 列表list 新增add  处理dispose 详情info 
+
       user: {},
       agencyId: '',
 
       tableData: [],
-
+      categrayArray: [],
       statusArray: [
         {
-          value: "processing",
-          label: "处理中",
+          value: "in_service",
+          label: "进行中",
         },
         {
-          value: "closed_case",
+          value: "completed",
           label: "已完成",
         },
       ],
-      qudaoArray: [
-        {
-          value: "0",
-          label: "随手拍/随时讲",
-        },
+      satisfyArray: [
         {
-          value: "1",
-          label: "多媒体反应",
+          value: "bad",
+          label: "不满意",
         },
         {
-          value: "2",
-          label: "社区电话",
+          value: "good",
+          label: "基本满意",
         },
         {
-          value: "3",
-          label: "12345",
-        },
-        {
-          value: "4",
-          label: "网络员手持终端",
+          value: "perfect",
+          label: "非常满意",
         },
+
       ],
 
       formData: {
-        gridId: '',
-        sourceType: '',
-        eventContent: '',
-        name: '',
-        mobile: '',
-        startTime: '',
-        endTime: '',
-        status: '',
+        serviceCategoryId: '',//服务类别id	
+        serviceProjectName: '',//项目名称	
+        serviceOrgName: '',//服务组织名称	
+        serviceTimeStart: '',//服务开始时间yyyy-MM-dd	
+        serviceTimeEnd: '',//服务结束时间yyyy-MM-dd	
+        serviceStatus: '',//服务状态。in_service服务中；completed:已完成	
+        satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect	
 
       },
       pageNo: 1,
@@ -334,13 +335,13 @@ export default {
       startPickerOptions: {
         disabledDate: startDisabledDate
       },
-      eventId: '',
-
-      eventDetailData: {},
+      serviceRecordId: '',
 
+      showAdd: false,
+      showDetail: false,
+      showFeedback: false,
+      formType: 'add'
 
-      showVoice: false,
-      selVoiceUrl: '',
     };
   },
   computed: {
@@ -352,20 +353,19 @@ export default {
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
   watch: {
-    "formData.endTime": function (val) {
-      if (val && val != '') {
-        let arrayTemp = val.split(' ')
-        this.formData.endTime = arrayTemp[0] + ' 23:59:59'
-      }
+    // "formData.serviceTimeEnd": function (val) {
+    //   if (val && val != '') {
+    //     let arrayTemp = val.split(' ')
+    //     this.formData.serviceTimeEnd = arrayTemp[0] 
+    //   }
 
-    },
+    // },
   },
   mounted () {
     console.log(this.$store.state)
     this.user = this.$store.state.user
-
     this.agencyId = this.user.agencyId
-
+    this.getCategrayList()
     this.getTableData();
   },
   methods: {
@@ -375,105 +375,67 @@ export default {
       this.pageNo = 1;
       this.getTableData();
     },
+    // 字典
+    async getCategrayList () {
+      const url = "/sys/dict/data/dictlist"
 
+      let params = {
+        dictType: 'ic_service_type'
+      }
 
-    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("网络错误");
-        });
-    },
-
-    async handleAdd () {
+      const { data, code, msg } = await requestPost(url, params)
 
-      this.pageType = "add";
+      if (code === 0) {
+        this.categrayArray = data
+      } else {
+        this.$message.error(msg)
+      }
     },
 
-    async handleWatch (row) {
-      this.eventId = row.icEventId
 
-      this.eventId = row.icEventId
-      const url = "/gov/project/icEvent/detail";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
-
-      const { data, code, msg } = await requestPost(url, {
-        icEventId: this.eventId,
-      });
-
-      if (code === 0) {
+    async handleAdd () {
+      this.formType = 'add'
+      this.showAdd = true;
+    },
 
-        this.eventDetailData = { ...data };
-        this.pageType = "info";
-      } else {
-        this.$message.error(msg);
-      }
+    async handleDetail (row) {
+      this.serviceRecordId = row.serviceRecordId
+      this.formType = 'detail'
+      // this.showDetail = true
+      this.showAdd = true;
     },
 
     //加载组织数据
     async handleDispose (row) {
-      this.eventId = row.icEventId
+      this.serviceRecordId = row.serviceRecordId
       const url = "/gov/project/icEvent/detail";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
 
       const { data, code, msg } = await requestPost(url, {
-        icEventId: this.eventId,
+        serviceRecordId: this.serviceRecordId,
       });
 
       if (code === 0) {
 
         this.eventDetailData = { ...data };
-        this.pageType = "dispose";
+
       } else {
         this.$message.error(msg);
       }
     },
 
-    //显示语音窗口
-    handleShowVoice (url) {
-      this.selVoiceUrl = url
-      this.showVoice = true
-    },
 
     handleClose () {
-      this.pageType = "list";
-      this.eventId = ""
+      this.serviceRecordId = ""
+      this.formType = ''
+
+      this.showAdd = false;
       this.getTableData()
 
     },
     handleOk () {
-      this.pageType = "list";
-      this.eventId = ""
+      this.handleClose()
       this.pageNo = 1
-      this.getTableData()
-
 
     },
 
@@ -501,8 +463,8 @@ export default {
     },
 
     async getTableData () {
-      const url = "/gov/project/icEvent/list";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/list";
+      // const url = "/heart/icServiceProject/service/recordList";
+      const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,
@@ -535,6 +497,41 @@ export default {
       }
     },
 
+    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;
@@ -550,18 +547,18 @@ export default {
     resetSearch () {
       this.formData = {
         gridId: '',
-        sourceType: '',
-        eventContent: '',
-        name: '',
+        serviceCategoryId: '',
+        serviceProjectName: '',
+        serviceOrgName: '',
         mobile: '',
-        startTime: '',
-        endTime: '',
-        status: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: '',
+        serviceStatus: '',
       }
 
 
-      // this.pageNo = 1
-      // this.loadTable()
+      this.pageNo = 1
+      // this.getTableData()
     },
   },
 };

From c65829c6ca7a71d0bc198a755cc69eb65be4e5c1 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 31 May 2022 13:40:41 +0800
Subject: [PATCH 05/13] 111

---
 src/views/modules/communityService/fuwujilu/addForm.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
index 52050dba..d935d34a 100644
--- a/src/views/modules/communityService/fuwujilu/addForm.vue
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -139,7 +139,7 @@
 
       </el-form>
       <div v-show="formType==='feedback'||showFeedback">
-        <h3 class="d-h3">反馈内容</h3>
+        <!-- <h3 class="d-h3">反馈内容</h3> -->
 
         <el-form ref="ref_form_feedback"
                  :inline="true"
@@ -448,10 +448,11 @@ export default {
       this.formData.serviceScope = []
       let selArray = this.$refs["myCascader"].getCheckedNodes()
       selArray.forEach(element => {
+
         let obj = {
-          objectType: element.objectType,
-          objectId: element.objectId,
-          objectName: element.objectName,
+          objectType: element.data.objectType,
+          objectId: element.data.objectId,
+          objectName: element.data.objectName,
         }
         this.formData.serviceScope.push(obj)
       });

From d6e1dfdf4dc7acd355d232987e4d5750146bb95d Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 31 May 2022 13:58:48 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwujilu/detailForm.vue  | 209 ++++--------------
 .../communityService/fuwujilu/fuwuList.vue    |  53 ++---
 2 files changed, 62 insertions(+), 200 deletions(-)

diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index 718b50f9..982eb426 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -5,18 +5,19 @@
       <el-form ref="ref_form"
                :inline="true"
                :model="formData"
+               :disabled="formType==='detail'"
                :rules="dataRule"
-               :disabled="formType === 'detail'"
-               class="form">
+               class="div_form">
 
         <el-form-item label="服务分类"
+                      label-width="150px"
                       prop="serviceCategoryId">
           <el-select v-model="formData.serviceCategoryId"
                      placeholder="请选择"
-                     size="small"
                      clearable
-                     class="item_width_2">
-            <el-option v-for="item in categrayArray"
+                     class="item_width_1">
+            <el-option v-for="(item,index) in categrayArray"
+                       @click.native="hancleClickCategray(index)"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
@@ -25,77 +26,80 @@
         </el-form-item>
 
         <el-form-item label="服务项目"
-                      prop="type"
+                      prop="serviceProjectId"
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.type"
+                     v-model="formData.serviceProjectId"
                      placeholder="请选择"
                      filterable
                      clearable>
-            <el-option v-for="item in typeList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+            <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="type"
+                      prop="serviceOrgId"
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.type"
+                     v-model="formData.serviceOrgId"
                      placeholder="请选择"
                      filterable
                      clearable>
-            <el-option v-for="item in typeList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+            <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="unitName"
+                      prop="serviceScope"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入单位名称"
-                    v-model="formData.unitName">
-          </el-input>
+          <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="contact"
+                      prop="principalName"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人姓名"
-                    v-model="formData.contact">
+                    v-model="formData.principalName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
-                      prop="contactMobile"
+                      prop="principalConcat"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人电话"
-                    v-model="formData.contactMobile">
+                    v-model="formData.principalConcat">
           </el-input>
         </el-form-item>
 
         <el-form-item label="服务时间"
+                      label-width="150px"
                       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"
@@ -105,7 +109,6 @@
           <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"
@@ -125,153 +128,17 @@
                     placeholder="请输入备注，不超过500字"
                     v-model="formData.remark"></el-input>
         </el-form-item>
-
-      </el-form>
-
-      <h3>反馈内容</h3>
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               :disabled="formType === 'detail'"
-               class="form">
-
-        <el-form-item label="分类"
-                      prop="type"
-                      label-width="150px"
-                      style="display: block">
-          <el-select class="item_width_1"
-                     v-model="formData.type"
-                     placeholder="请选择"
-                     filterable
-                     clearable>
-            <el-option v-for="item in typeList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-
-        <el-form-item label="单位名称"
-                      prop="unitName"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入单位名称"
-                    v-model="formData.unitName">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="服务事项"
-                      prop="serviceMatterList"
-                      label-width="150px"
-                      style="display: block">
-          <el-checkbox-group class="item_width_1"
-                             style="display:flex;flex-wrap:wrap"
-                             v-model="formData.serviceMatterList">
-            <el-checkbox v-for="item in serviceList"
-                         :key="item.value"
-                         :label="item.value">{{item.label}}</el-checkbox>
-
-          </el-checkbox-group>
-
-        </el-form-item>
-        <el-form-item label="联系人"
-                      prop="contact"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人姓名"
-                    v-model="formData.contact">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="联系电话"
-                      prop="contactMobile"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人电话"
-                    v-model="formData.contactMobile">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="在职党员"
-                      style="display: block"
-                      prop="memberCount"
-                      label-width="150px">
-          <el-input-number class="item_width_4"
-                           v-model="formData.memberCount"
-                           :min="0"
-                           :max="9999"
-                           label="在职党员"></el-input-number>
-        </el-form-item>
-        <el-form-item label="备注"
+        <el-form-item label="直接反馈"
                       prop="remark"
                       label-width="150px"
                       style="display: block">
-          <el-input 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-item label="位置坐标"
-                      prop="longitude"
-                      label-width="150px"
-                      style="display: block">
-          <div style="width:500px">
-
-            <div class="div_map">
-              <div id="app">
-
-              </div>
-              <div class="div_searchmap">
-                <el-input class="item_width_4"
-                          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 style="margin-top: 10px">
-              <span>经度</span>
-              <el-input class="item_width_3"
-                        maxlength="50"
-                        placeholder="请输入经度"
-                        v-model="formData.longitude">
-              </el-input>
-              <span style="margin-left: 20px">纬度</span>
-              <el-input class="item_width_3"
-                        maxlength="50"
-                        placeholder="请输入纬度"
-                        v-model="formData.latitude">
-              </el-input>
-            </div>
-          </div>
+          <el-checkbox :label="'是'"
+                       v-model="showFeedback"
+                       @change="handleChangeFeedback"></el-checkbox>
         </el-form-item>
 
-        <el-form-item label="地理位置"
-                      prop="address"
-                      label-width="150px"
-                      style="display: block">
-
-          <el-input class="item_width_1"
-                    v-model="formData.address">
-          </el-input>
-
-        </el-form-item>
       </el-form>
+
     </div>
 
     <div class="div_btn">
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index d9ad515a..c96b532f 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -198,7 +198,7 @@
                          size="small"
                          class="div-table-button--edit">反馈</el-button>
               <el-button v-if="scope.row.serviceStatus==='in_service'"
-                         @click="handleCancel(scope.row)"
+                         @click="handleDel(scope.row)"
                          type="text"
                          size="small"
                          class="div-table-button--delete">取消</el-button>
@@ -225,7 +225,7 @@
                :visible.sync="showAdd"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="'新增记录'"
+               :title="addDiaTitle"
                width="850px"
                top="5vh"
                class="dialog-h"
@@ -241,7 +241,7 @@
     <el-dialog :visible.sync="showDetail"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="'记录详情'"
+               :title="detailDiaTitle"
                width="850px"
                top="5vh"
                class="dialog-h"
@@ -340,7 +340,9 @@ export default {
       showAdd: false,
       showDetail: false,
       showFeedback: false,
-      formType: 'add'
+      formType: 'add',
+      addDiaTitle: '发起服务',
+      detailDiaTitle: '服务详情',
 
     };
   },
@@ -394,6 +396,7 @@ export default {
 
 
     async handleAdd () {
+      this.addDiaTitle = '发起服务'
       this.formType = 'add'
       this.showAdd = true;
     },
@@ -401,27 +404,22 @@ export default {
     async handleDetail (row) {
       this.serviceRecordId = row.serviceRecordId
       this.formType = 'detail'
-      // this.showDetail = true
-      this.showAdd = true;
+      this.showDetail = true
+
+    },
+    async handleEdit (row) {
+      this.serviceRecordId = row.serviceRecordId
+      this.formType = 'edit'
+      this.showDetail = true
+
     },
 
     //加载组织数据
     async handleDispose (row) {
       this.serviceRecordId = row.serviceRecordId
-      const url = "/gov/project/icEvent/detail";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
-
-      const { data, code, msg } = await requestPost(url, {
-        serviceRecordId: this.serviceRecordId,
-      });
-
-      if (code === 0) {
-
-        this.eventDetailData = { ...data };
-
-      } else {
-        this.$message.error(msg);
-      }
+      this.addDiaTitle = '服务反馈'
+      this.formType = 'dispose'
+      this.showAdd = true;
     },
 
 
@@ -444,18 +442,15 @@ export default {
       this.getTableData();
     },
 
-    async handleDel (rowData, rowIndex) {
-      console.log(rowData, rowIndex);
-      const url =
-        "/heart/iccommunityselforganization/delcommunityselforganization";
-      const { tableData } = this;
+    async handleDel (row) {
+      this.serviceRecordId = row.serviceRecordId
+      const url = "/heart/icServiceProject/service/cancel/" + row.serviceRecordId;
 
-      const { data, code, msg } = await requestPost(url, {
-        orgId: tableData[rowIndex].orgId,
-      });
+
+      const { data, code, msg } = await requestPost(url, {});
 
       if (code === 0) {
-        this.$message.success("删除成功！");
+        this.$message.success("取消成功！");
         this.getTableData();
       } else {
         this.$message.error("操作失败！");

From 4b8f83a25e42353c87bf36df283a5904d985e83a Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 31 May 2022 17:18:54 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fuwuxiangmu/cpts/edit.vue                 | 34 +++++++----------
 .../communityService/fuwuxiangmu/index.vue    | 30 ++++++++++-----
 .../communityService/fuwuzuzhi/cpts/edit.vue  | 19 ++++++----
 .../communityService/fuwuzuzhi/index.vue      | 37 ++++++++++++-------
 4 files changed, 68 insertions(+), 52 deletions(-)

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

From 5ef5133764f93de43b9f4a339b4756139967298e Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 31 May 2022 17:39:36 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwujilu/addForm.vue     | 230 ++++++++++++++----
 .../communityService/fuwujilu/detailForm.vue  | 196 +++++----------
 .../communityService/fuwujilu/fuwuList.vue    |  98 +++++---
 3 files changed, 313 insertions(+), 211 deletions(-)

diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
index d935d34a..85d4d109 100644
--- a/src/views/modules/communityService/fuwujilu/addForm.vue
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -11,8 +11,8 @@
 
         <el-form-item label="服务分类"
                       label-width="150px"
-                      prop="serviceCategoryId">
-          <el-select v-model="formData.serviceCategoryId"
+                      prop="serviceCategoryKey">
+          <el-select v-model="formData.serviceCategoryKey"
                      placeholder="请选择"
                      clearable
                      class="item_width_1">
@@ -85,12 +85,12 @@
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
-                      prop="principalConcat"
+                      prop="principalContact"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人电话"
-                    v-model="formData.principalConcat">
+                    v-model="formData.principalContact">
           </el-input>
         </el-form-item>
 
@@ -101,7 +101,7 @@
                           :picker-options="startPickerOptions"
                           class="item_width_2"
                           type="date"
-                          value-format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd HH:mm:ss"
                           value="yyyy-MM-dd"
                           placeholder="开始时间">
           </el-date-picker>
@@ -110,7 +110,7 @@
                           :picker-options="endPickerOptions"
                           class="item_width_2 data-tag"
                           type="date"
-                          value-format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd HH:mm:ss"
                           value="yyyy-MM-dd"
                           placeholder="结束时间">
           </el-date-picker>
@@ -196,7 +196,8 @@
           <el-form-item label="服务状态"
                         label-width="150px"
                         prop="serviceStatus">
-            <el-select class="item_width_1"
+            <span>已完成</span>
+            <!-- <el-select class="item_width_1"
                        v-model="feedbackFormData.serviceStatus"
                        placeholder="全部"
                        clearable>
@@ -205,7 +206,7 @@
                          :label="item.label"
                          :value="item.value">
               </el-option>
-            </el-select>
+            </el-select> -->
 
           </el-form-item>
           <el-form-item label="满意度"
@@ -261,17 +262,17 @@
                         prop="attach">
             <el-upload class="upload-demo"
                        :action="uploadUlr"
-                       accept=".doc,.pdf,.xls,.docx,.xlsx"
+                       accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
                        :on-success="handleFileSuccess"
                        :on-remove="handleFileRemove"
-                       :on-preview="handleFileDownload"
                        :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、excel、pdf文件</div>
+                   class="el-upload__tip">支持图片、word、pdf</div>
             </el-upload>
           </el-form-item>
         </el-form>
@@ -336,12 +337,12 @@ export default {
 
       keyWords: '',
       formData: {
-        serviceCategoryId: '',//服务分类id	
+        serviceCategoryKey: '',//服务分类id	
         serviceProjectId: '',//服务项目id	
         serviceOrgId: '',//服务组织id	
         serviceScope: [],//
         principalName: '',//经办人(责任人)姓名	
-        principalConcat: '',//经办人联系方式	
+        principalContact: '',//经办人联系方式	
         serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
         serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
         remark: '',//
@@ -354,13 +355,48 @@ export default {
         serviceGoal: '',//	服务目标	
         serviceEffect: '',//	服务效果	
         servicePeopleNumber: null,//	服务人数	
-        serviceStatus: '',//	服务状态。in_service服务中；completed:已完成	
+        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
         satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
         longitude: '',//	经度	
         latitude: '',//	维度	
         address: '',
         attachmentList: [],//	附件列表
       },
+      formDataTemp: {
+        principalContact: "15111111111",
+        principalName: "31231",
+        remark: "4234234",
+        serviceCategoryKey: "01",
+        serviceOrgId: "1531105677127692289",
+        serviceProjectId: "1531514265581076482",
+        serviceScope: [
+          {
+            objectId: "1479033225060757506",
+            objectName: "合肥路街道",
+            objectType: "street",
+          },
+          {
+            objectId: "1514064686570147842",
+            objectName: "ss",
+            objectType: "street",
+          }
+        ],
+        serviceTimeEnd: "",
+        serviceTimeStart: "",
+
+        feedback: {
+          address: "山东省青岛市市南区南京路73号",
+          latitude: 36.0722275,
+          longitude: 120.38945519,
+          satisfaction: "bad",
+          serviceEffect: "234234234",
+          serviceGoal: "234234",
+          servicePeopleNumber: 1,
+          serviceProjectId: "1531514265581076482",
+          serviceProjectName: "223",
+          serviceStatus: "completed",
+        }
+      },
 
       projectList: [],//服务项目list
       orgList: [],//服务组织list
@@ -382,22 +418,30 @@ export default {
   },
 
   watch: {
-    // "formData.serviceTimeEnd": function (val) {
-    //   if (val && val != '') {
-    //     let arrayTemp = val.split(' ')
-    //     this.formData.serviceTimeEnd = arrayTemp[0] 
-    //   }
+    "formData.serviceTimeEnd": function (val) {
+      if (val && val != '') {
+        let arrayTemp = val.split(' ')
+        this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
+      }
 
-    // },
+    },
   },
   components: {},
   async mounted () {
     this.startLoading()
     this.initMap()
-    this.$refs.ref_form.resetFields();
+    if (this.formType === 'add') {
+      this.$refs.ref_form.resetFields();
+      await this.loadScopeTree()
+    }
+
     this.$refs.ref_form_feedback.resetFields();
-    await this.loadScopeTree()
+
+
     this.endLoading()
+
+    this.formData = JSON.parse(JSON.stringify(this.formDataTemp));
+    this.feedbackFormData = { ...this.formData.feedback }
   },
 
 
@@ -408,6 +452,8 @@ export default {
     },
 
     hancleClickCategray () {
+      this.formData.serviceProjectId = ''
+      this.formData.serviceOrgId = ''
       //获取服务项目
       this.loadProjectList()
       //获取服务组织
@@ -421,8 +467,8 @@ export default {
 
     // 获取服务范围树
     loadScopeTree () {
-      // const url = '/gov/org/isServiceProject/service/serviceScopeTree'
-      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      const url = '/gov/org/icServiceProject/service/serviceScopeTree'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
       let params = {}
       window.app.ajax.post(
         url,
@@ -450,7 +496,7 @@ export default {
       selArray.forEach(element => {
 
         let obj = {
-          objectType: element.data.objectType,
+          objectType: element.data.objectType === 'grid' ? 'grid' : element.data.objectType === 'neighborhood' ? 'neighborhood' : 'agency',
           objectId: element.data.objectId,
           objectName: element.data.objectName,
         }
@@ -461,17 +507,17 @@ export default {
 
     //加载组织
     async loadProjectList () {
-      // const url = '/heart/icServiceProject/serviceProjectList'
-      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/serviceProjectList'
+      const url = '/heart/icServiceProject/serviceProjectList'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/serviceProjectList'
       let params = {
         isPage: false,
-        serviceCategory: this.formData.serviceCategoryId,
+        serviceCategoryKey: this.formData.serviceCategoryKey,
       }
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.projectList = data.list
+        this.projectList = [...data.list]
       } else {
         this.$message.error(msg)
       }
@@ -479,10 +525,10 @@ export default {
 
     //加载组织
     async loadOrgList () {
-      // const url = '/heart/icServiceOrg/selectlist'
-      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceOrg/selectlist'
+      const url = '/heart/icServiceOrg/selectlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceOrg/selectlist'
       let params = {
-        serviceType: this.formData.serviceCategoryId,
+        serviceType: this.formData.serviceCategoryKey,
 
       }
 
@@ -497,6 +543,15 @@ export default {
 
     async handleComfirm () {
 
+      if (this.formType === 'add') {
+        this.handleAdd()
+      } else if (this.formType === 'feedback') {
+        this.handleFeedback()
+      }
+    },
+
+    async handleAdd () {
+
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
@@ -531,10 +586,30 @@ export default {
     },
 
     async addFuwu () {
+      if (this.showFeedback) {
+        this.feedbackFormData.attachmentList = []
+        this.feedbackFormData.attachmentList = [...this.fileList]
+        this.formData.feedback = { ... this.feedbackFormData }
+      } else {
+        this.formData.feedback = null
+      }
+
+
       console.log(this.formData)
-      return false
-      // const url = '/heart/icServiceProject/service/initiate'
-      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
+      // return false
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      if (regPhone.test(this.formData.principalContact) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
+
+
+      const url = '/heart/icServiceProject/service/initiate'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
       let params = {
 
         ...this.formData
@@ -550,17 +625,62 @@ export default {
         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.attachmentList = []
+      this.feedbackFormData.attachmentList = [...this.fileList]
+      this.feedbackFormData.serviceRecordId = this.serviceRecordId
+
+      console.log(this.feedbackFormData)
+      // return false
+
+      const url = '/heart/icServiceProject/service/feedback'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
+      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]
 
-      if (extension !== 'xls'
-        && extension !== 'xlsx'
-        && extension !== 'doc'
-        && extension !== 'docx'
-        && extension !== 'pdf') {
-        this.$message.error('只能上传word、excel、pdf文件！')
+      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
       }
 
@@ -579,8 +699,28 @@ export default {
         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.attachmentFormat = 'image'
+        } else if (videoarray.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'video'
+        } else if (docArray.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'doc'
+        } else if (mp3Array.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'voice'
+        }
+
         file.url = res.data.url
         file.type = fileType
+
+        file.attachmentName = file.name
+        file.attachmentType = file.type
+        file.attachmentUrl = file.url
+
         this.fileList.push(file)
         console.log(this.fileList)
       } else this.$message.error(res.msg)
@@ -719,12 +859,12 @@ export default {
 
     resetData () {
       this.formData = {
-        serviceCategoryId: '',//服务分类id	
+        serviceCategoryKey: '',//服务分类id	
         serviceProjectId: '',//服务项目id	
         serviceOrgId: '',//服务组织id	
         serviceScope: [],//
         principalName: '',//经办人(责任人)姓名	
-        principalConcat: '',//经办人联系方式	
+        principalContact: '',//经办人联系方式	
         serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
         serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
         remark: '',//
@@ -737,7 +877,7 @@ export default {
         serviceGoal: '',//	服务目标	
         serviceEffect: '',//	服务效果	
         servicePeopleNumber: null,//	服务人数	
-        serviceStatus: '',//	服务状态。in_service服务中；completed:已完成	
+        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
         satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
         longitude: '',//	经度	
         latitude: '',//	维度	
@@ -765,7 +905,7 @@ export default {
     dataRule () {
       return {
 
-        serviceCategoryId: [
+        serviceCategoryKey: [
           { required: true, message: '服务类别不能为空', trigger: 'blur' },
         ],
         serviceProjectId: [
diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index 982eb426..6d4f002b 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -11,8 +11,10 @@
 
         <el-form-item label="服务分类"
                       label-width="150px"
-                      prop="serviceCategoryId">
-          <el-select v-model="formData.serviceCategoryId"
+                      prop="serviceCategoryKey">
+          <span>{{formData.serviceCategoryName}}</span>
+
+          <!-- <el-select v-model="formData.serviceCategoryKey"
                      placeholder="请选择"
                      clearable
                      class="item_width_1">
@@ -22,14 +24,15 @@
                        :label="item.label"
                        :value="item.value">
             </el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
 
         <el-form-item label="服务项目"
                       prop="serviceProjectId"
                       label-width="150px"
                       style="display: block">
-          <el-select class="item_width_1"
+          <span>{{formData.serviceProjectName}}</span>
+          <!-- <el-select class="item_width_1"
                      v-model="formData.serviceProjectId"
                      placeholder="请选择"
                      filterable
@@ -40,14 +43,15 @@
                        :label="item.serviceName"
                        :value="item.serviceProjectId">
             </el-option>
-          </el-select>
+          </el-select> -->
 
         </el-form-item>
         <el-form-item label="服务组织"
                       prop="serviceOrgId"
                       label-width="150px"
                       style="display: block">
-          <el-select class="item_width_1"
+          <span>{{formData.serviceOrgName}}</span>
+          <!-- <el-select class="item_width_1"
                      v-model="formData.serviceOrgId"
                      placeholder="请选择"
                      filterable
@@ -57,7 +61,7 @@
                        :label="item.orgName"
                        :value="item.icServiceOrgId">
             </el-option>
-          </el-select>
+          </el-select> -->
 
         </el-form-item>
 
@@ -65,14 +69,18 @@
                       prop="serviceScope"
                       label-width="150px"
                       style="display: block">
-          <el-cascader class="item_width_1"
+          <div v-for="item in formData.serviceScope"
+               :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>
+                       @change="handleChangeScope"></el-cascader> -->
         </el-form-item>
 
         <el-form-item label="经办人"
@@ -85,12 +93,12 @@
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
-                      prop="principalConcat"
+                      prop="principalContact"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人电话"
-                    v-model="formData.principalConcat">
+                    v-model="formData.principalContact">
           </el-input>
         </el-form-item>
 
@@ -128,14 +136,6 @@
                     placeholder="请输入备注，不超过500字"
                     v-model="formData.remark"></el-input>
         </el-form-item>
-        <el-form-item label="直接反馈"
-                      prop="remark"
-                      label-width="150px"
-                      style="display: block">
-          <el-checkbox :label="'是'"
-                       v-model="showFeedback"
-                       @change="handleChangeFeedback"></el-checkbox>
-        </el-form-item>
 
       </el-form>
 
@@ -185,11 +185,10 @@ export default {
     }
 
     return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+
 
       btnDisable: false,
 
-      unitId: '',
       keyWords: '',
       formData: {
         unitName: '',
@@ -212,7 +211,7 @@ export default {
         disabledDate: startDisabledDate
       },
 
-      categrayArray: [],
+
       projectList: [],
 
     }
@@ -220,75 +219,27 @@ export default {
   components: {},
   mounted () {
     if (this.serviceRecordId) {//详情
-
+      this.loadInfo()
     }
-    this.initMap()
+    // this.initMap()
     console.log('mounted')
   },
-  activated () {
-    console.log('activated')
-  },
-
-  methods: {
-
-    async initForm (type, unitId) {
-      this.startLoading()
-      this.$refs.ref_form.resetFields();
-
-      //获取服务事项
-      await this.loadService()
 
-      this.formType = type
-      if (unitId) {
-        this.unitId = unitId
-        this.formData.id = unitId
-        await this.loadFormData()
-      } else {
-        map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
-        this.setMarker(36.0722275, 120.38945519)
-      }
-
-      this.endLoading()
-
-    },
-
-    //获取服务事项下拉框
-    async loadService () {
-      const url = "/heart/serviceitem/dict-list"
-      let params = {
-        type: 'usable'
-        // parentCategoryCode: '1010'
-      }
 
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.serviceList = data
-
-      } else {
-        this.$message.error(msg)
-      }
+  methods: {
 
-    },
 
     //加载组织
-    async loadFormData () {
-      const url = '/heart/icpartyunit/detail'
-      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
-      let params = {
-        id: this.unitId
-      }
+    async loadInfo () {
+      const url = `/heart/icServiceProject/service/detail/${this.serviceRecordId}`
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail' + this.serviceRecordId
+      let params = {}
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) {
-          data.serviceMatterList = []
-        }
-
         this.formData = { ...data }
-        map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
-        this.setMarker(this.formData.latitude, this.formData.longitude)
+        this.formData.serviceRecordId = this.serviceRecordId
       } else {
         this.$message.error(msg)
       }
@@ -307,16 +258,16 @@ export default {
           app.util.validateRule(messageObj)
           this.btnDisable = false
         } else {
-          this.addUnit()
+          this.editFuwu()
         }
 
       })
 
 
     },
-    async addUnit () {
+    async editFuwu () {
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      if (regPhone.test(this.formData.contactMobile) === false) {
+      if (regPhone.test(this.formData.principalContact) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
@@ -325,11 +276,9 @@ export default {
         return false;
       }
 
-      let url = '/heart/icpartyunit/save'
-      // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
-      // if (this.formType === 'edit') {
-      //  this.formData.id = this.unitId
-      // } 
+      let url = '/heart/icServiceProject/service/update'
+      // let url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/update"
+
 
       const { data, code, msg } = await requestPost(url, this.formData)
 
@@ -339,8 +288,8 @@ export default {
           message: '操作成功'
         })
         this.resetData()
-        this.$emit('dialogOk')
-        this.btnDisable = false
+
+        this.$emit('handleOk')
       } else {
         this.btnDisable = false
         this.$message.error(msg)
@@ -467,19 +416,17 @@ export default {
 
 
     resetData () {
-      this.unitId = ''
-      this.keyWords = ''
       this.formData = {
-        unitName: '',
-        serviceMatterList: [],
-        type: '',
-        contact: '',
-        contactMobile: '',
-        memberCount: 0,
-        remark: '', //备注【最大500字】
-        address: '', //详细地址
-        longitude: '', //经度
-        latitude: '' //纬度
+        serviceCategoryKey: '',//服务分类id	
+        serviceProjectId: '',//服务项目id	
+        serviceOrgId: '',//服务组织id	
+        serviceScope: [],//
+        principalName: '',//经办人(责任人)姓名	
+        principalContact: '',//经办人联系方式	
+        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
+        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
+        remark: '',//
+
       }
     },
     // 开启加载动画
@@ -502,44 +449,39 @@ export default {
     dataRule () {
       return {
 
-        unitName: [
-          { required: true, message: '单位名称不能为空', trigger: 'blur' },
+        serviceCategoryKey: [
+          { required: true, message: '服务类别不能为空', trigger: 'blur' },
         ],
-        type: [
-          { required: true, message: '分类不能为空', trigger: 'blur' }
+        serviceProjectId: [
+          { required: true, message: '服务项目不能为空', trigger: 'blur' }
         ],
 
-        contact: [
-          { required: true, message: '联系人不能为空', trigger: 'blur' }
-        ],
-        contactMobile: [
-          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        serviceOrgId: [
+          { required: true, message: '服务组织不能为空', trigger: 'blur' }
         ],
-        memberCount: [
-          { required: true, message: '在职党员数不能为空', trigger: 'blur' }
+        serviceTimeStart: [
+          { required: true, message: '服务时间不能为空', trigger: 'blur' }
         ],
-        address: [
-          { required: true, message: '详细地址不能为空', trigger: 'blur' }
+        serviceScope: [
+          { required: true, message: '服务范围不能为空', trigger: 'blur' }
         ],
-        longitude: [
-          { required: true, message: '坐标不能为空', trigger: 'blur' }
-        ]
+
       }
     },
-
   },
   props: {
 
     serviceRecordId: {
       type: String,
-      required: ''
+      required: true
     },
-    formType: {
+    formType: {//表单操作类型 add新增，edit编辑，detail详情,feedback反馈
       type: String,
-      required: ''
+      required: true
     },
     categrayArray: {
       type: Array,
+      required: true,
       default () {
         return []
       }
@@ -547,18 +489,8 @@ export default {
   }
 }
 </script>
-<style scoped>
-.div_map {
-  position: relative;
-}
-.div_searchmap {
-  z-index: 5000;
-  position: absolute;
-  top: 5px;
-  left: 5px;
-}
-</style>
+
 
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManageForm.scss";
+@import "@/assets/scss/modules/management/form-main.scss";
 </style>
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index c96b532f..156e75a5 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -9,8 +9,8 @@
           <div>
 
             <el-form-item label="服务分类"
-                          prop="serviceCategoryId">
-              <el-select v-model="formData.serviceCategoryId"
+                          prop="serviceCategoryKey">
+              <el-select v-model="formData.serviceCategoryKey"
                          placeholder="请选择"
                          size="small"
                          clearable
@@ -49,7 +49,7 @@
                               class="item_width_2"
                               size="small"
                               type="date"
-                              value-format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd HH:mm:ss"
                               value="yyyy-MM-dd"
                               placeholder="开始时间">
               </el-date-picker>
@@ -59,7 +59,7 @@
                               class="item_width_2 data-tag"
                               size="small"
                               type="date"
-                              value-format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd HH:mm:ss"
                               value="yyyy-MM-dd"
                               placeholder="结束时间">
               </el-date-picker>
@@ -133,6 +133,7 @@
 
           <el-table-column prop="serviceCategoryName"
                            align="center"
+                           width="100"
                            label="服务类别"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -143,17 +144,17 @@
                            :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column prop="serviceTimeStart"
+          <el-table-column prop="serviceOrgName"
                            align="center"
-                           width="110"
+                           min-width="150"
                            label="服务组织名称"
                            :show-overflow-tooltip="true">
 
           </el-table-column>
 
-          <el-table-column prop="address"
+          <el-table-column prop="serviceTimeStart"
                            align="center"
-                           min-width="210"
+                           width="250"
                            :show-overflow-tooltip="true"
                            label="服务时间">
             <template slot-scope="scope">
@@ -167,7 +168,7 @@
                            label="服务状态"
                            :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{scope.row.serviceStatus==='in_service'?'服务':'已完成'}}</span>
+              <span>{{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}}</span>
             </template>
           </el-table-column>
 
@@ -181,7 +182,7 @@
           <el-table-column fixed="right"
                            label="操作"
                            align="center"
-                           width="100">
+                           width="180">
             <template slot-scope="scope">
               <el-button @click="handleDetail(scope.row)"
                          type="text"
@@ -193,7 +194,7 @@
                          size="small"
                          class="div-table-button--edit">编辑</el-button>
               <el-button v-if="scope.row.serviceStatus==='in_service'"
-                         @click="handleFreeBack(scope.row)"
+                         @click="handleFeedback(scope.row)"
                          type="text"
                          size="small"
                          class="div-table-button--edit">反馈</el-button>
@@ -235,10 +236,12 @@
                 :categrayArray="categrayArray"
                 :statusArray="statusArray"
                 :satisfyArray="satisfyArray"
+                :serviceRecordId="serviceRecordId"
                 @handleOk="handleOk"
                 @handleClose="handleClose"></add-form>
     </el-dialog>
-    <el-dialog :visible.sync="showDetail"
+    <el-dialog v-if="showDetail"
+               :visible.sync="showDetail"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="detailDiaTitle"
@@ -247,7 +250,11 @@
                class="dialog-h"
                @closed="showDetail = false">
       <detail-form ref="ref_detail_form"
-                   :serviceRecordId="serviceRecordId">
+                   :serviceRecordId="serviceRecordId"
+                   :categrayArray="categrayArray"
+                   @handleOk="handleOk"
+                   @handleClose="handleClose"
+                   :formType="formType">
       </detail-form>
     </el-dialog>
 
@@ -317,7 +324,7 @@ export default {
       ],
 
       formData: {
-        serviceCategoryId: '',//服务类别id	
+        serviceCategoryKey: '',//服务类别id	
         serviceProjectName: '',//项目名称	
         serviceOrgName: '',//服务组织名称	
         serviceTimeStart: '',//服务开始时间yyyy-MM-dd	
@@ -355,13 +362,13 @@ export default {
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
   watch: {
-    // "formData.serviceTimeEnd": function (val) {
-    //   if (val && val != '') {
-    //     let arrayTemp = val.split(' ')
-    //     this.formData.serviceTimeEnd = arrayTemp[0] 
-    //   }
+    "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)
@@ -415,10 +422,10 @@ export default {
     },
 
     //加载组织数据
-    async handleDispose (row) {
+    async handleFeedback (row) {
       this.serviceRecordId = row.serviceRecordId
       this.addDiaTitle = '服务反馈'
-      this.formType = 'dispose'
+      this.formType = 'feedback'
       this.showAdd = true;
     },
 
@@ -427,24 +434,48 @@ export default {
       this.serviceRecordId = ""
       this.formType = ''
 
-      this.showAdd = false;
-      this.getTableData()
+      this.showAdd = false
+      this.showDetail = false
+
 
     },
     handleOk () {
       this.handleClose()
       this.pageNo = 1
+      this.getTableData()
 
     },
 
-    handleEditSuccess () {
-      this.handleClose();
-      this.getTableData();
-    },
 
     async handleDel (row) {
+
       this.serviceRecordId = row.serviceRecordId
-      const url = "/heart/icServiceProject/service/cancel/" + 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 = `/heart/icServiceProject/service/cancel/${this.serviceRecordId}`;
 
 
       const { data, code, msg } = await requestPost(url, {});
@@ -458,8 +489,8 @@ export default {
     },
 
     async getTableData () {
-      // const url = "/heart/icServiceProject/service/recordList";
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
+      const url = "/heart/icServiceProject/service/recordList";
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,
@@ -541,14 +572,13 @@ export default {
 
     resetSearch () {
       this.formData = {
-        gridId: '',
-        serviceCategoryId: '',
+        serviceCategoryKey: '',
         serviceProjectName: '',
         serviceOrgName: '',
-        mobile: '',
         serviceTimeStart: '',
         serviceTimeEnd: '',
         serviceStatus: '',
+        satisfaction: ''
       }
 
 

From 5f5f942934767ec1eb6ad0ba83276ea7dd382ad8 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 1 Jun 2022 09:48:22 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E8=81=94=E8=B0=83=E8=81=94=E8=B0=83?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/fuwuxiangmu/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/communityService/fuwuxiangmu/index.vue b/src/views/modules/communityService/fuwuxiangmu/index.vue
index 1ef96efa..93321bd0 100644
--- a/src/views/modules/communityService/fuwuxiangmu/index.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/index.vue
@@ -9,9 +9,9 @@
           :label-width="'80px'"
         >
           <div>
-            <el-form-item label="服务类别" prop="serviceCategory">
+            <el-form-item label="服务类别" prop="serviceCategoryKey">
               <el-select
-                v-model="searchData.serviceCategory"
+                v-model="searchData.serviceCategoryKey"
                 placeholder="请选择"
                 size="small"
                 clearable
@@ -234,7 +234,7 @@ import editForm from "./cpts/edit";
 
 function iniSearchData() {
   return {
-    serviceCategory: "",
+    serviceCategoryKey: "",
     serviceName: "",
     serviceContent: "",
     policyGround: "",

From b9d466b85c5b05feb1a4028ee7359c317890a602 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 1 Jun 2022 10:05:24 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/fuwujilu/detailForm.vue | 2 +-
 src/views/modules/communityService/fuwujilu/fuwuList.vue   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index 6d4f002b..5ed9abe5 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -299,7 +299,7 @@ export default {
 
     handleCancle () {
       this.resetData()
-      this.$emit('dialogCancle')
+      this.$emit('handleClose')
 
     },
 
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index 156e75a5..de27fac6 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -121,6 +121,7 @@
 
         <el-table :data="tableData"
                   border
+                  v-loading="tableLoading"
                   :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                   class="table"
                   style="width: 100%"
@@ -291,7 +292,7 @@ export default {
     }
 
     return {
-
+      tableLoading: false,
       user: {},
       agencyId: '',
 
@@ -489,6 +490,7 @@ export default {
     },
 
     async getTableData () {
+      this.tableLoading = true
       const url = "/heart/icServiceProject/service/recordList";
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
       const { pageSize, pageNo, formData } = this;
@@ -497,6 +499,8 @@ export default {
         pageNo,
         ...formData,
       });
+
+      this.tableLoading = false
       if (code === 0) {
 
         this.total = data.total || 0;

From 216cd63fedf6c7774bcd04c107cb22aea9216e43 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 1 Jun 2022 10:07:24 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AE=A1=E9=87=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/xiangmu/cpts/project-info.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index e538e686..bd80b80d 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -224,7 +224,7 @@
               <el-form-item
                 v-if="fmData.operateType == 'turn'"
                 label="处理部门："
-                prop="publicReply"
+                prop="staffList"
               >
                 <el-popover
                   placement="bottom"
@@ -659,6 +659,9 @@ export default {
           obj.staffList = [
             { required: true, message: "请选择处理部门", trigger: "blur" },
           ];
+          obj.internalRemark = [
+            { required: true, message: "请填写内部备注", trigger: "blur" },
+          ];
         } else {
           obj.internalRemark = [
             { required: true, message: "请填写内部备注", trigger: "blur" },

From 8df9d3bd6e79a5f02c2f8c276379f8d8bd7a4069 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 2 Jun 2022 09:56:20 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E4=BC=98=E5=8C=96router=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 8895ffb6..81ca73ed 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -109,15 +109,6 @@ export const moduleShujuRoutes = {
     title: "主入口布局",
   },
   children: [
-    {
-      path: "/home2",
-      component: () => import("@/views/modules/home"),
-      name: "home2",
-      meta: {
-        title: "主页2",
-        isTab: false,
-      },
-    },
     {
       path: "/main-shuju/visual-basicinfo-people/:uid",
       props: true,

From 05143123a5309c93dd05ab6d902dfa92d294aad1 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 6 Jun 2022 10:17:14 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/fuwuzuzhi/cpts/edit.vue      | 2 +-
 src/views/modules/communityService/fuwuzuzhi/index.vue    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
index 65444c3d..0dff383d 100644
--- a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
@@ -96,7 +96,7 @@
           <el-input
             v-if="formType == 'add' || formType == 'edit'"
             class="item_width_1"
-            maxlength="100"
+            maxlength="11"
             show-word-limit
             placeholder="请输入联系方式"
             v-model="fmData.principalMobile"
diff --git a/src/views/modules/communityService/fuwuzuzhi/index.vue b/src/views/modules/communityService/fuwuzuzhi/index.vue
index d51cc0f5..e3417769 100644
--- a/src/views/modules/communityService/fuwuzuzhi/index.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/index.vue
@@ -148,6 +148,14 @@
           >
           </el-table-column>
 
+          <el-table-column
+            prop="remark"
+            align="center"
+            label="备注"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
           <el-table-column
             fixed="right"
             label="操作"