diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 19b4fed3d..e31257f58 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -14,22 +14,26 @@
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in unitList"
-                         :key="item.unitId"
-                         :label="item.unitName"
-                         :value="item.unitId">
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
 
           </el-form-item>
-          <el-form-item label="活动时间"
-                        prop="startTime">
-            <el-date-picker v-model="timeRange"
-                            type="daterange"
-                            @change="handleTimeChange"
-                            range-separator="至"
-                            start-placeholder="开始时间"
-                            end-placeholder="结束时间">
-            </el-date-picker>
+
+          <el-form-item label="服务事项"
+                        prop="serviceMatter">
+            <el-select class="item_width_2"
+                       v-model="formData.serviceMatter"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in serviceList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
 
           </el-form-item>
 
@@ -39,34 +43,29 @@
                         prop="title">
             <el-input v-model="formData.title"
                       class="item_width_1"
-                      size="small"
                       clearable
                       placeholder="请输入内容">
             </el-input>
 
           </el-form-item>
-          <el-form-item label="服务事项"
-                        prop="serviceMatter">
-            <el-select class="item_width_1"
-                       v-model="formData.serviceMatter"
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in serviceList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
 
-          </el-form-item>
+          <el-form-item label="活动时间"
+                        prop="startTime">
+            <el-date-picker v-model="timeRange"
+                            type="daterange"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            @change="handleTimeChange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
 
+          </el-form-item>
           <el-button style="margin-left:10px"
                      type="primary"
-                     size="small"
                      @click="handleSearch">查询</el-button>
           <el-button style="margin-left:10px"
                      type="yellow"
-                     size="small"
                      @click="resetSearch">重置</el-button>
         </div>
       </el-form>
@@ -185,7 +184,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="850px"
+               width="950px"
                top="5vh"
                @closed="diaClose">
       <activitys-form ref="ref_form"
@@ -288,8 +287,8 @@ export default {
     },
 
     async loadUnit () {
-      // const url = "/heart/icpartyunit/option"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
+      const url = "/heart/icpartyunit/option"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
 
       let params = {
         agencyId: this.agencyId
@@ -308,8 +307,8 @@ export default {
 
     //获取服务事项下拉框
     async loadService () {
-      // const url = "/heart/icresidemanddict/subcodelist"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
+      const url = "/heart/icresidemanddict/subcodelist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
 
       let params = {
         parentCategoryCode: '1010'
@@ -329,8 +328,8 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      // const url = "/heart/icpartyactivity/list"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
+      const url = "/heart/icpartyactivity/search"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
       let params = {
         agencyId: this.agencyId,
         pageSize: this.pageSize,
@@ -397,7 +396,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          this.deleteUnit(row)
+          this.deleteActivity(row)
         })
         .catch(err => {
           if (err == "cancel") {
@@ -407,9 +406,9 @@ export default {
         });
     },
 
-    async deleteUnit (row) {
-      // const url = "/heart/icpartyactivity/delete"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
+    async deleteActivity (row) {
+      const url = "/heart/icpartyactivity/delete"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
 
       let params = {
         id: row.id
@@ -550,8 +549,8 @@ export default {
         const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
         const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
 
-        this.formData.startTime = startTimeArray[0] + startTimeArray[1] + startTimeArray[2]
-        this.formData.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+        this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+        this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
 
         // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
         // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
@@ -626,6 +625,9 @@ export default {
 .item_width_1 {
   width: 260px;
 }
+.item_width_2 {
+  width: 520px;
+}
 
 .div_table {
   background: #ffffff;
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index a120e2828..a509533a8 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -34,9 +34,9 @@
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in unitList"
-                         :key="item.unitId"
-                         :label="item.unitName"
-                         :value="item.unitId">
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -78,7 +78,7 @@
 
               <p v-else
                  class="text_p"
-                 v-html="item.content"></p>
+                 v-html="formData.content"></p>
             </div>
           </el-form-item>
 
@@ -96,9 +96,9 @@
                         prop="activityTime"
                         label-width="150px">
             <el-date-picker v-model="formData.activityTime"
-                            value-format="yyyyMMdd"
-                            type="date"
-                            placeholder="选择日期">
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetime"
+                            placeholder="选择时间">
             </el-date-picker>
           </el-form-item>
 
@@ -167,7 +167,7 @@
 
               <p v-else
                  class="text_p"
-                 v-html="item.result"></p>
+                 v-html="formData.result"></p>
             </div>
           </el-form-item>
         </el-form>
@@ -211,7 +211,7 @@ export default {
         unitId: '',//单位ID
         title: '',//活动标题
         target: '',//活动目标
-        contact: '',//活动内容
+        content: '',//活动内容
         activityTime: '',//活动时间
         peopleCount: 0,//服务人数
         result: '', //活动结果
@@ -230,24 +230,26 @@ export default {
   methods: {
 
     async initForm (type, activityId) {
+      this.startLoading()
       this.$refs.ref_form.resetFields();
 
-      // debugger
-      // map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
-
       this.formType = type
       if (activityId) {
         this.activityId = activityId
         this.formData.id = activityId
         await this.loadFormData()
+      } else {
+        map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
+        this.setMarker(36.0722275, 120.38945519)
       }
+      this.endLoading()
 
     },
 
     //加载组织
     async loadFormData () {
-      // const url = '/heart/icpartyactivity/detail'
-      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/detail'
+      const url = '/heart/icpartyactivity/detail'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/detail'
       let params = {
         id: this.activityId
       }
@@ -256,7 +258,8 @@ export default {
 
       if (code === 0) {
         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)
       }
@@ -279,8 +282,8 @@ export default {
 
     },
     async addActivity () {
-      // let url = '/heart/icpartyactivity/save'
-      let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save"
+      let url = '/heart/icpartyactivity/save'
+      // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save"
 
 
       const { data, code, msg } = await requestPost(url, this.formData)
@@ -288,7 +291,7 @@ export default {
       if (code === 0) {
         this.$message({
           type: 'success',
-          message: '新增联建单位成功'
+          message: '操作成功'
         })
         this.resetData()
         this.$emit('dialogOk')
@@ -425,7 +428,7 @@ export default {
         unitId: '',//单位ID
         title: '',//活动标题
         target: '',//活动目标
-        contact: '',//活动内容
+        content: '',//活动内容
         activityTime: '',//活动时间
         peopleCount: 0,//服务人数
         result: '', //活动结果
@@ -499,7 +502,7 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style  lang="scss" scoped>
 .item_width_1 {
   width: 560px;
 }
@@ -541,6 +544,12 @@ export default {
   height: 400px;
   overflow: auto;
 }
+.text_p {
+  margin: 0;
+  > p {
+    margin: 0;
+  }
+}
 </style>
 
 <style lang=scss>
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 792c22440..ce93f05a3 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -6,25 +6,11 @@
                ref="ref_searchform"
                :label-width="'100px'">
         <div>
-          <el-form-item label="所属网格"
-                        prop="gridId">
-            <el-select class="item_width_1"
-                       v-model="formData.gridId"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in gridList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
 
-          </el-form-item>
           <el-form-item label="单位名称"
                         prop="unitName">
             <el-input v-model="formData.unitName"
                       class="item_width_1"
-                      size="small"
                       clearable
                       placeholder="请输入内容">
             </el-input>
@@ -32,7 +18,7 @@
           </el-form-item>
           <el-form-item label="服务事项"
                         prop="serviceMatter">
-            <el-select class="item_width_1"
+            <el-select class="item_width_2"
                        v-model="formData.serviceMatter"
                        placeholder="请选择"
                        clearable>
@@ -64,7 +50,6 @@
                         prop="contact">
             <el-input v-model="formData.contact"
                       class="item_width_1"
-                      size="small"
                       clearable
                       placeholder="请输入内容">
             </el-input>
@@ -75,7 +60,6 @@
                         prop="contactMobile">
             <el-input v-model="formData.contactMobile"
                       class="item_width_1"
-                      size="small"
                       clearable
                       placeholder="请输入内容">
             </el-input>
@@ -84,11 +68,9 @@
 
           <el-button style="margin-left:10px"
                      type="primary"
-                     size="small"
                      @click="handleSearch">查询</el-button>
           <el-button style="margin-left:10px"
                      type="yellow"
-                     size="small"
                      @click="resetSearch">重置</el-button>
         </div>
       </el-form>
@@ -133,12 +115,7 @@
                          align="center"
                          type="index"
                          width="50"></el-table-column>
-        <el-table-column prop="gridName"
-                         header-align="center"
-                         align="center"
-                         label="所属网格"
-                         width="180">
-        </el-table-column>
+
         <el-table-column prop="unitName"
                          header-align="center"
                          align="center"
@@ -149,13 +126,20 @@
                          header-align="center"
                          align="center"
                          label="分类"
-                         width="180">
+                         width="80">
         </el-table-column>
-        <el-table-column prop="serviceMatterShow"
+        <el-table-column prop="serviceMatterList"
                          header-align="center"
                          align="center"
                          label="服务事项"
-                         width="180">
+                         min-width="180">
+
+          <template slot-scope="scope">
+            <p style="text-align:center;margin:2px 0;"
+               v-for="(item,index) in scope.row.serviceMatterList"
+               :key="index">{{item}}</p>
+
+          </template>
         </el-table-column>
         <el-table-column prop="contact"
                          header-align="center"
@@ -173,13 +157,13 @@
                          header-align="center"
                          align="center"
                          label="在职党员数"
-                         width="150">
+                         width="100">
         </el-table-column>
         <el-table-column prop="satisfaction"
                          header-align="center"
                          align="center"
                          label="群众满意度"
-                         width="150">
+                         width="100">
         </el-table-column>
         <el-table-column prop="remark"
                          header-align="center"
@@ -229,11 +213,10 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="850px"
+               width="950px"
                top="5vh"
                @closed="diaClose">
       <units-form ref="ref_form"
-                  :gridList="gridList"
                   :serviceList="serviceList"
                   :typeList="typeList"
                   @dialogCancle="addFormCancle"
@@ -261,7 +244,7 @@ export default {
       pageNo: 0,
       tableLoading: false,
       agencyId: '',
-      gridList: [],//所属网格list
+
       unitList: [],//单位list
       serviceList: [
         {
@@ -285,7 +268,7 @@ export default {
 
       unitId: '',
       formData: {
-        gridId: '',
+
         unitName: '',
         serviceMatter: '',
         type: '',
@@ -320,8 +303,6 @@ export default {
 
     const { user } = this.$store.state
     this.agencyId = user.agencyId
-    //获取网格下拉框数据
-    await this.loadGrid()
 
     await this.loadTable()
   },
@@ -331,28 +312,10 @@ export default {
       this.loadTable()
     },
 
-    async loadGrid () {
-      const url = "/gov/org/customergrid/gridoption"
-
-      let params = {
-        agencyId: this.agencyId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.gridList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
     //获取服务事项下拉框
     async loadService () {
-      // const url = "/heart/icresidemanddict/subcodelist"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
+      const url = "/heart/icresidemanddict/subcodelist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
 
       let params = {
         parentCategoryCode: '1010'
@@ -390,8 +353,8 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      // const url = "/heart/icpartyunit/list"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
+      const url = "/heart/icpartyunit/list"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -404,14 +367,14 @@ export default {
       if (code === 0) {
         this.total = data.total
         this.tableData = data.list
-        this.tableData.forEach(item => {
-          item.serviceMatterShow = ''
-          if (item.serviceMatterList.length > 0) {
-            item.serviceMatterShow = item.serviceMatterList.jone('')
+        // this.tableData.forEach(item => {
+        //   item.serviceMatterShow = ''
+        //   if (item.serviceMatterList.length > 0) {
+        //     item.serviceMatterShow = item.serviceMatterList.join('')
 
-          }
+        //   }
 
-        });
+        // });
       } else {
         this.$message.error(msg)
       }
@@ -477,8 +440,8 @@ export default {
     },
 
     async deleteUnit (row) {
-      // const url = "/heart/icpartyunit/delete"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
+      const url = "/heart/icpartyunit/delete"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
 
       let params = {
         id: row.id
@@ -501,7 +464,6 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        gridId: '',
         unitName: '',
         serviceMatter: '',
         type: '',
@@ -676,6 +638,9 @@ export default {
 .item_width_1 {
   width: 260px;
 }
+.item_width_2 {
+  width: 620px;
+}
 
 .div_table {
   background: #ffffff;
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 0f9371a13..168763c06 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -9,22 +9,6 @@
                  :disabled="formType === 'detail'"
                  class="form">
 
-          <el-form-item label="所属网格"
-                        prop="gridId"
-                        label-width="150px"
-                        style="display: block">
-            <el-select class="item_width_1"
-                       v-model="formData.gridId"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in gridList"
-                         :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"
@@ -91,8 +75,8 @@
                         label-width="150px">
             <el-input-number class="item_width_1"
                              v-model="formData.memberCount"
-                             :min="1"
-                             label="单元数"></el-input-number>
+                             :min="0"
+                             label="在职党员"></el-input-number>
           </el-form-item>
           <el-form-item label="备注"
                         prop="remark"
@@ -195,7 +179,6 @@ export default {
       unitId: '',
       keyWords: '',
       formData: {
-        gridId: '',
         unitName: '',
         serviceMatterList: [],
         type: '',
@@ -218,24 +201,27 @@ export default {
   methods: {
 
     async initForm (type, unitId) {
+      this.startLoading()
       this.$refs.ref_form.resetFields();
 
-      // debugger
-      // map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
-
       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 loadFormData () {
-      // const url = '/heart/icpartyunit/detail'
-      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
+      const url = '/heart/icpartyunit/detail'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
       let params = {
         id: this.unitId
       }
@@ -243,8 +229,13 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.formData = data
+        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)
       }
@@ -271,18 +262,18 @@ export default {
 
     },
     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"
+      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
       // } 
@@ -292,7 +283,7 @@ export default {
       if (code === 0) {
         this.$message({
           type: 'success',
-          message: '新增联建单位成功'
+          message: '操作成功'
         })
         this.resetData()
         this.$emit('dialogOk')
@@ -305,7 +296,6 @@ export default {
     },
 
     handleCancle () {
-
       this.resetData()
       this.$emit('dialogCancle')
 
@@ -427,7 +417,6 @@ export default {
       this.unitId = ''
       this.keyWords = ''
       this.formData = {
-        gridId: '',
         unitName: '',
         serviceMatterList: [],
         type: '',
@@ -459,9 +448,7 @@ export default {
   computed: {
     dataRule () {
       return {
-        gridId: [
-          { required: true, message: '所属网格不能为空', trigger: 'blur' }
-        ],
+
         unitName: [
           { required: true, message: '单位名称不能为空', trigger: 'blur' },
         ],
@@ -490,10 +477,6 @@ export default {
   },
   props: {
 
-    gridList: {
-      type: Array,
-      default: []
-    },
     typeList: {
       type: Array,
       default: []
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index abf64bea0..bf05bbc94 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -11,7 +11,6 @@
                         prop="placeOrgName">
             <el-input v-model="formData.placeOrgName"
                       class="item_width_1"
-                      size="small"
                       clearable
                       placeholder="请输入九小场所名称">
             </el-input>
@@ -81,11 +80,9 @@
 
           <el-button style="margin-left:10px"
                      type="primary"
-                     size="small"
                      @click="handleSearch">查询</el-button>
           <el-button style="margin-left:10px"
                      type="yellow"
-                     size="small"
                      @click="resetSearch">重置</el-button>
         </div>
       </el-form>
@@ -118,13 +115,13 @@
                          header-align="center"
                          align="center"
                          label="场所类型"
-                         min-width="180">
+                         width="180">
         </el-table-column>
         <el-table-column prop="placePatrolTeamName"
                          header-align="center"
                          align="center"
                          label="分队名称"
-                         min-width="180">
+                         width="180">
         </el-table-column>
         <el-table-column prop="inspectorsNames"
                          header-align="center"
@@ -136,7 +133,7 @@
                          header-align="center"
                          align="center"
                          label="首次巡检时间"
-                         min-width="150">
+                         width="110">
         </el-table-column>
         <el-table-column prop="detailed"
                          header-align="center"
@@ -148,7 +145,7 @@
                          header-align="center"
                          align="center"
                          label="首次检查结果"
-                         min-width="180">
+                         width="110">
         </el-table-column>
         <el-table-column prop="reviewTime"
                          header-align="center"
@@ -160,7 +157,7 @@
                          header-align="center"
                          align="center"
                          label="最新结果"
-                         min-width="110">
+                         width="80">
         </el-table-column>
         <el-table-column prop="finalTime"
                          header-align="center"
@@ -350,8 +347,8 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      // const url = "/gov/org/placepatrolrecord/getlist"
-      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/getlist"
+      const url = "/gov/org/placepatrolrecord/getlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/getlist"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -363,6 +360,33 @@ export default {
       if (code === 0) {
         this.total = data.total
         this.tableData = data.list
+        if (this.tableData && this.tableData.length > 0) {
+          this.tableData.forEach(item => {
+            if (item.firstTime) {
+              let firstTimeArray = item.firstTime.split(' ')
+              item.firstTime = firstTimeArray[0]
+            }
+
+            if (item.reviewTime) {
+              let reviewTimeArray = item.reviewTime.split(' ')
+              item.reviewTime = reviewTimeArray[0]
+            }
+
+            if (item.finalTime) {
+              let finalTimeArray = item.finalTime.split(' ')
+              item.finalTime = finalTimeArray[0]
+            }
+
+            if (item.firstResult) {
+              item.firstResult = item.firstResult === '0' ? '合格' : '不合格'
+            }
+            if (item.finalResult) {
+              item.finalResult = item.finalResult === '0' ? '合格' : '不合格'
+            }
+          });
+
+        }
+
       } else {
         this.$message.error(msg)
       }
@@ -431,8 +455,8 @@ export default {
     },
 
     async deleteRecord (row) {
-      // const url = "/gov/org/placepatrolrecord/del"
-      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/del"
+      const url = "/gov/org/placepatrolrecord/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/del"
 
       let params = {
         placePatrolRecordId: row.placePatrolRecordId
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue
index 1c09cbc13..83836816d 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue
@@ -80,8 +80,8 @@
                                style="display:flex;flex-wrap:wrap"
                                v-model="formData.inspectorArray">
               <el-checkbox v-for="item in inspectorsList"
-                           :key="item.name"
-                           :label="item.name">{{item.name}}</el-checkbox>
+                           :key="item.id"
+                           :label="item.id">{{item.name}}</el-checkbox>
 
             </el-checkbox-group>
 
@@ -91,7 +91,7 @@
                         prop="firstTime"
                         label-width="150px">
             <el-date-picker v-model="formData.firstTime"
-                            value-format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd HH:mm:ss"
                             type="date"
                             placeholder="选择日期">
             </el-date-picker>
@@ -131,7 +131,7 @@
                         prop="reviewTime"
                         label-width="150px">
             <el-date-picker v-model="formData.reviewTime"
-                            value-format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd HH:mm:ss"
                             type="date"
                             placeholder="选择日期">
             </el-date-picker>
@@ -189,25 +189,26 @@ export default {
 
   methods: {
 
-    async initForm (type, placeOrgId) {
+    async initForm (type, placePatrolRecordId) {
       this.$refs.ref_form.resetFields();
-
+      this.startLoading()
       await this.loadPlaces()
       await this.loadTeams()
 
       this.formType = type
-      if (placeOrgId) {
-        this.placeOrgId = placeOrgId
-        this.formData.placeOrgId = placeOrgId
+      if (placePatrolRecordId) {
+        this.placePatrolRecordId = placePatrolRecordId
+        this.formData.placePatrolRecordId = placePatrolRecordId
         await this.loadFormData()
+        await this.loadInspectors()
       }
-
+      this.endLoading()
     },
 
     //加载场所
     async loadPlaces () {
-      // const url = '/gov/org/placeorg/getlist'
-      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist'
+      const url = '/gov/org/placeorg/getlist'
+
       let params = {
         isPage: false
       }
@@ -224,8 +225,8 @@ export default {
 
     //加载分队
     async loadTeams () {
-      // const url = '/gov/org/placepatrolteam/getlist'
-      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
+      const url = '/gov/org/placepatrolteam/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
       let params = {
         isPage: false
       }
@@ -247,14 +248,16 @@ export default {
 
     //点击分队切换人员
     async hancleChangeTeam (index) {
+      let array = []
+      this.formData.inspectorArray = [...array]
       // this.formData.placePatrolTeamId = this.teamsList[index].teamId
       await this.loadInspectors()
     },
 
     //加载分队下人员
     async loadInspectors () {
-      // const url = '/gov/org/placepatrolteamstaff/getlist'
-      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
+      const url = '/gov/org/placepatrolteamstaff/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
       let params = {
         teamId: this.formData.placePatrolTeamId
       }
@@ -270,16 +273,19 @@ export default {
     },
     //加载form
     async loadFormData () {
-      // const url = '/gov/org/placeorg/detail'
-      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/detail'
+      const url = '/gov/org/placepatrolrecord/detail'
+
       let params = {
-        placeOrgId: this.placeOrgId
+        placePatrolRecordId: this.placePatrolRecordId
       }
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.formData = data
+        data.inspectorArray = data.inspectors.split(',')
+        this.formData = { ...data }
+
+
 
       } else {
         this.$message.error(msg)
@@ -306,8 +312,8 @@ export default {
     },
     async addRecord () {
 
-      // let url = "/gov/org/placepatrolrecord/add"
-      let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add"
+      let url = "/gov/org/placepatrolrecord/add"
+      // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add"
       this.formData.inspectors = this.formData.inspectorArray.join(',')
 
       const { data, code, msg } = await requestPost(url, this.formData)
@@ -374,7 +380,7 @@ export default {
         ninePlaceVal: [
           { required: true, message: '场所类型不能为空', trigger: 'blur' },
         ],
-        placeOrgName: [
+        placeOrgId: [
           { required: true, message: '场所名称不能为空', trigger: 'blur' }
         ],
         placePatrolTeamId: [
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
index 7af128683..1f83f45e6 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
@@ -25,9 +25,9 @@
                          label="复查时间"
                          width="250">
           <template slot-scope="scope">
-            <div v-if="scope.row.isSet">
+            <div v-if="scope.row.isEdit">
               <el-date-picker v-model="scope.row.reviewTime"
-                              value-format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd HH:mm:ss"
                               type="date"
                               placeholder="选择日期">
               </el-date-picker>
@@ -43,13 +43,13 @@
                          width="280">
 
           <template slot-scope="scope">
-            <div v-if="scope.row.isSet">
+            <div v-if="scope.row.isEdit">
               <el-select class="item_width_1"
                          v-model="scope.row.placePatrolTeamId"
                          placeholder="请选择"
                          clearable>
                 <el-option v-for="(item,index) in teamsList"
-                           @click.native="hancleChangeTeam(scope.row,index)"
+                           @click.native="hancleChangeTeam(scope.row,index,scope.$index)"
                            :key="item.teamId"
                            :label="item.teamName"
                            :value="item.teamId">
@@ -67,23 +67,12 @@
                          min-width="380">
 
           <template slot-scope="scope">
-            <div v-if="scope.row.isSet">
-              <!-- <el-select class="item_width_1"
-                         multiple
-                         v-model="inspectorArray"
-                         placeholder="请选择"
-                         clearable>
-                <el-option v-for="item in scope.row.inspectorsList"
-                           :key="item.name"
-                           :label="item.name"
-                           :value="item.name">
-                </el-option>
-              </el-select> -->
+            <div v-if="scope.row.isEdit">
               <el-checkbox-group style="display:flex;flex-wrap:wrap"
-                                 v-model="inspectorArray[scope.$index]">
+                                 v-model="scope.row.inspectorArray">
                 <el-checkbox v-for="item in scope.row.inspectorsList"
-                             :key="item.name"
-                             :label="item.name">{{item.name}}</el-checkbox>
+                             :key="item.id"
+                             :label="item.id">{{item.name}}</el-checkbox>
 
               </el-checkbox-group>
             </div>
@@ -96,7 +85,7 @@
                          label="复查结论"
                          width="120">
           <template slot-scope="scope">
-            <div v-if="scope.row.isSet">
+            <div v-if="scope.row.isEdit">
               <el-select class="item_width_2"
                          v-model="scope.row.reviewResult"
                          placeholder="全部"
@@ -119,7 +108,13 @@
                          align="center"
                          class="operate">
           <template slot-scope="scope">
-            <el-button type="text"
+            <el-button v-if="scope.row.isEdit"
+                       type="text"
+                       style="color:#00A7A9;text-decoration: underline;"
+                       size="small"
+                       @click="handleComfirm(scope.row,scope.$index)">保存</el-button>
+            <el-button v-if="!scope.row.isEdit"
+                       type="text"
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
                        @click="handleEdit(scope.row,scope.$index)">修改</el-button>
@@ -127,18 +122,17 @@
             <el-button type="text"
                        style="color:#D51010;text-decoration: underline;"
                        size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+                       @click="handleDelete(scope.row,scope.$index)">删除</el-button>
 
           </template>
         </el-table-column>
       </el-table>
 
     </div>
-    <div class="div_btn">
+    <!-- <div class="div_btn">
       <el-button @click="handleCancle">取 消</el-button>
-      <el-button type="primary"
-                 @click="handleComfirm">确 定</el-button>
-    </div>
+  
+    </div> -->
   </div>
 </template>
 
@@ -154,41 +148,7 @@ export default {
       tableLoading: false,
       placePatrolRecordId: '',
       tableData: [],
-      inspectorArray: [],
-
-      inspectorsList1: [
-        {
-          name: '张三'
-        },
-        {
-          name: '李四'
-        },
-        {
-          name: '王二麻'
-        },
-      ],
-      inspectorsList2: [
-        {
-          name: '张三2'
-        },
-        {
-          name: '李四2'
-        },
-        {
-          name: '王二麻2'
-        },
-      ],
-      inspectorsList3: [
-        {
-          name: '张三3'
-        },
-        {
-          name: '李四3'
-        },
-        {
-          name: '王二麻3'
-        },
-      ]
+
 
     }
   },
@@ -210,8 +170,8 @@ export default {
 
     //加载分队
     async loadTeams () {
-      // const url = '/gov/org/placepatrolteam/getlist'
-      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
+      const url = '/gov/org/placepatrolteam/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
       let params = {
         isPage: false
       }
@@ -228,29 +188,29 @@ export default {
     },
 
     //点击分队切换人员
-    async hancleChangeTeam (index) {
-      // this.formData.placePatrolTeamId = this.teamsList[index].teamId
-      await this.loadInspectors()
+    async hancleChangeTeam (row, index, tableIndex) {
+      this.tableData[tableIndex].inspectorArray = [...[]]
+      let teamId = this.teamsList[index].teamId
+      await this.loadInspectors(teamId, tableIndex)
     },
 
     //加载分队下人员
-    async loadInspectors (index) {
+    async loadInspectors (teamId, tableIndex) {
 
-
-      // const url = '/gov/org/placepatrolteamstaff/getlist'
-      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
+      const url = '/gov/org/placepatrolteamstaff/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
       let params = {
-        teamId: this.tableData[index].placePatrolTeamId
+        teamId: teamId
       }
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        let obj = this.tableData[index]
-        obj.isSet = true
-
-        obj.inspectorsList = this.inspectorsList1
-        this.$set(this.tableData, index, obj)
+        // let obj = this.tableData[tableIndex]
+        this.tableData[tableIndex].inspectorsList = [...data]
+        // this.tableData[tableIndex]=
+        //         obj.inspectorsList = data
+        //         this.$set(this.tableData, tableIndex, obj)
         console.log(this.tableData)
       } else {
         this.$message.error(msg)
@@ -259,8 +219,8 @@ export default {
     //加载form
     async loadTable () {
       this.tableLoading = true
-      // const url = /gov/org/placepatrolreviewrecord/getlist'
-      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist'
+      const url = '/gov/org/placepatrolreviewrecord/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist'
       let params = {
         placePatrolRecordId: this.placePatrolRecordId
       }
@@ -268,12 +228,23 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
       this.tableLoading = false
       if (code === 0) {
-        this.tableData = data.list
-        this.tableData.forEach(item => {
-          item.isSet = false
-          let array = item.inspectors.split(',')
-          this.inspectorArray.push(array)
-        });
+
+        if (data.list && data.list.length > 0) {
+          data.list.forEach(item => {
+            item.isEdit = false
+            item.isNew = false
+            let array = item.inspectors.split(',')
+            item.inspectorArray = [...array]
+
+          });
+          let array = item.reviewTime.split(' ')
+          item.reviewTime = array[0]
+
+          this.tableData = { ...data.list }
+        } else {
+          this.tableData = []
+        }
+
 
       } else {
         this.$message.error(msg)
@@ -282,36 +253,51 @@ export default {
 
     handleAdd () {
       let obj = {
-        isSet: true,
+        isNew: true,//是否新增
+        isEdit: true,//是否编辑
+        placePatrolRecordId: this.placePatrolRecordId,
         reviewTime: '',
         placePatrolTeamId: '',
         inspectors: '',
         inspectorArray: [],
+        inspectorsList: [],
         reviewResult: '',
       }
       this.tableData.push(obj)
     },
 
-    handleEdit (row, index) {
-
-
-
-      this.loadInspectors(index)
+    async handleEdit (row, tableIndex) {
+      let teamId = row.placePatrolTeamId
+      await this.loadInspectors(teamId, tableIndex)
 
+      let params = JSON.parse(JSON.stringify(row))
+      params.isEdit = true
+      params.isNew = false
+      params.inspectorArray = params.inspectors.split(',')
+      this.tableData[tableIndex] = { ...params }
     },
 
-    async handleComfirm () {
+    async handleComfirm (row, tableIndex) {
+      let valiMsg = this.validata(row)
+      if (valiMsg) {
+        this.$message({
+          type: 'warning',
+          message: valiMsg
+        })
+        return false
+      }
 
-      this.addReview()
+      this.addReview(row, tableIndex)
 
     },
-    async addReview () {
+    async addReview (row, tableIndex) {
+
+      let url = "/gov/org/placepatrolreviewrecord/add"
 
-      // let url = "/gov/org/placepatrolrecord/add"
-      let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add"
-      this.formData.inspectors = this.formData.inspectorArray.join(',')
+      let params = JSON.parse(JSON.stringify(row))
+      params.inspectors = params.inspectorArray.join(',')
 
-      const { data, code, msg } = await requestPost(url, this.formData)
+      const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
         this.$message({
@@ -319,7 +305,9 @@ export default {
           message: '操作成功'
         })
 
-        this.$emit('dialogOk')
+        params.isEdit = false
+        params.isNew = false
+        this.$set(this.tableData, tableIndex, params)
 
       } else {
 
@@ -328,7 +316,24 @@ export default {
 
     },
 
-    async handleDelete (row) {
+    validata (row) {
+      let message = ''
+      if (row.reviewTime === '') {
+        message = message + '复查时间不能为空；'
+      }
+      if (row.placePatrolTeamId === '') {
+        message = message + '分队名称不能为空；'
+      }
+      if (row.inspectorArray.length === 0) {
+        message = message + '检查人员不能为空；'
+      }
+      if (row.reviewResult === '') {
+        message = message + '复查结论不能为空；'
+      }
+      return message
+    },
+
+    async handleDelete (row, tableIndex) {
 
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
@@ -336,7 +341,12 @@ export default {
         type: "warning"
       })
         .then(() => {
-          this.deleteRecord(row)
+          if (row.placePatrolReviewRecordId) {//存在id，调用服务删除
+            this.deleteRecord(row, tableIndex)
+          } else {//不存在id，直接删除数组数据
+            this.tableData.splice(tableIndex, 1);
+          }
+
         })
         .catch(err => {
           if (err == "cancel") {
@@ -346,9 +356,10 @@ export default {
         });
     },
 
-    async deleteRecord (row) {
-      // const url = "/gov/org/placepatrolrecord/delreview"
-      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/delreview"
+    async deleteRecord (row, tableIndex) {
+
+      const url = "/gov/org/placepatrolrecord/delreview"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/delreview"
 
       let params = {
         placePatrolReviewRecordId: row.placePatrolReviewRecordId
@@ -362,15 +373,13 @@ export default {
           message: "删除成功"
         });
 
-        this.loadTable()
+        this.tableData.splice(tableIndex, 1);
       } else {
         this.$message.error(msg)
       }
     },
 
     handleCancle () {
-
-
       this.$emit('dialogCancle')
 
     },
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 46a147352..a95279292 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -11,7 +11,6 @@
                         prop="placeOrgName">
             <el-input v-model="formData.placeOrgName"
                       class="item_width_1"
-                      size="small"
                       clearable
                       placeholder="请输入九小场所名称">
             </el-input>
@@ -22,7 +21,6 @@
                         prop="mobile">
             <el-input v-model="formData.mobile"
                       class="item_width_1"
-                      size="small"
                       clearable
                       placeholder="请输入电话">
             </el-input>
@@ -77,11 +75,9 @@
 
           <el-button style="margin-left:10px"
                      type="primary"
-                     size="small"
                      @click="handleSearch">查询</el-button>
           <el-button style="margin-left:10px"
                      type="yellow"
-                     size="small"
                      @click="resetSearch">重置</el-button>
         </div>
       </el-form>
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index fa406e2b3..8f73d6e55 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -11,7 +11,6 @@
                         prop="personInCharge">
             <el-input v-model="formData.personInCharge"
                       class="item_width_1"
-                      size="small"
                       clearable
                       placeholder="请输入负责人姓名">
             </el-input>
@@ -22,7 +21,6 @@
                         prop="mobile">
             <el-input v-model="formData.mobile"
                       class="item_width_1"
-                      size="small"
                       clearable
                       placeholder="请输入电话">
             </el-input>
@@ -62,11 +60,9 @@
 
           <el-button style="margin-left:10px"
                      type="primary"
-                     size="small"
                      @click="handleSearch">查询</el-button>
           <el-button style="margin-left:10px"
                      type="yellow"
-                     size="small"
                      @click="resetSearch">重置</el-button>
         </div>
       </el-form>