diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 17f0079c2..ec639db5d 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -2,7 +2,7 @@
   <div class="div_main">
     <div class="div_search">
       <el-form :inline="true"
-               :model="formData"
+               :model="workLog"
                ref="ref_searchform"
                :label-width="'100px'">
         <div>
@@ -26,9 +26,9 @@
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in serviceTypeList"
-                         :key="item.id"
+                         :key="item.serviceType"
                          :label="item.serviceTypeName"
-                         :value="item.id">
+                         :value="item.serviceType">
               </el-option>
             </el-select>
           </el-form-item>
@@ -70,6 +70,18 @@
                       placeholder="请输入内容">
             </el-input>
           </el-form-item>
+          <el-form-item label="服务时间"
+                        prop="serviceTimeArea">
+            <el-date-picker v-model="serviceTimeArea"
+                            clearable
+                            type="daterange"
+                            format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
           <el-button style="margin-left:10px"
                      class="diy-button--search"
                      size="small"
@@ -126,7 +138,7 @@
         <el-table-column prop="gridName"
                          header-align="center"
                          align="center"
-                         label="场所名称"
+                         label="所属网格"
                          min-width="100">
         </el-table-column>
         <el-table-column prop="serviceTypeName"
@@ -144,6 +156,7 @@
         </el-table-column>
         <el-table-column prop="applicantAddress"
                          header-align="center"
+                         show-overflow-tooltip
                          align="center"
                          label="住址"
                          width="80">
@@ -229,10 +242,10 @@
                top="5vh"
                class="dialog-h"
                @closed="editDiaClose">
-      <ggfw-form ref="ref_form"
+      <work-log-form ref="ref_form"
                  :typeList="typeList"
                  @dialogCancle="addFormCancle"
-                 @dialogOk="addFormOk"></ggfw-form>
+                 @dialogOk="addFormOk"></work-log-form>
     </el-dialog>
 
     <el-dialog :visible.sync="detailShow"
@@ -243,8 +256,8 @@
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
-      <ggfw-detail ref="ref_detail"
-                   @diaClose="diaClose"></ggfw-detail>
+      <work-log-detail ref="ref_detail"
+                   @diaClose="diaClose"></work-log-detail>
     </el-dialog>
 
   </div>
@@ -264,36 +277,37 @@ export default {
   data () {
     return {
       loading: false,
+      serviceTimeArea: '',
       total: 0,
       pageSize: 20,
       pageNo: 0,
       tableLoading: false,
       agencyId: '',
-
-      unitList: [],//单位list
-      serviceList: [],//服务list
       typeList: [],//分类list
       formData: {
-        name: '',
-        category: ''
+        gridId: '',
+        serviceType: '',
+        applicantName: '',
+        applicantAddress: '',
+        applicantMobile: '',
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       },
       tableData: [],
 
       //form相关
       formShow: false,
-      formTitle: '新增单位',
+      formTitle: '新增',
       detailShow: false,
 
-      //完成情况
-      finishDiaTitle: '区域化党建单位完成情况',
       finishDiaShow: false,
-      //积分记录
-      scoreDiaTitle: '积分记录',
+
       scoreDiaShow: false,
 
       files: "",
       fileName: "",
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/icPublicService/import',
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/heart/workdiaryService/record/import',
       optionsG: [],
       optionsEditG: [],
       workLog: {
@@ -302,7 +316,9 @@ export default {
         applicantName: '',
         applicantAddress: '',
         applicantMobile: '',
-        serviceContent: ''
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       },
       serviceTypeList: [],
 
@@ -316,15 +332,8 @@ export default {
     this.getServiceTypeList();
   },
   async mounted () {
-    //获取服务事项
-    await this.loadService()
-
-    //获取分类
-    await this.loadType()
-
     const { user } = this.$store.state
     this.agencyId = user.agencyId
-
     await this.loadTable()
   },
 
@@ -354,8 +363,8 @@ export default {
               });
     },
     async getServiceTypeList () {
-      let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
-      // let url = '/heart/workdiaryService/serviceType/page'
+      // let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
+      let url = '/heart/workdiaryService/serviceType/page'
       let params = {
         pageNo: 1,
         pageSize: 10000
@@ -374,8 +383,8 @@ export default {
               });
     },
     async handleExportModule () {
-      // let url = "/heart/workdiaryService/record/downloadTemplate";
-      let url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate";
+      let url = "/heart/workdiaryService/record/downloadTemplate";
+      // let url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate";
 
       let params = {};
       await this.$http({
@@ -385,7 +394,6 @@ export default {
         data: params,
       })
         .then((res) => {
-          // this.download(res.data, title + '.xls')
           if (res.headers["content-disposition"]) {
             let fileName = window.decodeURI(
               res.headers["content-disposition"].split(";")[1].split("=")[1]
@@ -411,48 +419,19 @@ export default {
         });
     },
 
-    //获取服务事项下拉框
-    async loadService () {
-      const url = "/gov/org/coverage/dict-select-list/public_service"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service"
-      let params = {
-        // parentCategoryCode: '1010'
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.serviceList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    //获取分类
-    async loadType () {
-      const url = "/sys/dict/data/dictlist"
-
-      let params = {
-        dictType: 'party_unit_type'
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.typeList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
     async loadTable () {
       this.tableLoading = true
 
-      // const url = "/gov/org/icPublicService/list"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page"
+      if (Array.isArray(this.serviceTimeArea) && this.serviceTimeArea.length > 0) {
+        this.workLog.serviceTimeStart = this.serviceTimeArea[0];
+        this.workLog.serviceTimeEnd = this.serviceTimeArea[1];
+      }else {
+        this.workLog.serviceTimeStart = '';
+        this.workLog.serviceTimeEnd = '';
+      }
+
+      const url = "/heart/workdiaryService/record/page"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -487,7 +466,6 @@ export default {
 
     //完成情况
     handleFinish (row) {
-      this.finishDiaTitle = row.name + '完成情况'
       this.finishDiaShow = true
       this.$nextTick(() => {
         this.$refs.ref_finish.initTable(row)
@@ -503,7 +481,7 @@ export default {
 
     handleAdd () {
       this.formTitle = '新增'
-      this.formShow = 'edit'
+      this.formShow = true
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('add', null)
       })
@@ -513,7 +491,7 @@ export default {
       this.formTitle = '修改'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.icPublicServiceId)
+        this.$refs.ref_form.initForm('edit', row)
       })
     },
 
@@ -538,18 +516,15 @@ export default {
         })
         .catch(err => {
           if (err == "cancel") {
-
           }
-
         });
     },
 
     async deleteUnit (row) {
-      // const url = "/heart/workdiaryService/record/delete"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/delete"
-      let params = {
-        ids: [row.applicantId]
-      }
+      const url = "/heart/workdiaryService/record/delete"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/delete"
+      let params = [row.id]
+
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
         this.$message({
@@ -564,21 +539,30 @@ export default {
 
     //重置搜索条件
     resetSearch () {
-      this.formData = {
-        name: '',
-        category: ''
+      this.optionsG = []
+      this.demandUserList = []
+      this.workLog = {
+        gridId: '',
+        serviceType: '',
+        applicantName: '',
+        applicantAddress: '',
+        applicantMobile: '',
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       }
+      this.serviceTimeArea = ''
       this.pageSize = 10
       this.pageNo = 0
-      // this.loadTable()
+      this.loadTable()
     },
 
     //导出表格
     async handleExport () {
       let title = '工作日志'
 
-      // const url = "/heart/workdiaryService/record/export"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/export"
+      const url = "/heart/workdiaryService/record/export"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/export"
       let params = {
         ...this.workLog
       }
@@ -655,8 +639,8 @@ export default {
       //清空上传列表
       this.$refs['upload'].clearFiles()
 
-      // var url = '/heart/workdiaryService/record/import'
-      var url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/import'
+      var url = '/heart/workdiaryService/record/import'
+      // var url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/import'
       let fileFormData = new FormData();
       fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
 
diff --git a/src/views/modules/communityService/worklog/workLogDetail.vue b/src/views/modules/communityService/worklog/workLogDetail.vue
index 917d571be..2bee32d29 100644
--- a/src/views/modules/communityService/worklog/workLogDetail.vue
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@@ -7,38 +7,40 @@
                :model="formData"
                class="form">
 
-        <el-form-item label="服务类型"
+        <el-form-item label="服务类型："
                       prop="serviceTypeName"
                       label-width="150px"
-                      style="display: block">
+                      style="display: block"
+                      class="input-width">
           <span>{{formData.serviceTypeName}}</span>
 
         </el-form-item>
-        <el-form-item label="所属网格"
+        <el-form-item label="所属网格："
                       prop="gridName"
                       label-width="150px"
                       style="display: block">
           <span>{{formData.gridName}}</span>
 
         </el-form-item>
-        <el-form-item label="申请人"
+        <el-form-item label="申请人："
                       prop="applicantName"
                       label-width="150px"
+                      class="input-width"
                       style="display: block">
-          <span>{{formData.areaCovered}}</span>
+          <span>{{formData.applicantName}}</span>
 
         </el-form-item>
-        <el-form-item label="住址"
+        <el-form-item label="住址："
                       prop="capacity"
                       label-width="150px"
                       style="display: block">
           <span>{{formData.applicantAddress}}</span>
         </el-form-item>
         <el-form-item label="服务内容："
-                      prop="principal"
+                      prop="serviceContent"
                       label-width="150px"
                       style="display: block">
-          <span>{{formData.applicantContent}}</span>
+          <span>{{formData.serviceContent}}</span>
         </el-form-item>
         <el-form-item label="联系电话："
                       prop="mobile"
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 6765d69e9..0920d3e60 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -9,91 +9,113 @@
                :disabled="formType === 'detail'"
                class="form">
 
-        <el-form-item label="场所名称"
-                      prop="name"
+        <el-form-item label="所属网格"
                       label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入场所名称"
-                    v-model="formData.name">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="场所类型"
-                      prop="category"
-                      label-width="150px"
-                      style="display: block">
-          <el-select class="item_width_1"
-                     v-model="formData.category"
-                     placeholder="请选择"
+                      style="display: block"
+                      prop="gridId">
+          <el-select v-model="formData.gridId"
                      filterable
+                     placeholder="请选择"
+                     @change="handleGridChange"
                      clearable>
-            <el-option v-for="item in serviceList"
+            <el-option v-for="item in optionsG"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
             </el-option>
           </el-select>
-
         </el-form-item>
 
-        <el-form-item label="占地面积"
+        <el-form-item label="服务类型"
+                      label-width="150px"
                       style="display: block"
-                      prop="areaCovered"
-                      label-width="150px">
-          <el-input-number class="item_width_4"
-                           v-model="formData.areaCovered"
-                           :precision="2"
-                           :step="0.01"
-                           :min="0"
-                           :max="9600000"
-                           label="占地面积"></el-input-number>平方公里
+                      prop="serviceType">
+          <el-select v-model="formData.serviceType" filterable placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in serviceTypeList"
+                       :key="item.serviceType"
+                       :label="item.serviceTypeName"
+                       :value="item.serviceType">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="容纳人数"
+
+        <el-form-item label="申请人"
+                      label-width="150px"
                       style="display: block"
-                      prop="capacity"
-                      label-width="150px">
-          <el-input-number class="item_width_4"
-                           v-model="formData.capacity"
-                           :min="0"
-                           :max="9999"
-                           label="容纳人数"></el-input-number>
+                      prop="applicantId">
+          <el-select v-model="formData.applicantId"
+                     filterable
+                     placeholder="请选择"
+                     @change="handleUserChange"
+                     clearable>
+            <el-option v-for="item in demandUserList"
+                       :key="item.demandUserId"
+                       :label="item.demandUserName + '（' +item.idCard + '）'"
+                       :value="item.demandUserId">
+            </el-option>
+          </el-select>
         </el-form-item>
 
-        <el-form-item label="负责人"
+        <el-form-item label="住址"
                       style="display: block"
                       label-width="150px"
-                      prop="principal">
-          <el-input v-model="formData.principal"
+                      prop="applicantAddress">
+          <el-input v-model="formData.applicantAddress"
                     class="item_width_1"
-                    placeholder="请输入负责人姓名"></el-input>
+                    placeholder="请输入住址"></el-input>
         </el-form-item>
+        <el-form-item label="服务内容"
+                      style="display: block"
+                      label-width="150px"
+                      prop="serviceContent">
+          <el-input v-model="formData.serviceContent"
+                    class="item_width_1"
+                    type="textarea"
+                    placeholder="请输入服务内容"></el-input>
+        </el-form-item>
+
         <el-form-item label="联系电话"
                       style="display: block"
                       label-width="150px"
-                      prop="mobile">
-          <el-input v-model="formData.mobile"
+                      prop="applicantMobile">
+          <el-input v-model="formData.applicantMobile"
                     class="item_width_1"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
-        <el-form-item label="地址"
-                      prop="address"
+
+        <el-form-item label="负责人"
+                      style="display: block"
                       label-width="150px"
-                      style="display: block">
-          <div class="item_width_1">
-            <el-input style="width:420px"
-                      :placeholder="'请输入所在地址'"
-                      v-model="formData.address">
-            </el-input>
-            <el-button style="margin-left: 10px"
-                       type="default"
-                       size="small"
-                       @click="handleSearchMap">查询</el-button>
-            <div id="app"
-                 class="div_map"></div>
-          </div>
+                      prop="principalName">
+          <el-input v-model="formData.principalName"
+                    class="item_width_1"
+                    placeholder="请输入负责人"></el-input>
         </el-form-item>
+
+        <el-form-item label="服务时间"
+                      style="display: block"
+                      label-width="150px"
+                      prop="serviceTime">
+          <el-date-picker v-model="formData.serviceTime"
+                          type="date"
+                          class="input-width"
+                          clearable
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="备注"
+                      style="display: block"
+                      label-width="150px"
+                      prop="remark">
+          <el-input v-model="formData.remark"
+                    class="item_width_1"
+                    type="textarea"
+                    placeholder="请输入备注"></el-input>
+        </el-form-item>
+
       </el-form>
     </div>
 
@@ -110,9 +132,9 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
+import {requestGet} from "../../../../js/dai/request";
 
 
 
@@ -127,102 +149,140 @@ export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-
+      agencyId: '',
       btnDisable: false,
-
-      icPublicServiceId: '',
+      disabled: false,
+      applicantId: '',
       keyWords: '',
       formData: {
-        name: '',//场所名称
-        category: '',
-        areaCovered: '',//占地面积
-        capacity: '',//容纳人数
-        address: '', //详细地址
-        longitude: 36.0722275, //经度
-        latitude: 120.38945519, //纬度
-        principal: '',
-        mobile: ''
+        serviceType: '',
+        serviceTypeName: '',
+        gridId: '',
+        gridName: '',
+        applicantAddress: '',
+        applicantName: '',
+        applicantId: '',
+        serviceContent: '',
+        applicantMobile: '',
+        principalName: '',
+        serviceTime: '',
+        remark: ''
       },
-      serviceList: [],//服务list
+      optionsG: [],
+      serviceTypeList: [],
       publicServiceData: {},
+      demandUserList: [],
     }
   },
   components: {},
+  async created () {
+    this.getGridList('query')
+    this.getServiceTypeList()
+    // this.getDemandUserList()
+  },
   mounted () {
   },
 
   methods: {
 
-    async initForm (type, icPublicServiceId) {
+    async initForm (type, row) {
       this.startLoading()
       this.$refs.ref_form.resetFields();
 
       //获取服务事项
-      await this.loadService()
-
+      await this.getServiceTypeList()
+      this.getGridList(type)
       this.formType = type
-      if (icPublicServiceId) {
-        this.icPublicServiceId = icPublicServiceId
-        this.formData.icPublicServiceId = icPublicServiceId
-        await this.loadFormData()
-      } else {
-        // map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
-        // this.setMarker(36.0722275, 120.38945519)
+      if (type === 'edit'){
+        this.formData = row
+        this.getDemandUserList(this.formData.gridId)
+        this.serviceTypeList.forEach(s => {
+          if (s.serviceType === this.formData.serviceType){
+            this.disabled = s.enabled === 1 ? true : false
+          }
+        })
+        if (!this.disabled){
+          this.formData.serviceType = ''
+        }
       }
-
       this.endLoading()
-
     },
 
     //获取服务事项下拉框
-    async loadService () {
-      const url = "/gov/org/coverage/dict-select-list/public_service"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service"
+    async getServiceTypeList () {
+      const url = "/heart/workdiaryService/serviceType/avaliableList"
+      // let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
       let params = {
+        pageNo: 1,
+        pageSize: 10000
       }
-
       const { data, code, msg } = await requestPost(url, params)
-
       if (code === 0) {
-        this.serviceList = data
-
+        this.serviceTypeList = data.list
       } else {
         this.$message.error(msg)
       }
-
     },
-
+    async getDemandUserList (gridId) {
+      const { user } = await this.$store.state;
+      const params = {
+        agencyId: user.agencyId,
+        gridId: gridId,
+        name: "",
+      };
+      // addorupdate
+      await this.$http
+              .post("/epmetuser/icresiuser/demandusers", params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                } else {
+                  this.demandUserList = res.data;
+                  console.log(this.demandUserList)
+                }
+              })
+              .catch(() => {
+                return this.$message.error("网络错误");
+              });
+    },
     //加载组织
-    async loadFormData () {
-      const url = '/gov/org/icPublicService/detail'
+    async getGridList (type) {
+      const { user } = await this.$store.state;
+      const url = '/gov/org/customergrid/gridoption'
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail'
       let params = {
-        icPublicServiceId: this.icPublicServiceId
+        agencyId: user.agencyId,
+        purpose: type,
       }
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
-        console.log(data)
-        if (null != data) {
-          data: this.publicServiceData
-        }
-
-        this.formData = { ...data }
-        // let { latitude, longitude } = this.$store.state.user;
-        // const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
-        // const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
-        if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') {
-          map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
-          this.setMarker(this.formData.latitude, this.formData.longitude)
+        this.optionsG = data;
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    handleGridChange (val) {
+      this.getDemandUserList(this.formData.gridId);
+    },
+    async handleUserChange () {
+      let homeId
+      this.demandUserList.forEach(d => {
+        if (d.demandUserId === this.formData.applicantId){
+           homeId = d.houseId
+           this.formData.applicantMobile = d.demandUserMobile
         }
+      })
+      let url = '/gov/org/ichouse/'+homeId
+      let params = {}
+      const { data, code, msg } = await requestGet(url)
+      if (code === 0) {
+        this.formData.applicantAddress = data.fullName
       } else {
         this.$message.error(msg)
       }
     },
 
-
-
     async handleComfirm () {
-
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
@@ -234,17 +294,16 @@ export default {
         } else {
           this.addUnit()
         }
-
       })
-
-
     },
     async addUnit () {
       let url = ''
       if (this.formType === 'add') {
-        url = '/gov/org/icPublicService/add'
+        url = '/heart/workdiaryService/record/save'
+        // url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/save'
       } else {
-        url = '/gov/org/icPublicService/edit'
+        url = '/heart/workdiaryService/record/update'
+        // url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/update'
       }
       const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
       if (code === 0) {
@@ -257,7 +316,7 @@ export default {
         this.btnDisable = false
       } else {
         this.btnDisable = false
-        this.$message.error(internalMsg)
+        this.$message.error(msg)
       }
 
     },
@@ -267,138 +326,21 @@ export default {
       this.$emit('dialogCancle')
 
     },
-
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      let { latitude, longitude } = this.$store.state.user;
-      console.log('lat' + latitude + ',lon' + longitude)
-      if (!latitude || latitude == "" || latitude == "0") {
-        latitude = 39.9088810666821;
-        longitude = 116.39743841556731;
-      }
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(latitude, longitude);
-      // 定义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.formData.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.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) => {
-          console.log(this.formData)
-          // this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
-          this.formData.address = this.formData.address !== '' && this.formData.address !== null && (this.formData.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address
-          // 显示搜索到的地址
-        });
-    },
-
-
     resetData () {
-      this.icPublicServiceId = ''
-      this.keyWords = ''
+      this.demandUserList = []
+      this.optionsG = []
+      this.disabled = false
       this.formData = {
-        name: '',
-        category: '',
-        areaCovered: '',
-        capacity: '',
-        address: '', //详细地址
-        longitude: '', //经度
-        latitude: '' //纬度
+        serviceType: 0,
+        gridId: '',
+        applicantAddress: '',
+        applicantName: '',
+        applicantId: '',
+        serviceContent: '',
+        applicantMobile: '',
+        principalName: '',
+        serviceTime: '',
+        remark: ''
       }
     },
     // 开启加载动画
@@ -420,22 +362,27 @@ export default {
   computed: {
     dataRule () {
       return {
-
-        name: [
-          { required: true, message: '场所名称不能为空', trigger: 'blur' },
+        gridId: [
+          { required: true, message: '所属网格不能为空', trigger: 'blur' },
+        ],
+        serviceType: [
+          { required: true, message: '服务类型不能为空', trigger: 'blur' }
+        ],
+        applicantAddress: [
+          { required: true, message: '住址不能为空', trigger: 'blur' }
         ],
-        category: [
-          { required: true, message: '场所类别不能为空', trigger: 'blur' }
+        applicantId: [
+          { required: true, message: '申请人不能为空', trigger: 'blur' }
         ],
-        address: [
-          { required: true, message: '地址不能为空', trigger: 'blur' }
+        serviceContent: [
+          { required: true, message: '服务内容不能为空', trigger: 'blur' }
         ],
-        /*longitude: [
-          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        serviceTime: [
+          { required: true, message: '服务时间不能为空', trigger: 'blur' }
         ],
-        latitude: [
-          { required: true, message: '坐标不能为空', trigger: 'blur' }
-        ]*/
+        applicantMobile: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        ]
       }
     },