From c96f313ccfc3eee0fd9c29287c7bd5efec918c48 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 18 Aug 2022 13:57:38 +0800
Subject: [PATCH 01/60] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=BB=8F=E7=BA=AC?=
 =?UTF-8?q?=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regionalParty/activitysForm.vue           | 26 ++++++++++++-------
 .../regionalParty/unitsForm.vue               | 26 ++++++++++++++-----
 .../modules/shequzhili/event/cpts/add.vue     | 14 ++++++++--
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index efd2c776a..94ce4234b 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -254,8 +254,8 @@ export default {
         peopleCount: 0,//服务人数
         result: '', //活动结果
         address: '', //详细地址
-        longitude: 36.0722275, //经度
-        latitude: 120.38945519 //纬度
+        longitude: 120.38945519, //经度
+        latitude: 36.0722275 //纬度
       },
       serviceList: [],
       // gridList: [],
@@ -274,23 +274,31 @@ export default {
     async initForm (type, activityId) {
       this.startLoading()
       this.$refs.ref_form.resetFields();
-      //     const { user } = this.$store.state
-      //     this.agencyId = user.agencyId
 
-      // await this.loadGrid()
 
       //获取服务事项
       await this.loadService()
 
+      let { latitude, longitude } = this.$store.state.user;
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+
+      this.formData.latitude = latitude
+      this.formData.longitude = 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)
+
       }
+
+      map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+      this.setMarker(this.formData.latitude, this.formData.longitude)
       this.endLoading()
 
     },
@@ -353,8 +361,8 @@ export default {
 
         }
         console.log(this.formData.content)
-        map.setCenter(new TMap.LatLng(parseFloat(this.formData.latitude), parseFloat(this.formData.longitude)))
-        this.setMarker(this.formData.latitude, this.formData.longitude)
+        // map.setCenter(new TMap.LatLng(parseFloat(this.formData.latitude), parseFloat(this.formData.longitude)))
+        // this.setMarker(this.formData.latitude, this.formData.longitude)
       } else {
         this.$message.error(msg)
       }
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index ac3965ea8..06b5eece2 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -189,8 +189,8 @@ export default {
         memberCount: 0,
         remark: '', //备注【最大500字】
         address: '', //详细地址
-        longitude: 36.0722275, //经度
-        latitude: 120.38945519 //纬度
+        longitude: 120.38945519, //经度
+        latitude: 36.0722275//纬度
       },
       serviceList: [],//服务list
 
@@ -198,6 +198,7 @@ export default {
   },
   components: {},
   mounted () {
+
     this.initMap()
   },
 
@@ -210,16 +211,27 @@ export default {
       //获取服务事项
       await this.loadService()
 
+      let { latitude, longitude } = this.$store.state.user;
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+
+      this.formData.latitude = latitude
+      this.formData.longitude = 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)
+
       }
 
+      map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+      this.setMarker(this.formData.latitude, this.formData.longitude)
+
       this.endLoading()
 
     },
@@ -259,8 +271,8 @@ export default {
         }
 
         this.formData = { ...data }
-        map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
-        this.setMarker(this.formData.latitude, this.formData.longitude)
+        // map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+        // this.setMarker(this.formData.latitude, this.formData.longitude)
       } else {
         this.$message.error(msg)
       }
@@ -329,7 +341,7 @@ export default {
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap () {
       // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      var center = new window.TMap.LatLng(this.formData.latitude, this.formData.longitude)
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById('app'), {
         center: center, // 设置地图中心点坐标
diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index b53caf480..d3581582a 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -402,10 +402,20 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
+    let { latitude, longitude } = this.$store.state.user;
+    if (!latitude || latitude == "" || latitude == "0") {
+      latitude = 39.9088810666821;
+      longitude = 116.39743841556731;
+    }
+
+    this.formData.latitude = latitude
+    this.formData.longitude = longitude
+
+    this.initMap()
     this.loadGrid();
     this.getCategoryList()
 
-    this.initMap()
+
 
   },
 
@@ -597,7 +607,7 @@ export default {
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap () {
       // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      var center = new window.TMap.LatLng(this.formData.latitude, this.formData.longitude)
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById('app'), {
         center: center, // 设置地图中心点坐标

From ab4ad940a5e0477c5419d1a63b9e8af9c44e3cf6 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 18 Aug 2022 16:36:16 +0800
Subject: [PATCH 02/60] =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regionalParty/activitysForm.vue           | 53 +++++++++----------
 .../communityParty/regionalParty/units.vue    | 19 +++----
 .../regionalParty/unitsDetail.vue             |  3 +-
 .../regionalParty/unitsForm.vue               | 31 ++++++-----
 4 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index 94ce4234b..a45a5b80b 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -234,6 +234,22 @@ var geocoder // 新建一个正逆地址解析类
 let loading // 加载动画
 export default {
   data () {
+    let initFormData = () => {
+      let _form = {
+        unitName: '',
+        serviceMatterList: [],
+        type: '',
+        contact: '',
+        contactMobile: '',
+        memberCount: 0,
+        remark: '', //备注【最大500字】
+        address: '', //详细地址
+        longitude: this.$store.state.user.longitude, //经度
+        latitude: this.$store.state.user.latitude//纬度
+      }
+
+      return _form
+    }
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
 
@@ -241,22 +257,7 @@ export default {
 
       keyWords: '',
       activityId: '',
-      formData: {
-        gridId: '',
-        serviceMatter: '',//服务事项
-        serviceMatterList: [],
-        unitId: '',//单位ID
-        unitIdList: [],
-        title: '',//活动标题
-        target: '',//活动目标
-        content: '',//活动内容
-        activityTime: '',//活动时间
-        peopleCount: 0,//服务人数
-        result: '', //活动结果
-        address: '', //详细地址
-        longitude: 120.38945519, //经度
-        latitude: 36.0722275 //纬度
-      },
+      formData: initFormData(),
       serviceList: [],
       // gridList: [],
       agencyId: ''
@@ -527,20 +528,16 @@ export default {
       this.activityId = ''
       this.keyWords = ''
       this.formData = {
-        gridId: '',
-        serviceMatter: '',//服务事项
+        unitName: '',
         serviceMatterList: [],
-        unitId: '',//单位ID
-        unitIdList: [],
-        title: '',//活动标题
-        target: '',//活动目标
-        content: '',//活动内容
-        activityTime: '',//活动时间
-        peopleCount: 0,//服务人数
-        result: '', //活动结果
+        type: '',
+        contact: '',
+        contactMobile: '',
+        memberCount: 0,
+        remark: '', //备注【最大500字】
         address: '', //详细地址
-        longitude: 36.0722275, //经度
-        latitude: 120.38945519 //纬度
+        longitude: this.$store.state.user.longitude, //经度
+        latitude: this.$store.state.user.latitude//纬度
       }
     },
     // 开启加载动画
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 0feb07c8b..23db7d00e 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -477,9 +477,10 @@ export default {
     },
 
     handleDetail (row) {
-      this.detailShow = true
+      this.formTitle = '详情'
+      this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_detail.initForm(row)
+        this.$refs.ref_form.initForm('detail', row.id)
       })
     },
 
@@ -501,7 +502,7 @@ export default {
 
     handleAdd () {
       this.formTitle = '新增'
-      this.formShow = 'edit'
+      this.formShow = true
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('add', null)
       })
@@ -574,12 +575,12 @@ export default {
 
       if (code === 0) {
         if (data.type) {
-            this.$message({
-              type: "success",
-              message: data.msg || "同步成功"
-            });
-          
-            this.loadTable()
+          this.$message({
+            type: "success",
+            message: data.msg || "同步成功"
+          });
+
+          this.loadTable()
         } else {
           this.$message.error(data.msg)
         }
diff --git a/src/views/modules/communityParty/regionalParty/unitsDetail.vue b/src/views/modules/communityParty/regionalParty/unitsDetail.vue
index 306fc3f83..b9f18486b 100644
--- a/src/views/modules/communityParty/regionalParty/unitsDetail.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsDetail.vue
@@ -106,7 +106,7 @@ export default {
     }
   },
   components: {},
-  mounted () {
+  created () {
     this.initMap()
   },
 
@@ -118,6 +118,7 @@ export default {
     },
 
     async initForm (row) {
+
       this.startLoading()
       this.formData = { ...row }
       map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 06b5eece2..f6de440b1 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -173,14 +173,8 @@ var geocoder // 新建一个正逆地址解析类
 let loading // 加载动画
 export default {
   data () {
-    return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-
-      btnDisable: false,
-
-      unitId: '',
-      keyWords: '',
-      formData: {
+    let initFormData = () => {
+      let _form = {
         unitName: '',
         serviceMatterList: [],
         type: '',
@@ -189,9 +183,20 @@ export default {
         memberCount: 0,
         remark: '', //备注【最大500字】
         address: '', //详细地址
-        longitude: 120.38945519, //经度
-        latitude: 36.0722275//纬度
-      },
+        longitude: this.$store.state.user.longitude, //经度
+        latitude: this.$store.state.user.latitude//纬度
+      }
+
+      return _form
+    }
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      unitId: '',
+      keyWords: '',
+      formData: initFormData(),
       serviceList: [],//服务list
 
     }
@@ -462,8 +467,8 @@ export default {
         memberCount: 0,
         remark: '', //备注【最大500字】
         address: '', //详细地址
-        longitude: '', //经度
-        latitude: '' //纬度
+        longitude: this.$store.state.user.longitude, //经度
+        latitude: this.$store.state.user.latitude//纬度
       }
     },
     // 开启加载动画

From 14af9a12e2e73615ca85ff6885ba204438a3e2db Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 19 Aug 2022 13:18:12 +0800
Subject: [PATCH 03/60] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shequzhili/event/eventList.vue    | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index 1632a2d5c..b4a8e2a08 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -49,9 +49,9 @@
             <el-form-item label="事件类型"
                           prop="firstIdList">
               <el-cascader ref="cascaderEvent" v-model="eventTypeCheck" :options="cateOptions"
-                collapse-tags 
+                collapse-tags
                 :show-all-levels="false"
-                :props="{ 
+                :props="{
                   multiple: true,
                   checkStrictly: false,
                   emitPath: false,
@@ -254,7 +254,7 @@
                            label="满意度"
                            :show-overflow-tooltip="true">
             <!-- <template slot-scope="scope">
-           
+
             <span v-if="scope.row.satisfactionName">--</span>
           </template> -->
           </el-table-column>
@@ -317,6 +317,10 @@
                          @click="handleWatch(scope.row)"
                          type="text"
                          size="small">查看</el-button>
+              <el-button @click="handleDel(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--delete">删除</el-button>
 
             </template>
           </el-table-column>
@@ -400,7 +404,7 @@ export default {
     }
 
     return {
-      pageType: "list", // 列表list 新增add  处理dispose 详情info 
+      pageType: "list", // 列表list 新增add  处理dispose 详情info
       user: {},
       agencyId: '',
       gridList: [],//所属网格list--场所区域
@@ -694,15 +698,22 @@ export default {
       this.getTableData();
     },
 
-    async handleDel (rowData, rowIndex) {
-      console.log(rowData, rowIndex);
-      const url =
-        "/heart/iccommunityselforganization/delcommunityselforganization";
-      const { tableData } = this;
+    async handleDel (rowData) {
+      let message = "确认删除?";
 
-      const { data, code, msg } = await requestPost(url, {
-        orgId: tableData[rowIndex].orgId,
-      });
+      this.$confirm(message, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.delEvent(rowData.icEventId);
+      }).catch((err) => { });
+    },
+    async delEvent (eventId){
+      const url = "/gov/project/icEvent/delete";
+      let idsArr = [eventId];
+
+      const { data, code, msg } =await requestPost(url, idsArr);
 
       if (code === 0) {
         this.$message.success("删除成功！");
@@ -790,7 +801,7 @@ export default {
         secondIdList: [],
       }
       this.eventTypeCheck = []
-      
+
 
       this.pageNo = 1
       this.getTableData();

From 09e4578c8e1401f09cd16ee9dac3b1ee6f4310c8 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 19 Aug 2022 16:01:25 +0800
Subject: [PATCH 04/60] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/validate.js             |  10 +
 src/views/components/resiForm.vue | 495 ++++++++++++++++--------------
 2 files changed, 272 insertions(+), 233 deletions(-)

diff --git a/src/utils/validate.js b/src/utils/validate.js
index a130010f2..659eeb346 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -39,3 +39,13 @@ export function isURL(s) {
 export function isCard(s) {
   return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s);
 }
+/**
+ * 护照
+ * @param {*} s
+ */
+export function isPassport(s) {
+  let reg=/(^[EeKkGgDdSsPpHh]\d{8}$)|(^(([Ee][a-fA-F])|([DdSsPp][Ee])|([Kk][Jj])|([Mm][Aa])|(1[45]))\d{7}$)/;  //护照（包括香港和澳门）
+
+
+  return reg.test(s);
+}
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 505fe55c0..014216e24 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -1,91 +1,115 @@
 <template>
-  <div :id="formId" class="resi-container">
-    <el-form :ref="formId" class="resi-form" :model="form" :rules="rulesForm" :label-width="labelWidth">
+  <div :id="formId"
+       class="resi-container">
+    <el-form :ref="formId"
+             class="resi-form"
+             :model="form"
+             :rules="rulesForm"
+             :label-width="labelWidth">
       <template v-if="supportAdd">
         <el-row style="margin-bottom: 10px;">
           <el-col :span="24">
-            <el-button icon="el-icon-plus" size="small" @click="handleAddRow"></el-button>
+            <el-button icon="el-icon-plus"
+                       size="small"
+                       @click="handleAddRow"></el-button>
           </el-col>
         </el-row>
-        <resi-form v-for="(item, index) in addList" :key="index"  :ref="'baseForms' + index" :columns="3" :form-list="formList" :form-id="'baseForms' + item" />
+        <resi-form v-for="(item, index) in addList"
+                   :key="index"
+                   :ref="'baseForms' + index"
+                   :columns="3"
+                   :form-list="formList"
+                   :form-id="'baseForms' + item" />
       </template>
       <template v-else>
-        <el-row v-if="fixed" class="resi-row">
+        <el-row v-if="fixed"
+                class="resi-row">
           <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
           <el-col :span="6">
-              <el-form-item prop="GRID_ID" label="所属网格">
+            <el-form-item prop="GRID_ID"
+                          label="所属网格">
               <!-- <div class="resi-cell"> -->
-                <!-- <div class="resi-cell-label">{{n.label}}</div> -->
-                <div class="resi-cell-value">
-                  <el-select v-model.trim="form.GRID_ID" placeholder="请选择网格" size="small"
-                  clearable class="resi-cell-select" @change="handleChangeGrid"
-                  >
-                    <el-option
-                      v-for="item in optionsG"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
+              <!-- <div class="resi-cell-label">{{n.label}}</div> -->
+              <div class="resi-cell-value">
+                <el-select v-model.trim="form.GRID_ID"
+                           placeholder="请选择网格"
+                           size="small"
+                           clearable
+                           class="resi-cell-select"
+                           @change="handleChangeGrid">
+                  <el-option v-for="item in optionsG"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+              </div>
               <!-- </div> -->
             </el-form-item>
           </el-col>
           <el-col :span="18">
-              <el-form-item label="所属房屋" required>
-                <div class="resi-cell-value">
-                  <div class="resi-cell-col">
-                    <el-form-item prop="VILLAGE_ID">
-                      <el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small"
-                      clearable class="resi-cell-select" @change="handleChangeV"
-                      >
-                        <el-option
-                          v-for="item in optionsV"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="BUILD_ID">
-                      <el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
-                      clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeB"
-                      >
-                        <el-option
-                          v-for="item in optionsB"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="UNIT_ID">
-                      <el-select v-model.trim="form.UNIT_ID" placeholder="请选择单元" size="small"
-                      clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeD"
-                      >
-                        <el-option
-                          v-for="item in optionsD"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="HOME_ID">
-                      <el-select v-model.trim="form.HOME_ID" placeholder="请选择房号" size="small"
-                      clearable class="resi-cell-select resi-cell-select-middle"
-                      @change="handleChangeH"
-                      >
-                        <el-option
-                          v-for="item in optionsH"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                  </div>
-                  <!-- <el-col :span="6">
+            <el-form-item label="所属房屋"
+                          required>
+              <div class="resi-cell-value">
+                <div class="resi-cell-col">
+                  <el-form-item prop="VILLAGE_ID">
+                    <el-select v-model.trim="form.VILLAGE_ID"
+                               placeholder="请选择小区"
+                               size="small"
+                               clearable
+                               class="resi-cell-select"
+                               @change="handleChangeV">
+                      <el-option v-for="item in optionsV"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="BUILD_ID">
+                    <el-select v-model.trim="form.BUILD_ID"
+                               placeholder="请选择楼号"
+                               size="small"
+                               clearable
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeB">
+                      <el-option v-for="item in optionsB"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="UNIT_ID">
+                    <el-select v-model.trim="form.UNIT_ID"
+                               placeholder="请选择单元"
+                               size="small"
+                               clearable
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeD">
+                      <el-option v-for="item in optionsD"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="HOME_ID">
+                    <el-select v-model.trim="form.HOME_ID"
+                               placeholder="请选择房号"
+                               size="small"
+                               clearable
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeH">
+                      <el-option v-for="item in optionsH"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </div>
+                <!-- <el-col :span="6">
                     
                   </el-col>
                   <el-col :span="6">
@@ -97,41 +121,42 @@
                   <el-col :span="6">
                     
                   </el-col> -->
-                </div>
+              </div>
             </el-form-item>
           </el-col>
-          
+
         </el-row>
-        <el-row v-for="(item, index) in sliceList(formList, columns)" :key="index" class="resi-row">
-            <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
-            <el-col v-for="n in item" :key="n.itemId" :span="item.length === 1 ? 24 : (24/columns)"
-            :style="n.itemType === 'divider' && 'display: none;'">
-              <el-form-item :prop="n.columnName" :label="n.label">
-                <!-- <div class="resi-cell"> -->
-                  <!-- <div class="resi-cell-label">{{n.label}}</div> -->
-                  <div class="resi-cell-value">
-                    <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
-                      <el-input
-                        v-if="n.validType"
-                        v-model.trim="form[n.columnName]"
-                        class="resi-cell-input"
-                        size="small"
-                        clearable
-                        placeholder="请输入内容"
-                        @blur="handleValidBlur(n)"
-                        >
-                      </el-input>
-                      <el-input
-                        v-else
-                        v-model.trim="form[n.columnName]"
-                        class="resi-cell-input"
-                        size="small"
-                        clearable
-                        placeholder="请输入内容"
-                        >
-                      </el-input>
-                    </template>
-                    <!-- <template v-if="n.itemType === 'textarea'">
+        <el-row v-for="(item, index) in sliceList(formList, columns)"
+                :key="index"
+                class="resi-row">
+          <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
+          <el-col v-for="n in item"
+                  :key="n.itemId"
+                  :span="item.length === 1 ? 24 : (24/columns)"
+                  :style="n.itemType === 'divider' && 'display: none;'">
+            <el-form-item :prop="n.columnName"
+                          :label="n.label">
+              <!-- <div class="resi-cell"> -->
+              <!-- <div class="resi-cell-label">{{n.label}}</div> -->
+              <div class="resi-cell-value">
+                <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
+                  <el-input v-if="n.validType"
+                            v-model.trim="form[n.columnName]"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容"
+                            @blur="handleValidBlur(n)">
+                  </el-input>
+                  <el-input v-else
+                            v-model.trim="form[n.columnName]"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容">
+                  </el-input>
+                </template>
+                <!-- <template v-if="n.itemType === 'textarea'">
                       <el-input
                         v-model.trim="form[n.columnName]"
                         class="resi-cell-textarea"
@@ -142,88 +167,90 @@
                         >
                       </el-input>
                     </template> -->
-                    <el-date-picker
-                      v-else-if="n.itemType === 'datepicker'"
-                      v-model.trim="form[n.columnName]"
-                      class="resi-cell-input"
-                      type="date"
-                      size="small"
-                      clearable
-                      placeholder="选择日期"
-                      format="yyyy 年 MM 月 dd 日"
-                      value-format="yyyy-MM-dd">
-                    </el-date-picker>
-                    <el-date-picker
-                      v-else-if="n.itemType === 'daterange'"
-                      v-model.trim="form[n.columnName]"
-                      type="daterange"
-                      align="right"
-                      unlink-panels
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                      value-format="yyyy-MM-dd"
-                      >
-                    </el-date-picker>
-                    <el-time-picker
-                      v-else-if="n.itemType === 'timepicker'"
-                      v-model.trim="form[n.columnName]"
-                      placeholder="任意时间点">
-                    </el-time-picker>
-                    <el-time-picker
-                      v-else-if="n.itemType === 'timerange'"
-                      v-model.trim="form[n.columnName]"
-                      is-range
-                      class="resi-cell-range"
-                      range-separator="至"
-                      start-placeholder="开始时间"
-                      end-placeholder="结束时间"
-                      placeholder="选择时间范围">
-                    </el-time-picker>
-                    <el-select v-else-if="n.itemType === 'select'" v-model.trim="form[n.columnName]"
-                    :multiple="n.multiSelect"
-                    placeholder="请选择" size="small" clearable class="resi-cell-select">
-                      <el-option
-                        v-for="item in n.options || options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                    <!-- <el-cascader
+                <el-date-picker v-else-if="n.itemType === 'datepicker'"
+                                v-model.trim="form[n.columnName]"
+                                class="resi-cell-input"
+                                type="date"
+                                size="small"
+                                clearable
+                                placeholder="选择日期"
+                                format="yyyy 年 MM 月 dd 日"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+                <el-date-picker v-else-if="n.itemType === 'daterange'"
+                                v-model.trim="form[n.columnName]"
+                                type="daterange"
+                                align="right"
+                                unlink-panels
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+                <el-time-picker v-else-if="n.itemType === 'timepicker'"
+                                v-model.trim="form[n.columnName]"
+                                placeholder="任意时间点">
+                </el-time-picker>
+                <el-time-picker v-else-if="n.itemType === 'timerange'"
+                                v-model.trim="form[n.columnName]"
+                                is-range
+                                class="resi-cell-range"
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间"
+                                placeholder="选择时间范围">
+                </el-time-picker>
+                <el-select v-else-if="n.itemType === 'select'"
+                           v-model.trim="form[n.columnName]"
+                           :multiple="n.multiSelect"
+                           placeholder="请选择"
+                           size="small"
+                           clearable
+                           class="resi-cell-select">
+                  <el-option v-for="item in n.options || options"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+                <!-- <el-cascader
                       :options="options"
                       :props="{ checkStrictly: true }"
                       clearable></el-cascader> -->
-                    <el-cascader
-                      v-else-if="n.itemType === 'cascader'"
-                      v-model.trim="form[n.columnName]"
-                      :options="n.options"
-                      :props="{ emitPath: false }"
-                      clearable
-                      size="small"
-                      class="resi-cell-select">
-                    </el-cascader>
-                    <template v-else-if="n.itemType === 'radio'">
-                      <el-radio v-for="ns in n.options" :key="ns.value" v-model.trim="form[n.columnName]"
-                      :label="ns.value" @change="hanldeChangeRadio(n)">
-                        {{ ns.label }}
-                      </el-radio>
-                      <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
-                    </template>
-                    <template v-else-if="n.itemType === 'checkbox'">
-                      <el-checkbox-group v-model.trim="form[n.columnName]">
-                        <template v-for="ns in n.options">
-                          <el-checkbox v-if="ns.value != 'dangyuanzhongxinhu'" :key="ns.value" :label="ns.value">
-                            {{ns.label}}
-                          </el-checkbox>
-                        </template>
-                        <!-- <el-checkbox label="n.la"></el-checkbox> -->
-                      </el-checkbox-group>
+                <el-cascader v-else-if="n.itemType === 'cascader'"
+                             v-model.trim="form[n.columnName]"
+                             :options="n.options"
+                             :props="{ emitPath: false }"
+                             clearable
+                             size="small"
+                             class="resi-cell-select">
+                </el-cascader>
+                <template v-else-if="n.itemType === 'radio'">
+                  <el-radio v-for="ns in n.options"
+                            :key="ns.value"
+                            v-model.trim="form[n.columnName]"
+                            :label="ns.value"
+                            @change="hanldeChangeRadio(n)">
+                    {{ ns.label }}
+                  </el-radio>
+                  <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
+                </template>
+                <template v-else-if="n.itemType === 'checkbox'">
+                  <el-checkbox-group v-model.trim="form[n.columnName]">
+                    <template v-for="ns in n.options">
+                      <el-checkbox v-if="ns.value != 'dangyuanzhongxinhu'"
+                                   :key="ns.value"
+                                   :label="ns.value">
+                        {{ns.label}}
+                      </el-checkbox>
                     </template>
-                  </div>
-                <!-- </div> -->
-              </el-form-item>
-            </el-col>
+                    <!-- <el-checkbox label="n.la"></el-checkbox> -->
+                  </el-checkbox-group>
+                </template>
+              </div>
+              <!-- </div> -->
+            </el-form-item>
+          </el-col>
         </el-row>
       </template>
     </el-form>
@@ -231,7 +258,7 @@
 </template>
 
 <script>
-import { isCard, isMobile } from '@/utils/validate'
+import { isCard, isPassport, isMobile } from '@/utils/validate'
 import { computedCard } from '@/utils/index'
 
 export default {
@@ -286,10 +313,10 @@ export default {
     }
     let checkIdCard = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入身份证'))
+        callback(new Error('请输入证件号码'))
       } else {
-        if (!isCard(value)) {
-          callback(new Error('身份证号格式不正确'))
+        if (!isCard(value) && !isPassport(value)) {
+          callback(new Error('证件号码格式不正确'))
         }
         callback()
       }
@@ -311,13 +338,13 @@ export default {
             _form[item.columnName] = obj[item.columnName]
             item.isChange = true
           }
-          
+
         } else {
           if (item.multiSelect) _form[item.columnName] = []
           else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue
           else _form[item.columnName] = ''
         }
-        
+
 
         // if (item.optionSourceType === 'remote') {
         //   this.getOptionsLists(item.optionSourceValue).then(res => {
@@ -351,7 +378,7 @@ export default {
     let form = initForm(this.formInfo, this.formList)
     let rules = initRules(this.formList)
     console.log('rulessss', rules)
-    let tempFormList = [ ...this.formList ].map(item => {
+    let tempFormList = [...this.formList].map(item => {
       const isChange = (item.itemType == 'radio' && item.defaultValue == '0') && true
       return {
         ...item,
@@ -506,27 +533,30 @@ export default {
         // }
       })
     },
-    hanldeChangeRadio(n) {
+    hanldeChangeRadio (n) {
       this.$emit('changeradio', n)
     },
-    handleValidBlur(n) {
+    handleValidBlur (n) {
       console.log('n---', n)
       if (n.columnName !== 'ID_CARD') return
-      if (!isCard(this.form.ID_CARD)) return
+      if (!isCard(this.form.ID_CARD) && !isPassport(this.form.ID_CARD)) return
       const { user } = this.$store.state
       let huji = '', i = 0
       if (user.areaCodePath && user.areaCodePath.length > 0) {
         i = user.areaCodePath.length - 1
         huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
       }
-      const _id = this.form.ID_CARD.substr(0, 6)
-      const { sex, birth, age } = computedCard(this.form.ID_CARD)
-      this.form.BIRTHDAY = birth
-      this.form.GENDER = sex == 1 ? '1' : '2'
-      this.form.IS_OLD_PEOPLE = age >= 60 ? '1' : '0'
-      this.form.IS_BDHJ = huji == _id ? '1' : ''
-      this.validateIdcard(this.form.ID_CARD)
-      console.log('age-----', age, _id)
+      if (this.form.ID_CARD.length === 18 || this.form.ID_CARD.length === 15) {
+        const _id = this.form.ID_CARD.substr(0, 6)
+        const { sex, birth, age } = computedCard(this.form.ID_CARD)
+        this.form.BIRTHDAY = birth
+        this.form.GENDER = sex == 1 ? '1' : '2'
+        this.form.IS_OLD_PEOPLE = age >= 60 ? '1' : '0'
+        this.form.IS_BDHJ = huji == _id ? '1' : ''
+        this.validateIdcard(this.form.ID_CARD)
+        console.log('age-----', age, _id)
+      }
+
     },
     handleOpenSearch () {
       this.openSearch = !this.openSearch
@@ -551,7 +581,7 @@ export default {
           if (this.isParty) {
             this.$emit('changegroup', { value, partyInfo: this.partyInfo, childGroup: item.childGroup })
           } else this.$emit('changegroup', { value, childGroup: item.childGroup })
-          
+
         }
       })
     },
@@ -589,9 +619,9 @@ export default {
       this.getHouseList()
     },
     // 为了实现根据房屋类型改版是否租户的需求
-    handleChangeH(val){
+    handleChangeH (val) {
       let item = this.optionsH.find(item => item.value === val);
-      if(item && item.type == '1'){
+      if (item && item.type == '1') {
         this.form.IS_TENANT = '1'
         console.log('item-----', item)
       } else this.form.IS_TENANT = '0'
@@ -619,7 +649,7 @@ export default {
       let arr = []
       this.addList.forEach(item => {
         // console.log('handlerMuscForm----000', this.$refs['baseForms' + item][0].handleForm())
-        arr.push([ ...this.$refs['baseForms' + item][0].handleForm() ])
+        arr.push([...this.$refs['baseForms' + item][0].handleForm()])
       })
       // console.log('handlerMuscForm----111', arr)
       let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
@@ -698,19 +728,19 @@ export default {
             return this.$message.error(res.msg)
           } else {
             console.log('获取查询详情成功', res.data)
-            
+
             if (res.data.isVolunteer == '1') this.form.IS_VOLUNTEER = '1'
             else this.form.IS_VOLUNTEER = '0'
-            
+
             if (res.data.isPartyMember == '1') {
               this.form.IS_PARTY = '1'
-               this.isParty = true
+              this.isParty = true
               this.partyInfo = res.data.detail.ic_party_member
             } else this.form.IS_PARTY = '0'
 
             // if (type == 'vol') {
             //   this.isParty = false
-              
+
             // } else if (res.data.isPartyMember == '1' && val == 'party') {
             //   this.isParty = true
             // }
@@ -822,12 +852,13 @@ export default {
 
 <style lang="scss" scoped>
 .resi-form {
-  :deep .el-date-editor.el-input, .el-date-editor.el-input__inner {
+  :deep .el-date-editor.el-input,
+  .el-date-editor.el-input__inner {
     width: 100% !important;
   }
 }
 .resi-cell-value .resi-cell-input {
-    width: 190px;
+  width: 190px;
 }
 .resi-cell-value {
   :deep .el-col {
@@ -839,33 +870,31 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
-
 .resi-form .resi-row {
   margin-bottom: 0;
 }
 
-
-  .resi-cell-value .resi-cell-textarea {
-    width: 300px;
-  }
-  .resi-cell-col {
-    display: flex;
-    .el-form-item {
-      margin-right: 10px;
-    }
-  }
-  .resi-cell-select {
-    width: 190px;
-    box-sizing: border-box;
+.resi-cell-value .resi-cell-textarea {
+  width: 300px;
+}
+.resi-cell-col {
+  display: flex;
+  .el-form-item {
     margin-right: 10px;
-    &-middle {
-      width: 130px;
-    }
-    &-small {
-      width: 88px;
-    }
   }
-  .resi-cell-select:last-child {
-    margin-right: 0;
+}
+.resi-cell-select {
+  width: 190px;
+  box-sizing: border-box;
+  margin-right: 10px;
+  &-middle {
+    width: 130px;
+  }
+  &-small {
+    width: 88px;
   }
+}
+.resi-cell-select:last-child {
+  margin-right: 0;
+}
 </style>

From 4c16e7d291869028ff568d17f7bff7967c6ede0a Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 22 Aug 2022 10:09:40 +0800
Subject: [PATCH 05/60] =?UTF-8?q?=E6=8D=A2=E4=B8=AA=E5=80=9F=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/shundeju/controlCount.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/visual/shundeju/controlCount.vue b/src/views/modules/visual/shundeju/controlCount.vue
index 9263b8886..6a08398b7 100644
--- a/src/views/modules/visual/shundeju/controlCount.vue
+++ b/src/views/modules/visual/shundeju/controlCount.vue
@@ -48,7 +48,7 @@
               >
             </el-date-picker>
           </div>
-        </div>  
+        </div>
       </div>
       <div class="warning-box-bottom">
         <screen-table
@@ -180,7 +180,7 @@ export default {
   methods: {
     // 从这里开始写
     async getChartTraffic () {
-      const url = "/pli/power/visitVisitor/chart/traffic";
+      const url = "/epmetuser/icResiCollectVisitor/chart/traffic";
       let params = {
         date: this.timeFormat(this.lineTime)
       };
@@ -231,7 +231,7 @@ export default {
           }
         })
         this.total = data.total
-        
+
       } else {
       }
       this.visibleLoading = false;
@@ -440,7 +440,7 @@ export default {
           line-height: 24px;
         }
       }
-      
+
     }
   }
 
@@ -533,7 +533,7 @@ export default {
     position: relative;
     flex: 1;
     display: flex;
-    
+
   }
 }
 .echart-wr {

From eadbd55e1542bedc48c614cb30eb195351b52abc Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 22 Aug 2022 15:31:21 +0800
Subject: [PATCH 06/60] =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/shundeju/controlCount.vue  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/visual/shundeju/controlCount.vue b/src/views/modules/visual/shundeju/controlCount.vue
index 6a08398b7..ae3bb12ba 100644
--- a/src/views/modules/visual/shundeju/controlCount.vue
+++ b/src/views/modules/visual/shundeju/controlCount.vue
@@ -100,15 +100,15 @@ export default {
         {
           'min-width': '210px'
         },
-        {
-          'min-width': '20px'
-        },
+        // {
+        //   'min-width': '20px'
+        // },
         {
           'min-width': '50px'
         },
-        {
-          'min-width': '20px'
-        },
+        // {
+        //   'min-width': '20px'
+        // },
         {
           'min-width': '210px'
         },
@@ -133,15 +133,15 @@ export default {
         { title: "姓名", coulmn: 'name' },
         { title: "人脸", coulmn: 'faceImg' },
         { title: "身份证", coulmn: 'idCard' },
-        { title: "性别", coulmn: 'gender' },
+        // { title: "性别", coulmn: 'gender' },
         { title: "手机号", coulmn: 'mobile' },
-        { title: "类型", coulmn: 'type' },
+        // { title: "类型", coulmn: 'type' },
         { title: "出入时间", coulmn: 'createdTime' },
-        { title: "进入原因", coulmn: 'visitReason' },
-        { title: "小区", coulmn: 'residential' },
-        { title: "楼号", coulmn: 'building' },
-        { title: "单元", coulmn: 'unit' },
-        { title: "房间", coulmn: 'room' },
+        { title: "进入原因", coulmn: 'comeReason' },
+        { title: "小区", coulmn: 'villageName' },
+        { title: "楼号", coulmn: 'buildName' },
+        { title: "单元", coulmn: 'unitName' },
+        { title: "房间", coulmn: 'homeName' },
       ],
       timeRange: '',
       tableData: [],
@@ -200,7 +200,7 @@ export default {
       }
     },
     async getVisitVisitorPage () {
-      const url = "/pli/power/visitVisitor/page";
+      const url = "/epmetuser/icResiCollectVisitor/page";
       let params = {
         page: this.pageNo,
         limit: this.pageSize,

From 9983b3292f295e7a815b1f3dd51c60c8517aeaaa Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 22 Aug 2022 15:54:37 +0800
Subject: [PATCH 07/60] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?=
 =?UTF-8?q?=E6=88=96=E6=8A=A4=E7=85=A7=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/validate.js                         |  4 +--
 .../modules/base/huji/chusheng/cpts/edit.vue  |  4 +--
 .../modules/base/huji/chusheng/index.vue      |  6 ++--
 .../modules/base/huji/immigration/edit.vue    | 36 +++++++++----------
 .../modules/base/huji/immigration/index.vue   | 14 ++++----
 .../change/changedeath-add-or-update.vue      |  4 +--
 .../modules/plugins/change/changedeath.vue    |  6 ++--
 .../plugins/change/changerelocation.vue       |  6 ++--
 .../change/changewelfare-add-or-update.vue    |  4 +--
 .../modules/plugins/change/changewelfare.vue  |  6 ++--
 src/views/modules/plugins/change/verify.vue   | 14 ++++----
 .../modules/plugins/change/verifyForm.vue     | 12 +++----
 12 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/utils/validate.js b/src/utils/validate.js
index a130010f2..0b595955a 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -33,9 +33,9 @@ export function isURL(s) {
 }
 
 /**
- * 身份证
+ * 身份证或证件号
  * @param {*} s
  */
 export function isCard(s) {
-  return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s);
+  return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|(^\w{2}\d{7}$|^\w{1}\d{8}$)/.test(s);
 }
diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index ccf2018e4..b3e0db470 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -170,7 +170,7 @@
         </el-form-item>
 
         <el-form-item
-          label="身份证号"
+          label="证件号"
           prop="idCard"
           label-width="150px"
           style="display: block"
@@ -178,7 +178,7 @@
           <el-input
             class="item_width_1"
             maxlength="30"
-            placeholder="请输入身份证号"
+            placeholder="请输入身份证号或护照号"
             v-model="fmData.idCard"
             @blur="handleBlurId"
             :disabled="formType === 'edit'"
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 99b9837f0..fca0d3e4a 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -131,13 +131,13 @@
             </el-input>
           </el-form-item>
 
-          <el-form-item label="身份证号" prop="idCard">
+          <el-form-item label="证件号" prop="idCard">
             <el-input
               v-model="fmData.idCard"
               class="resi-cell-input"
               size="small"
               clearable
-              placeholder="请输入"
+              placeholder="请输入身份证号或证件号"
             >
             </el-input>
           </el-form-item>
@@ -282,7 +282,7 @@
         <el-table-column
           prop="idCard"
           align="center"
-          label="身份证号"
+          label="证件号"
           :show-overflow-tooltip="true"
         >
         </el-table-column>
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 2999880c6..764b7a8b9 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -153,7 +153,7 @@
               >补充居民信息</el-checkbox
             >
           </template>
-          
+
           <el-checkbox
             v-else
             v-model="fmData.isCheck"
@@ -183,14 +183,14 @@
         </el-form-item>
 
         <el-form-item
-          label="身份证号"
+          label="证件号"
           prop="idCard"
           label-width="150px"
           style="display: block"
         >
           <el-input
             class="item_width_1"
-            placeholder="请输入身份证号"
+            placeholder="请输入身份证号或护照号"
             v-model="fmData.idCard"
             :disabled="formType === 'edit'"
             @blur="handleBlurId"
@@ -282,9 +282,9 @@
             disabled
             v-model="fmData.sourceAddress"
           />
-          <el-cascader v-else ref="nowArea" class="item_width_1" :props="areaProps" 
+          <el-cascader v-else ref="nowArea" class="item_width_1" :props="areaProps"
             v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
-          
+
         </el-form-item>
         <el-form-item
           label="详细地址"
@@ -439,10 +439,10 @@ export default {
     dataRule() {
       let checkIdCard = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入身份证'))
+          callback(new Error('请输入证件号'))
         } else {
           if (!isCard(value)) {
-            callback(new Error('身份证号格式不正确'))
+            callback(new Error('证件号格式不正确'))
           }
           callback()
         }
@@ -457,7 +457,7 @@ export default {
         ],
         name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
         idCard: [
-          { required: true, message: '身份证号不能为空', trigger: 'blur' },
+          { required: true, message: '证件号不能为空', trigger: 'blur' },
           { required: true, validator: checkIdCard, trigger: 'blur' }
         ],
         inTime: [
@@ -491,7 +491,7 @@ export default {
   async mounted() {
     console.log('mounted-----我执行了')
     await this.getGridList()
-    
+
     this.getRelationList()
   },
 
@@ -616,7 +616,7 @@ export default {
 
       if (code === 0) {
         const nodes = data.map(item => ({
-          value: item.areaCode, // 
+          value: item.areaCode, //
           label: item.areaName,
           code: item.areaCode,
           level: item.level,
@@ -748,7 +748,7 @@ export default {
             return this.$message.error(res.msg)
           } else {
             console.log('获取户主信息成功', res.data)
-            
+
             if (res.data) {
               const { name } = res.data
               this.fmData.householderName = name
@@ -767,7 +767,7 @@ export default {
       this.$refs.ref_form.resetFields()
 
       this.formType = type
-      
+
       if (id) {
         await this.getDatail(id)
       }
@@ -780,7 +780,7 @@ export default {
     },
     async getDatail(moveInId) {
       let url = '/epmetuser/icMoveIn/detail'
-      
+
       const params = {
         moveInId: moveInId || ''
       }
@@ -793,7 +793,7 @@ export default {
     },
 
     async handleComfirm() {
-      
+
       // setTimeout(() => {
       //   this.btnDisable = false
       // }, 10000)
@@ -821,21 +821,21 @@ export default {
                   this.fmData.isReplace = '1'
                   this.submit()
                 }).catch(() => {
-                  this.fmData.isReplace = '0'    
-                  this.submit()   
+                  this.fmData.isReplace = '0'
+                  this.submit()
                 });
                 return
               }
             }
           }
           this.submit()
-          
+
         }
       })
     },
 
     async submit() {
-      
+
       let url = ''
       if (this.formType === 'add') {
         url = '/epmetuser/icMoveIn/add'
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 641343708..8f4673564 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -134,7 +134,7 @@
             </el-input>
           </el-form-item>
 
-          <el-form-item label="身份证号" prop="idCard">
+          <el-form-item label="证件号" prop="idCard">
             <el-input
               v-model="fmData.idCard"
               class="resi-cell-input"
@@ -291,7 +291,7 @@
           prop="idCard"
           align="center"
           min-width="160"
-          label="身份证号"
+          label="证件号"
         >
         </el-table-column>
 
@@ -491,9 +491,9 @@ export default {
       const _h = this.clientHeight - this.searchH
       console.log('computed-searchH---_h', _h)
       return this.$store.state.inIframe ? h : _h
-      
+
     },
-    
+
     changeVDisabled() {
       return !this.fmData.villageId
     },
@@ -519,7 +519,7 @@ export default {
       const h = this.clientHeight - this.searchH + this.iframeHeight
       const _h = this.clientHeight - this.searchH
       console.log('computed-searchH---_h', _h)
-      
+
       this.$nextTick(() => {
         this.tableHeight = this.$store.state.inIframe ? h : _h
       })
@@ -831,13 +831,13 @@ export default {
           console.log('res----dddd', res)
           // this.download(res.data, title + '.xls')
           // this.getTemplateList()
-          
+
           // this.exportLoading = false
           // if (res.data.code && res.data.code == 9999) {
           //   return this.$message.error(res.data.msg)
           // }
           this.formatData(res)
-          
+
         })
         .catch(err => {
           console.log('err', err)
diff --git a/src/views/modules/plugins/change/changedeath-add-or-update.vue b/src/views/modules/plugins/change/changedeath-add-or-update.vue
index 19cdb429d..bab279502 100644
--- a/src/views/modules/plugins/change/changedeath-add-or-update.vue
+++ b/src/views/modules/plugins/change/changedeath-add-or-update.vue
@@ -7,8 +7,8 @@
           <el-form-item label="姓名" prop="name">
           <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
-          <el-form-item label="身份证" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
+          <el-form-item label="证件号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="身份证号或护照号"></el-input>
       </el-form-item>
           <el-form-item label="手机号" prop="mobile">
           <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index 725c58069..d1a75bffb 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -12,13 +12,13 @@
                     placeholder="请输入姓名">
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="证件号"
                       prop="idCard">
           <el-input v-model="dataForm.idCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入身份证号或护照号">
           </el-input>
         </el-form-item>
         <el-form-item label="手机"
@@ -82,7 +82,7 @@
             <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">{{scope.row.name}}</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center">
           <template slot-scope="scope">
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 57faca640..944baeecf 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -109,13 +109,13 @@
                     placeholder="请输入姓名">
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="证件号"
                       prop="idCard">
           <el-input v-model="dataForm.idCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入身份证号或护照号">
           </el-input>
         </el-form-item>
         <el-form-item label="手机"
@@ -181,7 +181,7 @@
         <el-table-column prop="oldAddress" label="所属房屋" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="ownerName" label="户主姓名" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center" min-width="70" show-overflow-tooltip>
           <template slot-scope="scope">
             {{
diff --git a/src/views/modules/plugins/change/changewelfare-add-or-update.vue b/src/views/modules/plugins/change/changewelfare-add-or-update.vue
index 902508f5b..c672c13e8 100644
--- a/src/views/modules/plugins/change/changewelfare-add-or-update.vue
+++ b/src/views/modules/plugins/change/changewelfare-add-or-update.vue
@@ -10,8 +10,8 @@
           <el-form-item label="姓名" prop="name">
           <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
-          <el-form-item label="身份证" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
+          <el-form-item label="护照号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="身份证号或护照号"></el-input>
       </el-form-item>
           <el-form-item label="手机号" prop="mobile">
           <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index fe4ecbd6e..c37a65e93 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -12,13 +12,13 @@
                     placeholder="请输入姓名">
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="护照号"
                       prop="idCard">
           <el-input v-model="dataForm.idCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入身份证号或护照号">
           </el-input>
         </el-form-item>
         <el-form-item label="手机"
@@ -76,7 +76,7 @@
             <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">{{scope.row.name}}</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center">
           <template slot-scope="scope">
diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue
index 76385675f..23e4239f8 100644
--- a/src/views/modules/plugins/change/verify.vue
+++ b/src/views/modules/plugins/change/verify.vue
@@ -134,7 +134,7 @@
             </el-input>
           </el-form-item>
 
-          <el-form-item label="身份证号" prop="idCard">
+          <el-form-item label="证件号" prop="idCard">
             <el-input
               v-model="fmData.idCard"
               class="resi-cell-input"
@@ -236,7 +236,7 @@
           prop="idCard"
           align="center"
           width="180"
-          label="身份证号"
+          label="证件号"
         >
         </el-table-column>
 
@@ -276,7 +276,7 @@
           align="center"
           width="100"
         />
-        
+
 
         <el-table-column fixed="right" label="操作" align="center" width="120">
           <template slot-scope="scope">
@@ -298,7 +298,7 @@
                 >审核</el-button
               >
             </template>
-            
+
           </template>
         </el-table-column>
       </el-table>
@@ -408,9 +408,9 @@ export default {
       const _h = this.clientHeight - this.searchH - 440
       console.log('computed-searchH---_h', _h)
       return this.$store.state.inIframe ? h : _h
-      
+
     },
-    
+
     changeVDisabled() {
       return !this.fmData.villageId
     },
@@ -436,7 +436,7 @@ export default {
       const h = this.clientHeight - this.searchH + this.iframeHeight
       const _h = this.clientHeight - this.searchH
       console.log('computed-searchH---_h', _h)
-      
+
       this.$nextTick(() => {
         this.tableHeight = this.$store.state.inIframe ? h : _h
       })
diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue
index 1efb046ac..125822d30 100644
--- a/src/views/modules/plugins/change/verifyForm.vue
+++ b/src/views/modules/plugins/change/verifyForm.vue
@@ -15,7 +15,7 @@
           <span>{{ detailInfo.mobile }}</span>
         </el-form-item>
         <el-form-item
-          label="身份证号:"
+          label="证件号:"
           label-width="150px"
         >
           <span>{{ detailInfo.idCard }}</span>
@@ -140,7 +140,7 @@
         </template> -->
       </el-form>
       <el-form v-if="btnType == 'detail' && isMoveOut == 1" :model="detailInfo">
-        
+
         <template>
           <el-form-item
             label="迁往区域:"
@@ -155,14 +155,14 @@
             <span>{{ detailInfo.newHomeName }}</span>
           </el-form-item>
         </template>
-        
+
         <el-form-item
           label="迁出时间:"
           label-width="150px"
         >
           <span>{{ detailInfo.moveOutDate }}</span>
         </el-form-item>
-        
+
       </el-form>
 
 
@@ -491,7 +491,7 @@ export default {
         this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : ''
       } else this.confirmResult = '1'
       if (row.newGridName) this.isMoveOut = 1
-      
+
       this.reason = row.reason
 
       // await this.loadRootAgency()
@@ -751,7 +751,7 @@ export default {
           moveOutDate: this.dataForm.outOfTime
         }
       }
-      
+
 
       const { data, code, msg } = await requestPost('/epmetuser/myHome/moveOutConfirm', params)
 

From 69d513cdd3a95038f8294bc340a0b4cd79aba875 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 22 Aug 2022 16:02:21 +0800
Subject: [PATCH 08/60] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/visitor.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/visitor.vue b/src/views/modules/base/visitor.vue
index ab33ddc80..032ee4de0 100644
--- a/src/views/modules/base/visitor.vue
+++ b/src/views/modules/base/visitor.vue
@@ -10,13 +10,13 @@
         <el-form-item label="填写时间" prop="startTime">
           <el-date-picker
             v-model="timeRange"
-            type="daterange"
+            type="datetimerange"
             clearable
             size="small"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -85,9 +85,9 @@
           label="人脸"
         >
         <template slot-scope="scope">
-          <el-image 
+          <el-image
             style="max-height: 50px; max-width: 50px;"
-            :src="scope.row.faceImg" 
+            :src="scope.row.faceImg"
             :preview-src-list="[scope.row.faceImg]">
             <div slot="error" class="image-slot">
               <!-- <i class="el-icon-picture-outline"></i> -->
@@ -155,7 +155,7 @@ export default {
   mounted() {
     this.getTableData()
   },
-  methods: {  
+  methods: {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val

From bc332423ba4ceee328a70c34b3fe6486e25016db Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Mon, 22 Aug 2022 17:09:59 +0800
Subject: [PATCH 09/60] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=B0=8F=E5=8C=BA=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/communityTable.vue | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index c579de9a7..31a6aed0d 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -8,6 +8,12 @@
                       size="small"
                       :loading="yhymLoading"
                       @click="handleYhymInfo">补全一房一码信息</el-button>
+      <el-button v-if="showYhymInfo"
+                      style=""
+                      class="diy-button--export"
+                      size="small"
+                      :loading="xcxmLoading"
+                      @click="createBatchNeiQrUrl">补全小程序小区码</el-button>
       <el-button style=""
                  class="diy-button--add"
                  size="small"
@@ -247,6 +253,7 @@ export default {
       roleList: [],//角色列表
       showYhymInfo: false, // 是否显示补全一房一码信息按钮
       yhymLoading: false,
+      xcxmLoading: false,
 
       agencyObj: {},//树所选的组织对象
 
@@ -443,7 +450,33 @@ export default {
         this.$message.error(msg)
       }
     },
+    // 补全小程序一户一码
+    async createBatchNeiQrUrl () {
+      this.xcxmLoading = true
+      const url = "/gov/org/neighborhood/createBatchNeiQrUrl"
 
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.xcxmLoading = false
+        this.$message({
+          type: "success",
+          message: "批量生成成功"
+        });
+      } else if (code > 8000) {
+        this.xcxmLoading = false
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0
+        })
+      } else {
+        this.xcxmLoading = false
+        this.$message.error(msg)
+      }
+    },
     async handleEdit (row) {
       this.formTitle = '修改小区'
       this.formShow = true

From 5432342c8714d522d579b75d4f88735f0f33d73d Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 22 Aug 2022 17:49:01 +0800
Subject: [PATCH 10/60] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?=
 =?UTF-8?q?=E6=88=96=E6=8A=A4=E7=85=A7=E5=8F=B7=20=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/validate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/validate.js b/src/utils/validate.js
index 0b595955a..480ad2692 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -37,5 +37,5 @@ export function isURL(s) {
  * @param {*} s
  */
 export function isCard(s) {
-  return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|(^\w{2}\d{7}$|^\w{1}\d{8}$)/.test(s);
+  return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/.test(s);
 }

From e44d9fd94add17915418803f57e2d4fbe4efe0e8 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 23 Aug 2022 10:10:08 +0800
Subject: [PATCH 11/60] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwujilu/addForm.vue     | 690 ++++++++----------
 1 file changed, 293 insertions(+), 397 deletions(-)

diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
index 71a5fe731..9cc357e8b 100644
--- a/src/views/modules/communityService/fuwujilu/addForm.vue
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -1,304 +1,229 @@
 <template>
   <div>
-    <div
-      class="dialog-h-content scroll-h"
-      :class="{ 'visiual-form': source === 'visiual' }"
-    >
-      <el-form
-        v-if="formType === 'add'"
-        ref="ref_form"
-        :inline="true"
-        :model="formData"
-        :rules="dataRule"
-        class="div_form"
-      >
-        <el-form-item
-          label="服务分类"
-          prop="serviceCategoryKey"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-select
-            v-model="formData.serviceCategoryKey"
-            class="item_width_1"
-            placeholder="请选择"
-            clearable
-          >
-            <el-option
-              v-for="item in categrayOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+    <div class="dialog-h-content scroll-h"
+         :class="{ 'visiual-form': source === 'visiual' }">
+      <el-form v-if="formType === 'add'"
+               ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               class="div_form">
+        <el-form-item label="服务分类"
+                      prop="serviceCategoryKey"
+                      label-width="150px"
+                      :class="{ 'form-item': source === 'visiual' }"
+                      style="display: block">
+          <el-select v-model="formData.serviceCategoryKey"
+                     class="item_width_1"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in categrayOptions"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="服务名称"
-          prop="serviceName"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入服务名称"
-            v-model="formData.serviceName"
-          >
+        <el-form-item label="服务名称"
+                      prop="serviceName"
+                      label-width="150px"
+                      :class="{ 'form-item': source === 'visiual' }"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入服务名称"
+                    v-model="formData.serviceName">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="服务组织"
-          prop="serviceOrgId"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-select
-            v-model="formData.serviceOrgType"
-            class="input-width-small"
-            placeholder="请选择"
-            clearable
-            @change="handleServiceChange('add', $event)"
-          >
-            <el-option
-              v-for="item in serviceOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+        <el-form-item label="服务组织"
+                      prop="serviceOrgId"
+                      label-width="150px"
+                      :class="{ 'form-item': source === 'visiual' }"
+                      style="display: block">
+          <el-select v-model="formData.serviceOrgType"
+                     class="input-width-small"
+                     placeholder="请选择"
+                     clearable
+                     @change="handleServiceChange('add', $event)">
+            <el-option v-for="item in serviceOptions"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
           -
-          <el-select
-            v-model="formData.serviceOrgId"
-            class="input-width-middle"
-            filterable
-            placeholder="请选择"
-            clearable
-          >
-            <el-option
-              v-for="item in serviceOptiondList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+          <el-select v-model="formData.serviceOrgId"
+                     class="input-width-middle"
+                     filterable
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in serviceOptiondList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item
-          label="服务范围"
-          prop="objList"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-cascader
-            class="item_width_1"
-            ref="myCascader"
-            v-model="scopeIdArray"
-            :key="iscascaderShow"
-            :options="casOptions"
-            :props="optionProps"
-            :show-all-levels="false"
-            @change="handleChangeScope"
-          ></el-cascader>
+        <el-form-item label="服务范围"
+                      prop="objList"
+                      label-width="150px"
+                      :class="{ 'form-item': source === 'visiual' }"
+                      style="display: block">
+          <el-cascader class="item_width_1"
+                       ref="myCascader"
+                       v-model="scopeIdArray"
+                       :key="iscascaderShow"
+                       :options="casOptions"
+                       :props="optionProps"
+                       :show-all-levels="false"
+                       @change="handleChangeScope"></el-cascader>
         </el-form-item>
 
-        <el-form-item
-          label="政策依据"
-          prop="policyId"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-select
-            v-model="formData.policyId"
-            class="input-width-small"
-            placeholder="请选择"
-            clearable
-          >
-            <el-option
-              v-for="item in policyList"
-              :key="item.policyId"
-              :label="item.title"
-              :value="item.policyId"
-            >
+        <el-form-item label="政策依据"
+                      prop="policyId"
+                      label-width="150px"
+                      :class="{ 'form-item': source === 'visiual' }"
+                      style="display: block">
+          <el-select v-model="formData.policyId"
+                     class="input-width-small"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in policyList"
+                       :key="item.policyId"
+                       :label="item.title"
+                       :value="item.policyId">
             </el-option>
           </el-select>
 
-          <el-button
-            style="margin-left: 10px"
-            type="primary"
-            size="small"
-            @click="handlePersonList"
-            >预览</el-button
-          >
+          <el-button style="margin-left: 10px"
+                     type="primary"
+                     size="small"
+                     @click="handlePersonList">预览</el-button>
         </el-form-item>
 
-        <el-form-item
-          label="经办人"
-          prop="principalName"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人姓名"
-            v-model="formData.principalName"
-          >
+        <el-form-item label="经办人"
+                      prop="principalName"
+                      :class="{ 'form-item': source === 'visiual' }"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入联系人姓名"
+                    v-model="formData.principalName">
           </el-input>
         </el-form-item>
-        <el-form-item
-          label="联系方式"
-          prop="principalContact"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人电话"
-            v-model="formData.principalContact"
-          >
+        <el-form-item label="联系方式"
+                      prop="principalContact"
+                      :class="{ 'form-item': source === 'visiual' }"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入联系人电话"
+                    v-model="formData.principalContact">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="服务时间"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          prop="serviceTimeStart"
-        >
-          <el-date-picker
-            v-model="formData.serviceTimeStart"
-            :picker-options="startPickerOptions"
-            class="item_width_2"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="开始时间"
-          >
+        <el-form-item label="服务时间"
+                      label-width="150px"
+                      :class="{ 'form-item': source === 'visiual' }"
+                      prop="serviceTimeStart">
+          <el-date-picker v-model="formData.serviceTimeStart"
+                          :picker-options="startPickerOptions"
+                          class="item_width_2"
+                          style="width: 220px"
+                          type="date"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          value="yyyy-MM-dd"
+                          placeholder="开始时间">
           </el-date-picker>
           <span class="data-tag">至</span>
-          <el-date-picker
-            v-model="formData.serviceTimeEnd"
-            :picker-options="endPickerOptions"
-            class="item_width_2 data-tag"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="结束时间"
-          >
+          <el-date-picker v-model="formData.serviceTimeEnd"
+                          :picker-options="endPickerOptions"
+                          class="item_width_2 data-tag"
+                          style="width: 220px"
+                          type="date"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          value="yyyy-MM-dd"
+                          placeholder="结束时间">
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item
-          label="备注"
-          prop="remark"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="textarea"
-            maxlength="1000"
-            show-word-limit
-            :rows="3"
-            placeholder="请输入备注，不超过1000字"
-            v-model="formData.remark"
-          ></el-input>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      :class="{ 'form-item': source === 'visiual' }"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :rows="3"
+                    placeholder="请输入备注，不超过1000字"
+                    v-model="formData.remark"></el-input>
         </el-form-item>
-        <el-form-item
-          label="直接反馈"
-          prop="remark"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-checkbox
-            :label="'是'"
-            v-model="showFeedback"
-            @change="handleChangeFeedback"
-          ></el-checkbox>
+        <el-form-item label="直接反馈"
+                      prop="remark"
+                      label-width="150px"
+                      :class="{ 'form-item': source === 'visiual' }"
+                      style="display: block">
+          <el-checkbox :label="'是'"
+                       v-model="showFeedback"
+                       @change="handleChangeFeedback"></el-checkbox>
         </el-form-item>
       </el-form>
       <div v-show="formType === 'feedback' || showFeedback">
         <!-- <h3 class="d-h3">反馈内容</h3> -->
 
-        <el-form
-          ref="ref_form_feedback"
-          :inline="true"
-          :model="feedbackFormData"
-          :rules="feedbackDataRule"
-          class="div_form"
-        >
-          <el-form-item
-            label="服务目标"
-            prop="serviceGoal"
-            :class="{ 'form-item': source === 'visiual' }"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              placeholder="请输入服务目标，不超过1000字"
-              v-model="feedbackFormData.serviceGoal"
-            ></el-input>
+        <el-form ref="ref_form_feedback"
+                 :inline="true"
+                 :model="feedbackFormData"
+                 :rules="feedbackDataRule"
+                 class="div_form">
+          <el-form-item label="服务目标"
+                        prop="serviceGoal"
+                        :class="{ 'form-item': source === 'visiual' }"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="1000"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入服务目标，不超过1000字"
+                      v-model="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
 
-          <el-form-item
-            label="服务效果"
-            prop="serviceEffect"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              placeholder="请输入服务效果，不超过1000字"
-              v-model="feedbackFormData.serviceEffect"
-            ></el-input>
+          <el-form-item label="服务效果"
+                        prop="serviceEffect"
+                        label-width="150px"
+                        :class="{ 'form-item': source === 'visiual' }"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="1000"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入服务效果，不超过1000字"
+                      v-model="feedbackFormData.serviceEffect"></el-input>
           </el-form-item>
 
-          <el-form-item
-            label="服务人数"
-            style="display: block"
-            :class="{ 'form-item': source === 'visiual' }"
-            prop="servicePeopleNumber"
-            label-width="150px"
-          >
-            <el-input-number
-              class="item_width_2"
-              v-model="feedbackFormData.servicePeopleNumber"
-              :min="0"
-              :max="9999"
-              label="服务人数"
-            ></el-input-number>
+          <el-form-item label="服务人数"
+                        style="display: block"
+                        :class="{ 'form-item': source === 'visiual' }"
+                        prop="servicePeopleNumber"
+                        label-width="150px">
+            <el-input-number class="item_width_2"
+                             v-model="feedbackFormData.servicePeopleNumber"
+                             :min="0"
+                             :max="9999"
+                             label="服务人数"></el-input-number>
           </el-form-item>
 
-          <el-form-item
-            label="服务状态"
-            style="display: block"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            prop="serviceStatus"
-          >
+          <el-form-item label="服务状态"
+                        style="display: block"
+                        label-width="150px"
+                        :class="{ 'form-item': source === 'visiual' }"
+                        prop="serviceStatus">
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
                        v-model="feedbackFormData.serviceStatus"
@@ -311,93 +236,70 @@
               </el-option>
             </el-select> -->
           </el-form-item>
-          <el-form-item
-            label="满意度"
-            style="display: block"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            prop="satisfaction"
-          >
-            <el-select
-              class="item_width_2"
-              v-model="feedbackFormData.satisfaction"
-              placeholder="全部"
-              clearable
-            >
-              <el-option
-                v-for="item in satisfyArray"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+          <el-form-item label="满意度"
+                        style="display: block"
+                        label-width="150px"
+                        :class="{ 'form-item': source === 'visiual' }"
+                        prop="satisfaction">
+            <el-select class="item_width_2"
+                       v-model="feedbackFormData.satisfaction"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in satisfyArray"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="地址"
-            prop="address"
-            :class="{ 'form-item': source === 'visiual' }"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              v-model="feedbackFormData.address"
-            ></el-input>
+          <el-form-item label="地址"
+                        prop="address"
+                        :class="{ 'form-item': source === 'visiual' }"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      v-model="feedbackFormData.address"></el-input>
           </el-form-item>
-          <el-form-item
-            label="地图位置"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            style="display: block"
-          >
+          <el-form-item label="地图位置"
+                        label-width="150px"
+                        :class="{ 'form-item': source === 'visiual' }"
+                        style="display: block">
             <div style="width: 500px">
               <div class="div_map">
                 <div id="map_app"></div>
                 <div class="div_searchmap">
-                  <el-input
-                    maxlength="50"
-                    size="mini"
-                    placeholder="请输入关键字"
-                    v-model="keyWords"
-                  >
+                  <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
-                  >
+                  <el-button style="margin-left: 10px"
+                             type="primary"
+                             size="mini"
+                             @click="handleSearchMap">查询</el-button>
                 </div>
               </div>
             </div>
           </el-form-item>
 
-          <el-form-item
-            class="block"
-            label="附件"
-            :class="{ 'form-item': source === 'visiual' }"
-            label-width="150px"
-            prop="attach"
-          >
-            <el-upload
-              class="upload-demo"
-              :action="uploadUlr"
-              accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
-              :on-success="handleFileSuccess"
-              :on-remove="handleFileRemove"
-              :limit="3"
-              :before-upload="beforeUpload"
-              :file-list="fileList"
-            >
-              <el-button
-                size="small"
-                :disabled="fileList.length === 3"
-                type="primary"
-                >点击上传</el-button
-              >
-              <div slot="tip" class="el-upload__tip">支持图片、word、pdf</div>
+          <el-form-item class="block"
+                        label="附件"
+                        :class="{ 'form-item': source === 'visiual' }"
+                        label-width="150px"
+                        prop="attach">
+            <el-upload class="upload-demo"
+                       :action="uploadUlr"
+                       accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+                       :on-success="handleFileSuccess"
+                       :on-remove="handleFileRemove"
+                       :limit="3"
+                       :before-upload="beforeUpload"
+                       :file-list="fileList">
+              <el-button size="small"
+                         :disabled="fileList.length === 3"
+                         type="primary">点击上传</el-button>
+              <div slot="tip"
+                   class="el-upload__tip">支持图片、word、pdf</div>
             </el-upload>
           </el-form-item>
         </el-form>
@@ -405,35 +307,29 @@
     </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
-      >
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
     </div>
 
-    <el-dialog
-      v-if="showPersonList"
-      :visible.sync="showPersonList"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'政策预览'"
-      width="1150px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showPersonList = false"
-    >
-      <person-list
-        ref="ref_detail_form"
-        :policyId="policyId"
-        :ruleList="ruleList"
-        @handleOk="handleOk"
-        @handleClose="handleClose"
-      >
+    <el-dialog v-if="showPersonList"
+               :visible.sync="showPersonList"
+               :append-to-body="true"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'政策预览'"
+               width="1150px"
+               top="5vh"
+               class="dialog-h"
+               @closed="showPersonList = false">
+      <person-list ref="ref_detail_form"
+                   :policyId="policyId"
+                   :ruleList="ruleList"
+                   @handleOk="handleOk"
+                   @handleClose="handleClose">
       </person-list>
     </el-dialog>
   </div>
@@ -480,7 +376,7 @@ export default {
     },
     categrayArray: {
       type: Array,
-      default() {
+      default () {
         return [];
       },
     },
@@ -491,7 +387,7 @@ export default {
     },
   },
 
-  data() {
+  data () {
     let endDisabledDate = (time) => {
       //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
       let nowData = Date.now();
@@ -555,10 +451,10 @@ export default {
       },
 
       endPickerOptions: {
-        disabledDate: endDisabledDate,
+        // disabledDate: endDisabledDate,
       },
       startPickerOptions: {
-        disabledDate: startDisabledDate,
+        // disabledDate: startDisabledDate,
       },
 
       showFeedback: false,
@@ -604,7 +500,7 @@ export default {
   },
 
   computed: {
-    dataRule() {
+    dataRule () {
       return {
         serviceName: [
           { required: true, message: "服务名称不能为空", trigger: "change" },
@@ -621,7 +517,7 @@ export default {
         ],
       };
     },
-    feedbackDataRule() {
+    feedbackDataRule () {
       return {
         serviceGoal: [
           { required: true, message: "服务目标不能为空", trigger: "blur" },
@@ -655,7 +551,7 @@ export default {
 
   components: { personList },
 
-  async mounted() {
+  async mounted () {
     this.startLoading();
     // 都已经重置了，还放在prop里干嘛，我不理解
     this.categrayOptions = this.categrayArray;
@@ -680,7 +576,7 @@ export default {
   },
 
   methods: {
-    async iniDefaultData() {
+    async iniDefaultData () {
       const { defaultData } = this;
       console.log("iniDefaultData3", defaultData);
       if (defaultData) {
@@ -701,7 +597,7 @@ export default {
     },
 
     //加载组织数据
-    async handlePersonList() {
+    async handlePersonList () {
       if (!this.formData.policyId) {
         this.$message.info("请先选择政策");
         return false;
@@ -713,7 +609,7 @@ export default {
       this.showPersonList = true;
     },
 
-    async loadRuleList() {
+    async loadRuleList () {
       const url = "/heart/policy/rulelist/" + this.policyId;
 
       let params = {};
@@ -727,14 +623,14 @@ export default {
       }
     },
 
-    handleClose() {
+    handleClose () {
       this.showPersonList = false;
     },
-    handleOk() {
+    handleOk () {
       this.showPersonList = false;
     },
 
-    async getPolicyList() {
+    async getPolicyList () {
       const url = "/heart/policy/policyListSelect";
 
       let params = {};
@@ -747,7 +643,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getDictOptions() {
+    async getDictOptions () {
       this.$http
         .post("/sys/dict/data/dictlist", {
           dictType: "user_demand_service_type",
@@ -765,7 +661,7 @@ export default {
     },
 
     // 字典
-    async getCategrayList() {
+    async getCategrayList () {
       const url = "/sys/dict/data/dictlist";
 
       let params = {
@@ -780,14 +676,14 @@ export default {
         this.$message.error(msg);
       }
     },
-    handleServiceChange(type, val) {
+    handleServiceChange (type, val) {
       if (val === "social_org") {
         if (type === "add") this.getServiceuserList(val, "add_demand");
         else this.getServiceuserList(val, "query_demand");
       } else this.getServiceuserList(val, "");
     },
 
-    async getServiceuserList(serviceType, query) {
+    async getServiceuserList (serviceType, query) {
       if (!serviceType) return false;
 
       const params = {
@@ -808,7 +704,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    handleChangeFeedback(val) {
+    handleChangeFeedback (val) {
       this.showFeedback = val;
 
       if (this.firstInitMap) {
@@ -819,7 +715,7 @@ export default {
     },
 
     // 获取服务范围树
-    async loadScopeTree() {
+    async loadScopeTree () {
       const url = "/gov/org/icServiceProject/service/serviceScopeTree";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
       let params = {};
@@ -836,7 +732,7 @@ export default {
       }
     },
 
-    handleChangeScope(value) {
+    handleChangeScope (value) {
       this.formData.objList = [];
       let selArray = this.$refs["myCascader"].getCheckedNodes();
       console.log("handleChangeScope", selArray);
@@ -846,8 +742,8 @@ export default {
             element.data.objectType === "grid"
               ? "grid"
               : element.data.objectType === "neighborhood"
-              ? "neighborhood"
-              : "agency",
+                ? "neighborhood"
+                : "agency",
           objectId: element.data.objectId,
           objectName: element.data.objectName,
         };
@@ -855,7 +751,7 @@ export default {
       });
     },
 
-    async handleComfirm() {
+    async handleComfirm () {
       if (this.formType === "add") {
         this.handleAdd();
       } else if (this.formType === "feedback") {
@@ -863,7 +759,7 @@ export default {
       }
     },
 
-    async handleAdd() {
+    async handleAdd () {
       this.btnDisable = true;
       setTimeout(() => {
         this.btnDisable = false;
@@ -897,7 +793,7 @@ export default {
       });
     },
 
-    async addFuwu() {
+    async addFuwu () {
       if (this.showFeedback) {
         this.feedbackFormData.fileList = [];
         this.feedbackFormData.fileList = [...this.fileList];
@@ -942,7 +838,7 @@ export default {
       }
     },
 
-    async handleFeedback() {
+    async handleFeedback () {
       this.btnDisable = true;
       setTimeout(() => {
         this.btnDisable = false;
@@ -958,7 +854,7 @@ export default {
       });
     },
 
-    async addFeecback() {
+    async addFeecback () {
       this.feedbackFormData.fileList = [];
       this.feedbackFormData.fileList = [...this.fileList];
       this.feedbackFormData.serviceRecordId = this.serviceRecordId;
@@ -983,7 +879,7 @@ export default {
       }
     },
 
-    beforeUpload(file) {
+    beforeUpload (file) {
       const array = file.name.split(".");
       const extension = array[array.length - 1];
 
@@ -1009,7 +905,7 @@ export default {
       }
     },
 
-    handleFileRemove(file) {
+    handleFileRemove (file) {
       if (file && file.status === "success") {
         this.fileList.splice(
           this.fileList.findIndex((item) => item.uid === file.uid),
@@ -1018,7 +914,7 @@ export default {
       }
     },
 
-    handleFileSuccess(res, file) {
+    handleFileSuccess (res, file) {
       if (res.code === 0 && res.msg === "success") {
         const array = file.name.split(".");
         const fileType = array[array.length - 1];
@@ -1051,7 +947,7 @@ export default {
     },
 
     //下载
-    handleFileDownload(file) {
+    handleFileDownload (file) {
       var a = document.createElement("a");
       var event = new MouseEvent("click");
       a.download = file.name;
@@ -1059,13 +955,13 @@ export default {
       a.href = file.url;
       a.dispatchEvent(event);
     },
-    handleCancle() {
+    handleCancle () {
       this.resetData();
       this.$emit("handleClose");
     },
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap() {
+    initMap () {
       // 定义地图中心点坐标
       var center = new window.TMap.LatLng(36.0722275, 120.38945519);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
@@ -1096,7 +992,7 @@ export default {
       this.firstInitMap = false;
     },
 
-    setMarker(lat, lng) {
+    setMarker (lat, lng) {
       markers.setGeometries([]);
       markers.add([
         {
@@ -1110,7 +1006,7 @@ export default {
       ]);
     },
 
-    handleSearchMap() {
+    handleSearchMap () {
       infoWindowList.forEach((infoWindow) => {
         infoWindow.close();
       });
@@ -1140,7 +1036,7 @@ export default {
         });
     },
 
-    handleMoveCenter() {
+    handleMoveCenter () {
       //修改地图中心点
       const center = map.getCenter();
       const lat = center.getLat();
@@ -1151,7 +1047,7 @@ export default {
       this.convert(lat, lng);
     },
 
-    convert(lat, lng) {
+    convert (lat, lng) {
       markers.setGeometries([]);
       // var input = document.getElementById('location').value.split(',');
       let location;
@@ -1179,7 +1075,7 @@ export default {
         });
     },
 
-    resetData() {
+    resetData () {
       this.formData = {
         objList: [], //
         principalName: "", //经办人(责任人)姓名
@@ -1202,7 +1098,7 @@ export default {
       };
     },
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -1210,7 +1106,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();

From 24272570465cd8064075edd07f615cd6177d0419 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 23 Aug 2022 10:42:27 +0800
Subject: [PATCH 12/60] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E7=A4=BE?=
 =?UTF-8?q?=E4=BC=9A=E7=BB=84=E7=BB=87=E6=B7=BB=E5=8A=A0=20=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E7=AD=89=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/shzz/cpts/edit.vue       | 412 +++++++++++-------
 .../modules/communityService/shzz/index.vue   |   4 +-
 2 files changed, 264 insertions(+), 152 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index af275e9dc..eb0aee65c 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -2,179 +2,209 @@
   <div>
     <div>
       <el-form
-        ref="ref_form"
-        :inline="true"
-        :model="dataForm"
-        :rules="dataRule"
-        :disabled="formType === 'detail'"
-        class="form"
+          ref="ref_form"
+          :inline="true"
+          :model="dataForm"
+          :rules="dataRule"
+          :disabled="formType === 'detail'"
+          class="form"
       >
+
+        <el-form-item label="头像" label-width="150px"
+                      prop="imageList"
+                      style="display: block">
+          <div class="imsg-list">
+            <div v-for="(item, index) in dataForm.imageList" :key="index" class="imgs-item">
+              <el-image
+                  style="width: 100px; height: 100px"
+                  :src="item"
+                  fit="fill"
+                  :preview-src-list="dataForm.imageList"></el-image>
+              <i class="el-icon-delete" @click="handleDelimg(item, index)"></i>
+            </div>
+            <el-upload class="avatar-uploader"
+                       v-if="dataForm.imageList.length < 1 && !disabled"
+                       :action="uploadUlr"
+                       :data="{customerId:customerId}"
+                       :show-file-list="false"
+                       :disabled="disabled"
+                       :on-progress="handleProgress"
+                       :on-success="handleImgSuccess"
+                       :before-upload="beforeImgUpload"
+                       accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf,.JPG,.JPEG,.PBG,.GIF,.BMP">
+              <el-progress v-if="uploading" :width="100" type="circle" :percentage="unloadPencent"></el-progress>
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+
+            </el-upload>
+          </div>
+        </el-form-item>
         <el-form-item
-          label="社会组织名称	"
-          prop="societyName"
-          label-width="150px"
-          style="display: block"
+            label="社会组织名称	"
+            prop="societyName"
+            label-width="150px"
+            style="display: block"
         >
           <el-input
-            class="item_width_1"
-            maxlength="50"
-            show-word-limit
-            placeholder="请输入社会组织名称	"
-            v-model="dataForm.societyName"
+              class="item_width_1"
+              maxlength="50"
+              show-word-limit
+              placeholder="请输入社会组织名称	"
+              v-model="dataForm.societyName"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-          label="服务事项"
-          prop="serviceMatters"
-          label-width="150px"
-          style="display: block"
+            label="服务事项"
+            prop="serviceMatters"
+            label-width="150px"
+            style="display: block"
         >
           <el-input
-            class="item_width_1"
-            type="textarea"
-            maxlength="1000"
-            show-word-limit
-            :rows="3"
-            placeholder="请输入服务事项，不超过1000字"
-            v-model="dataForm.serviceMatters"
+              class="item_width_1"
+              type="textarea"
+              maxlength="1000"
+              show-word-limit
+              :rows="3"
+              placeholder="请输入服务事项，不超过1000字"
+              v-model="dataForm.serviceMatters"
           ></el-input>
         </el-form-item>
 
         <el-form-item
-          label="负责人姓名	"
-          prop="personInCharge"
-          label-width="150px"
-          style="display: block"
+            label="负责人姓名	"
+            prop="personInCharge"
+            label-width="150px"
+            style="display: block"
         >
           <el-input
-            class="item_width_1"
-            maxlength="50"
-            show-word-limit
-            placeholder="请输入负责人姓名	"
-            v-model="dataForm.personInCharge"
+              class="item_width_1"
+              maxlength="50"
+              show-word-limit
+              placeholder="请输入负责人姓名	"
+              v-model="dataForm.personInCharge"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-          label="负责人电话	"
-          prop="mobile"
-          label-width="150px"
-          style="display: block"
+            label="负责人电话	"
+            prop="mobile"
+            label-width="150px"
+            style="display: block"
         >
           <el-input
-            class="item_width_1"
-            maxlength="50"
-            show-word-limit
-            placeholder="请输入负责人电话	"
-            v-model="dataForm.mobile"
+              class="item_width_1"
+              maxlength="50"
+              show-word-limit
+              placeholder="请输入负责人电话	"
+              v-model="dataForm.mobile"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-          label="服务时间	"
-          prop="serviceTime"
-          label-width="150px"
-          style="display: block"
+            label="服务时间	"
+            prop="serviceTime"
+            label-width="150px"
+            style="display: block"
         >
           <el-date-picker
-            v-model="dataForm.serviceTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
+              v-model="dataForm.serviceTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
 
         <el-form-item
-          label="绑定管理员"
-          prop="adminStaffId"
-          label-width="150px"
-          style="display: block"
+            label="绑定管理员"
+            prop="adminStaffId"
+            label-width="150px"
+            style="display: block"
         >
           <el-select
-            class="item_width_1"
-            v-model="dataForm.adminStaffId"
-            placeholder="请选择"
-            clearable
-            filterable
+              class="item_width_1"
+              v-model="dataForm.adminStaffId"
+              placeholder="请选择"
+              clearable
+              filterable
           >
             <el-option
-              v-for="item in staffList"
-              :key="item.staffId"
-              :label="item.staffName"
-              :value="item.staffId"
+                v-for="item in staffList"
+                :key="item.staffId"
+                :label="item.staffName"
+                :value="item.staffId"
             >
             </el-option>
           </el-select>
         </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="dataForm.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="dataForm.longitude"
-              >
-              </el-input>
-              <span style="margin-left: 20px">纬度</span>
-              <el-input
-                class="item_width_3"
-                maxlength="50"
-                placeholder="请输入纬度"
-                v-model="dataForm.latitude"
-              >
-              </el-input>
-            </div>
-          </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="dataForm.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="dataForm.longitude"
+                      >
+                      </el-input>
+                      <span style="margin-left: 20px">纬度</span>
+                      <el-input
+                        class="item_width_3"
+                        maxlength="50"
+                        placeholder="请输入纬度"
+                        v-model="dataForm.latitude"
+                      >
+                      </el-input>
+                    </div>
+                  </div>
+                </el-form-item>-->
       </el-form>
     </div>
     <div class="div_btn">
       <el-button @click="handleCancle">取 消</el-button>
       <el-button
-        v-if="formType != 'detail'"
-        type="primary"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
+          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";
+import {mapGetters} from "vuex";
+import {Loading} from "element-ui"; // 引入Loading服务
+import {requestPost} from "@/js/dai/request";
 
 var map;
 var search;
@@ -185,6 +215,11 @@ let loading; // 加载动画
 export default {
   data() {
     return {
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+      btnLoading: false,
+      uploading: false,
+      disabled: false,
+      customerId: '',
       formType: "add", //表单操作类型 add新增，edit编辑，detail详情
 
       agencyId: "",
@@ -206,6 +241,7 @@ export default {
         address: "",
         longitude: "",
         latitude: "",
+        imageList: [],
       },
     };
   },
@@ -214,7 +250,7 @@ export default {
     dataRule() {
       return {
         societyName: [
-          { required: true, message: "社会组织名称	不能为空", trigger: "blur" },
+          {required: true, message: "社会组织名称	不能为空", trigger: "blur"},
           {
             min: 1,
             max: 50,
@@ -222,21 +258,27 @@ export default {
             trigger: "blur",
           },
         ],
+        imageList: [
+          {required: true, message: "头像不能为空", trigger: "blur"},
+        ],
         serviceMatters: [
-          { required: true, message: "服务事项不能为空", trigger: "blur" },
+          {required: true, message: "服务事项不能为空", trigger: "blur"},
         ],
         personInCharge: [
-          { required: true, message: "负责人姓名不能为空", trigger: "blur" },
+          {required: true, message: "负责人姓名不能为空", trigger: "blur"},
         ],
-        adminStaffId: [
+        /*adminStaffId: [
           { required: true, message: "绑定管理员不能为空", trigger: "blur" },
-        ],
+        ],*/
         mobile: [
-          { required: true, message: "负责人电话不能为空", trigger: "blur" },
+          {required: true, message: "负责人电话不能为空", trigger: "blur"},
         ],
-        longitude: [
-          { required: true, message: "位置坐标不能为空", trigger: "blur" },
+        serviceTime: [
+          {required: true, message: "服务时间不能为空", trigger: "blur"},
         ],
+        /*longitude: [
+          { required: true, message: "位置坐标不能为空", trigger: "blur" },
+        ],*/
       };
     },
   },
@@ -251,7 +293,7 @@ export default {
   },
 
   async mounted() {
-    this.initMap();
+    //this.initMap();
 
     await this.loadAgency();
     this.loadStaff();
@@ -270,7 +312,7 @@ export default {
         rotation: 45, // 设置地图旋转角度
       });
 
-      search = new window.TMap.service.Search({ pageSize: 10 });
+      search = new window.TMap.service.Search({pageSize: 10});
       // 新建一个地点搜索类
       markers = new TMap.MultiMarker({
         map: map,
@@ -307,26 +349,56 @@ export default {
       markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
-          keyword: this.dataForm.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.dataForm.latitude = lat;
-            this.dataForm.longitude = lng;
-          } else {
-            this.$message.error("未检索到相关位置坐标");
-          }
-        });
+          .searchRectangle({
+            keyword: this.dataForm.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.dataForm.latitude = lat;
+              this.dataForm.longitude = lng;
+            } else {
+              this.$message.error("未检索到相关位置坐标");
+            }
+          });
+    },
+    beforeImgUpload(file) {
+      const isPNG = (file.type === 'image/png') || (file.type === 'image/jpeg')
+      const isLt1M = file.size / 1024 / 1024 < 10
+
+      if (!isPNG) {
+        this.$message.error('上传图片只能是 PNG 或 JPEG 格式!')
+      }
+      if (!isLt1M) {
+        this.$message.error('上传图片大小不能超过 10MB!')
+      }
+      return isPNG && isLt1M
     },
+    handleProgress(event, file, fileList) {
+      console.log('percentage', event, file.percentage)
+      this.uploading = true
+      this.unloadPencent = Number(file.percentage.toFixed(0))
+    },
+    handleImgSuccess(res, file) {
+      if (res.code === 0 && res.msg === 'success') {
 
+        console.log('res.data.url', res.data.url)
+        this.uploading = false
+        this.unloadPencent = 0
+        this.dataForm.imageList.push(res.data.url)
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    handleDelimg(item, index) {
+      this.dataForm.imageList.splice(index, 1)
+    },
     handleMoveCenter() {
       //修改地图中心点
       const center = map.getCenter();
@@ -342,8 +414,12 @@ export default {
 
       this.formType = type;
       console.log(row);
+      this.dataForm.imageList = []
       if (row) {
-        this.dataForm = { ...this.dataForm, ...row };
+        this.dataForm = {...this.dataForm, ...row};
+        if (row.imgUrl) {
+          this.dataForm.imageList.push(row.imgUrl);
+        }
         this.societyId = this.dataForm.societyId;
         if (row.latitude && row.longitude) {
           map.setCenter(new TMap.LatLng(row.latitude, row.longitude));
@@ -356,7 +432,7 @@ export default {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
 
-      const { data, code, msg } = await requestPost(url, params);
+      const {data, code, msg} = await requestPost(url, params);
 
       if (code === 0) {
         this.agencyId = data.agencyId;
@@ -375,7 +451,7 @@ export default {
         pageSize: 100000,
       };
 
-      const { data, code, msg } = await requestPost(url, params);
+      const {data, code, msg} = await requestPost(url, params);
 
       if (code === 0) {
         this.staffList = data.staffList.map((item) => {
@@ -415,7 +491,7 @@ export default {
         this.dataForm.societyId = this.societyId;
       }
 
-      const { data, code, msg } = await requestPost(url, this.dataForm);
+      const {data, code, msg} = await requestPost(url, this.dataForm);
 
       if (code === 0) {
         this.$message({
@@ -471,17 +547,20 @@ export default {
 };
 </script>
 
-<style scoped>
+<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;
 }
@@ -494,14 +573,47 @@ export default {
   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;
 }
+
+.avatar-uploader {
+  ::v-deep
+  .el-upload {
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .el-upload:hover {
+    border-color: #409EFF;
+  }
+
+  .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+
+  .avatar-uploader-icon {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+}
 </style>
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index f8ce4fb51..8112c8c5f 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -139,10 +139,10 @@
             <el-button @click="handleWatch(scope.$index)"
                        type="text"
                        size="small">查看</el-button>
-            <el-button type="text"
+<!--            <el-button type="text"
                        style="color:#00A7A9;"
                        size="small"
-                       @click="handleScore(scope.row)">积分记录</el-button>
+                       @click="handleScore(scope.row)">积分记录</el-button>-->
 
             <el-button @click="handleEdit(scope.$index)"
                        type="text"

From 688287c54bc0b5f052348dc2e47c93529345363e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 23 Aug 2022 10:45:17 +0800
Subject: [PATCH 13/60] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E7=A4=BE?=
 =?UTF-8?q?=E4=BC=9A=E7=BB=84=E7=BB=87=E6=B7=BB=E5=8A=A0=20=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E7=AD=89=E8=B0=83=E6=95=B4=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 8112c8c5f..4c9cb6275 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -128,9 +128,9 @@
                          label="负责人电话"> </el-table-column>
         <el-table-column prop="serviceTime"
                          label="服务时间"> </el-table-column>
-        <el-table-column prop="score"
+<!--        <el-table-column prop="score"
                          width="80"
-                         label="积分"> </el-table-column>
+                         label="积分"> </el-table-column>-->
         <el-table-column fixed="right"
                          label="操作"
                          align="center"

From be334178fe7aa61fbbf64338ca32af8732c7b217 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 23 Aug 2022 14:37:18 +0800
Subject: [PATCH 14/60] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/huji/chusheng/cpts/edit.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index b3e0db470..9edea79ba 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -444,10 +444,10 @@ export default {
     dataRule() {
       let checkIdCard = (rule, value, callback) => {
         if (value === "") {
-          callback(new Error("请输入身份证"));
+          callback(new Error("请输入证件号"));
         } else {
           if (!isCard(value)) {
-            callback(new Error("身份证号格式不正确"));
+            callback(new Error("证件号格式不正确"));
           }
           callback();
         }

From 8dedd73616954deab88a14330576c616e3011835 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 23 Aug 2022 15:48:00 +0800
Subject: [PATCH 15/60] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=94=B9=E4=B8=BA=E8=AF=81=E4=BB=B6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/collect.vue            |  14 +--
 src/views/modules/base/visitor.vue            |   2 +-
 .../change/changedeath-add-or-update.vue      |   4 +-
 .../modules/plugins/change/changedeath.vue    |   6 +-
 .../plugins/change/changerelocation.vue       |   6 +-
 .../change/changewelfare-add-or-update.vue    |   4 +-
 .../modules/plugins/change/changewelfare.vue  |   6 +-
 src/views/modules/plugins/change/verify.vue   |  14 +--
 .../modules/plugins/change/verifyForm.vue     |  12 +-
 .../rent/hikerrorinfo-add-or-update.vue       |   4 +-
 .../modules/plugins/rent/hikerrorinfo.vue     |   2 +-
 .../rent/rentblacklist-add-or-update.vue      |   4 +-
 .../modules/plugins/rent/rentblacklist.vue    |  14 +--
 .../rent/rentcontractinfo-add-or-update.vue   |  16 +--
 .../rent/rentcontractinfo-look-or-check.vue   |  12 +-
 .../modules/plugins/rent/rentcontractinfo.vue |  34 +++---
 .../plugins/rent/rentcontractreview.vue       |  30 +++--
 .../plugins/rent/renthouse-add-or-update.vue  |   4 +-
 src/views/modules/plugins/rent/renthouse.vue  | 105 ++++++++++++++----
 .../modules/plugins/rent/renthouseForm.vue    |   4 +-
 .../rent/renttenantinfo-add-or-update.vue     |   6 +-
 .../modules/plugins/rent/renttenantinfo.vue   |  12 +-
 .../plugins/visit/visitor-add-or-update.vue   |   4 +-
 .../visit/visitvisitor-add-or-update.vue      |   4 +-
 .../modules/plugins/visit/visitvisitor.vue    |   6 +-
 25 files changed, 193 insertions(+), 136 deletions(-)

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 0dabd1b4e..3baad809d 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -141,7 +141,7 @@
           prop="memberIdNum"
           width="180"
           align="center"
-          label="成员身份证"
+          label="成员证件号"
           :show-overflow-tooltip="true"
         />
         <el-table-column
@@ -209,9 +209,9 @@
           label="人脸"
         >
         <template slot-scope="scope">
-          <el-image 
+          <el-image
             style="max-height: 50px; max-width: 50px;"
-            :src="scope.row.faceImg" 
+            :src="scope.row.faceImg"
             :preview-src-list="[scope.row.faceImg]">
             <div slot="error" class="image-slot">
               <!-- <i class="el-icon-picture-outline"></i> -->
@@ -349,7 +349,7 @@
             prop="memberIdNum"
             width="180"
             align="center"
-            label="成员身份证"
+            label="成员证件号"
             :show-overflow-tooltip="true"
           />
           <el-table-column
@@ -406,9 +406,9 @@
             label="人脸"
           >
           <template slot-scope="scope">
-            <el-image 
+            <el-image
               style="max-height: 50px; max-width: 50px;"
-              :src="scope.row.faceImg" 
+              :src="scope.row.faceImg"
               :preview-src-list="[scope.row.faceImg]">
               <div slot="error" class="image-slot">
                 <!-- <i class="el-icon-picture-outline"></i> -->
@@ -773,7 +773,7 @@ export default {
             // this.fileJurisdiction(params)
           }).catch(() => {})
         }).catch(() => {
-          // 取消输入原因  
+          // 取消输入原因
         })
       } else {
         this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {
diff --git a/src/views/modules/base/visitor.vue b/src/views/modules/base/visitor.vue
index 032ee4de0..669f812c0 100644
--- a/src/views/modules/base/visitor.vue
+++ b/src/views/modules/base/visitor.vue
@@ -67,7 +67,7 @@
         <el-table-column
           prop="idCard"
           width="240"
-          label="身份证号"
+          label="证件号"
           align="center"
           :show-overflow-tooltip="true"
         />
diff --git a/src/views/modules/plugins/change/changedeath-add-or-update.vue b/src/views/modules/plugins/change/changedeath-add-or-update.vue
index 19cdb429d..cf2dba584 100644
--- a/src/views/modules/plugins/change/changedeath-add-or-update.vue
+++ b/src/views/modules/plugins/change/changedeath-add-or-update.vue
@@ -7,8 +7,8 @@
           <el-form-item label="姓名" prop="name">
           <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
-          <el-form-item label="身份证" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
+          <el-form-item label="证件号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="手机号" prop="mobile">
           <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index 725c58069..7b691ab07 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -12,13 +12,13 @@
                     placeholder="请输入姓名">
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="证件号"
                       prop="idCard">
           <el-input v-model="dataForm.idCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入证件号">
           </el-input>
         </el-form-item>
         <el-form-item label="手机"
@@ -82,7 +82,7 @@
             <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">{{scope.row.name}}</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center">
           <template slot-scope="scope">
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 57faca640..3a1343bb1 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -109,13 +109,13 @@
                     placeholder="请输入姓名">
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="证件号"
                       prop="idCard">
           <el-input v-model="dataForm.idCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入证件号">
           </el-input>
         </el-form-item>
         <el-form-item label="手机"
@@ -181,7 +181,7 @@
         <el-table-column prop="oldAddress" label="所属房屋" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="ownerName" label="户主姓名" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center" min-width="70" show-overflow-tooltip>
           <template slot-scope="scope">
             {{
diff --git a/src/views/modules/plugins/change/changewelfare-add-or-update.vue b/src/views/modules/plugins/change/changewelfare-add-or-update.vue
index 902508f5b..35c48ef2e 100644
--- a/src/views/modules/plugins/change/changewelfare-add-or-update.vue
+++ b/src/views/modules/plugins/change/changewelfare-add-or-update.vue
@@ -10,8 +10,8 @@
           <el-form-item label="姓名" prop="name">
           <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
-          <el-form-item label="身份证" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
+          <el-form-item label="证件号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="手机号" prop="mobile">
           <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index fe4ecbd6e..81374dfae 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -12,13 +12,13 @@
                     placeholder="请输入姓名">
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="证件号"
                       prop="idCard">
           <el-input v-model="dataForm.idCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入证件号">
           </el-input>
         </el-form-item>
         <el-form-item label="手机"
@@ -76,7 +76,7 @@
             <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">{{scope.row.name}}</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center">
           <template slot-scope="scope">
diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue
index 76385675f..23e4239f8 100644
--- a/src/views/modules/plugins/change/verify.vue
+++ b/src/views/modules/plugins/change/verify.vue
@@ -134,7 +134,7 @@
             </el-input>
           </el-form-item>
 
-          <el-form-item label="身份证号" prop="idCard">
+          <el-form-item label="证件号" prop="idCard">
             <el-input
               v-model="fmData.idCard"
               class="resi-cell-input"
@@ -236,7 +236,7 @@
           prop="idCard"
           align="center"
           width="180"
-          label="身份证号"
+          label="证件号"
         >
         </el-table-column>
 
@@ -276,7 +276,7 @@
           align="center"
           width="100"
         />
-        
+
 
         <el-table-column fixed="right" label="操作" align="center" width="120">
           <template slot-scope="scope">
@@ -298,7 +298,7 @@
                 >审核</el-button
               >
             </template>
-            
+
           </template>
         </el-table-column>
       </el-table>
@@ -408,9 +408,9 @@ export default {
       const _h = this.clientHeight - this.searchH - 440
       console.log('computed-searchH---_h', _h)
       return this.$store.state.inIframe ? h : _h
-      
+
     },
-    
+
     changeVDisabled() {
       return !this.fmData.villageId
     },
@@ -436,7 +436,7 @@ export default {
       const h = this.clientHeight - this.searchH + this.iframeHeight
       const _h = this.clientHeight - this.searchH
       console.log('computed-searchH---_h', _h)
-      
+
       this.$nextTick(() => {
         this.tableHeight = this.$store.state.inIframe ? h : _h
       })
diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue
index 1efb046ac..125822d30 100644
--- a/src/views/modules/plugins/change/verifyForm.vue
+++ b/src/views/modules/plugins/change/verifyForm.vue
@@ -15,7 +15,7 @@
           <span>{{ detailInfo.mobile }}</span>
         </el-form-item>
         <el-form-item
-          label="身份证号:"
+          label="证件号:"
           label-width="150px"
         >
           <span>{{ detailInfo.idCard }}</span>
@@ -140,7 +140,7 @@
         </template> -->
       </el-form>
       <el-form v-if="btnType == 'detail' && isMoveOut == 1" :model="detailInfo">
-        
+
         <template>
           <el-form-item
             label="迁往区域:"
@@ -155,14 +155,14 @@
             <span>{{ detailInfo.newHomeName }}</span>
           </el-form-item>
         </template>
-        
+
         <el-form-item
           label="迁出时间:"
           label-width="150px"
         >
           <span>{{ detailInfo.moveOutDate }}</span>
         </el-form-item>
-        
+
       </el-form>
 
 
@@ -491,7 +491,7 @@ export default {
         this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : ''
       } else this.confirmResult = '1'
       if (row.newGridName) this.isMoveOut = 1
-      
+
       this.reason = row.reason
 
       // await this.loadRootAgency()
@@ -751,7 +751,7 @@ export default {
           moveOutDate: this.dataForm.outOfTime
         }
       }
-      
+
 
       const { data, code, msg } = await requestPost('/epmetuser/myHome/moveOutConfirm', params)
 
diff --git a/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue b/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue
index 5ecc620f3..752106aef 100644
--- a/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue
@@ -22,8 +22,8 @@
           <el-form-item label="客户ID" prop="customerId">
           <el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
       </el-form-item>
-          <el-form-item label="身份证号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证号"></el-input>
+          <el-form-item label="证件号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="错误类型 0：token，1：人员，2权限" prop="errorType">
           <el-input v-model="dataForm.errorType" placeholder="错误类型 0：token，1：人员，2权限"></el-input>
diff --git a/src/views/modules/plugins/rent/hikerrorinfo.vue b/src/views/modules/plugins/rent/hikerrorinfo.vue
index f6356981a..0ae95744d 100644
--- a/src/views/modules/plugins/rent/hikerrorinfo.vue
+++ b/src/views/modules/plugins/rent/hikerrorinfo.vue
@@ -11,7 +11,7 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="idCard" label="身份证号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="errorInfo" label="错误详情" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
diff --git a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue
index cd2f51986..37deeb3fe 100644
--- a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue
@@ -7,8 +7,8 @@
           <el-form-item label="姓名" prop="name">
           <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
-          <el-form-item label="身份证" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
+          <el-form-item label="证件号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="手机号" prop="mobile">
           <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue
index 6b8f9402a..fe9186836 100644
--- a/src/views/modules/plugins/rent/rentblacklist.vue
+++ b/src/views/modules/plugins/rent/rentblacklist.vue
@@ -1,9 +1,8 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentBlacklist} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="姓名"
+        <el-form-item label="姓名" label-width="100px"
                       prop="name">
           <el-input v-model="dataForm.name"
                     size="small"
@@ -12,16 +11,16 @@
                     placeholder="请输入姓名">
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="证件号" label-width="100px"
                       prop="idCard">
           <el-input v-model="dataForm.idCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入证件号">
           </el-input>
         </el-form-item>
-        <el-form-item label="手机"
+        <el-form-item label="手机" label-width="100px"
                       prop="mobile">
           <el-input v-model="dataForm.mobile"
                     size="small"
@@ -30,7 +29,7 @@
                     placeholder="请输入手机">
           </el-input>
         </el-form-item>
-        <el-form-item label="入黑名单时间"
+        <el-form-item label="入黑名单时间" label-width="100px"
                       prop="startTime">
           <el-date-picker v-model="timeRange"
                           type="daterange"
@@ -54,7 +53,7 @@
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idCard" label="身份证号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center"></el-table-column>
         <el-table-column prop="joinDate" label="入黑名单时间" header-align="center" align="center"></el-table-column>
@@ -95,7 +94,6 @@
                    :gridName="lookInfo.gridName"
                    @close="handleCancleLook" />
     </div>
-  </el-card>
 </template>
 
 <script>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index db7b029ed..af71bc574 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -133,7 +133,7 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column prop="idCard" label="身份证号" :render-header="renderHeader" header-align="center" align="center" width="180">
+              <el-table-column prop="idCard" label="证件号" :render-header="renderHeader" header-align="center" align="center" width="180">
                 <template slot-scope="scope">
                   <el-form-item :prop="'tenantList['+scope.$index+'].idCard'" required :show-message="false">
                     <el-input v-model="dataForm.tenantList[scope.$index].idCard"></el-input>
@@ -189,7 +189,7 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column label="身份证照片" :render-header="renderHeader" header-align="center" align="center" width="245px">
+              <el-table-column label="证件照片" :render-header="renderHeader" header-align="center" align="center" width="245px">
                   <template slot-scope="scope">
                     <upload-image :defaultFileList="dataForm.tenantList[scope.$index].idCardImgList" :limit="2" :rowIndex="scope.$index" @change="onChangeTenantListIdImgList"></upload-image>
                   </template>
@@ -211,8 +211,8 @@
         <el-form-item label="出租人姓名" prop="lessorName" label-width="140px">
             <el-input v-model="dataForm.lessorName" placeholder="出租人姓名"></el-input>
         </el-form-item>
-        <el-form-item label="出租人身份证" prop="lessorIdCard" label-width="140px">
-            <el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证"></el-input>
+        <el-form-item label="出租人证件号" prop="lessorIdCard" label-width="140px">
+            <el-input v-model="dataForm.lessorIdCard" placeholder="出租人证件号"></el-input>
         </el-form-item>
         <el-form-item label="出租人手机" prop="lessorMobile" label-width="140px">
             <el-input v-model="dataForm.lessorMobile" placeholder="出租人手机"></el-input>
@@ -239,8 +239,8 @@
         <el-form-item label="承租人姓名" prop="lesseeName" label-width="140px">
             <el-input v-model="dataForm.lesseeName" placeholder="承租人姓名" ></el-input>
         </el-form-item>
-        <el-form-item label="承租人身份证" prop="lesseeIdCard" label-width="140px">
-            <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证" ></el-input>
+        <el-form-item label="承租人证件号" prop="lesseeIdCard" label-width="140px">
+            <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人证件号" ></el-input>
         </el-form-item>
         <el-form-item label="承租人手机" prop="lesseeMobile" label-width="140px">
             <el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机" ></el-input>
@@ -559,7 +559,7 @@ export default {
           <span style="font-size:12px; color: #ff0000;">*</span>
           <span>{label}</span>
         </div>
-      ) 
+      )
     },
     onChangeTenantListIdImgList (e, rowIndex=0) {
       console.log('onChangeTenantListIdImgList', e)
@@ -876,7 +876,7 @@ export default {
           return item.idCardImgList.length == 0
         })
         if (isUploadIdCardImgList) {
-          this.$message.error('请上传成员身份证照片')
+          this.$message.error('请上传成员证件照片')
             return
         }
         const isUploadImgList = this.dataForm.tenantList.some(item => {
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
index 34a0af067..4bf8f7084 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@@ -29,12 +29,12 @@
               <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
               <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center" width="120"></el-table-column>
               <el-table-column prop="mobile" label="手机" header-align="center" align="center" width="120"></el-table-column>
-              <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" width="180"></el-table-column>
+              <el-table-column prop="idCard" label="证件号" header-align="center" align="center" width="180"></el-table-column>
               <el-table-column prop="unit" label="工作单位" header-align="center" align="center" width="180" show-overflow-tooltip></el-table-column>
               <el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column>
               <el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center" width="120"></el-table-column>
               <el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="idCardImgList" label="身份证照片" header-align="center" align="center">
+              <el-table-column prop="idCardImgList" label="证件照片" header-align="center" align="center">
                   <template slot-scope="scope">
                       <div v-for="(item,index) in scope.row.idCardImgList" :key="index">
                           <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
@@ -55,8 +55,8 @@
         <el-form-item label="出租人姓名" prop="lessorName">
             <el-input v-model="dataForm.lessorName" placeholder="出租人姓名" disabled></el-input>
         </el-form-item>
-        <el-form-item label="出租人身份证" prop="lessorIdCard">
-            <el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证" disabled></el-input>
+        <el-form-item label="出租人证件号" prop="lessorIdCard">
+            <el-input v-model="dataForm.lessorIdCard" placeholder="出租人证件号" disabled></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="出租人手机" prop="lessorMobile">
@@ -87,8 +87,8 @@
         <el-form-item label="承租人姓名" prop="lesseeName">
             <el-input v-model="dataForm.lesseeName" placeholder="承租人姓名" disabled></el-input>
         </el-form-item>
-        <el-form-item label="承租人身份证" prop="lesseeIdCard">
-            <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证" disabled></el-input>
+        <el-form-item label="承租人证件号" prop="lesseeIdCard">
+            <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人证件号" disabled></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="承租人手机" prop="lesseeMobile">
diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue
index e1cb6b30b..b687f7d07 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo.vue
@@ -1,11 +1,10 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentContractInfo} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="所属网格" label-width="100px"
                       prop="gridId">
-          <el-select
+          <el-select size="small"
                   v-model.trim="dataForm.gridId"
                   placeholder="请选择"
                   clearable
@@ -24,7 +23,7 @@
           <div class="resi-cell-value">
             <div class="resi-cell-col">
               <el-form-item prop="villageId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.villageId"
                         placeholder="请选择小区"
                         clearable
@@ -41,7 +40,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item prop="buildId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.buildId"
                         placeholder="楼号"
                         clearable
@@ -60,7 +59,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item prop="unitId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.unitId"
                         :disabled="changeBDisabled"
                         placeholder="单元"
@@ -79,7 +78,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item prop="homeId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.homeId"
                         :disabled="changeDDisabled"
                         placeholder="房号"
@@ -100,34 +99,34 @@
         </el-form-item>
           <br/>
           <el-form-item label="出租人" label-width="100px">
-              <el-input v-model="dataForm.lessorName" placeholder='出租人' clearable @keyup.native="btKeyUpLessorName"></el-input>
+              <el-input size="small" v-model="dataForm.lessorName" placeholder='出租人' clearable @keyup.native="btKeyUpLessorName"></el-input>
           </el-form-item>
-          <el-form-item label="出租人身份证" label-width="100px">
-              <el-input v-model="dataForm.lessorIdCard" placeholder='出租人身份证' clearable @keyup.native="btKeyUpLessorIdCard"></el-input>
+          <el-form-item label="出租人证件号" label-width="100px">
+              <el-input size="small" v-model="dataForm.lessorIdCard" placeholder='出租人证件号' clearable @keyup.native="btKeyUpLessorIdCard"></el-input>
           </el-form-item>
           <el-form-item label="出租人手机号" label-width="100px">
-              <el-input v-model="dataForm.lessorMobile" placeholder='出租人手机号' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
+              <el-input size="small" v-model="dataForm.lessorMobile" placeholder='出租人手机号' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
           </el-form-item>
           <br/>
           <el-form-item label="承租人" label-width="100px">
-              <el-input v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
+              <el-input size="small" v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
           </el-form-item>
-          <el-form-item label="承租人身份证" label-width="100px">
-            <el-input v-model="dataForm.lesseeIdCard" placeholder='承租人身份证' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
+          <el-form-item label="承租人证件号" label-width="100px">
+            <el-input size="small" v-model="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
           </el-form-item>
           <el-form-item label="承租人手机号" label-width="100px">
-            <el-input v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
+            <el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
           </el-form-item>
           <br/>
           <el-form-item label="合同到期时间" prop="endDate" label-width="100px">
-              <el-select v-model="dataForm.endDate" placeholder="合同到期时间" clearable>
+              <el-select size="small" v-model="dataForm.endDate" placeholder="合同到期时间" clearable>
                   <el-option v-for="item in endDateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                   </el-option>
               </el-select>
           </el-form-item>
         <el-form-item label="合同签订时间" prop="startTime" label-width="100px">
           <el-date-picker v-model="dataForm.startTime"
-                          type="date"
+                          type="date" size="small"
                           :picker-options="pickerBeginDateBefore"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
@@ -137,7 +136,7 @@
         </el-form-item>
         <el-form-item label="至" prop="endTime">
           <el-date-picker v-model="dataForm.endTime"
-                          type="date"
+                          type="date" size="small"
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
@@ -194,7 +193,6 @@
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     </div>
-  </el-card>
 </template>
 
 <script>
diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue
index be5a7aa01..a9714c134 100644
--- a/src/views/modules/plugins/rent/rentcontractreview.vue
+++ b/src/views/modules/plugins/rent/rentcontractreview.vue
@@ -1,11 +1,10 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentContractInfo} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="所属网格" label-width="100px"
                       prop="gridId">
-          <el-select
+          <el-select size="small"
                   v-model.trim="dataForm.gridId"
                   placeholder="请选择"
                   clearable
@@ -24,7 +23,7 @@
           <div class="resi-cell-value">
             <div class="resi-cell-col">
               <el-form-item prop="villageId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.villageId"
                         placeholder="请选择小区"
                         clearable
@@ -41,7 +40,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item prop="buildId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.buildId"
                         placeholder="楼号"
                         clearable
@@ -60,7 +59,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item prop="unitId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.unitId"
                         :disabled="changeBDisabled"
                         placeholder="单元"
@@ -79,7 +78,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item prop="homeId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.homeId"
                         :disabled="changeDDisabled"
                         placeholder="房号"
@@ -100,24 +99,24 @@
         </el-form-item>
         <br/>
         <el-form-item label="审核状态" prop="scanFlag" label-width="100px">
-          <el-select v-model="dataForm.state" placeholder="审核状态" clearable>
+          <el-select size="small" v-model="dataForm.state" placeholder="审核状态" clearable>
             <el-option v-for="item in stateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="承租人身份证" label-width="100px">
-          <el-input v-model="dataForm.lesseeIdCard" placeholder='承租人身份证' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
+        <el-form-item label="承租人证件号" label-width="100px">
+          <el-input size="small" v-model="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
         </el-form-item>
         <el-form-item label="承租人手机号" label-width="100px">
-          <el-input v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
+          <el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="承租人" label-width="100px">
-          <el-input v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
+          <el-input size="small" v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
         </el-form-item>
         <el-form-item label="审核时间" prop="startTime" label-width="100px">
           <el-date-picker v-model="dataForm.startTime"
-                          type="date"
+                          type="date" size="small"
                           :picker-options="pickerBeginDateBefore"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
@@ -127,7 +126,7 @@
         </el-form-item>
         <el-form-item label="至" prop="endTime">
           <el-date-picker v-model="dataForm.endTime"
-                          type="date"
+                          type="date" size="small"
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
@@ -137,7 +136,7 @@
         </el-form-item>
         <el-form-item label="数据来源" label-width="100px"
                       prop="gridId">
-          <el-select
+          <el-select size="small"
                   v-model.trim="dataForm.isPcInput"
                   placeholder="请选择"
                   clearable
@@ -184,7 +183,7 @@
 <!--        <el-table-column prop="unitName" label="单元" header-align="center" align="center"></el-table-column>-->
 <!--        <el-table-column prop="homeName" label="房屋" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="lesseeName" label="承租人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="lesseeIdCard" label="身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeIdCard" label="证件号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="lesseeMobile" label="手机" header-align="center" align="center"></el-table-column>
         <el-table-column prop="state" label="审核状态" header-align="center" align="center">
           <template slot-scope="scope">
@@ -217,7 +216,6 @@
       <look-or-check v-if="lookOrCheckVisible" ref="LookOrCheck" @refreshDataList="getDataList"></look-or-check>
       <add-or-update v-if="addOrUpdateVisible" ref="AddOrUpdate" @refreshDataList="getDataList"></add-or-update>
     </div>
-  </el-card>
 </template>
 
 <script>
diff --git a/src/views/modules/plugins/rent/renthouse-add-or-update.vue b/src/views/modules/plugins/rent/renthouse-add-or-update.vue
index 1833b7d15..f522cf19e 100644
--- a/src/views/modules/plugins/rent/renthouse-add-or-update.vue
+++ b/src/views/modules/plugins/rent/renthouse-add-or-update.vue
@@ -25,8 +25,8 @@
         <el-form-item label="房主电话" prop="ownerPhone">
             <el-input v-model="dataForm.ownerPhone" placeholder="房主电话"></el-input>
         </el-form-item>
-        <el-form-item label="房主身份证号" prop="ownerIdCard">
-            <el-input v-model="dataForm.ownerIdCard" placeholder="房主身份证号"></el-input>
+        <el-form-item label="房主证件号" prop="ownerIdCard">
+            <el-input v-model="dataForm.ownerIdCard" placeholder="房主证件号"></el-input>
         </el-form-item>
         <el-form-item label="网格" prop="gridName">
             <el-input v-model="dataForm.gridName" placeholder="网格"></el-input>
diff --git a/src/views/modules/plugins/rent/renthouse.vue b/src/views/modules/plugins/rent/renthouse.vue
index cca04ff18..9ebcbefa5 100644
--- a/src/views/modules/plugins/rent/renthouse.vue
+++ b/src/views/modules/plugins/rent/renthouse.vue
@@ -1,8 +1,8 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-rent__rentHouse}">
+    <div class="mod-rent__rentHouse} resi-container">
+      <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
-        <el-form-item label="所属网格"
+        <el-form-item label="所属网格" size="small"
                       prop="gridId">
           <el-select
                   v-model.trim="dataForm.gridId"
@@ -23,7 +23,7 @@
           <div class="resi-cell-value">
             <div class="resi-cell-col">
               <el-form-item prop="villageId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.villageId"
                         placeholder="请选择小区"
                         clearable
@@ -40,7 +40,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item prop="buildId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.buildId"
                         placeholder="楼号"
                         clearable
@@ -59,7 +59,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item prop="unitId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.unitId"
                         :disabled="changeBDisabled"
                         placeholder="单元"
@@ -78,7 +78,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item prop="homeId">
-                <el-select
+                <el-select size="small"
                         v-model.trim="dataForm.homeId"
                         :disabled="changeDDisabled"
                         placeholder="房号"
@@ -108,13 +108,13 @@
                     placeholder="请输入姓名">
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="证件号"
                       prop="ownerIdCard">
           <el-input v-model="dataForm.ownerIdCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入证件号">
           </el-input>
         </el-form-item>
         <el-form-item label="手机"
@@ -128,12 +128,12 @@
         </el-form-item>
         <br/>
         <el-form-item label="房屋状态" prop="rentFlag">
-          <el-select v-model="dataForm.rentFlag" placeholder="房屋状态" clearable>
+          <el-select size="small" v-model="dataForm.rentFlag" placeholder="房屋状态" clearable>
             <el-option v-for="item in rentFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="购房时间"
+        <el-form-item label="购房时间" size="small"
                       prop="startTime">
           <el-date-picker v-model="timeRange"
                           type="daterange"
@@ -151,17 +151,16 @@
         <el-form-item>
           <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
         </el-form-item>
-        <br/>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="handleEdit()">{{ '购房登记' }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="warning" size="small" @click="exportHandle()">{{ $t('export') }}</el-button>
-        </el-form-item>
         <!--<el-form-item>-->
           <!--<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
         <!--</el-form-item>-->
       </el-form>
+      </el-card>
+      <el-card class="resi-card-table">
+        <div style="margin-bottom: 13px;">
+          <el-button type="primary" size="small" @click="handleEdit()">{{ '购房登记' }}</el-button>
+          <el-button type="warning" size="small" @click="exportHandle()">{{ $t('export') }}</el-button>
+        </div>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column label="序号"
                          type="index"
@@ -222,7 +221,7 @@
         </el-table-column>
         <el-table-column prop="ownerName" label="房主姓名" header-align="center" align="center" min-width="70" show-overflow-tooltip></el-table-column>
         <el-table-column prop="ownerPhone" label="房主电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="ownerIdCard" label="房主身份证号" header-align="center" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="ownerIdCard" label="房主证件号" header-align="center" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="purchaseDate" label="购房日期" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
@@ -240,6 +239,7 @@
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
+      </el-card>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
       <!-- 购房登记弹出框 -->
@@ -256,7 +256,6 @@
                    @dialogOk="addFormOk"></room-form>
       </el-dialog>
     </div>
-  </el-card>
 </template>
 
 <script>
@@ -512,3 +511,69 @@ export default {
     }
 }
 </script>
+<style lang="scss" scoped>
+  .blacklist-reason {
+    width: 100%;
+    height: 80px;
+    border: 1px solid #e4e4e4;
+    border-radius: 4px;
+    resize: none;
+    padding: 8px;
+    box-sizing: border-box;
+  }
+</style>
+<style lang="scss" scoped>
+  @import "@/assets/scss/buttonstyle.scss";
+
+  .resi-container .resi-card-table {
+    ::v-deep .el-table th {
+      color: #fff;
+      background-color: rgba(33, 149, 254, 1);
+      // border-right: 1px solid rgba(33, 149, 254, 1);
+    }
+  }
+  .resi-table {
+    ::v-deep .el-button--text {
+      text-decoration: underline;
+    }
+    ::v-deep .btn-color-del {
+      margin-left: 10px;
+      color: rgba(213, 16, 16, 1);
+    }
+    ::v-deep .btn-color-edit {
+      color: rgba(0, 167, 169, 1);
+    }
+  }
+  .form-wr {
+    .input-width {
+      width: 260px;
+
+    }
+    .input-width-textarea {
+      width: 500px;
+    }
+    .imsg-list {
+      display: flex;
+      align-items: center;
+      .imgs-item {
+        position: relative;
+        margin-right: 10px;
+        .el-icon-delete {
+          position: absolute;
+          top: 0;
+          right: 0;
+          font-size: 18px;
+          color: red;
+          z-index: 3;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+  .div-content {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+</style>
diff --git a/src/views/modules/plugins/rent/renthouseForm.vue b/src/views/modules/plugins/rent/renthouseForm.vue
index 802960604..698eb824d 100644
--- a/src/views/modules/plugins/rent/renthouseForm.vue
+++ b/src/views/modules/plugins/rent/renthouseForm.vue
@@ -144,12 +144,12 @@
                     v-model="dataForm.ownerPhone">
           </el-input>
         </el-form-item>
-        <el-form-item label="房主身份证"
+        <el-form-item label="房主证件号"
                       prop="ownerIdCard"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
-                    placeholder="请输入房主身份证"
+                    placeholder="请输入房主证件号"
                     v-model="dataForm.ownerIdCard">
           </el-input>
         </el-form-item>
diff --git a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
index f73040617..bfdb5a170 100644
--- a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
@@ -4,8 +4,8 @@
         <el-form-item label="姓名" prop="name">
             <el-input v-model="dataForm.name" placeholder="姓名" disabled></el-input>
         </el-form-item>
-        <el-form-item label="身份证" prop="idCard">
-            <el-input v-model="dataForm.idCard" placeholder="身份证" disabled></el-input>
+        <el-form-item label="证件号" prop="idCard">
+            <el-input v-model="dataForm.idCard" placeholder="证件号" disabled></el-input>
         </el-form-item>
         <el-form-item label="手机号" prop="mobile">
             <el-input v-model="dataForm.mobile" placeholder="手机号" disabled></el-input>
@@ -13,7 +13,7 @@
         <!--<el-form-item label="与房主关系" prop="yfzgx">-->
             <!--<el-input v-model="dataForm.yfzgx" placeholder="与房主关系" disabled></el-input>-->
         <!--</el-form-item>-->
-        <el-form-item label="身份证照片" prop="idCardImgList">
+        <el-form-item label="证件照片" prop="idCardImgList">
             <template>
                 <label v-for="(item,index) in dataForm.idCardImgList" :key="index">
                     <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
diff --git a/src/views/modules/plugins/rent/renttenantinfo.vue b/src/views/modules/plugins/rent/renttenantinfo.vue
index 63aedd360..7dc917119 100644
--- a/src/views/modules/plugins/rent/renttenantinfo.vue
+++ b/src/views/modules/plugins/rent/renttenantinfo.vue
@@ -1,16 +1,15 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentTenantInfo} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="姓名" label-width="60px">
-          <el-input v-model="dataForm.name" placeholder='姓名' clearable @keyup.native="btKeyUpName"></el-input>
+          <el-input size="small" v-model="dataForm.name" placeholder='姓名' clearable @keyup.native="btKeyUpName"></el-input>
         </el-form-item>
-        <el-form-item label="身份证" label-width="60px">
-          <el-input v-model="dataForm.idCard" placeholder='身份证' clearable @keyup.native="btKeyUpIdCard"></el-input>
+        <el-form-item label="证件号" label-width="60px">
+          <el-input size="small" v-model="dataForm.idCard" placeholder='证件号' clearable @keyup.native="btKeyUpIdCard"></el-input>
         </el-form-item>
         <el-form-item label="手机号" label-width="60px">
-          <el-input v-model="dataForm.mobile" placeholder='手机号' clearable @keyup.native="btKeyUpMobile"></el-input>
+          <el-input size="small" v-model="dataForm.mobile" placeholder='手机号' clearable @keyup.native="btKeyUpMobile"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
@@ -31,7 +30,7 @@
         <!--<el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="contractId" label="合同ID" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
         <!--<el-table-column prop="yfzgx" label="与房主关系" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="state" label="审核状态" header-align="center" align="center">
@@ -73,7 +72,6 @@
       </span>
       </el-dialog>
     </div>
-  </el-card>
 </template>
 
 <script>
diff --git a/src/views/modules/plugins/visit/visitor-add-or-update.vue b/src/views/modules/plugins/visit/visitor-add-or-update.vue
index 528af1fb9..9d67dd0bc 100644
--- a/src/views/modules/plugins/visit/visitor-add-or-update.vue
+++ b/src/views/modules/plugins/visit/visitor-add-or-update.vue
@@ -4,8 +4,8 @@
           <el-form-item label="姓名" prop="name">
           <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
-          <el-form-item label="身份证" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
+          <el-form-item label="证件号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="性别" prop="gender">
               <el-radio-group v-model="dataForm.gender">
diff --git a/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue b/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
index 528af1fb9..9d67dd0bc 100644
--- a/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
+++ b/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
@@ -4,8 +4,8 @@
           <el-form-item label="姓名" prop="name">
           <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
-          <el-form-item label="身份证" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
+          <el-form-item label="证件号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="性别" prop="gender">
               <el-radio-group v-model="dataForm.gender">
diff --git a/src/views/modules/plugins/visit/visitvisitor.vue b/src/views/modules/plugins/visit/visitvisitor.vue
index a7d573694..e6942c19e 100644
--- a/src/views/modules/plugins/visit/visitvisitor.vue
+++ b/src/views/modules/plugins/visit/visitvisitor.vue
@@ -6,8 +6,8 @@
         <el-form-item label="姓名" label-width="100px">
           <el-input v-model="dataForm.name" placeholder='姓名' clearable></el-input>
         </el-form-item>
-        <el-form-item label="身份证" label-width="100px">
-          <el-input v-model="dataForm.idCard" placeholder='身份证' clearable></el-input>
+        <el-form-item label="证件号" label-width="100px">
+          <el-input v-model="dataForm.idCard" placeholder='证件号' clearable></el-input>
         </el-form-item>
         <el-form-item label="联系方式" label-width="100px">
           <el-input v-model="dataForm.mobile" placeholder='联系方式' clearable></el-input>
@@ -114,7 +114,7 @@
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="type" label="人员类型" header-align="center" align="center">

From 9cd83b196bc9213bacb39cd2a2eaf8208dc8549a Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 23 Aug 2022 16:04:14 +0800
Subject: [PATCH 16/60] =?UTF-8?q?label=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/rent/renthouse.vue      | 14 +++++++-------
 src/views/modules/plugins/rent/renttenantinfo.vue |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/plugins/rent/renthouse.vue b/src/views/modules/plugins/rent/renthouse.vue
index 9ebcbefa5..90e09fe74 100644
--- a/src/views/modules/plugins/rent/renthouse.vue
+++ b/src/views/modules/plugins/rent/renthouse.vue
@@ -2,7 +2,7 @@
     <div class="mod-rent__rentHouse} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
-        <el-form-item label="所属网格" size="small"
+        <el-form-item label="所属网格" size="small" label-width="100px"
                       prop="gridId">
           <el-select
                   v-model.trim="dataForm.gridId"
@@ -19,7 +19,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="所属房屋" >
+        <el-form-item label="所属房屋" label-width="100px">
           <div class="resi-cell-value">
             <div class="resi-cell-col">
               <el-form-item prop="villageId">
@@ -99,7 +99,7 @@
         </el-form-item>
 
         <br/>
-        <el-form-item label="姓名"
+        <el-form-item label="姓名" label-width="100px"
                       prop="ownerName">
           <el-input v-model="dataForm.ownerName"
                     size="small"
@@ -108,7 +108,7 @@
                     placeholder="请输入姓名">
           </el-input>
         </el-form-item>
-        <el-form-item label="证件号"
+        <el-form-item label="证件号" label-width="100px"
                       prop="ownerIdCard">
           <el-input v-model="dataForm.ownerIdCard"
                     size="small"
@@ -117,7 +117,7 @@
                     placeholder="请输入证件号">
           </el-input>
         </el-form-item>
-        <el-form-item label="手机"
+        <el-form-item label="手机" label-width="100px"
                       prop="ownerPhone">
           <el-input v-model="dataForm.ownerPhone"
                     size="small"
@@ -127,13 +127,13 @@
           </el-input>
         </el-form-item>
         <br/>
-        <el-form-item label="房屋状态" prop="rentFlag">
+        <el-form-item label="房屋状态" prop="rentFlag" label-width="100px">
           <el-select size="small" v-model="dataForm.rentFlag" placeholder="房屋状态" clearable>
             <el-option v-for="item in rentFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="购房时间" size="small"
+        <el-form-item label="购房时间" label-width="100px"
                       prop="startTime">
           <el-date-picker v-model="timeRange"
                           type="daterange"
diff --git a/src/views/modules/plugins/rent/renttenantinfo.vue b/src/views/modules/plugins/rent/renttenantinfo.vue
index 7dc917119..a298420f7 100644
--- a/src/views/modules/plugins/rent/renttenantinfo.vue
+++ b/src/views/modules/plugins/rent/renttenantinfo.vue
@@ -2,13 +2,13 @@
     <div class="mod-rent__rentTenantInfo} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="姓名" label-width="60px">
+        <el-form-item label="姓名" label-width="100px">
           <el-input size="small" v-model="dataForm.name" placeholder='姓名' clearable @keyup.native="btKeyUpName"></el-input>
         </el-form-item>
-        <el-form-item label="证件号" label-width="60px">
+        <el-form-item label="证件号" label-width="100px">
           <el-input size="small" v-model="dataForm.idCard" placeholder='证件号' clearable @keyup.native="btKeyUpIdCard"></el-input>
         </el-form-item>
-        <el-form-item label="手机号" label-width="60px">
+        <el-form-item label="手机号" label-width="100px">
           <el-input size="small" v-model="dataForm.mobile" placeholder='手机号' clearable @keyup.native="btKeyUpMobile"></el-input>
         </el-form-item>
         <el-form-item>

From 514b85a15a1a57040121afb0927ef4ad3e738100 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 23 Aug 2022 16:08:06 +0800
Subject: [PATCH 17/60] =?UTF-8?q?=E5=A4=AE=E8=A7=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/stats/factagencyuserhousedaily.vue      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 5cabb481a..101e7dff6 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -1,5 +1,4 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mode-block resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
@@ -18,7 +17,7 @@
             >
             </el-option>
           </el-select> -->
-          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
+          <el-cascader size="small" ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
             <template slot-scope="{ node, data }">
               <div @click="cascaderClick(data)">
                 <!-- <span class="block"></span> -->
@@ -28,7 +27,7 @@
             </template>
           </el-cascader>
         </el-form-item>
-        <el-form-item label="时间范围"
+        <el-form-item label="时间范围" label-width="100px"
                       prop="startTime">
           <el-date-picker v-model="timeRange"
                           type="daterange"
@@ -107,7 +106,6 @@
         </template>
       </el-dialog>
     </div>
-  </el-card>
 </template>
 
 <script>

From 2369d228368f6e1892d0b9230e33bd271a13540c Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 23 Aug 2022 17:24:30 +0800
Subject: [PATCH 18/60] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/shzz/cpts/edit.vue       | 37 ++++++++++++-------
 .../modules/communityService/shzz/index.vue   | 19 +++++++---
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index eb0aee65c..bcd5c95be 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -39,7 +39,7 @@
           </div>
         </el-form-item>
         <el-form-item
-            label="社会组织名称	"
+            label="组织名称	"
             prop="societyName"
             label-width="150px"
             style="display: block"
@@ -48,14 +48,14 @@
               class="item_width_1"
               maxlength="50"
               show-word-limit
-              placeholder="请输入社会组织名称	"
+              placeholder="请输入组织名称	"
               v-model="dataForm.societyName"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-            label="服务事项"
+            label="服务内容"
             prop="serviceMatters"
             label-width="150px"
             style="display: block"
@@ -66,7 +66,7 @@
               maxlength="1000"
               show-word-limit
               :rows="3"
-              placeholder="请输入服务事项，不超过1000字"
+              placeholder="请输入服务内容，不超过1000字"
               v-model="dataForm.serviceMatters"
           ></el-input>
         </el-form-item>
@@ -88,7 +88,7 @@
         </el-form-item>
 
         <el-form-item
-            label="负责人电话	"
+            label="服务电话	"
             prop="mobile"
             label-width="150px"
             style="display: block"
@@ -97,7 +97,7 @@
               class="item_width_1"
               maxlength="50"
               show-word-limit
-              placeholder="请输入负责人电话	"
+              placeholder="请输入服务电话	"
               v-model="dataForm.mobile"
           >
           </el-input>
@@ -105,11 +105,19 @@
 
         <el-form-item
             label="服务时间	"
-            prop="serviceTime"
+            prop="serviceTimeStr"
             label-width="150px"
             style="display: block"
         >
-          <el-date-picker
+          <el-input
+              class="item_width_1"
+              maxlength="50"
+              show-word-limit
+              placeholder="请输入服务时间	"
+              v-model="dataForm.serviceTimeStr"
+          >
+          </el-input>
+<!--          <el-date-picker
               v-model="dataForm.serviceTime"
               type="daterange"
               range-separator="至"
@@ -117,7 +125,7 @@
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd"
           >
-          </el-date-picker>
+          </el-date-picker>-->
         </el-form-item>
 
         <el-form-item
@@ -236,6 +244,7 @@ export default {
         mobile: "",
         serviceStartTime: "",
         serviceEndTime: "",
+        serviceTimeStr: "",
         serviceTime: ["", ""],
         adminStaffId: "",
         address: "",
@@ -250,11 +259,11 @@ export default {
     dataRule() {
       return {
         societyName: [
-          {required: true, message: "社会组织名称	不能为空", trigger: "blur"},
+          {required: true, message: "组织名称	不能为空", trigger: "blur"},
           {
             min: 1,
             max: 50,
-            message: "社会组织名称	长度在 1 到 50个字符",
+            message: "组织名称	长度在 1 到 50个字符",
             trigger: "blur",
           },
         ],
@@ -262,7 +271,7 @@ export default {
           {required: true, message: "头像不能为空", trigger: "blur"},
         ],
         serviceMatters: [
-          {required: true, message: "服务事项不能为空", trigger: "blur"},
+          {required: true, message: "服务内容不能为空", trigger: "blur"},
         ],
         personInCharge: [
           {required: true, message: "负责人姓名不能为空", trigger: "blur"},
@@ -271,9 +280,9 @@ export default {
           { required: true, message: "绑定管理员不能为空", trigger: "blur" },
         ],*/
         mobile: [
-          {required: true, message: "负责人电话不能为空", trigger: "blur"},
+          {required: true, message: "服务电话不能为空", trigger: "blur"},
         ],
-        serviceTime: [
+        serviceTimeStr: [
           {required: true, message: "服务时间不能为空", trigger: "blur"},
         ],
         /*longitude: [
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 4c9cb6275..a50590d92 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -57,13 +57,19 @@
                 <div class="resi-cell-label">服务时间</div>
                 <div class="resi-cell-value"
                      :class="'resi-cell-value-radio'">
-                  <el-date-picker v-model="fmData.serviceTime"
+                  <el-input v-model="fmData.serviceTimeStr"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入">
+                  </el-input>
+<!--                  <el-date-picker v-model="fmData.serviceTime"
                                   type="daterange"
                                   range-separator="至"
                                   start-placeholder="开始日期"
                                   end-placeholder="结束日期"
                                   value-format="yyyy-MM-dd">
-                  </el-date-picker>
+                  </el-date-picker>-->
                 </div>
               </div>
             </el-col>
@@ -116,17 +122,17 @@
                          align="center"
                          width="50" />
         <el-table-column prop="societyName"
-                         label="社会组织名称">
+                         label="组织名称">
         </el-table-column>
         <el-table-column prop="serviceMatters"
-                         label="服务事项">
+                         label="服务内容">
         </el-table-column>
         <el-table-column prop="personInCharge"
                          label="负责人">
         </el-table-column>
         <el-table-column prop="mobile"
-                         label="负责人电话"> </el-table-column>
-        <el-table-column prop="serviceTime"
+                         label="服务电话"> </el-table-column>
+        <el-table-column prop="serviceTimeStr"
                          label="服务时间"> </el-table-column>
 <!--        <el-table-column prop="score"
                          width="80"
@@ -229,6 +235,7 @@ export default {
         serviceStartTime: "",
         serviceEndTime: "",
         serviceTime: "",
+        serviceTimeStr: "",
       },
 
       importBtnTitle: "excel导入",

From 38780c5d414107f248d435699be8680d9d00df8a Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 23 Aug 2022 17:54:40 +0800
Subject: [PATCH 19/60] =?UTF-8?q?=E6=AD=A3=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/rent/renthouseForm.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/rent/renthouseForm.vue b/src/views/modules/plugins/rent/renthouseForm.vue
index 698eb824d..3d1711742 100644
--- a/src/views/modules/plugins/rent/renthouseForm.vue
+++ b/src/views/modules/plugins/rent/renthouseForm.vue
@@ -520,11 +520,12 @@ export default {
 
     async addRoom () {
       const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-      if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
+      const regPassport = /^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/; //护照号，1字母8数字或2字母7数字
+      if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false && regPassport.test(this.dataForm.ownerIdCard) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的身份证号码'
+          message: '请输入正确的证件号'
         })
         return false;
       }

From fb980eef5fed85f92f5bc217012385436ce63c88 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 24 Aug 2022 11:17:39 +0800
Subject: [PATCH 20/60] worklog

---
 .../communityService/worklog/index.vue        | 1040 +++++++++++++++++
 .../worklog/workLogDetail.vue                 |  209 ++++
 2 files changed, 1249 insertions(+)
 create mode 100644 src/views/modules/communityService/worklog/index.vue
 create mode 100644 src/views/modules/communityService/worklog/workLogDetail.vue

diff --git a/src/views/modules/communityService/worklog/index.vue b/src/views/modules/communityService/worklog/index.vue
new file mode 100644
index 000000000..470ce4fa9
--- /dev/null
+++ b/src/views/modules/communityService/worklog/index.vue
@@ -0,0 +1,1040 @@
+<template>
+    <div v-if="pageLoading" class="resi-container">
+        <el-card ref="searchCard" class="search-card">
+            <div class="">
+                <el-form ref="searchForm" :inline="true" :model="searchForm" size="small" label-width="100px"
+                         class="demo-form-inline">
+                    <div>
+                        <el-form-item label="所属网格"
+                                      prop="gridId">
+                          <el-select v-model="searchForm.gridId"
+                                     filterable
+                                     placeholder="请选择"
+                                     clearable>
+                            <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="服务类型"
+                                      prop="serviceType">
+                            <el-select v-model="searchForm.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="申请人" prop="name">
+                            <el-input v-model="searchForm.applicantName" placeholder="请输入" class="input-width"
+                                      clearable></el-input>
+                        </el-form-item>
+                        <el-form-item label="住址" prop="mobile">
+                            <el-input v-model="searchForm.applicantAddress" placeholder="请输入" class="input-width"
+                                      clearable></el-input>
+                        </el-form-item>
+                    </div>
+                    <div>
+                        <el-form-item label="服务内容" prop="idCard">
+                            <el-input v-model="searchForm.serviceContent" placeholder="请输入" class="input-width"
+                                      clearable></el-input>
+                        </el-form-item>
+                        <el-form-item label="联系电话" prop="address">
+                            <el-input v-model="searchForm.applicantMobile" placeholder="请输入" class="input-width"
+                                      clearable></el-input>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
+                            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置
+                            </el-button>
+                        </el-form-item>
+                    </div>
+
+                </el-form>
+            </div>
+        </el-card>
+        <el-card class="resi-card-table">
+
+            <div class="resi-row-btn">
+                <el-button class="diy-button--add"
+                           style="margin-left: 0"
+                           size="small"
+                           @click="handleAdd">新增
+                </el-button>
+                <el-button
+                        class="diy-button--export"
+                        size="small"
+                        @click="handleExportModule('room')">下载模板
+                </el-button>
+                <el-upload
+                        ref="upload"
+                        class="upload-demo"
+                        action="uploadUlr"
+                        :limit="1"
+                        :accept="'.xls,.xlsx'"
+                        :with-credentials="true"
+                        :show-file-list="false"
+                        :auto-upload="true"
+                        :on-success="handleExcelSuccess"
+                        :before-upload="beforeExcelUpload"
+                        :http-request="uploadHttpRequest">
+                    <el-button size="small" class="diy-button--delete" :loading="importLoading">{{importBtnTitle}}
+                    </el-button>
+                </el-upload>
+                <el-button class="diy-button--reset" size="small" :loading="exportBtn" @click="handleExport">{{
+                    exportBtnTitle }}
+                </el-button>
+            </div>
+
+            <el-table
+                    :data="tableData"
+                    row-key="id"
+                    v-loading="tableLoading"
+                    border
+                    style="width: 100%"
+                    class="resi-table">
+                <el-table-column label="序号" type="index" align="center" width="50">
+                </el-table-column>
+                <el-table-column
+                        prop="gridName"
+                        label="所属网格"
+                        align="center"
+                        width="100"/>
+                <el-table-column
+                        prop="serviceTypeName"
+                        label="服务类型"
+                        align="center"
+                        min-width="180"/>
+                <el-table-column
+                        prop="principalName"
+                        label="申请人"
+                        align="center"
+                        min-width="160"/>
+                <el-table-column
+                        prop="applicantAddress"
+                        label="住址"
+                        align="center"
+                        min-width="160"/>
+                <el-table-column
+                        prop="serviceContent"
+                        label="服务内容"
+                        align="center"
+                        min-width="160"/>
+                <el-table-column
+                        prop="applicantMobile"
+                        label="联系电话"
+                        align="center"
+                        min-width="160"/>
+                <el-table-column
+                        prop="principalName"
+                        label="责任人"
+                        align="center"
+                        width="100"/>
+                <el-table-column
+                        prop="serviceTime"
+                        label="服务时间"
+                        align="center"
+                        show-overflow-tooltip
+                        min-width="180"/>
+                <el-table-column
+                        prop="remark"
+                        label="备注"
+                        align="center"
+                        width="100"/>
+                <el-table-column fixed="right" label="操作" align="center" width="200">
+                    <template slot-scope="scope">
+                        <el-button
+                                @click="handleLook(scope.row)"
+                                type="text"
+                                size="small"
+                                class="btn-color-look">查看</el-button>
+                        <el-button
+                                @click="handleEdit(scope.row, 'edit')"
+                                type="text"
+                                size="small"
+                                class="btn-color-edit">修改</el-button>
+                        <el-popconfirm
+                                title="删除之后无法恢复，确认删除？"
+                                @onConfirm="handleDel(scope.row)">
+                            <el-button
+                                    slot="reference"
+                                    type="text"
+                                    size="small"
+                                    class="btn-color-del">删除</el-button>
+                        </el-popconfirm>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div>
+                <el-pagination
+                        @size-change="handleSizeChange"
+                        @current-change="handleCurrentChange"
+                        :current-page.sync="currentPage"
+                        :page-sizes="[20, 50, 100, 200]"
+                        :page-size="pageSize"
+                        layout="sizes, prev, pager, next, total"
+                        :total="total">
+                </el-pagination>
+            </div>
+        </el-card>
+
+        <el-dialog title=""
+                   :visible.sync="dialogVisible"
+                   width="50%"
+                   top="5vh"
+                   append-to-body
+                   class="dialog-h"
+                   :close-on-click-modal="false"
+                   :before-close="handlerCancle">
+            <el-form v-if="dialogVisible"
+                     label-width="120px"
+                     :model="workLogDetail"
+                     ref="ruleForm"
+                     class="form-wr dialog-h-content scroll-h">
+                <el-form-item label="所属网格"
+                              prop="gridId">
+                    <el-input v-if="disabled"
+                              v-model="workLogDetail.gridName"
+                              :disabled="disabled"
+                              class="input-width"></el-input>
+                    <el-select v-else
+                               v-model="workLogDetail.gridId"
+                               filterable
+                               placeholder="请选择"
+                               class="input-width"
+                               clearable
+                               :disabled="disabled"
+                               @change="handleGridChange">
+                        <el-option v-for="item in disabled ? optionsG : optionsEditG"
+                                   :key="item.value"
+                                   :label="item.label"
+                                   :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="需求类型"
+                              prop="serviceType">
+                    <el-input v-if="disabled"
+                              v-model="workLogDetail.serviceTypeName"
+                              :disabled="disabled"
+                              class="input-width-min"></el-input>
+                    <el-cascader v-else
+                                 v-model="workLogDetail.serviceType"
+                                 :options="demandOptions"
+                                 :disabled="disabled"
+                                 clearable
+                                 class="input-width"
+                                 @change="handleCateSlect"></el-cascader>
+                </el-form-item>
+                <el-form-item label="上报类型"
+                              prop="reportType">
+                    <el-input v-if="disabled"
+                              v-model="form.reportTypeName"
+                              :disabled="disabled"
+                              class="input-width"></el-input>
+                </el-form-item>
+                <el-form-item label="上报人"
+                              prop="reportUserName">
+                    <el-input v-model="form.reportUserName"
+                              :disabled="disabled"
+                              placeholder="请输入"
+                              class="input-width"
+                              clearable></el-input>
+                </el-form-item>
+                <el-form-item label="上报人手机号"
+                              prop="reportUserMobile">
+                    <el-input v-model="form.reportUserMobile"
+                              :disabled="disabled"
+                              placeholder="请输入"
+                              class="input-width"
+                              maxlength="11"
+                              clearable></el-input>
+                </el-form-item>
+                <el-form-item label="上报时间"
+                              prop="reportTime">
+                    <el-date-picker v-model="form.reportTime"
+                                    type="datetime"
+                                    class="input-width"
+                                    clearable
+                                    :disabled="disabled"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
+                                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="需求人"
+                              prop="demandUserId">
+                    <el-input v-if="disabled"
+                              v-model="form.demandUserName"
+                              :disabled="disabled"
+                              class="input-width"></el-input>
+                    <el-select v-else
+                               v-model="selectDemandUser"
+                               class="input-width"
+                               filterable
+                               :disabled="disabled"
+                               placeholder="请选择"
+                               clearable
+                               @change="handleDemandChange">
+                        <el-option v-for="item in demandUserList"
+                                   :key="item.demandUserId"
+                                   :label="item.label"
+                                   :value="item">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="服务时间"
+                              prop="wantServiceTime">
+                    <el-date-picker v-model="form.wantServiceTime"
+                                    type="datetime"
+                                    class="input-width"
+                                    clearable
+                                    :disabled="disabled"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
+                                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="需求内容"
+                              prop="content">
+                    <el-input v-model="form.content"
+                              :autosize="{ minRows: 2, maxRows: 10 }"
+                              :disabled="disabled"
+                              type="textarea"
+                              clearable
+                              class="input-width-textarea"
+                              placeholder="请输入内容"></el-input>
+                </el-form-item>
+                <el-form-item v-if="
+            addType == 'finish' ||
+            (addType == 'look' && form.serviceShowFlag)
+          "
+                              label="服务方"
+                              prop="serviceType">
+                    <template v-if="disabled && addType !== 'appoint'">
+                        <el-input v-model="form.serviceShowName"
+                                  :disabled="disabled"
+                                  class="input-width"></el-input>
+                    </template>
+                    <template v-else>
+                        <el-select v-model="form.serviceType"
+                                   class="input-width-small"
+                                   placeholder="请选择"
+                                   clearable
+                                   :disabled="disabled && addType !== 'appoint'"
+                                   @change="handleServiceChange('add', $event)">
+                            <el-option v-for="item in serviceOptions"
+                                       :key="item.value"
+                                       :label="item.label"
+                                       :value="item.value">
+                            </el-option>
+                        </el-select>
+                        -
+                        <el-select v-model="form.serverId"
+                                   class="input-width-middle"
+                                   filterable
+                                   placeholder="请选择"
+                                   clearable
+                                   :disabled="disabled && addType !== 'appoint'">
+                            <el-option v-for="item in serviceOptiondList"
+                                       :key="item.value"
+                                       :label="item.label"
+                                       :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-form-item>
+                <el-form-item v-if="addType == 'look' && form.status == 'canceled'"
+                              label="取消时间"
+                              prop="cancelTime">
+                    <span>{{ form.cancelTime }}</span>
+                </el-form-item>
+                <template v-if="
+            (addType == 'finish' && form.reportType != 'self_help') ||
+            (addType == 'look' && form.status == 'finished')
+          ">
+                    <el-form-item label="实际服务时间"
+                                  prop="serviceStartTime">
+                        <el-date-picker v-model="finishServiceTime"
+                                        class="input-width-min"
+                                        clearable
+                                        :disabled="disabled && addType != 'finish'"
+                                        type="datetimerange"
+                                        range-separator="至"
+                                        start-placeholder="开始日期"
+                                        end-placeholder="结束日期"
+                                        value-format="yyyy-MM-dd HH:mm:ss"
+                                        @change="handelBlurServiceTime">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="完成情况"
+                                  prop="finishResult">
+                        <el-radio v-model="form.finishResult"
+                                  label="resolved"
+                                  :disabled="disabled && addType != 'finish'">已解决</el-radio>
+                        <el-radio v-model="form.finishResult"
+                                  label="unresolved"
+                                  :disabled="disabled && addType != 'finish'">未解决</el-radio>
+                    </el-form-item>
+                    <el-form-item label="评价"
+                                  prop="score"
+                                  class="form-score">
+                        <el-rate v-model="form.score"
+                                 :allow-half="true"
+                                 :disabled="disabled && addType != 'finish'"></el-rate>
+                    </el-form-item>
+                    <el-form-item label="备注"
+                                  prop="finishDesc">
+                        <el-input v-model="form.finishDesc"
+                                  :autosize="{ minRows: 2, maxRows: 10 }"
+                                  :disabled="disabled && addType != 'finish'"
+                                  type="textarea"
+                                  clearable
+                                  class="input-width-textarea"
+                                  placeholder="请输入内容"></el-input>
+                    </el-form-item>
+                </template>
+                <template v-if="addType == 'finish' && form.reportType == 'self_help'">
+                    <el-form-item label="实际服务时间"
+                                  prop="serviceStartTime">
+                        <el-date-picker v-model="finishServiceTime"
+                                        class="input-width-min"
+                                        clearable
+                                        :disabled="disabled && addType != 'finish'"
+                                        type="datetimerange"
+                                        range-separator="至"
+                                        start-placeholder="开始日期"
+                                        end-placeholder="结束日期"
+                                        value-format="yyyy-MM-dd HH:mm:ss"
+                                        @change="handelBlurServiceTime">
+                        </el-date-picker>
+                    </el-form-item>
+                </template>
+            </el-form>
+            <div class="resi-btns">
+                <el-button size="small"
+                           @click="handlerCancle">{{
+                    addType != "look" ? "取消" : "关闭"
+                    }}</el-button>
+<!--                <el-button v-if="addType != 'look'"-->
+<!--                           type="primary"-->
+<!--                           size="small"-->
+<!--                           :loading="btnLoading"-->
+<!--                           @click="handleSubmit">提交</el-button>-->
+            </div>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+
+    import workLogDetail from './workLogDetail'
+    import axios from 'axios'
+    import {mapGetters} from 'vuex'
+
+    export default {
+        components: {},
+        data() {
+            return {
+                uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+                importBtnTitle: '导入',
+                importLoading: false,
+                exportBtn: false,
+                exportBtnTitle: '导出',
+                tableLoading: false,
+                btnLoading: false,
+                uploading: false,
+                disabled: false,
+                pageLoading: false,
+                dialogVisible: false,
+                currentPage: 1,
+                pageSize: 20,
+                total: null,
+                tableData: [],
+                searchH: 0,
+                unloadPencent: 0,
+                addLevel: '1',
+                addType: 'add',
+                value: '',
+                optionsEditG: [],
+                optionsG: [],
+                optionsC: [],
+                optionsEditC: [],
+                options: [
+                    {
+                        label: '是',
+                        value: 1
+                    }, {
+                        label: '否',
+                        value: 2
+                    }
+                ],
+                demandOptions: [],
+                partyOrgRange: [],
+                timeRangePay: [],
+                timeRange: [],
+                customerId: '',
+                searchForm: {
+                    gridId: '',
+                    serviceType: '',
+                    applicantName: '',
+                    applicantAddress: '',
+                    serviceContent: '',
+                    applicantMobile: ''
+                },
+                partyProps: {
+                    label: 'partyOrgName',
+                    value: 'id',
+                    checkStrictly: true
+                },
+                workLogDetail: {
+                    gridId: '',
+                    gridName: ''
+                },
+                serviceTypeList: []
+            }
+        },
+        computed: {
+        },
+        async created() {
+            this.customerId = localStorage.getItem('customerId')
+            this.getTableData()
+            this.getGridList('query')
+            this.getServiceType()
+            this.pageLoading = true
+
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.searchH = this.$refs.searchCard.$el.offsetHeight
+            })
+        },
+        methods: {
+            handleSizeChange(val) {
+                this.pageSize = val
+                this.getTableData()
+            },
+            handleCurrentChange(val) {
+                this.currentPage = val
+                this.getTableData()
+            },
+            handlePartyChange(val) {
+                this.searchForm.partyOrgId = val[val.length - 1]
+            },
+            handleFilterSpan(row, item) {
+                let _val = ''
+                if (item.options && item.options.length > 0) {
+                    item.options.forEach((n) => {
+                        if (n.value === row[item.columnName]) _val = n.label
+                    })
+                }
+                return _val || row[item.columnName]
+            },
+            handleTimeChange(val) {
+                if (val.length > 0) {
+                    this.searchForm.rdsjStartDate = val[0]
+                    this.searchForm.rdsjEndDate = val[1]
+                } else {
+                    this.searchForm.rdsjStartDate = ''
+                    this.searchForm.rdsjEndDate = ''
+                }
+
+            },
+            handleTimeChangePay(val) {
+                if (val.length > 0) {
+                    this.searchForm.payStatrDate = val[0]
+                    this.searchForm.payEndDate = val[1]
+                } else {
+                    this.searchForm.payStatrDate = ''
+                    this.searchForm.payEndDate = ''
+                }
+
+            },
+            // 上传大图标成功
+            handleExcelSuccess(res, file) {
+                if (res.code === 0 && res.msg === 'success') {
+
+                } else {
+                    this.$message.error(res.msg)
+                }
+            },
+            handleProgress(event, file, fileList) {
+                this.uploading = true
+                this.unloadPencent = Number(file.percentage.toFixed(0))
+            },
+            download(data, fileName) {
+                if (!data) {
+                    return
+                }
+                var csvData = new Blob([data])
+                if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                    window.navigator.msSaveOrOpenBlob(csvData, fileName)
+                }
+                else {
+                    var a = document.createElement('a')
+                    document.body.appendChild(a)
+                    a.style = 'display: none'
+                    var url = window.URL.createObjectURL(csvData)
+                    a.href = url
+                    a.download = fileName
+                    a.click()
+                    a.remove()
+                    window.URL.revokeObjectURL(url)
+                }
+            },
+            async getServiceType(){
+                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/serviceTypePage'
+                let params = {
+                    pageNo: 1,
+                    pageSize: 10000
+                }
+                await this.$http
+                    .post(url, params)
+                    .then(({ data: res }) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg);
+                        } else {
+                            this.serviceTypeList = res.data.list
+                            console.log('serviceTypeList:',this.serviceTypeList)
+                        }
+                    })
+                    .catch(() => {
+                        return this.$message.error("网络错误");
+                    });
+            },
+            async handleExportModule() {
+                let url = "/resi/partymember/icPartyMember/downloadTemplate"
+                let params = {}
+                await this.$http({
+                    method: 'POST',
+                    url,
+                    responseType: 'blob',
+                    data: params
+                })
+                    .then(res => {
+                        console.log('res-------dd', res)
+                        if (res.headers["content-disposition"]) {
+                            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+                            this.download(res.data, fileName)
+
+                        } else this.$message.error('下载失败')
+                    })
+                    .catch(err => {
+                        console.log('err', err)
+                        return this.$message.error('网络错误')
+                    })
+            },
+            beforeExcelUpload(file) {
+                console.log('file', file)
+                const isType = file.type === 'application/vnd.ms-excel'
+                const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                const fileType = isType || isTypeComputer
+                const isLt1M = (file.size / 1024 / 1024) < 10
+                if (!fileType) {
+                    this.$message.error('上传文件只能是xls/xlsx格式！')
+                }
+
+                if (!isLt1M) {
+                    this.$message.error('上传文件大小不能超过 10MB!')
+                }
+                return fileType && isLt1M
+            },
+            async uploadHttpRequest(file) {
+                this.importLoading = true
+                this.importBtnTitle = '正在上传中...'
+                this.$message({
+                    showClose: true,
+                    message: '导入中，请到系统管理-导入记录中查看进度',
+                    duration: 0
+                })
+                const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
+                formData.append('file', file.file) //添加文件对象
+                this.$http
+                    .post('/resi/partymember/icPartyMember/import', formData).then(res => {
+                    console.log('res-up', res)
+                    if (res.data.code == 0 && res.data.msg == 'success') {
+                        // this.$message.success('导入成功')
+                        this.getTableData()
+                    } else {
+                        this.$message.error(res.data.msg)
+                    }
+                }).catch(err => {
+                    console.log('失败', err)
+                    file.onError() //上传失败的文件会从文件列表中删除
+                    // this.$message.error('导入失败')
+                })
+
+                this.importLoading = false
+                this.importBtnTitle = '导入'
+                this.$refs.upload.clearFiles()
+            },
+            async handleExport() {
+                this.exportBtn = true
+                this.exportBtnTitle = '正在导出...'
+                let params = {
+                    agencyId: this.$store.state.user.agencyId,
+                    pageSize: 9999,
+                    pageNo: this.currentPage
+                }
+                // .post('epmetuser/icresiuser/exportExcel', params)
+                const url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate'
+                await axios({
+                    // url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icPartyMember/export',
+                    url: url,
+                    // url: 'epmetuser/icresiuser/exportExcel',
+                    method: 'post',
+                    data: params,
+                    responseType: 'blob'
+                })
+                    .then(res => {
+                        console.log('resllll', 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)
+                        this.$message.error('获取导出失败')
+                    })
+                this.exportBtn = false
+                this.exportBtnTitle = '导出'
+            },
+            beforeImgUpload(file) {
+                const isPNG = (file.type === 'image/png') || (file.type === 'image/jpeg')
+                const isLt1M = file.size / 1024 / 1024 < 10
+
+                if (!isPNG) {
+                    this.$message.error('上传图片只能是 PNG 或 JPEG 格式!')
+                }
+                if (!isLt1M) {
+                    this.$message.error('上传图片大小不能超过 10MB!')
+                }
+                return isPNG && isLt1M
+            },
+            handleImgSuccess(res, file) {
+                if (res.code === 0 && res.msg === 'success') {
+
+                    console.log('res.data.url', res.data.url)
+                    this.uploading = false
+                    this.unloadPencent = 0
+                    this.form.imageList.push(res.data.url)
+
+                } else {
+                    this.$message.error(res.msg)
+                }
+            },
+            handleDelimg(item, index) {
+                this.form.imageList.splice(index, 1)
+            },
+            handleSearch(val) {
+                console.log('searchhh--', val)
+                this.currentPage = 1
+                this.getTableData()
+            },
+            resetForm(formName) {
+                this.timeRangePay = []
+                this.timeRange = []
+                this.searchForm.payStatrDate = ''
+                this.searchForm.payEndDate = ''
+                this.searchForm.rdsjStartDate = ''
+                this.searchForm.rdsjEndDate = ''
+                this.$refs[formName].resetFields()
+                this.handleSearch()
+            },
+            handleAdd() {
+                this.dialogVisible = true
+            },
+
+            handlerCancle() {
+                this.detailInfo = {}
+                this.disabled = false
+                this.dialogVisible = false
+            },
+            async handleLook(row) {
+                this.disabled = true
+                this.$nextTick(() => {
+                    this.$refs.ref_detail.initForm(row)
+                })
+                // await this.getDetail(row.applicantId)
+            },
+            async handleEdit(row, addType) {
+                await this.getDetail(row.id)
+                this.dialogVisible = true
+            },
+
+            handleDel(row) {
+                let params = {
+                    ids: [row.applicantId]
+                }
+                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/delete'
+                // let url = '/heart/workdiaryService/record/delete'
+                this.$http
+                    .post(url, params)
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        } else {
+                            this.$message.success('删除成功')
+                            this.getTableData()
+                        }
+                    })
+                    .catch((err) => {
+                        return this.$message.error('网络错误')
+                    })
+            },
+            async getDetail(id) {
+                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/'
+                // let url = '/heart/workdiaryService/record/'
+                this.$http
+                    .post(url+id)
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        } else {
+                            this.workLogDetail = {...res.data}
+                            this.dialogVisible = true
+                        }
+                    })
+                    .catch((err) => {
+                        console.log('row4', err)
+                        return this.$message.error('网络错误')
+                    })
+            },
+            /*async getGridList(type, agencyId) {
+                const {user} = await this.$store.state
+                console.log('user---ppp', user)
+                // addorupdate  query
+                await this.$http
+                    .get('/resi/partymember/icPartyOrg/getSearchTreelist', {params: {agencyId: agencyId || user.agencyId}})
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        } else {
+                            console.log('获取查询详情成功', res.data)
+
+                            this.optionsG = this.deepArrTOnull(res.data)
+                        }
+                    })
+                    .catch(() => {
+                        return this.$message.error('网络错误')
+                    })
+            },*/
+          async getGridList (type, agencyId) {
+            const { user } = await this.$store.state;
+            await this.$http
+                    .post("/gov/org/customergrid/gridoption", {
+                      agencyId: agencyId || user.agencyId,
+                      purpose: type,
+                    })
+                    .then(({ data: res }) => {
+                      if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                      } else {
+                        if (type === "query") this.optionsG = res.data;
+                        else this.optionsEditG = res.data;
+                      }
+                    })
+                    .catch(() => {
+                      return this.$message.error("网络错误");
+                    });
+          },
+            deepArrTOnull(arr) {
+                let a = []
+                a = arr.map(item => {
+                    return {
+                        ...item,
+                        children: (item.children.length > 0 && this.deepArrTOnull(item.children)) || null
+                    }
+                })
+                return a
+            },
+            async getCateList(type) {
+                const {user} = await this.$store.state
+                console.log('user---ppp', user)
+                const params = {
+                    customerId: this.customerId,
+                    type
+                }
+                // addorupdate  query
+                await this.$http
+                    .post('/resi/partymember/stylecategorydict/select-list', params)
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        } else {
+                            console.log('获取查询详情成功', res.data)
+
+                            if (type === 'query') this.optionsC = res.data
+                            else this.optionsEditC = res.data
+                        }
+                    })
+                    .catch(() => {
+                        return this.$message.error('网络错误')
+                    })
+            },
+            async getTableData() {
+                this.tableLoading = true
+                const {user} = await this.$store.state
+                let params = {
+                    ...this.searchForm,
+                    pageNo: this.currentPage,
+                    pageSize: this.pageSize
+                }
+                const url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page'
+                await this.$http
+                    // .post('/resi/partymember/icPartyMember/page', params)
+                    .post(url, params)
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        } else {
+                            this.tableData = res.data.list
+                            this.total = res.data.total
+                            console.log(this.tableData)
+                        }
+                    })
+                    .catch(() => {
+                        return this.$message.error('网络错误')
+                    })
+                this.tableLoading = false
+            }
+
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/assets/scss/buttonstyle.scss";
+
+    .resi-container .resi-card-table {
+        ::v-deep .el-table th {
+            color: #fff;
+            background-color: rgba(33, 149, 254, 1);
+            // border-right: 1px solid rgba(33, 149, 254, 1);
+        }
+    }
+
+    .resi-table {
+        ::v-deep .el-button--text {
+            text-decoration: underline;
+        }
+
+        ::v-deep .btn-color-del {
+            margin-left: 10px;
+            color: rgba(213, 16, 16, 1);
+        }
+
+        ::v-deep .btn-color-edit {
+            color: rgba(0, 167, 169, 1);
+        }
+    }
+
+    .form-wr {
+        .input-width {
+            width: 260px;
+
+        }
+
+        .input-width-textarea {
+            width: 500px;
+        }
+
+        .imsg-list {
+            display: flex;
+            align-items: center;
+
+            .imgs-item {
+                position: relative;
+                margin-right: 10px;
+
+                .el-icon-delete {
+                    position: absolute;
+                    top: 0;
+                    right: 0;
+                    font-size: 18px;
+                    color: red;
+                    z-index: 3;
+                    cursor: pointer;
+                }
+            }
+        }
+    }
+
+    .div-content {
+        width: 100%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+</style>
+
+<style lang="scss" scoped>
+    .resi-row-btn {
+        display: flex;
+        margin-bottom: 13px;
+        ::v-deep .el-button {
+            margin-left: 10px;
+            border: 0;
+        }
+        ::v-deep .el-select {
+            margin-right: 10px;
+        }
+        .el-button--success {
+            background: rgba(34, 193, 195, 1);
+        }
+        .el-button {
+            /*margin-right: 10px;*/
+            border: 0;
+        }
+        .el-button--warning {
+            background: rgba(254, 179, 73, 1);
+        }
+        .el-button--danger {
+            background: rgba(254, 98, 82, 1);
+        }
+    }
+    .avatar-uploader {
+        ::v-deep
+        .el-upload {
+            cursor: pointer;
+            position: relative;
+            overflow: hidden;
+        }
+        .el-upload:hover {
+            border-color: #409EFF;
+        }
+        .avatar {
+            width: 100px;
+            height: 100px;
+            display: block;
+        }
+        .avatar-uploader-icon {
+            border: 1px dashed #d9d9d9;
+            border-radius: 6px;
+            font-size: 28px;
+            color: #8c939d;
+            width: 100px;
+            height: 100px;
+            line-height: 100px;
+            text-align: center;
+        }
+    }
+    .resi-btns {
+        margin-top: 20px;
+        text-align: center;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/modules/communityService/worklog/workLogDetail.vue b/src/views/modules/communityService/worklog/workLogDetail.vue
new file mode 100644
index 000000000..a8dc01dc2
--- /dev/null
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@@ -0,0 +1,209 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="workLogDetail"
+               class="form">
+
+        <el-form-item label="需求类型"
+                      prop="serviceType">
+          <el-input v-if="disabled"
+                    v-model="workLogDetail.serviceTypeName"
+                    :disabled="disabled"
+                    class="input-width-min"></el-input>
+          <el-cascader v-else
+                       v-model="workLogDetail.serviceType"
+                       :options="demandOptions"
+                       :disabled="disabled"
+                       clearable
+                       class="input-width"
+                       @change="handleCateSlect"></el-cascader>
+        </el-form-item>
+        <el-form-item label="所属网格"
+                      prop="gridId">
+          <el-input v-if="disabled"
+                    v-model="workLogDetail.gridName"
+                    :disabled="disabled"
+                    class="input-width"></el-input>
+          <el-select v-else
+                     v-model="workLogDetail.gridId"
+                     filterable
+                     placeholder="请选择"
+                     class="input-width"
+                     clearable
+                     :disabled="disabled"
+                     @change="handleGridChange">
+            <el-option v-for="item in disabled ? optionsG : optionsEditG"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="上报类型"
+                      prop="reportType">
+          <el-input v-if="disabled"
+                    v-model="workLogDetail.reportTypeName"
+                    :disabled="disabled"
+                    class="input-width"></el-input>
+        </el-form-item>
+        <el-form-item label="申请人"
+                      prop="applicantName">
+          <el-input v-model="workLogDetail.applicantName"
+                    :disabled="disabled"
+                    placeholder="请输入"
+                    class="input-width"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="上报人手机号"
+                      prop="reportUserMobile">
+          <el-input v-model="workLogDetail.reportUserMobile"
+                    :disabled="disabled"
+                    placeholder="请输入"
+                    class="input-width"
+                    maxlength="11"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="上报时间"
+                      prop="reportTime">
+          <el-date-picker v-model="workLogDetail.reportTime"
+                          type="datetime"
+                          class="input-width"
+                          clearable
+                          :disabled="disabled"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="需求人"
+                      prop="demandUserId">
+          <el-input v-if="disabled"
+                    v-model="workLogDetail.demandUserName"
+                    :disabled="disabled"
+                    class="input-width"></el-input>
+          <el-select v-else
+                     v-model="selectDemandUser"
+                     class="input-width"
+                     filterable
+                     :disabled="disabled"
+                     placeholder="请选择"
+                     clearable
+                     @change="handleDemandChange">
+            <el-option v-for="item in demandUserList"
+                       :key="item.demandUserId"
+                       :label="item.label"
+                       :value="item">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="服务时间"
+                      prop="wantServiceTime">
+          <el-date-picker v-model="workLogDetail.wantServiceTime"
+                          type="datetime"
+                          class="input-width"
+                          clearable
+                          :disabled="disabled"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="需求内容"
+                      prop="content">
+          <el-input v-model="workLogDetail.content"
+                    :autosize="{ minRows: 2, maxRows: 10 }"
+                    :disabled="disabled"
+                    type="textarea"
+                    clearable
+                    class="input-width-textarea"
+                    placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+
+    </div>
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      workLogDetail: {},
+    }
+  },
+  components: {},
+  mounted () {
+    this.initMap()
+  },
+
+  methods: {
+    handleCancle () {
+
+      this.$emit('diaClose')
+
+    },
+
+    async initForm (row) {
+      this.startLoading()
+      this.formData = { ...row }
+      this.endLoading()
+
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+<style scoped>
+.detail_span {
+  width: 500px;
+  font-weight: bold;
+  text-align: left;
+  margin: 0 0;
+  font-size: 16px;
+}
+
+.form {
+  margin-top: 30px;
+}
+</style>
+
+

From 60fa7ac723de14f3b4fdebf6ef6eef66d3f672fa Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 14:23:42 +0800
Subject: [PATCH 21/60] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=20=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/workLog/edit.vue | 176 ++++++++++++
 src/views/modules/workSys/workLog/list.vue | 295 +++++++++++++++++++++
 2 files changed, 471 insertions(+)
 create mode 100644 src/views/modules/workSys/workLog/edit.vue
 create mode 100644 src/views/modules/workSys/workLog/list.vue

diff --git a/src/views/modules/workSys/workLog/edit.vue b/src/views/modules/workSys/workLog/edit.vue
new file mode 100644
index 000000000..59311cbae
--- /dev/null
+++ b/src/views/modules/workSys/workLog/edit.vue
@@ -0,0 +1,176 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="title"
+             :width="diaWidth+'%'"
+             :close-on-click-modal="false"
+             :before-close="handleClose"
+             :close-on-press-escape="false">
+    <el-form :inline="false"
+             :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             :label-width="'120px'">
+      <div style="margin-top:20px">
+
+        <el-form-item label="分类名称"
+                      prop="serviceTypeName">
+          <el-tooltip class="item"
+                      effect="dark"
+                      content="请输入1-10个字"
+                      placement="bottom-start">
+            <el-input class="item_width_1"
+                      :maxlength="10"
+                      :minlength="1"
+                      v-model="dataForm.serviceTypeName"
+                      placeholder="分类名称"></el-input>
+          </el-tooltip>
+        </el-form-item>
+        <!-- <el-form-item label="排序"
+                      prop="sort">
+          <el-input-number v-model="dataForm.sort"
+                           :min="1"
+                           label="描述文字"></el-input-number>
+        </el-form-item> -->
+      </div>
+
+    </el-form>
+    <!-- <template slot="footer">
+      <el-button @click="visible = false;resetData()">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="saveForm()">{{ $t('confirm') }}</el-button>
+    </template> -->
+     <div class="resi-btns">
+        <el-button size="small"
+                   @click="visible = false;resetData()">取消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   @click="saveForm">提交</el-button>
+      </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { requestPost } from '@/js/dai/request'
+export default {
+  data () {
+    return {
+      visible: false,
+      title: '分类信息',
+
+      customerId: '',
+      parentid: '', // 父级分类Id
+      id: '', // 当前操作分类Id
+      type: '', // 操作类型(add:新增  edit:编辑)
+
+      dataForm: {
+        serviceTypeName: '', // 分类名称
+        sort: 0,
+        type: '', // 操作类型(add:新增  edit:编辑)
+        level: ''
+      },
+
+      url: ''
+
+    }
+  },
+  created () {
+    // this.queryFunctionList()
+  },
+  computed: {
+
+    dataRule () {
+      return {
+        serviceTypeName: [
+          { required: true, message: '分类名称不能为空', trigger: 'blur' },
+          { min: 2, max: 20, message: '分类名称长度在 2 到 20 个字符', trigger: 'blur' }
+        ]
+      }
+    },
+    diaWidth () {
+      console.log(this.resolution)
+      return this.resolution === 'small' ? 70 : 50
+    },
+
+    ...mapGetters(['clientHeight', 'resolution'])
+  },
+  methods: {
+    // 初始化  customerId,parentid ,level,排序
+    initAdd (customerId, parentid, level, sort) {
+      this.visible = true
+      this.customerId = customerId
+      this.parentid = parentid
+      this.type = 'add'
+      this.dataForm.level = level
+      this.dataForm.sort = sort
+      this.url = '/heart/workdiaryService/serviceType/save'
+    },
+
+    // 初始化  customerId,parentid,dateform,level
+    initEdit (customerId, parentid, dataForm) {
+      this.visible = true
+      this.customerId = customerId
+      this.parentid = parentid
+      this.type = 'edit'
+      this.dataForm = dataForm
+
+      this.url = '/heart/workdiaryService/serviceType/update'
+    },
+
+    async saveForm () {
+      await this.$refs['dataForm'].validate((valid, messageObj) => {
+        if (!valid) {
+          window.app.util.validateRule(messageObj)
+          return false
+        }
+      })
+
+      let params = {
+        customerId: this.customerId,
+        id: this.dataForm.id,
+        serviceTypeName: this.dataForm.serviceTypeName
+      }
+
+      const { data, code, msg } = await requestPost(this.url, params)
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '保存成功'
+        })
+        this.resetData()
+        this.visible = false
+        this.$emit('editDiaOK')
+      } else {
+        // this.$message.error(msg)
+      }
+    },
+    handleClose () {
+      this.visible = false
+    },
+    resetData () {
+      this.dataForm = {
+        serviceTypeName: '', // 分类名称
+        sort: 0,
+        type: ''// 操作类型(add:新增  edit:编辑)
+      }
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+.item_width_1 {
+  width: 400px;
+}
+.item_width_2 {
+  width: 700px;
+}
+.block {
+  display: block;
+}
+.btn_reset {
+  vertical-align: bottom;
+  margin-left: 10px;
+}
+</style>
diff --git a/src/views/modules/workSys/workLog/list.vue b/src/views/modules/workSys/workLog/list.vue
new file mode 100644
index 000000000..453a46bbb
--- /dev/null
+++ b/src/views/modules/workSys/workLog/list.vue
@@ -0,0 +1,295 @@
+<template>
+  <div class="resi-container">
+    <el-card class="resi-card-table">
+      <div class="mod-sys__menu">
+        <div class="resi-row-btn">
+          <el-button class="diy-button--add"
+                    size="small"
+                    @click="addShow()">新增</el-button>
+        </div>
+        <el-table v-loading="dataListLoading"
+                  :data="dataList"
+                  :default-expand-all="false"
+                  row-key="id"
+                  :height="tableHeight"
+                  border
+                  style="width: 100%;" class="resi-table">
+          <el-table-column prop="serviceTypeName"
+                          label="分类名称"
+                          align="center"
+                          header-align="center"
+                          min-width="150"></el-table-column>
+          <el-table-column prop="stateShow"
+                          label="状态"
+                          align="center"
+                          header-align="center"
+                          min-width="150"></el-table-column>
+
+          <!-- <el-table-column prop="sort"
+                            :label="$t('menu.sort')"
+                            header-align="center"
+                            align="center"></el-table-column> -->
+
+          <el-table-column label="操作"
+                          fixed="right"
+                          header-align="center"
+                          align="center"
+                          width="350">
+            <template slot-scope="scope">
+
+              <el-button type="text"
+                        size="small"
+                         class="div-table-button--detail"
+                        @click="disableCategory(scope.row)">{{ scope.row.btnShow}}</el-button>
+              <el-button type="text"
+                        size="small"
+                        class="div-table-button--edit"
+                        @click="editShow(scope.row)">修改</el-button>
+              <el-button type="text"
+                        size="small"
+                        class="div-table-button--delete"
+                        @click="deleteCategory(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </div>
+    </el-card>
+
+
+    <elegant-edit ref="ref_edit"
+                   @editDiaOK="editDiaOK">
+
+    </elegant-edit>
+
+  </div>
+</template>
+
+<script>
+
+import { requestPost } from '@/js/dai/request'
+import elegantEdit from './edit.vue'
+import { mapGetters } from 'vuex'
+export default {
+
+  data () {
+    return {
+      customerId: '', // 客户id，父组件传
+      customerName: '', // 客户名称，父组件传
+
+      tableParams: {
+        customerId: '',
+        pageNo:1,
+        pageSize:10000
+      },
+      // tableHeight: 500,
+      search: '',
+      dataList: [],
+
+      dataListLoading: false
+
+    }
+  },
+
+  computed: {
+    tables () {
+      const search = this.search
+      if (search) {
+        console.log('this.dataList', this.dataList)
+        return this.dataList.filter(dataNews => {
+          return Object.keys(dataNews).some(key => {
+            return String(dataNews[key]).toLowerCase().indexOf(search) > -1
+          })
+        })
+      }
+      console.log('this.dataList', this.dataList)
+      return this.dataList
+    },
+    tableHeight () {
+      const h = this.clientHeight - 220 + this.iframeHeigh
+      const _h = this.clientHeight - 220
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  components: {
+    elegantEdit
+  },
+  created() {
+    const { user } = this.$store.state
+    console.log('user----', user)
+    this.initData(user.customerId, user.customerName)
+  },
+  mounted() {
+    // this.$nextTick(() => {
+    //   this.tableHeight = document.documentElement.clientHeight - 220 + 'px'
+    //   console.log('tableHeight', this.tableHeight)
+    // })
+  },
+  methods: {
+    cellStyle ({ row, column, rowIndex, columnIndex }) {
+      // 状态列字体颜色
+      if (row.state === 'enable' && columnIndex === 1) {
+        return 'color: #EA1B29'
+      } else if (row.state === 'disable' && columnIndex === 1) {
+        return 'color: #0CB618'
+      } else {
+        return 'color: #1a1a1b'
+      }
+    },
+    initData (customerId, customerName) {
+      this.customerId = customerId
+      this.customerName = customerName
+
+      this.loadData()
+    },
+
+    // 加载列表数据
+    async loadData () {
+      this.dataListLoading = true
+      // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/customercategorylist'
+      const url = '/heart/workdiaryService/serviceType/page'
+
+      this.tableParams.customerId = this.customerId
+
+      const { data, code, msg } = await requestPost(url, this.tableParams)
+      this.dataListLoading = false
+      if (code === 0) {
+        this.dataList = data.list || []
+        this.dataList.forEach(element => {
+          element.state = element.enabled ? 'enable' : 'disable'
+          element.btnShow = element.enabled ? '禁用' : '启用'
+          element.stateShow = element.enabled ? '启用' : '禁用'
+          element.level = 'l1'
+        })
+      } else {
+        // this.$message.error(msg )
+      }
+    },
+
+    // 开启/启用
+    disableCategory (row) {
+      this.$confirm('确认' + row.btnShow + '当前分类?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const url = '/heart/workdiaryService/serviceType/update'
+        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/isdisablecategory'
+        const param = {
+          customerId: this.customerId,
+          id: row.id,
+          enabled: row.state !== 'enable'? 1:0
+        }
+        window.app.ajax.post(url, param,
+          (data, rspMsg) => {
+            this.$message.success('操作成功')
+            this.loadData()
+          },
+          (rspMsg, data) => {
+            this.$message.error(rspMsg)
+          })
+      }).catch(() => {
+
+      })
+    },
+    // 删除
+    deleteCategory (row) {
+      this.$confirm('确认删除当前分类?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const url = '/heart/workdiaryService/serviceType/delete'
+        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/delcategory'
+        const param = {
+          customerId: this.customerId,
+          ids: [row.id]
+        }
+        window.app.ajax.post(url, param,
+          (data, rspMsg) => {
+            this.$message.success('操作成功')
+            this.loadData()
+          },
+          (rspMsg, data) => {
+            this.$message.error(rspMsg)
+          })
+      }).catch(() => {
+
+      })
+    },
+
+    // 新增  customerId,parentid,id,type,level,num
+    addShow () {
+      const sort = this.dataList.length + 1
+      this.$refs['ref_edit'].initAdd(this.customerId, '', 'l1', sort)
+    },
+    // 新增二级分类  customerId,parentid,id,type,level，num
+    showAddLevel2 (row) {
+      const sort = row.children.length + 1
+      this.$refs['ref_edit'].initAdd(this.customerId, row.id, 'l2', sort)
+    },
+    // 编辑 customerId,parentid,dateform
+    editShow (row) {
+      this.$refs['ref_edit'].initEdit(this.customerId, row.id, row)
+    },
+
+    // 取消
+    diaCancel () {
+      this.$emit('cancleBack')
+    },
+
+    editDiaOK () {
+      this.loadData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table {
+    th  {
+      color: #fff;
+      background-color: rgba(33, 149, 254, 1);
+    }
+
+    .cell {
+
+      span:nth-of-type(3) {
+        display: inline-block;
+        width: 90%;
+        word-break: break-all;
+      }
+    }
+  }
+}
+.resi-row-btn {
+  display: flex;
+  margin-bottom: 13px;
+  ::v-deep .el-button {
+    // margin-left: 10px;
+    border: 0;
+  }
+  ::v-deep .el-select {
+    margin-right: 10px;
+  }
+  .el-button--success {
+    background: rgba(34, 193, 195, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+</style>

From c3a4843001d5b5483cb40b08b60cec6112bb9875 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 24 Aug 2022 14:28:39 +0800
Subject: [PATCH 22/60] worklog

---
 .../communityService/worklog/index.vue        | 1040 -----------------
 .../communityService/worklog/workLog.vue      |  762 ++++++++++++
 .../worklog/workLogDetail.vue                 |  158 +--
 .../communityService/worklog/workLogForm.vue  |  467 ++++++++
 4 files changed, 1278 insertions(+), 1149 deletions(-)
 delete mode 100644 src/views/modules/communityService/worklog/index.vue
 create mode 100644 src/views/modules/communityService/worklog/workLog.vue
 create mode 100644 src/views/modules/communityService/worklog/workLogForm.vue

diff --git a/src/views/modules/communityService/worklog/index.vue b/src/views/modules/communityService/worklog/index.vue
deleted file mode 100644
index 470ce4fa9..000000000
--- a/src/views/modules/communityService/worklog/index.vue
+++ /dev/null
@@ -1,1040 +0,0 @@
-<template>
-    <div v-if="pageLoading" class="resi-container">
-        <el-card ref="searchCard" class="search-card">
-            <div class="">
-                <el-form ref="searchForm" :inline="true" :model="searchForm" size="small" label-width="100px"
-                         class="demo-form-inline">
-                    <div>
-                        <el-form-item label="所属网格"
-                                      prop="gridId">
-                          <el-select v-model="searchForm.gridId"
-                                     filterable
-                                     placeholder="请选择"
-                                     clearable>
-                            <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="服务类型"
-                                      prop="serviceType">
-                            <el-select v-model="searchForm.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="申请人" prop="name">
-                            <el-input v-model="searchForm.applicantName" placeholder="请输入" class="input-width"
-                                      clearable></el-input>
-                        </el-form-item>
-                        <el-form-item label="住址" prop="mobile">
-                            <el-input v-model="searchForm.applicantAddress" placeholder="请输入" class="input-width"
-                                      clearable></el-input>
-                        </el-form-item>
-                    </div>
-                    <div>
-                        <el-form-item label="服务内容" prop="idCard">
-                            <el-input v-model="searchForm.serviceContent" placeholder="请输入" class="input-width"
-                                      clearable></el-input>
-                        </el-form-item>
-                        <el-form-item label="联系电话" prop="address">
-                            <el-input v-model="searchForm.applicantMobile" placeholder="请输入" class="input-width"
-                                      clearable></el-input>
-                        </el-form-item>
-                        <el-form-item>
-                            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
-                            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置
-                            </el-button>
-                        </el-form-item>
-                    </div>
-
-                </el-form>
-            </div>
-        </el-card>
-        <el-card class="resi-card-table">
-
-            <div class="resi-row-btn">
-                <el-button class="diy-button--add"
-                           style="margin-left: 0"
-                           size="small"
-                           @click="handleAdd">新增
-                </el-button>
-                <el-button
-                        class="diy-button--export"
-                        size="small"
-                        @click="handleExportModule('room')">下载模板
-                </el-button>
-                <el-upload
-                        ref="upload"
-                        class="upload-demo"
-                        action="uploadUlr"
-                        :limit="1"
-                        :accept="'.xls,.xlsx'"
-                        :with-credentials="true"
-                        :show-file-list="false"
-                        :auto-upload="true"
-                        :on-success="handleExcelSuccess"
-                        :before-upload="beforeExcelUpload"
-                        :http-request="uploadHttpRequest">
-                    <el-button size="small" class="diy-button--delete" :loading="importLoading">{{importBtnTitle}}
-                    </el-button>
-                </el-upload>
-                <el-button class="diy-button--reset" size="small" :loading="exportBtn" @click="handleExport">{{
-                    exportBtnTitle }}
-                </el-button>
-            </div>
-
-            <el-table
-                    :data="tableData"
-                    row-key="id"
-                    v-loading="tableLoading"
-                    border
-                    style="width: 100%"
-                    class="resi-table">
-                <el-table-column label="序号" type="index" align="center" width="50">
-                </el-table-column>
-                <el-table-column
-                        prop="gridName"
-                        label="所属网格"
-                        align="center"
-                        width="100"/>
-                <el-table-column
-                        prop="serviceTypeName"
-                        label="服务类型"
-                        align="center"
-                        min-width="180"/>
-                <el-table-column
-                        prop="principalName"
-                        label="申请人"
-                        align="center"
-                        min-width="160"/>
-                <el-table-column
-                        prop="applicantAddress"
-                        label="住址"
-                        align="center"
-                        min-width="160"/>
-                <el-table-column
-                        prop="serviceContent"
-                        label="服务内容"
-                        align="center"
-                        min-width="160"/>
-                <el-table-column
-                        prop="applicantMobile"
-                        label="联系电话"
-                        align="center"
-                        min-width="160"/>
-                <el-table-column
-                        prop="principalName"
-                        label="责任人"
-                        align="center"
-                        width="100"/>
-                <el-table-column
-                        prop="serviceTime"
-                        label="服务时间"
-                        align="center"
-                        show-overflow-tooltip
-                        min-width="180"/>
-                <el-table-column
-                        prop="remark"
-                        label="备注"
-                        align="center"
-                        width="100"/>
-                <el-table-column fixed="right" label="操作" align="center" width="200">
-                    <template slot-scope="scope">
-                        <el-button
-                                @click="handleLook(scope.row)"
-                                type="text"
-                                size="small"
-                                class="btn-color-look">查看</el-button>
-                        <el-button
-                                @click="handleEdit(scope.row, 'edit')"
-                                type="text"
-                                size="small"
-                                class="btn-color-edit">修改</el-button>
-                        <el-popconfirm
-                                title="删除之后无法恢复，确认删除？"
-                                @onConfirm="handleDel(scope.row)">
-                            <el-button
-                                    slot="reference"
-                                    type="text"
-                                    size="small"
-                                    class="btn-color-del">删除</el-button>
-                        </el-popconfirm>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div>
-                <el-pagination
-                        @size-change="handleSizeChange"
-                        @current-change="handleCurrentChange"
-                        :current-page.sync="currentPage"
-                        :page-sizes="[20, 50, 100, 200]"
-                        :page-size="pageSize"
-                        layout="sizes, prev, pager, next, total"
-                        :total="total">
-                </el-pagination>
-            </div>
-        </el-card>
-
-        <el-dialog title=""
-                   :visible.sync="dialogVisible"
-                   width="50%"
-                   top="5vh"
-                   append-to-body
-                   class="dialog-h"
-                   :close-on-click-modal="false"
-                   :before-close="handlerCancle">
-            <el-form v-if="dialogVisible"
-                     label-width="120px"
-                     :model="workLogDetail"
-                     ref="ruleForm"
-                     class="form-wr dialog-h-content scroll-h">
-                <el-form-item label="所属网格"
-                              prop="gridId">
-                    <el-input v-if="disabled"
-                              v-model="workLogDetail.gridName"
-                              :disabled="disabled"
-                              class="input-width"></el-input>
-                    <el-select v-else
-                               v-model="workLogDetail.gridId"
-                               filterable
-                               placeholder="请选择"
-                               class="input-width"
-                               clearable
-                               :disabled="disabled"
-                               @change="handleGridChange">
-                        <el-option v-for="item in disabled ? optionsG : optionsEditG"
-                                   :key="item.value"
-                                   :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="需求类型"
-                              prop="serviceType">
-                    <el-input v-if="disabled"
-                              v-model="workLogDetail.serviceTypeName"
-                              :disabled="disabled"
-                              class="input-width-min"></el-input>
-                    <el-cascader v-else
-                                 v-model="workLogDetail.serviceType"
-                                 :options="demandOptions"
-                                 :disabled="disabled"
-                                 clearable
-                                 class="input-width"
-                                 @change="handleCateSlect"></el-cascader>
-                </el-form-item>
-                <el-form-item label="上报类型"
-                              prop="reportType">
-                    <el-input v-if="disabled"
-                              v-model="form.reportTypeName"
-                              :disabled="disabled"
-                              class="input-width"></el-input>
-                </el-form-item>
-                <el-form-item label="上报人"
-                              prop="reportUserName">
-                    <el-input v-model="form.reportUserName"
-                              :disabled="disabled"
-                              placeholder="请输入"
-                              class="input-width"
-                              clearable></el-input>
-                </el-form-item>
-                <el-form-item label="上报人手机号"
-                              prop="reportUserMobile">
-                    <el-input v-model="form.reportUserMobile"
-                              :disabled="disabled"
-                              placeholder="请输入"
-                              class="input-width"
-                              maxlength="11"
-                              clearable></el-input>
-                </el-form-item>
-                <el-form-item label="上报时间"
-                              prop="reportTime">
-                    <el-date-picker v-model="form.reportTime"
-                                    type="datetime"
-                                    class="input-width"
-                                    clearable
-                                    :disabled="disabled"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    placeholder="选择日期时间">
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item label="需求人"
-                              prop="demandUserId">
-                    <el-input v-if="disabled"
-                              v-model="form.demandUserName"
-                              :disabled="disabled"
-                              class="input-width"></el-input>
-                    <el-select v-else
-                               v-model="selectDemandUser"
-                               class="input-width"
-                               filterable
-                               :disabled="disabled"
-                               placeholder="请选择"
-                               clearable
-                               @change="handleDemandChange">
-                        <el-option v-for="item in demandUserList"
-                                   :key="item.demandUserId"
-                                   :label="item.label"
-                                   :value="item">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="服务时间"
-                              prop="wantServiceTime">
-                    <el-date-picker v-model="form.wantServiceTime"
-                                    type="datetime"
-                                    class="input-width"
-                                    clearable
-                                    :disabled="disabled"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    placeholder="选择日期时间">
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item label="需求内容"
-                              prop="content">
-                    <el-input v-model="form.content"
-                              :autosize="{ minRows: 2, maxRows: 10 }"
-                              :disabled="disabled"
-                              type="textarea"
-                              clearable
-                              class="input-width-textarea"
-                              placeholder="请输入内容"></el-input>
-                </el-form-item>
-                <el-form-item v-if="
-            addType == 'finish' ||
-            (addType == 'look' && form.serviceShowFlag)
-          "
-                              label="服务方"
-                              prop="serviceType">
-                    <template v-if="disabled && addType !== 'appoint'">
-                        <el-input v-model="form.serviceShowName"
-                                  :disabled="disabled"
-                                  class="input-width"></el-input>
-                    </template>
-                    <template v-else>
-                        <el-select v-model="form.serviceType"
-                                   class="input-width-small"
-                                   placeholder="请选择"
-                                   clearable
-                                   :disabled="disabled && addType !== 'appoint'"
-                                   @change="handleServiceChange('add', $event)">
-                            <el-option v-for="item in serviceOptions"
-                                       :key="item.value"
-                                       :label="item.label"
-                                       :value="item.value">
-                            </el-option>
-                        </el-select>
-                        -
-                        <el-select v-model="form.serverId"
-                                   class="input-width-middle"
-                                   filterable
-                                   placeholder="请选择"
-                                   clearable
-                                   :disabled="disabled && addType !== 'appoint'">
-                            <el-option v-for="item in serviceOptiondList"
-                                       :key="item.value"
-                                       :label="item.label"
-                                       :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </template>
-                </el-form-item>
-                <el-form-item v-if="addType == 'look' && form.status == 'canceled'"
-                              label="取消时间"
-                              prop="cancelTime">
-                    <span>{{ form.cancelTime }}</span>
-                </el-form-item>
-                <template v-if="
-            (addType == 'finish' && form.reportType != 'self_help') ||
-            (addType == 'look' && form.status == 'finished')
-          ">
-                    <el-form-item label="实际服务时间"
-                                  prop="serviceStartTime">
-                        <el-date-picker v-model="finishServiceTime"
-                                        class="input-width-min"
-                                        clearable
-                                        :disabled="disabled && addType != 'finish'"
-                                        type="datetimerange"
-                                        range-separator="至"
-                                        start-placeholder="开始日期"
-                                        end-placeholder="结束日期"
-                                        value-format="yyyy-MM-dd HH:mm:ss"
-                                        @change="handelBlurServiceTime">
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="完成情况"
-                                  prop="finishResult">
-                        <el-radio v-model="form.finishResult"
-                                  label="resolved"
-                                  :disabled="disabled && addType != 'finish'">已解决</el-radio>
-                        <el-radio v-model="form.finishResult"
-                                  label="unresolved"
-                                  :disabled="disabled && addType != 'finish'">未解决</el-radio>
-                    </el-form-item>
-                    <el-form-item label="评价"
-                                  prop="score"
-                                  class="form-score">
-                        <el-rate v-model="form.score"
-                                 :allow-half="true"
-                                 :disabled="disabled && addType != 'finish'"></el-rate>
-                    </el-form-item>
-                    <el-form-item label="备注"
-                                  prop="finishDesc">
-                        <el-input v-model="form.finishDesc"
-                                  :autosize="{ minRows: 2, maxRows: 10 }"
-                                  :disabled="disabled && addType != 'finish'"
-                                  type="textarea"
-                                  clearable
-                                  class="input-width-textarea"
-                                  placeholder="请输入内容"></el-input>
-                    </el-form-item>
-                </template>
-                <template v-if="addType == 'finish' && form.reportType == 'self_help'">
-                    <el-form-item label="实际服务时间"
-                                  prop="serviceStartTime">
-                        <el-date-picker v-model="finishServiceTime"
-                                        class="input-width-min"
-                                        clearable
-                                        :disabled="disabled && addType != 'finish'"
-                                        type="datetimerange"
-                                        range-separator="至"
-                                        start-placeholder="开始日期"
-                                        end-placeholder="结束日期"
-                                        value-format="yyyy-MM-dd HH:mm:ss"
-                                        @change="handelBlurServiceTime">
-                        </el-date-picker>
-                    </el-form-item>
-                </template>
-            </el-form>
-            <div class="resi-btns">
-                <el-button size="small"
-                           @click="handlerCancle">{{
-                    addType != "look" ? "取消" : "关闭"
-                    }}</el-button>
-<!--                <el-button v-if="addType != 'look'"-->
-<!--                           type="primary"-->
-<!--                           size="small"-->
-<!--                           :loading="btnLoading"-->
-<!--                           @click="handleSubmit">提交</el-button>-->
-            </div>
-        </el-dialog>
-
-    </div>
-</template>
-
-<script>
-
-    import workLogDetail from './workLogDetail'
-    import axios from 'axios'
-    import {mapGetters} from 'vuex'
-
-    export default {
-        components: {},
-        data() {
-            return {
-                uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-                importBtnTitle: '导入',
-                importLoading: false,
-                exportBtn: false,
-                exportBtnTitle: '导出',
-                tableLoading: false,
-                btnLoading: false,
-                uploading: false,
-                disabled: false,
-                pageLoading: false,
-                dialogVisible: false,
-                currentPage: 1,
-                pageSize: 20,
-                total: null,
-                tableData: [],
-                searchH: 0,
-                unloadPencent: 0,
-                addLevel: '1',
-                addType: 'add',
-                value: '',
-                optionsEditG: [],
-                optionsG: [],
-                optionsC: [],
-                optionsEditC: [],
-                options: [
-                    {
-                        label: '是',
-                        value: 1
-                    }, {
-                        label: '否',
-                        value: 2
-                    }
-                ],
-                demandOptions: [],
-                partyOrgRange: [],
-                timeRangePay: [],
-                timeRange: [],
-                customerId: '',
-                searchForm: {
-                    gridId: '',
-                    serviceType: '',
-                    applicantName: '',
-                    applicantAddress: '',
-                    serviceContent: '',
-                    applicantMobile: ''
-                },
-                partyProps: {
-                    label: 'partyOrgName',
-                    value: 'id',
-                    checkStrictly: true
-                },
-                workLogDetail: {
-                    gridId: '',
-                    gridName: ''
-                },
-                serviceTypeList: []
-            }
-        },
-        computed: {
-        },
-        async created() {
-            this.customerId = localStorage.getItem('customerId')
-            this.getTableData()
-            this.getGridList('query')
-            this.getServiceType()
-            this.pageLoading = true
-
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.searchH = this.$refs.searchCard.$el.offsetHeight
-            })
-        },
-        methods: {
-            handleSizeChange(val) {
-                this.pageSize = val
-                this.getTableData()
-            },
-            handleCurrentChange(val) {
-                this.currentPage = val
-                this.getTableData()
-            },
-            handlePartyChange(val) {
-                this.searchForm.partyOrgId = val[val.length - 1]
-            },
-            handleFilterSpan(row, item) {
-                let _val = ''
-                if (item.options && item.options.length > 0) {
-                    item.options.forEach((n) => {
-                        if (n.value === row[item.columnName]) _val = n.label
-                    })
-                }
-                return _val || row[item.columnName]
-            },
-            handleTimeChange(val) {
-                if (val.length > 0) {
-                    this.searchForm.rdsjStartDate = val[0]
-                    this.searchForm.rdsjEndDate = val[1]
-                } else {
-                    this.searchForm.rdsjStartDate = ''
-                    this.searchForm.rdsjEndDate = ''
-                }
-
-            },
-            handleTimeChangePay(val) {
-                if (val.length > 0) {
-                    this.searchForm.payStatrDate = val[0]
-                    this.searchForm.payEndDate = val[1]
-                } else {
-                    this.searchForm.payStatrDate = ''
-                    this.searchForm.payEndDate = ''
-                }
-
-            },
-            // 上传大图标成功
-            handleExcelSuccess(res, file) {
-                if (res.code === 0 && res.msg === 'success') {
-
-                } else {
-                    this.$message.error(res.msg)
-                }
-            },
-            handleProgress(event, file, fileList) {
-                this.uploading = true
-                this.unloadPencent = Number(file.percentage.toFixed(0))
-            },
-            download(data, fileName) {
-                if (!data) {
-                    return
-                }
-                var csvData = new Blob([data])
-                if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-                    window.navigator.msSaveOrOpenBlob(csvData, fileName)
-                }
-                else {
-                    var a = document.createElement('a')
-                    document.body.appendChild(a)
-                    a.style = 'display: none'
-                    var url = window.URL.createObjectURL(csvData)
-                    a.href = url
-                    a.download = fileName
-                    a.click()
-                    a.remove()
-                    window.URL.revokeObjectURL(url)
-                }
-            },
-            async getServiceType(){
-                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/serviceTypePage'
-                let params = {
-                    pageNo: 1,
-                    pageSize: 10000
-                }
-                await this.$http
-                    .post(url, params)
-                    .then(({ data: res }) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg);
-                        } else {
-                            this.serviceTypeList = res.data.list
-                            console.log('serviceTypeList:',this.serviceTypeList)
-                        }
-                    })
-                    .catch(() => {
-                        return this.$message.error("网络错误");
-                    });
-            },
-            async handleExportModule() {
-                let url = "/resi/partymember/icPartyMember/downloadTemplate"
-                let params = {}
-                await this.$http({
-                    method: 'POST',
-                    url,
-                    responseType: 'blob',
-                    data: params
-                })
-                    .then(res => {
-                        console.log('res-------dd', res)
-                        if (res.headers["content-disposition"]) {
-                            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-                            this.download(res.data, fileName)
-
-                        } else this.$message.error('下载失败')
-                    })
-                    .catch(err => {
-                        console.log('err', err)
-                        return this.$message.error('网络错误')
-                    })
-            },
-            beforeExcelUpload(file) {
-                console.log('file', file)
-                const isType = file.type === 'application/vnd.ms-excel'
-                const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-                const fileType = isType || isTypeComputer
-                const isLt1M = (file.size / 1024 / 1024) < 10
-                if (!fileType) {
-                    this.$message.error('上传文件只能是xls/xlsx格式！')
-                }
-
-                if (!isLt1M) {
-                    this.$message.error('上传文件大小不能超过 10MB!')
-                }
-                return fileType && isLt1M
-            },
-            async uploadHttpRequest(file) {
-                this.importLoading = true
-                this.importBtnTitle = '正在上传中...'
-                this.$message({
-                    showClose: true,
-                    message: '导入中，请到系统管理-导入记录中查看进度',
-                    duration: 0
-                })
-                const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
-                formData.append('file', file.file) //添加文件对象
-                this.$http
-                    .post('/resi/partymember/icPartyMember/import', formData).then(res => {
-                    console.log('res-up', res)
-                    if (res.data.code == 0 && res.data.msg == 'success') {
-                        // this.$message.success('导入成功')
-                        this.getTableData()
-                    } else {
-                        this.$message.error(res.data.msg)
-                    }
-                }).catch(err => {
-                    console.log('失败', err)
-                    file.onError() //上传失败的文件会从文件列表中删除
-                    // this.$message.error('导入失败')
-                })
-
-                this.importLoading = false
-                this.importBtnTitle = '导入'
-                this.$refs.upload.clearFiles()
-            },
-            async handleExport() {
-                this.exportBtn = true
-                this.exportBtnTitle = '正在导出...'
-                let params = {
-                    agencyId: this.$store.state.user.agencyId,
-                    pageSize: 9999,
-                    pageNo: this.currentPage
-                }
-                // .post('epmetuser/icresiuser/exportExcel', params)
-                const url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate'
-                await axios({
-                    // url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icPartyMember/export',
-                    url: url,
-                    // url: 'epmetuser/icresiuser/exportExcel',
-                    method: 'post',
-                    data: params,
-                    responseType: 'blob'
-                })
-                    .then(res => {
-                        console.log('resllll', 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)
-                        this.$message.error('获取导出失败')
-                    })
-                this.exportBtn = false
-                this.exportBtnTitle = '导出'
-            },
-            beforeImgUpload(file) {
-                const isPNG = (file.type === 'image/png') || (file.type === 'image/jpeg')
-                const isLt1M = file.size / 1024 / 1024 < 10
-
-                if (!isPNG) {
-                    this.$message.error('上传图片只能是 PNG 或 JPEG 格式!')
-                }
-                if (!isLt1M) {
-                    this.$message.error('上传图片大小不能超过 10MB!')
-                }
-                return isPNG && isLt1M
-            },
-            handleImgSuccess(res, file) {
-                if (res.code === 0 && res.msg === 'success') {
-
-                    console.log('res.data.url', res.data.url)
-                    this.uploading = false
-                    this.unloadPencent = 0
-                    this.form.imageList.push(res.data.url)
-
-                } else {
-                    this.$message.error(res.msg)
-                }
-            },
-            handleDelimg(item, index) {
-                this.form.imageList.splice(index, 1)
-            },
-            handleSearch(val) {
-                console.log('searchhh--', val)
-                this.currentPage = 1
-                this.getTableData()
-            },
-            resetForm(formName) {
-                this.timeRangePay = []
-                this.timeRange = []
-                this.searchForm.payStatrDate = ''
-                this.searchForm.payEndDate = ''
-                this.searchForm.rdsjStartDate = ''
-                this.searchForm.rdsjEndDate = ''
-                this.$refs[formName].resetFields()
-                this.handleSearch()
-            },
-            handleAdd() {
-                this.dialogVisible = true
-            },
-
-            handlerCancle() {
-                this.detailInfo = {}
-                this.disabled = false
-                this.dialogVisible = false
-            },
-            async handleLook(row) {
-                this.disabled = true
-                this.$nextTick(() => {
-                    this.$refs.ref_detail.initForm(row)
-                })
-                // await this.getDetail(row.applicantId)
-            },
-            async handleEdit(row, addType) {
-                await this.getDetail(row.id)
-                this.dialogVisible = true
-            },
-
-            handleDel(row) {
-                let params = {
-                    ids: [row.applicantId]
-                }
-                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/delete'
-                // let url = '/heart/workdiaryService/record/delete'
-                this.$http
-                    .post(url, params)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        } else {
-                            this.$message.success('删除成功')
-                            this.getTableData()
-                        }
-                    })
-                    .catch((err) => {
-                        return this.$message.error('网络错误')
-                    })
-            },
-            async getDetail(id) {
-                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/'
-                // let url = '/heart/workdiaryService/record/'
-                this.$http
-                    .post(url+id)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        } else {
-                            this.workLogDetail = {...res.data}
-                            this.dialogVisible = true
-                        }
-                    })
-                    .catch((err) => {
-                        console.log('row4', err)
-                        return this.$message.error('网络错误')
-                    })
-            },
-            /*async getGridList(type, agencyId) {
-                const {user} = await this.$store.state
-                console.log('user---ppp', user)
-                // addorupdate  query
-                await this.$http
-                    .get('/resi/partymember/icPartyOrg/getSearchTreelist', {params: {agencyId: agencyId || user.agencyId}})
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        } else {
-                            console.log('获取查询详情成功', res.data)
-
-                            this.optionsG = this.deepArrTOnull(res.data)
-                        }
-                    })
-                    .catch(() => {
-                        return this.$message.error('网络错误')
-                    })
-            },*/
-          async getGridList (type, agencyId) {
-            const { user } = await this.$store.state;
-            await this.$http
-                    .post("/gov/org/customergrid/gridoption", {
-                      agencyId: agencyId || user.agencyId,
-                      purpose: type,
-                    })
-                    .then(({ data: res }) => {
-                      if (res.code !== 0) {
-                        return this.$message.error(res.msg);
-                      } else {
-                        if (type === "query") this.optionsG = res.data;
-                        else this.optionsEditG = res.data;
-                      }
-                    })
-                    .catch(() => {
-                      return this.$message.error("网络错误");
-                    });
-          },
-            deepArrTOnull(arr) {
-                let a = []
-                a = arr.map(item => {
-                    return {
-                        ...item,
-                        children: (item.children.length > 0 && this.deepArrTOnull(item.children)) || null
-                    }
-                })
-                return a
-            },
-            async getCateList(type) {
-                const {user} = await this.$store.state
-                console.log('user---ppp', user)
-                const params = {
-                    customerId: this.customerId,
-                    type
-                }
-                // addorupdate  query
-                await this.$http
-                    .post('/resi/partymember/stylecategorydict/select-list', params)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        } else {
-                            console.log('获取查询详情成功', res.data)
-
-                            if (type === 'query') this.optionsC = res.data
-                            else this.optionsEditC = res.data
-                        }
-                    })
-                    .catch(() => {
-                        return this.$message.error('网络错误')
-                    })
-            },
-            async getTableData() {
-                this.tableLoading = true
-                const {user} = await this.$store.state
-                let params = {
-                    ...this.searchForm,
-                    pageNo: this.currentPage,
-                    pageSize: this.pageSize
-                }
-                const url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page'
-                await this.$http
-                    // .post('/resi/partymember/icPartyMember/page', params)
-                    .post(url, params)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        } else {
-                            this.tableData = res.data.list
-                            this.total = res.data.total
-                            console.log(this.tableData)
-                        }
-                    })
-                    .catch(() => {
-                        return this.$message.error('网络错误')
-                    })
-                this.tableLoading = false
-            }
-
-        }
-    }
-</script>
-
-<style lang="scss" scoped>
-    @import "@/assets/scss/buttonstyle.scss";
-
-    .resi-container .resi-card-table {
-        ::v-deep .el-table th {
-            color: #fff;
-            background-color: rgba(33, 149, 254, 1);
-            // border-right: 1px solid rgba(33, 149, 254, 1);
-        }
-    }
-
-    .resi-table {
-        ::v-deep .el-button--text {
-            text-decoration: underline;
-        }
-
-        ::v-deep .btn-color-del {
-            margin-left: 10px;
-            color: rgba(213, 16, 16, 1);
-        }
-
-        ::v-deep .btn-color-edit {
-            color: rgba(0, 167, 169, 1);
-        }
-    }
-
-    .form-wr {
-        .input-width {
-            width: 260px;
-
-        }
-
-        .input-width-textarea {
-            width: 500px;
-        }
-
-        .imsg-list {
-            display: flex;
-            align-items: center;
-
-            .imgs-item {
-                position: relative;
-                margin-right: 10px;
-
-                .el-icon-delete {
-                    position: absolute;
-                    top: 0;
-                    right: 0;
-                    font-size: 18px;
-                    color: red;
-                    z-index: 3;
-                    cursor: pointer;
-                }
-            }
-        }
-    }
-
-    .div-content {
-        width: 100%;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
-</style>
-
-<style lang="scss" scoped>
-    .resi-row-btn {
-        display: flex;
-        margin-bottom: 13px;
-        ::v-deep .el-button {
-            margin-left: 10px;
-            border: 0;
-        }
-        ::v-deep .el-select {
-            margin-right: 10px;
-        }
-        .el-button--success {
-            background: rgba(34, 193, 195, 1);
-        }
-        .el-button {
-            /*margin-right: 10px;*/
-            border: 0;
-        }
-        .el-button--warning {
-            background: rgba(254, 179, 73, 1);
-        }
-        .el-button--danger {
-            background: rgba(254, 98, 82, 1);
-        }
-    }
-    .avatar-uploader {
-        ::v-deep
-        .el-upload {
-            cursor: pointer;
-            position: relative;
-            overflow: hidden;
-        }
-        .el-upload:hover {
-            border-color: #409EFF;
-        }
-        .avatar {
-            width: 100px;
-            height: 100px;
-            display: block;
-        }
-        .avatar-uploader-icon {
-            border: 1px dashed #d9d9d9;
-            border-radius: 6px;
-            font-size: 28px;
-            color: #8c939d;
-            width: 100px;
-            height: 100px;
-            line-height: 100px;
-            text-align: center;
-        }
-    }
-    .resi-btns {
-        margin-top: 20px;
-        text-align: center;
-    }
-</style>
\ No newline at end of file
diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
new file mode 100644
index 000000000..17f0079c2
--- /dev/null
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -0,0 +1,762 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'100px'">
+        <div>
+          <el-form-item label="所属网格"
+                        prop="gridId">
+            <el-select v-model="workLog.gridId"
+                       filterable
+                       placeholder="请选择"
+                       clearable>
+              <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="服务类型"
+                        prop="serviceType">
+            <el-select v-model="workLog.serviceType"
+                       filterable
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in serviceTypeList"
+                         :key="item.id"
+                         :label="item.serviceTypeName"
+                         :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="申请人"
+                        prop="applicantName">
+            <el-input v-model="workLog.applicantName"
+                      class="item_width_1"
+                      clearable
+                      size="small"
+                      placeholder="请输入内容">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="住址"
+                        prop="applicantAddress">
+            <el-input v-model="workLog.applicantAddress"
+                      class="item_width_1"
+                      clearable
+                      size="small"
+                      placeholder="请输入内容">
+            </el-input>
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="服务内容"
+                        prop="serviceContent">
+            <el-input v-model="workLog.serviceContent"
+                      class="item_width_1"
+                      clearable
+                      size="small"
+                      placeholder="请输入内容">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="联系电话"
+                        prop="applicantMobile">
+            <el-input v-model="workLog.applicantMobile"
+                      class="item_width_1"
+                      clearable
+                      size="small"
+                      placeholder="请输入内容">
+            </el-input>
+          </el-form-item>
+          <el-button style="margin-left:10px"
+                     class="diy-button--search"
+                     size="small"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     class="diy-button--reset"
+                     size="small"
+                     @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 class="diy-button--search"
+                   style="margin-left:10px"
+                   size="small"
+                   @click="handleExportModule('room')">下载模板</el-button>
+        <el-upload ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left:10px"
+                     class="diy-button--delete"
+                     size="small">导入</el-button>
+        </el-upload>
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+      </div>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="gridName"
+                         header-align="center"
+                         align="center"
+                         label="场所名称"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="serviceTypeName"
+                         header-align="center"
+                         align="center"
+                         label="服务类型"
+                         min-width="80">
+        </el-table-column>
+        <el-table-column prop="applicantName"
+                         header-align="center"
+                         align="center"
+                         label="申请人"
+                         show-overflow-tooltip
+                         max-width="100">
+        </el-table-column>
+        <el-table-column prop="applicantAddress"
+                         header-align="center"
+                         align="center"
+                         label="住址"
+                         width="80">
+        </el-table-column>
+        <el-table-column prop="serviceContent"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="服务内容"
+                         mix-width="230">
+        </el-table-column>
+        <el-table-column prop="applicantMobile"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="联系电话"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="principalName"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="责任人"
+                         width="130">
+        </el-table-column>
+        <el-table-column prop="serviceTime"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="服务时间"
+                         width="130">
+        </el-table-column>
+        <el-table-column prop="remark"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="备注"
+                         width="130">
+        </el-table-column>
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="200"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+            <el-button type="text"
+                       class="div-table-button--delete"
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[10, 20, 50]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               :destroy-on-close="true"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="editDiaClose">
+      <ggfw-form ref="ref_form"
+                 :typeList="typeList"
+                 @dialogCancle="addFormCancle"
+                 @dialogOk="addFormOk"></ggfw-form>
+    </el-dialog>
+
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'详情'"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <ggfw-detail ref="ref_detail"
+                   @diaClose="diaClose"></ggfw-detail>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import workLogForm from './workLogForm'
+import workLogDetail from './workLogDetail'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+      agencyId: '',
+
+      unitList: [],//单位list
+      serviceList: [],//服务list
+      typeList: [],//分类list
+      formData: {
+        name: '',
+        category: ''
+      },
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增单位',
+      detailShow: false,
+
+      //完成情况
+      finishDiaTitle: '区域化党建单位完成情况',
+      finishDiaShow: false,
+      //积分记录
+      scoreDiaTitle: '积分记录',
+      scoreDiaShow: false,
+
+      files: "",
+      fileName: "",
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/icPublicService/import',
+      optionsG: [],
+      optionsEditG: [],
+      workLog: {
+        gridId: '',
+        serviceType: '',
+        applicantName: '',
+        applicantAddress: '',
+        applicantMobile: '',
+        serviceContent: ''
+      },
+      serviceTypeList: [],
+
+    }
+  },
+  components: {
+    workLogDetail, workLogForm
+  },
+  async created () {
+    this.getGridList("query");
+    this.getServiceTypeList();
+  },
+  async mounted () {
+    //获取服务事项
+    await this.loadService()
+
+    //获取分类
+    await this.loadType()
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+    async getGridList (type, agencyId) {
+      const { user } = await this.$store.state;
+      await this.$http
+              .post("/gov/org/customergrid/gridoption", {
+                agencyId: agencyId || user.agencyId,
+                purpose: type,
+              })
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                } else {
+                  console.log("获取查询详情成功", res.data);
+
+                  if (type === "query") this.optionsG = res.data;
+                  else this.optionsEditG = res.data;
+                }
+              })
+              .catch(() => {
+                return this.$message.error("网络错误");
+              });
+    },
+    async getServiceTypeList () {
+      let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
+      // let url = '/heart/workdiaryService/serviceType/page'
+      let params = {
+        pageNo: 1,
+        pageSize: 10000
+      }
+      await this.$http
+              .post(url, params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                } else {
+                  this.serviceTypeList = res.data.list;
+                }
+              })
+              .catch(() => {
+                return this.$message.error("网络错误");
+              });
+    },
+    async handleExportModule () {
+      // let url = "/heart/workdiaryService/record/downloadTemplate";
+      let url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate";
+
+      let params = {};
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        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]
+            );
+            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对象
+          } else this.$message.error("下载失败");
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    //获取服务事项下拉框
+    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"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.workLog
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    editDiaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+    },
+    diaClose () {
+      this.detailShow = false
+      this.finishDiaShow = false
+      this.scoreDiaShow = false
+    },
+
+    handleDetail (row) {
+      this.detailShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_detail.initForm(row)
+      })
+    },
+
+    //完成情况
+    handleFinish (row) {
+      this.finishDiaTitle = row.name + '完成情况'
+      this.finishDiaShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_finish.initTable(row)
+      })
+    },
+    //积分记录
+    handleScore (row) {
+      this.scoreDiaShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_score.initForm(row.icPublicServiceId)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = 'edit'
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null)
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.icPublicServiceId)
+      })
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteUnit(row)
+        })
+        .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 { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        name: '',
+        category: ''
+      }
+      this.pageSize = 10
+      this.pageNo = 0
+      // this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = '工作日志'
+
+      // const url = "/heart/workdiaryService/record/export"
+      const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/export"
+      let params = {
+        ...this.workLog
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    // 上传文件之前的钩子
+    beforeUpload (file) {
+      this.files = file;
+
+      const isText = file.type === 'application/vnd.ms-excel'
+      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
+      if (!isText && !isTextComputer) {
+        this.$message.error('请选择正确格式的文件')
+        return false
+      } else {
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+
+    async uploadFile () {
+      this.loading = true
+
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      // 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是要传的文件名
+
+      const { data, code, msg } = await requestPost(url, fileFormData)
+      if (code === 0) {
+        this.$message({
+          showClose: true,
+          message: "导入中，请到系统管理-导入记录中查看进度",
+          duration: 0,
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+
+
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return this.$store.state.inIframe ? this.clientHeight - 350 + this.iframeHeight : this.clientHeight - 350
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+.div_main {
+  width: 100%;
+}
+
+.div_search {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 30px 20px 5px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+}
+
+.item_width_1 {
+  width: 260px;
+}
+.item_width_2 {
+  width: 620px;
+}
+
+.div_table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  // padding: 23px 30px 10px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+
+.el-row {
+  /* margin-bottom: 20px; */
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
+}
+</style>
diff --git a/src/views/modules/communityService/worklog/workLogDetail.vue b/src/views/modules/communityService/worklog/workLogDetail.vue
index a8dc01dc2..917d571be 100644
--- a/src/views/modules/communityService/worklog/workLogDetail.vue
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@@ -4,120 +4,65 @@
 
       <el-form ref="ref_form"
                :inline="true"
-               :model="workLogDetail"
+               :model="formData"
                class="form">
 
-        <el-form-item label="需求类型"
-                      prop="serviceType">
-          <el-input v-if="disabled"
-                    v-model="workLogDetail.serviceTypeName"
-                    :disabled="disabled"
-                    class="input-width-min"></el-input>
-          <el-cascader v-else
-                       v-model="workLogDetail.serviceType"
-                       :options="demandOptions"
-                       :disabled="disabled"
-                       clearable
-                       class="input-width"
-                       @change="handleCateSlect"></el-cascader>
+        <el-form-item label="服务类型"
+                      prop="serviceTypeName"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.serviceTypeName}}</span>
+
         </el-form-item>
         <el-form-item label="所属网格"
-                      prop="gridId">
-          <el-input v-if="disabled"
-                    v-model="workLogDetail.gridName"
-                    :disabled="disabled"
-                    class="input-width"></el-input>
-          <el-select v-else
-                     v-model="workLogDetail.gridId"
-                     filterable
-                     placeholder="请选择"
-                     class="input-width"
-                     clearable
-                     :disabled="disabled"
-                     @change="handleGridChange">
-            <el-option v-for="item in disabled ? optionsG : optionsEditG"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="上报类型"
-                      prop="reportType">
-          <el-input v-if="disabled"
-                    v-model="workLogDetail.reportTypeName"
-                    :disabled="disabled"
-                    class="input-width"></el-input>
+                      prop="gridName"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.gridName}}</span>
+
         </el-form-item>
         <el-form-item label="申请人"
-                      prop="applicantName">
-          <el-input v-model="workLogDetail.applicantName"
-                    :disabled="disabled"
-                    placeholder="请输入"
-                    class="input-width"
-                    clearable></el-input>
+                      prop="applicantName"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.areaCovered}}</span>
+
+        </el-form-item>
+        <el-form-item label="住址"
+                      prop="capacity"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.applicantAddress}}</span>
         </el-form-item>
-        <el-form-item label="上报人手机号"
-                      prop="reportUserMobile">
-          <el-input v-model="workLogDetail.reportUserMobile"
-                    :disabled="disabled"
-                    placeholder="请输入"
-                    class="input-width"
-                    maxlength="11"
-                    clearable></el-input>
+        <el-form-item label="服务内容："
+                      prop="principal"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.applicantContent}}</span>
         </el-form-item>
-        <el-form-item label="上报时间"
-                      prop="reportTime">
-          <el-date-picker v-model="workLogDetail.reportTime"
-                          type="datetime"
-                          class="input-width"
-                          clearable
-                          :disabled="disabled"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期时间">
-          </el-date-picker>
+        <el-form-item label="联系电话："
+                      prop="mobile"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.applicantMobile}}</span>
         </el-form-item>
-        <el-form-item label="需求人"
-                      prop="demandUserId">
-          <el-input v-if="disabled"
-                    v-model="workLogDetail.demandUserName"
-                    :disabled="disabled"
-                    class="input-width"></el-input>
-          <el-select v-else
-                     v-model="selectDemandUser"
-                     class="input-width"
-                     filterable
-                     :disabled="disabled"
-                     placeholder="请选择"
-                     clearable
-                     @change="handleDemandChange">
-            <el-option v-for="item in demandUserList"
-                       :key="item.demandUserId"
-                       :label="item.label"
-                       :value="item">
-            </el-option>
-          </el-select>
+        <el-form-item label="负责人："
+                      style="display: block"
+                      prop="address"
+                      label-width="150px">
+          <span>{{formData.principalName}}</span>
         </el-form-item>
-        <el-form-item label="服务时间"
-                      prop="wantServiceTime">
-          <el-date-picker v-model="workLogDetail.wantServiceTime"
-                          type="datetime"
-                          class="input-width"
-                          clearable
-                          :disabled="disabled"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期时间">
-          </el-date-picker>
+        <el-form-item label="服务时间："
+                      style="display: block"
+                      prop="address"
+                      label-width="150px">
+          <span>{{formData.serviceTime}}</span>
         </el-form-item>
-        <el-form-item label="需求内容"
-                      prop="content">
-          <el-input v-model="workLogDetail.content"
-                    :autosize="{ minRows: 2, maxRows: 10 }"
-                    :disabled="disabled"
-                    type="textarea"
-                    clearable
-                    class="input-width-textarea"
-                    placeholder="请输入内容"></el-input>
+        <el-form-item label="备注："
+                      style="display: block"
+                      prop="address"
+                      label-width="150px">
+          <span>{{formData.remark}}</span>
         </el-form-item>
       </el-form>
 
@@ -125,7 +70,6 @@
     <div class="div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
-
     </div>
   </div>
 </template>
@@ -134,9 +78,6 @@
 
 import { Loading } from 'element-ui' // 引入Loading服务
 
-var map
-var search
-var markers
 var infoWindowList
 var geocoder // 新建一个正逆地址解析类
 
@@ -144,12 +85,11 @@ let loading // 加载动画
 export default {
   data () {
     return {
-      workLogDetail: {},
+      formData: {},
     }
   },
   components: {},
   mounted () {
-    this.initMap()
   },
 
   methods: {
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
new file mode 100644
index 000000000..6765d69e9
--- /dev/null
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -0,0 +1,467 @@
+<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="name"
+                      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="请选择"
+                     filterable
+                     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="占地面积"
+                      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>平方公里
+        </el-form-item>
+        <el-form-item label="容纳人数"
+                      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>
+        </el-form-item>
+
+        <el-form-item label="负责人"
+                      style="display: block"
+                      label-width="150px"
+                      prop="principal">
+          <el-input v-model="formData.principal"
+                    class="item_width_1"
+                    placeholder="请输入负责人姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话"
+                      style="display: block"
+                      label-width="150px"
+                      prop="mobile">
+          <el-input v-model="formData.mobile"
+                    class="item_width_1"
+                    placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+        <el-form-item label="地址"
+                      prop="address"
+                      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>
+        </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 () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      icPublicServiceId: '',
+      keyWords: '',
+      formData: {
+        name: '',//场所名称
+        category: '',
+        areaCovered: '',//占地面积
+        capacity: '',//容纳人数
+        address: '', //详细地址
+        longitude: 36.0722275, //经度
+        latitude: 120.38945519, //纬度
+        principal: '',
+        mobile: ''
+      },
+      serviceList: [],//服务list
+      publicServiceData: {},
+    }
+  },
+  components: {},
+  mounted () {
+  },
+
+  methods: {
+
+    async initForm (type, icPublicServiceId) {
+      this.startLoading()
+      this.$refs.ref_form.resetFields();
+
+      //获取服务事项
+      await this.loadService()
+
+      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)
+      }
+
+      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"
+      let params = {
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.serviceList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //加载组织
+    async loadFormData () {
+      const url = '/gov/org/icPublicService/detail'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail'
+      let params = {
+        icPublicServiceId: this.icPublicServiceId
+      }
+      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)
+        }
+      } 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 () {
+      let url = ''
+      if (this.formType === 'add') {
+        url = '/gov/org/icPublicService/add'
+      } else {
+        url = '/gov/org/icPublicService/edit'
+      }
+      const { data, code, msg, internalMsg } = 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(internalMsg)
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      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.formData = {
+        name: '',
+        category: '',
+        areaCovered: '',
+        capacity: '',
+        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 {
+
+        name: [
+          { required: true, message: '场所名称不能为空', trigger: 'blur' },
+        ],
+        category: [
+          { required: true, message: '场所类别不能为空', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '地址不能为空', trigger: 'blur' }
+        ],
+        /*longitude: [
+          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        ],
+        latitude: [
+          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        ]*/
+      }
+    },
+
+  },
+  props: {
+
+    typeList: {
+      type: Array,
+      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";
+</style>

From f6a88767966d13be00a818b1c69cb8cf310cc9c9 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 15:07:50 +0800
Subject: [PATCH 23/60] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/shzz/cpts/edit.vue       | 10 ++--
 .../modules/communityService/shzz/index.vue   | 53 ++++++++++++++++---
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index bcd5c95be..8acdd3a6e 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -31,7 +31,7 @@
                        :on-progress="handleProgress"
                        :on-success="handleImgSuccess"
                        :before-upload="beforeImgUpload"
-                       accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf,.JPG,.JPEG,.PBG,.GIF,.BMP">
+                       accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP">
               <el-progress v-if="uploading" :width="100" type="circle" :percentage="unloadPencent"></el-progress>
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
 
@@ -71,7 +71,7 @@
           ></el-input>
         </el-form-item>
 
-        <el-form-item
+<!--        <el-form-item
             label="负责人姓名	"
             prop="personInCharge"
             label-width="150px"
@@ -85,7 +85,7 @@
               v-model="dataForm.personInCharge"
           >
           </el-input>
-        </el-form-item>
+        </el-form-item>-->
 
         <el-form-item
             label="服务电话	"
@@ -273,9 +273,9 @@ export default {
         serviceMatters: [
           {required: true, message: "服务内容不能为空", trigger: "blur"},
         ],
-        personInCharge: [
+        /*personInCharge: [
           {required: true, message: "负责人姓名不能为空", trigger: "blur"},
-        ],
+        ],*/
         /*adminStaffId: [
           { required: true, message: "绑定管理员不能为空", trigger: "blur" },
         ],*/
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index a50590d92..a130cf446 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -21,7 +21,7 @@
               </div>
             </el-col>
 
-            <el-col :span="8">
+<!--            <el-col :span="8">
               <div class="resi-cell">
                 <div class="resi-cell-label">负责人</div>
                 <div class="resi-cell-value"
@@ -34,11 +34,11 @@
                   </el-input>
                 </div>
               </div>
-            </el-col>
+            </el-col>-->
 
             <el-col :span="8">
               <div class="resi-cell">
-                <div class="resi-cell-label">联系电话</div>
+                <div class="resi-cell-label">服务电话</div>
                 <div class="resi-cell-value"
                      :class="'resi-cell-value-radio'">
                   <el-input v-model="fmData.mobile"
@@ -90,6 +90,10 @@
         <el-button type="success"
                    size="small"
                    @click="handleAdd">新增</el-button>
+        <el-button class="diy-button--search"
+                   style="margin-left:10px"
+                   size="small"
+                   @click="handleExportModule('room')">下载模板</el-button>
         <el-upload ref="upload"
                    class="upload-btn"
                    action="uploadUlr"
@@ -127,9 +131,9 @@
         <el-table-column prop="serviceMatters"
                          label="服务内容">
         </el-table-column>
-        <el-table-column prop="personInCharge"
+<!--        <el-table-column prop="personInCharge"
                          label="负责人">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column prop="mobile"
                          label="服务电话"> </el-table-column>
         <el-table-column prop="serviceTimeStr"
@@ -302,7 +306,7 @@ export default {
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象
       axios({
-        url: window.SITE_CONFIG["apiURL"] + "/heart/societyorg/import",
+        url: window.SITE_CONFIG["apiURL"] + "/heart/societyorg/importV2",
         method: "post",
         data: formData,
         // responseType: "blob",
@@ -455,6 +459,43 @@ export default {
 
       this.scoreDiaShow = false
     },
+    async handleExportModule () {
+      let url = "/heart/societyorg/import-template-download";
+
+      let params = {};
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        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]
+              );
+              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对象
+            } else this.$message.error("下载失败");
+          })
+          .catch((err) => {
+            console.log("err", err);
+            return this.$message.error("网络错误");
+          });
+    },
+
   },
 };
 </script>

From 1dabe36d7b6439d99aa7f14e2be2bc234332ed7e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 15:28:44 +0800
Subject: [PATCH 24/60] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/workLog/list.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/modules/workSys/workLog/list.vue b/src/views/modules/workSys/workLog/list.vue
index 453a46bbb..f53cc086c 100644
--- a/src/views/modules/workSys/workLog/list.vue
+++ b/src/views/modules/workSys/workLog/list.vue
@@ -202,12 +202,7 @@ export default {
         type: 'warning'
       }).then(() => {
         const url = '/heart/workdiaryService/serviceType/delete'
-        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/delcategory'
-        const param = {
-          customerId: this.customerId,
-          ids: [row.id]
-        }
-        window.app.ajax.post(url, param,
+        window.app.ajax.post(url, [row.id],
           (data, rspMsg) => {
             this.$message.success('操作成功')
             this.loadData()

From c7c12e834b75be3f5a90104206189b5b2a3ef93d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 24 Aug 2022 15:35:05 +0800
Subject: [PATCH 25/60] =?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/worklog/workLog.vue      |  10 +-
 .../worklog/workLogDetail.vue                 |  20 +-
 .../communityService/worklog/workLogForm.vue  | 387 ++++++------------
 3 files changed, 152 insertions(+), 265 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 17f0079c2..b6d89577b 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -229,10 +229,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 +243,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>
@@ -503,7 +503,7 @@ export default {
 
     handleAdd () {
       this.formTitle = '新增'
-      this.formShow = 'edit'
+      this.formShow = 'add'
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('add', null)
       })
diff --git a/src/views/modules/communityService/worklog/workLogDetail.vue b/src/views/modules/communityService/worklog/workLogDetail.vue
index 917d571be..86c44280c 100644
--- a/src/views/modules/communityService/worklog/workLogDetail.vue
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@@ -10,7 +10,8 @@
         <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>
@@ -24,8 +25,9 @@
         <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="住址"
@@ -34,31 +36,31 @@
                       style="display: block">
           <span>{{formData.applicantAddress}}</span>
         </el-form-item>
-        <el-form-item label="服务内容："
-                      prop="principal"
+        <el-form-item label="服务内容"
+                      prop="serviceContent"
                       label-width="150px"
                       style="display: block">
-          <span>{{formData.applicantContent}}</span>
+          <span>{{formData.serviceContent}}</span>
         </el-form-item>
-        <el-form-item label="联系电话："
+        <el-form-item label="联系电话"
                       prop="mobile"
                       label-width="150px"
                       style="display: block">
           <span>{{formData.applicantMobile}}</span>
         </el-form-item>
-        <el-form-item label="负责人："
+        <el-form-item label="负责人"
                       style="display: block"
                       prop="address"
                       label-width="150px">
           <span>{{formData.principalName}}</span>
         </el-form-item>
-        <el-form-item label="服务时间："
+        <el-form-item label="服务时间"
                       style="display: block"
                       prop="address"
                       label-width="150px">
           <span>{{formData.serviceTime}}</span>
         </el-form-item>
-        <el-form-item label="备注："
+        <el-form-item label="备注"
                       style="display: block"
                       prop="address"
                       label-width="150px">
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 6765d69e9..f61d35883 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -9,91 +9,105 @@
                :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="请选择"
                      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="服务类型"
+                      label-width="150px"
+                      style="display: block"
+                      prop="serviceType">
+          <el-select v-model="formData.serviceType"
+                     filterable
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in serviceTypeList"
+                       :key="item.id"
+                       :label="item.serviceTypeName"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="申请人"
+                      prop="applicantName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入申请人"
+                    v-model="formData.applicantName">
+          </el-input>
         </el-form-item>
 
-        <el-form-item label="占地面积"
+        <el-form-item label="住址"
                       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>平方公里
+                      label-width="150px"
+                      prop="applicantAddress">
+          <el-input v-model="formData.applicantAddress"
+                    class="item_width_1"
+                    placeholder="请输入住址"></el-input>
         </el-form-item>
-        <el-form-item label="容纳人数"
+        <el-form-item label="服务内容"
                       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>
+                      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="applicantMobile">
+          <el-input v-model="formData.applicantMobile"
+                    class="item_width_1"
+                    placeholder="请输入联系电话"></el-input>
         </el-form-item>
 
         <el-form-item label="负责人"
                       style="display: block"
                       label-width="150px"
-                      prop="principal">
-          <el-input v-model="formData.principal"
+                      prop="principalName">
+          <el-input v-model="formData.principalName"
                     class="item_width_1"
-                    placeholder="请输入负责人姓名"></el-input>
+                    placeholder="请输入负责人"></el-input>
         </el-form-item>
-        <el-form-item label="联系电话"
+
+        <el-form-item label="服务时间"
                       style="display: block"
                       label-width="150px"
-                      prop="mobile">
-          <el-input v-model="formData.mobile"
+                      prop="serviceTime">
+          <el-input v-model="formData.serviceTime"
                     class="item_width_1"
-                    placeholder="请输入联系电话"></el-input>
+                    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="remark">
+          <el-input v-model="formData.remark"
+                    class="item_width_1"
+                    type="textarea"
+                    placeholder="请输入备注"></el-input>
         </el-form-item>
+
       </el-form>
     </div>
 
@@ -127,93 +141,83 @@ export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-
+      agencyId: '',
       btnDisable: false,
 
-      icPublicServiceId: '',
+      applicantId: '',
       keyWords: '',
       formData: {
-        name: '',//场所名称
-        category: '',
-        areaCovered: '',//占地面积
-        capacity: '',//容纳人数
-        address: '', //详细地址
-        longitude: 36.0722275, //经度
-        latitude: 120.38945519, //纬度
-        principal: '',
-        mobile: ''
+        serviceType: '',
+        gridId: '',
+        applicantAddress: '',
+        applicantName: '',
+        serviceContent: '',
+        applicantMobile: '',
+        principalName: '',
+        serviceTime: '',
+        remark: ''
       },
-      serviceList: [],//服务list
+      optionsG: [],
+      serviceTypeList: [],
       publicServiceData: {},
     }
   },
   components: {},
+  async created () {
+    this.getGridList('query')
+    this.getServiceTypeList()
+  },
   mounted () {
   },
 
   methods: {
 
-    async initForm (type, icPublicServiceId) {
+    async initForm (type, applicantId) {
       this.startLoading()
       this.$refs.ref_form.resetFields();
 
       //获取服务事项
-      await this.loadService()
+      await this.getServiceTypeList()
 
       this.formType = type
-      if (icPublicServiceId) {
-        this.icPublicServiceId = icPublicServiceId
-        this.formData.icPublicServiceId = icPublicServiceId
-        await this.loadFormData()
+      if (applicantId) {
+        this.applicantId = applicantId
+        this.formData.applicantId = applicantId
+        // 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 = "/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/page"
+      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 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)
       }
@@ -222,7 +226,6 @@ export default {
 
 
     async handleComfirm () {
-
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
@@ -234,15 +237,13 @@ 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'
       }
@@ -267,138 +268,17 @@ 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.formData = {
-        name: '',
-        category: '',
-        areaCovered: '',
-        capacity: '',
-        address: '', //详细地址
-        longitude: '', //经度
-        latitude: '' //纬度
+        serviceType: '',
+        gridId: '',
+        applicantAddress: '',
+        applicantName: '',
+        serviceContent: '',
+        applicantMobile: '',
+        principalName: '',
+        serviceTime: '',
+        remark: ''
       }
     },
     // 开启加载动画
@@ -420,22 +300,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' }
+        applicantName: [
+          { 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' }
+        ]
       }
     },
 

From e2f43eabaac7728ff408e5451edc64ab49ce90fc Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 16:03:56 +0800
Subject: [PATCH 26/60] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/shzz/cpts/edit.vue      | 12 +++++++++---
 src/views/modules/communityService/shzz/index.vue    |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index 8acdd3a6e..993ca6ab8 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -294,6 +294,7 @@ export default {
   props: {},
   watch: {
     "dataForm.serviceTime": function (val) {
+      console.log("watch start"+val+'_'+Array.isArray(val))
       if (Array.isArray(val) && val.length == 2) {
         this.dataForm.serviceStartTime = val[0];
         this.dataForm.serviceEndTime = val[1];
@@ -440,7 +441,7 @@ export default {
     async loadAgency() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
-
+      console.log("======loadAgency")
       const {data, code, msg} = await requestPost(url, params);
 
       if (code === 0) {
@@ -490,6 +491,7 @@ export default {
     },
 
     async submit() {
+
       let url = "";
       if (this.formType === "add") {
         url = "/heart/societyorg/add";
@@ -522,6 +524,9 @@ export default {
     },
     resetData() {
       this.societyId = ""; //小区ID
+      this.$refs.ref_form.resetFields();
+      this.propertyFormShow = false;
+     /*
       this.dataForm = {
         societyName: "",
         serviceMatters: "",
@@ -534,8 +539,9 @@ export default {
         address: "",
         longitude: "",
         latitude: "",
-      };
-      this.propertyFormShow = false;
+        imageList:[]
+      };*/
+
     },
     // 开启加载动画
     startLoading() {
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index a130cf446..333e082db 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -258,6 +258,7 @@ export default {
   },
   watch: {
     "fmData.serviceTime": function (val) {
+      console.log("watch start"+val+'_'+Array.isArray(val))
       if (Array.isArray(val) && val.length == 2) {
         this.fmData.serviceStartTime = val[0];
         this.fmData.serviceEndTime = val[1];

From 10c6828e70dd3e72ff9c8a581505dcf998c32008 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 16:10:56 +0800
Subject: [PATCH 27/60] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 333e082db..e9a6c504d 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -114,7 +114,7 @@
 
         <el-button @click="handleChu"
                    type="danger"
-                   size="small">excel导出</el-button>
+                   size="small">导出</el-button>
       </div>
       <el-table :data="tableData"
                 border
@@ -242,7 +242,7 @@ export default {
         serviceTimeStr: "",
       },
 
-      importBtnTitle: "excel导入",
+      importBtnTitle: "导入",
       importLoading: false,
 
       //积分记录

From c818dd6114a122794f5187a89745f739f648bbf0 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 16:26:53 +0800
Subject: [PATCH 28/60] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/shzz/index.vue   | 281 ++++++++++--------
 1 file changed, 162 insertions(+), 119 deletions(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index e9a6c504d..46c1405c9 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -21,20 +21,20 @@
               </div>
             </el-col>
 
-<!--            <el-col :span="8">
-              <div class="resi-cell">
-                <div class="resi-cell-label">负责人</div>
-                <div class="resi-cell-value"
-                     :class="'resi-cell-value-radio'">
-                  <el-input v-model="fmData.personInCharge"
-                            class="resi-cell-input"
-                            size="small"
-                            clearable
-                            placeholder="请输入">
-                  </el-input>
-                </div>
-              </div>
-            </el-col>-->
+            <!--            <el-col :span="8">
+                          <div class="resi-cell">
+                            <div class="resi-cell-label">负责人</div>
+                            <div class="resi-cell-value"
+                                 :class="'resi-cell-value-radio'">
+                              <el-input v-model="fmData.personInCharge"
+                                        class="resi-cell-input"
+                                        size="small"
+                                        clearable
+                                        placeholder="请输入">
+                              </el-input>
+                            </div>
+                          </div>
+                        </el-col>-->
 
             <el-col :span="8">
               <div class="resi-cell">
@@ -50,9 +50,7 @@
                 </div>
               </div>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
+            <el-col :span="8">
               <div class="resi-cell">
                 <div class="resi-cell-label">服务时间</div>
                 <div class="resi-cell-value"
@@ -63,23 +61,40 @@
                             clearable
                             placeholder="请输入">
                   </el-input>
-<!--                  <el-date-picker v-model="fmData.serviceTime"
-                                  type="daterange"
-                                  range-separator="至"
-                                  start-placeholder="开始日期"
-                                  end-placeholder="结束日期"
-                                  value-format="yyyy-MM-dd">
-                  </el-date-picker>-->
                 </div>
               </div>
             </el-col>
           </el-row>
+          <!--          <el-row>
+                      <el-col :span="24">
+                        <div class="resi-cell">
+                          <div class="resi-cell-label">服务时间</div>
+                          <div class="resi-cell-value"
+                               :class="'resi-cell-value-radio'">
+                            <el-input v-model="fmData.serviceTimeStr"
+                                      class="resi-cell-input"
+                                      size="small"
+                                      clearable
+                                      placeholder="请输入">
+                            </el-input>
+          &lt;!&ndash;                  <el-date-picker v-model="fmData.serviceTime"
+                                            type="daterange"
+                                            range-separator="至"
+                                            start-placeholder="开始日期"
+                                            end-placeholder="结束日期"
+                                            value-format="yyyy-MM-dd">
+                            </el-date-picker>&ndash;&gt;
+                          </div>
+                        </div>
+                      </el-col>
+                    </el-row>-->
         </el-row>
         <el-row class="resi-search">
           <el-col :span="24">
             <el-button type="primary"
                        size="small"
-                       @click="handleSearch">查询</el-button>
+                       @click="handleSearch">查询
+            </el-button>
           </el-col>
         </el-row>
       </el-card>
@@ -89,11 +104,13 @@
       <div class="resi-row-btn">
         <el-button type="success"
                    size="small"
-                   @click="handleAdd">新增</el-button>
+                   @click="handleAdd">新增
+        </el-button>
         <el-button class="diy-button--search"
                    style="margin-left:10px"
                    size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
+                   @click="handleExportModule('room')">下载模板
+        </el-button>
         <el-upload ref="upload"
                    class="upload-btn"
                    action="uploadUlr"
@@ -108,13 +125,15 @@
           <el-button type="warning"
                      size="small"
                      :loading="importLoading">{{
-            importBtnTitle
-          }}</el-button>
+              importBtnTitle
+            }}
+          </el-button>
         </el-upload>
 
         <el-button @click="handleChu"
                    type="danger"
-                   size="small">导出</el-button>
+                   size="small">导出
+        </el-button>
       </div>
       <el-table :data="tableData"
                 border
@@ -124,23 +143,23 @@
         <el-table-column label="序号"
                          type="index"
                          align="center"
-                         width="50" />
+                         width="50"/>
         <el-table-column prop="societyName"
                          label="组织名称">
         </el-table-column>
         <el-table-column prop="serviceMatters"
                          label="服务内容">
         </el-table-column>
-<!--        <el-table-column prop="personInCharge"
-                         label="负责人">
-        </el-table-column>-->
+        <!--        <el-table-column prop="personInCharge"
+                                 label="负责人">
+                </el-table-column>-->
         <el-table-column prop="mobile"
-                         label="服务电话"> </el-table-column>
+                         label="服务电话"></el-table-column>
         <el-table-column prop="serviceTimeStr"
-                         label="服务时间"> </el-table-column>
-<!--        <el-table-column prop="score"
-                         width="80"
-                         label="积分"> </el-table-column>-->
+                         label="服务时间"></el-table-column>
+        <!--        <el-table-column prop="score"
+                                 width="80"
+                                 label="积分"> </el-table-column>-->
         <el-table-column fixed="right"
                          label="操作"
                          align="center"
@@ -148,16 +167,18 @@
           <template slot-scope="scope">
             <el-button @click="handleWatch(scope.$index)"
                        type="text"
-                       size="small">查看</el-button>
-<!--            <el-button type="text"
-                       style="color:#00A7A9;"
-                       size="small"
-                       @click="handleScore(scope.row)">积分记录</el-button>-->
+                       size="small">查看
+            </el-button>
+            <!--            <el-button type="text"
+                                   style="color:#00A7A9;"
+                                   size="small"
+                                   @click="handleScore(scope.row)">积分记录</el-button>-->
 
             <el-button @click="handleEdit(scope.$index)"
                        type="text"
                        size="small"
-                       style="margin-right: 10px; color: #00a7a9">编辑</el-button>
+                       style="margin-right: 10px; color: #00a7a9">编辑
+            </el-button>
 
             <el-popconfirm title="删除之后无法回复，确认删除？"
                            @onConfirm="handleDel(scope.row, scope.$index)"
@@ -165,7 +186,8 @@
               <el-button slot="reference"
                          type="text"
                          size="small"
-                         style="color: #d51010">删除</el-button>
+                         style="color: #d51010">删除
+              </el-button>
             </el-popconfirm>
           </template>
         </el-table-column>
@@ -210,16 +232,16 @@
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request";
+import {requestPost} from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 import editForm from "./cpts/edit";
 import axios from "axios";
 import scoreRecord from '../../../components/scoreRecord.vue'
 
 export default {
-  components: { editForm, scoreRecord },
-  data () {
+  components: {editForm, scoreRecord},
+  data() {
     return {
       openSearch: false,
 
@@ -251,14 +273,14 @@ export default {
     };
   },
   computed: {
-    maxTableHeight () {
+    maxTableHeight() {
       return this.clientHeight - 450;
     },
     ...mapGetters(["clientHeight"]),
   },
   watch: {
     "fmData.serviceTime": function (val) {
-      console.log("watch start"+val+'_'+Array.isArray(val))
+      console.log("watch start" + val + '_' + Array.isArray(val))
       if (Array.isArray(val) && val.length == 2) {
         this.fmData.serviceStartTime = val[0];
         this.fmData.serviceEndTime = val[1];
@@ -268,28 +290,28 @@ export default {
       }
     },
   },
-  mounted () {
+  mounted() {
     this.getTableData();
   },
   methods: {
     // 上传大图标成功
-    handleExcelSuccess (res, file) {
+    handleExcelSuccess(res, file) {
       if (res.code === 0 && res.msg === "success") {
         console.log("resss---ppp", res);
       } else {
         this.$message.error(res.msg);
       }
     },
-    handleProgress (event, file, fileList) {
+    handleProgress(event, file, fileList) {
       console.log("percentage", file.percentage);
     },
 
-    beforeExcelUpload (file) {
+    beforeExcelUpload(file) {
       console.log("file", file);
       const isType = file.type === "application/vnd.ms-excel";
       const isTypeComputer =
-        file.type ===
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+          file.type ===
+          "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
       const fileType = isType || isTypeComputer;
       const isLt1M = file.size / 1024 / 1024 < 10;
       if (!fileType) {
@@ -301,7 +323,7 @@ export default {
       }
       return fileType && isLt1M;
     },
-    uploadHttpRequest (file) {
+    uploadHttpRequest(file) {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
@@ -312,55 +334,55 @@ export default {
         data: formData,
         // responseType: "blob",
       })
-        .then((res) => {
-          this.importLoading = false;
-          this.importBtnTitle = "excel导入";
-          console.log("resresresresresresres", res);
-
-          this.getTableData();
-          if (res.data.code == 0) {
-            return this.$message.success(res.data.data || '导入成功');
-          } else {
-            return this.$message.error(res.data.msg);
-          }
-        })
-        .catch((err) => {
-          console.log("失败", err);
-        });
+          .then((res) => {
+            this.importLoading = false;
+            this.importBtnTitle = "excel导入";
+            console.log("resresresresresresres", res);
+
+            this.getTableData();
+            if (res.data.code == 0) {
+              return this.$message.success(res.data.data || '导入成功');
+            } else {
+              return this.$message.error(res.data.msg);
+            }
+          })
+          .catch((err) => {
+            console.log("失败", err);
+          });
       this.$refs.upload.clearFiles();
     },
 
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getTableData();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNo = val;
       this.getTableData();
     },
 
-    handleClose () {
+    handleClose() {
       this.formShow = false;
     },
-    handleSearch (val) {
+    handleSearch(val) {
       console.log(this.fmData);
       this.pageNo = 1;
       this.getTableData();
     },
 
-    async handleAdd () {
+    async handleAdd() {
       this.formShow = true;
       await nextTick();
       console.log(this.$refs);
       this.$refs.eleEditForm.initForm("add");
     },
 
-    async handleChu () {
+    async handleChu() {
       const url = "/heart/societyorg/export";
-      const { pageSize, pageNo, fmData } = this;
+      const {pageSize, pageNo, fmData} = this;
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
         method: "post",
@@ -371,50 +393,50 @@ export default {
         },
         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("网络错误");
-        });
+          .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 handleWatch (rowIndex) {
+    async handleWatch(rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
     },
 
-    async handleEdit (rowIndex) {
+    async handleEdit(rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
     },
-    handleEditSuccess () {
+    handleEditSuccess() {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleDel (rowData, rowIndex) {
+    async handleDel(rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url = "/heart/societyorg/del";
-      const { tableData } = this;
+      const {tableData} = this;
 
-      const { data, code, msg } = await requestPost(url, {
+      const {data, code, msg} = await requestPost(url, {
         societyId: tableData[rowIndex].societyId,
       });
 
@@ -426,10 +448,10 @@ export default {
       }
     },
 
-    async getTableData () {
+    async getTableData() {
       const url = "/heart/societyorg/getlist";
-      const { pageSize, pageNo, fmData } = this;
-      const { data, code, msg } = await requestPost(url, {
+      const {pageSize, pageNo, fmData} = this;
+      const {data, code, msg} = await requestPost(url, {
         pageSize,
         pageNo,
         ...fmData,
@@ -438,29 +460,29 @@ export default {
         console.log("列表请求成功！！！！！！！！！！！！！！");
         this.total = data.total || 0;
         this.tableData = data.list
-          ? data.list.map((item) => {
-            item.serviceTime =
-              item.serviceStartTime + "至" + item.serviceEndTime;
-            return item;
-          })
-          : [];
+            ? data.list.map((item) => {
+              item.serviceTime =
+                  item.serviceStartTime + "至" + item.serviceEndTime;
+              return item;
+            })
+            : [];
       } else {
       }
     },
 
     //积分记录
-    handleScore (row) {
+    handleScore(row) {
       this.scoreDiaShow = true
       this.$nextTick(() => {
         this.$refs.ref_score.initForm(row.societyId)
       })
     },
 
-    diaClose () {
+    diaClose() {
 
       this.scoreDiaShow = false
     },
-    async handleExportModule () {
+    async handleExportModule() {
       let url = "/heart/societyorg/import-template-download";
 
       let params = {};
@@ -516,10 +538,12 @@ export default {
     background: #ebecf1;
     border-radius: 2px;
   }
+
   .el-tabs__nav-wrap::after,
   .el-tabs__active-bar {
     display: none;
   }
+
   .el-tabs__nav-next,
   .el-tabs__nav-prev {
     line-height: 20px;
@@ -529,16 +553,20 @@ export default {
 .resi-card-table {
   margin-top: 20px;
 }
+
 .resi-row-btn {
   margin-bottom: 13px;
+
   .upload-btn {
     display: inline-block;
     margin: 0 10px;
   }
 }
+
 .resi-other {
   width: 100%;
   display: flex;
+
   .resi-other-title {
     width: 100px;
     box-sizing: border-box;
@@ -549,6 +577,7 @@ export default {
     color: #333;
     text-align: center;
   }
+
   .tabs-other-info {
     // padding-left: 60px;
   }
@@ -563,6 +592,7 @@ export default {
   position: relative;
   overflow: visible;
 }
+
 .resi-down {
   position: absolute;
   left: 50%;
@@ -577,30 +607,37 @@ export default {
   cursor: pointer;
   background: #ffffff;
   border-radius: 0 0 10px 10px;
+
   img {
     display: block;
   }
 }
+
 .resi-row-box {
   height: 104px;
   overflow: hidden;
   transition: height 0.5s;
 }
+
 .resi-row-more {
   height: max-content;
   transition: height 0.5s;
 }
+
 .resi-row {
   margin-bottom: 20px;
 }
+
 .resi-search {
   .el-col {
     text-align: right;
   }
 }
+
 .resi-cell {
   display: flex;
   align-items: center;
+
   .resi-cell-label {
     width: 70px;
     box-sizing: border-box;
@@ -608,25 +645,31 @@ export default {
     text-align: right;
     // line-height: 32;
   }
+
   .resi-cell-value-radio {
     display: flex;
     align-items: center;
     min-height: 32px;
   }
+
   .resi-cell-input {
     width: 180px;
   }
+
   .resi-cell-select {
     width: 180px;
     box-sizing: border-box;
     margin-right: 10px;
+
     &-middle {
       width: 130px;
     }
+
     &-small {
       width: 88px;
     }
   }
+
   .resi-cell-select:last-child {
     margin-right: 0;
   }

From d8486b231ce6f0d179a0956165e364986e9494d0 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 16:33:51 +0800
Subject: [PATCH 29/60] =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=87=A0=E4=B8=AA=20?=
 =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue             | 12 +++----
 .../modules/base/epidemic/travelForm.vue      | 34 +++++++++----------
 .../modules/shequzhili/xiangmu/cpts/edit.vue  | 10 +++---
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 751bde6c1..c9e6d7201 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -87,16 +87,16 @@
                     </el-form-item>
                   </div>
                   <!-- <el-col :span="6">
-                    
+
                   </el-col>
                   <el-col :span="6">
-                    
+
                   </el-col>
                   <el-col :span="6">
-                    
+
                   </el-col>
                   <el-col :span="6">
-                    
+
                   </el-col> -->
                 </div>
             </el-form-item>
@@ -333,10 +333,10 @@ export default {
     }
     let checkIdCard = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入身份证'))
+        callback(new Error('请输入证件号'))
       } else {
         if (!isCard(value)) {
-          callback(new Error('身份证号格式不正确'))
+          callback(new Error('证件号格式不正确'))
         }
         callback()
       }
diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index 9647aef24..20a5fdbb1 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -83,18 +83,18 @@
                     v-model="formData.mobile">
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证号"
+        <el-form-item label="证件号"
                       prop="idCard"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_2"
-                    placeholder="请输入身份证号"
+                    placeholder="请输入身份证号或证件号"
                     clearable
                     :disabled="isFromResi"
                     v-model="formData.idCard">
           </el-input>
         </el-form-item>
-        <el-form-item 
+        <el-form-item
                       label="现居地"
                       prop="presentAddress"
                       style="display: block"
@@ -111,7 +111,7 @@
                     clearable
                     :disabled="isFromResi"
                     v-model="formData.presentAddress" />
-            <el-cascader v-else ref="nowArea" class="item_width_2" :props="areaProps" 
+            <el-cascader v-else ref="nowArea" class="item_width_2" :props="areaProps"
             v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
           </template>
         </el-form-item>
@@ -245,10 +245,10 @@ export default {
     }
     let checkIdCard = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('身份证不能为空'))
+        callback(new Error('证件号不能为空'))
       } else {
         if (!isCard(value)) {
-          callback(new Error('身份证号格式不正确'))
+          callback(new Error('证件号格式不正确'))
         }
         callback()
       }
@@ -273,9 +273,9 @@ export default {
       icNatId: '',
       formData: {
         gridId: '',
-        agencyId: '',//当前网格所属组织Id	
-        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
-        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
+        agencyId: '',//当前网格所属组织Id
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
         name: '',
         idCard: '',
         mobile: '',
@@ -358,12 +358,12 @@ export default {
       if (type != 'add') {
         // this.formData = { ...row, channel: [], content: '' }
         await this.loadFormData(row.id)
-        
-        
+
+
       } else {
         const { user } = this.$store.state
         this.nowAllCode = user.areaCodePath
-      } 
+      }
       // this.$refs['ref_form'].resetFields();
 
       console.log('formtype', type)
@@ -386,7 +386,7 @@ export default {
         const { user } = this.$store.state
         this.nowAllCode = user.areaCodePath
       }
-      
+
 
     },
     handleSourceArea(val) {
@@ -403,7 +403,7 @@ export default {
         this.formData.sourceAddress = ''
         this.formData.sourceAddressPathCode = ''
       }
-      
+
     },
     handleNowArea(val) {
       console.log('val-----', val)
@@ -469,7 +469,7 @@ export default {
 
       if (code === 0) {
         const nodes = data.map(item => ({
-          value: item.areaCode, // 
+          value: item.areaCode, //
           label: item.areaName,
           code: item.areaCode,
           level: item.level,
@@ -517,7 +517,7 @@ export default {
         console.log('deda-------', data)
         this.formData = { ...data, channel: [], content: '' }
         this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
-        
+
         if (data.userType == 'icresi') this.isFromResi = true
         else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
       } else {
@@ -566,7 +566,7 @@ export default {
           return false;
         }
       });
-      
+
 
     },
 
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
index ccf2018e4..552c7f50c 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
@@ -170,7 +170,7 @@
         </el-form-item>
 
         <el-form-item
-          label="身份证号"
+          label="证件号"
           prop="idCard"
           label-width="150px"
           style="display: block"
@@ -178,7 +178,7 @@
           <el-input
             class="item_width_1"
             maxlength="30"
-            placeholder="请输入身份证号"
+            placeholder="请输入身份证号或证件号"
             v-model="fmData.idCard"
             @blur="handleBlurId"
             :disabled="formType === 'edit'"
@@ -444,10 +444,10 @@ export default {
     dataRule() {
       let checkIdCard = (rule, value, callback) => {
         if (value === "") {
-          callback(new Error("请输入身份证"));
+          callback(new Error("请输入证件号"));
         } else {
           if (!isCard(value)) {
-            callback(new Error("身份证号格式不正确"));
+            callback(new Error("证件号格式不正确"));
           }
           callback();
         }
@@ -462,7 +462,7 @@ export default {
         ],
         name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
         idCard: [
-          { required: true, message: "身份证号不能为空", trigger: "blur" },
+          { required: true, message: "证件号不能为空", trigger: "blur" },
           { required: true, validator: checkIdCard, trigger: "blur" },
         ],
         birthplace: [

From fcf0f0f946641d0b7c7fa10cf4048fb7bf8dd287 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 24 Aug 2022 17:36:30 +0800
Subject: [PATCH 30/60] =?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/worklog/workLog.vue      | 96 ++++++-------------
 .../communityService/worklog/workLogForm.vue  | 83 ++++++++++------
 2 files changed, 84 insertions(+), 95 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index b6d89577b..6c221465f 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>
@@ -274,8 +274,12 @@ export default {
       serviceList: [],//服务list
       typeList: [],//分类list
       formData: {
-        name: '',
-        category: ''
+        gridId: '',
+        serviceType: '',
+        applicantName: '',
+        applicantAddress: '',
+        applicantMobile: '',
+        serviceContent: ''
       },
       tableData: [],
 
@@ -293,7 +297,7 @@ export default {
 
       files: "",
       fileName: "",
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/icPublicService/import',
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/heart/workdiaryService/record/import',
       optionsG: [],
       optionsEditG: [],
       workLog: {
@@ -316,15 +320,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 +351,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
@@ -385,7 +382,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 +407,11 @@ 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"
+      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,
@@ -513,7 +472,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 +497,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,9 +520,13 @@ export default {
 
     //重置搜索条件
     resetSearch () {
-      this.formData = {
-        name: '',
-        category: ''
+      this.workLog = {
+        gridId: '',
+        serviceType: '',
+        applicantName: '',
+        applicantAddress: '',
+        applicantMobile: '',
+        serviceContent: ''
       }
       this.pageSize = 10
       this.pageNo = 0
@@ -577,8 +537,8 @@ export default {
     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
       }
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index f61d35883..dee051f3f 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -16,6 +16,7 @@
           <el-select v-model="formData.gridId"
                      filterable
                      placeholder="请选择"
+                     @change="handleGridChange"
                      clearable>
             <el-option v-for="item in optionsG"
                        :key="item.value"
@@ -34,23 +35,27 @@
                      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>
 
         <el-form-item label="申请人"
-                      prop="applicantName"
                       label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入申请人"
-                    v-model="formData.applicantName">
-          </el-input>
+                      style="display: block"
+                      prop="applicantId">
+          <el-select v-model="formData.applicantId"
+                     filterable
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in demandUserList"
+                       :key="item.demandUserId"
+                       :label="item.label"
+                       :value="item.demandUserId">
+            </el-option>
+          </el-select>
         </el-form-item>
 
         <el-form-item label="住址"
@@ -147,10 +152,13 @@ export default {
       applicantId: '',
       keyWords: '',
       formData: {
-        serviceType: '',
+        serviceType: 0,
+        serviceTypeName: '',
         gridId: '',
+        gridName: '',
         applicantAddress: '',
         applicantName: '',
+        applicantId: '',
         serviceContent: '',
         applicantMobile: '',
         principalName: '',
@@ -160,6 +168,7 @@ export default {
       optionsG: [],
       serviceTypeList: [],
       publicServiceData: {},
+      demandUserList: []
     }
   },
   components: {},
@@ -172,28 +181,25 @@ export default {
 
   methods: {
 
-    async initForm (type, applicantId) {
+    async initForm (type, row) {
       this.startLoading()
       this.$refs.ref_form.resetFields();
 
       //获取服务事项
       await this.getServiceTypeList()
+      this.getGridList(type)
 
       this.formType = type
-      if (applicantId) {
-        this.applicantId = applicantId
-        this.formData.applicantId = applicantId
-        // await this.loadFormData()
-      } else {
-
+      if (type === 'edit'){
+        this.formData = row
       }
       this.endLoading()
     },
 
     //获取服务事项下拉框
     async getServiceTypeList () {
-      // const url = "/heart/workdiaryService/serviceType/page"
-      let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
+      const url = "/heart/workdiaryService/serviceType/page"
+      // let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
       let params = {
         pageNo: 1,
         pageSize: 10000
@@ -205,7 +211,27 @@ export default {
         this.$message.error(msg)
       }
     },
-
+    async getDemandUserList () {
+      const { user } = await this.$store.state;
+      const params = {
+        agencyId: user.agencyId,
+        gridId: this.formData.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;
+                }
+              })
+              .catch(() => {
+                return this.$message.error("网络错误");
+              });
+    },
     //加载组织
     async getGridList (type) {
       const { user } = await this.$store.state;
@@ -222,7 +248,9 @@ export default {
         this.$message.error(msg)
       }
     },
-
+    handleGridChange (val) {
+      this.getDemandUserList();
+    },
 
 
     async handleComfirm () {
@@ -242,10 +270,11 @@ export default {
     async addUnit () {
       let url = ''
       if (this.formType === 'add') {
-        // url = '/heart/workdiaryService/record/save'
-        url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/save'
+        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) {
@@ -270,7 +299,7 @@ export default {
     },
     resetData () {
       this.formData = {
-        serviceType: '',
+        serviceType: 0,
         gridId: '',
         applicantAddress: '',
         applicantName: '',
@@ -309,7 +338,7 @@ export default {
         applicantAddress: [
           { required: true, message: '住址不能为空', trigger: 'blur' }
         ],
-        applicantName: [
+        applicantId: [
           { required: true, message: '申请人不能为空', trigger: 'blur' }
         ],
         serviceContent: [

From 0f8c7e95b9e9adce06f8229e932746bc0f079884 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Aug 2022 09:26:20 +0800
Subject: [PATCH 31/60] =?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/worklog/workLog.vue        |  6 ++++--
 .../communityService/worklog/workLogForm.vue    | 17 +++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 6c221465f..4bf2e50ab 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -371,8 +371,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({
@@ -520,6 +520,8 @@ export default {
 
     //重置搜索条件
     resetSearch () {
+      this.optionsG = []
+      this.demandUserList = []
       this.workLog = {
         gridId: '',
         serviceType: '',
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index dee051f3f..cbb3a06f1 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -31,8 +31,8 @@
                       style="display: block"
                       prop="serviceType">
           <el-select v-model="formData.serviceType"
-                     filterable
                      placeholder="请选择"
+                     filterable
                      clearable>
             <el-option v-for="item in serviceTypeList"
                        :key="item.serviceType"
@@ -152,7 +152,7 @@ export default {
       applicantId: '',
       keyWords: '',
       formData: {
-        serviceType: 0,
+        serviceType: '',
         serviceTypeName: '',
         gridId: '',
         gridName: '',
@@ -175,6 +175,7 @@ export default {
   async created () {
     this.getGridList('query')
     this.getServiceTypeList()
+    // this.getDemandUserList()
   },
   mounted () {
   },
@@ -188,10 +189,10 @@ export default {
       //获取服务事项
       await this.getServiceTypeList()
       this.getGridList(type)
-
       this.formType = type
       if (type === 'edit'){
         this.formData = row
+        this.getDemandUserList(this.formData.gridId)
       }
       this.endLoading()
     },
@@ -211,11 +212,11 @@ export default {
         this.$message.error(msg)
       }
     },
-    async getDemandUserList () {
+    async getDemandUserList (gridId) {
       const { user } = await this.$store.state;
       const params = {
         agencyId: user.agencyId,
-        gridId: this.formData.gridId,
+        gridId: gridId,
         name: "",
       };
       // addorupdate
@@ -226,6 +227,7 @@ export default {
                   return this.$message.error(res.msg);
                 } else {
                   this.demandUserList = res.data;
+                  console.log(this.demandUserList)
                 }
               })
               .catch(() => {
@@ -249,7 +251,7 @@ export default {
       }
     },
     handleGridChange (val) {
-      this.getDemandUserList();
+      this.getDemandUserList(this.formData.gridId);
     },
 
 
@@ -298,11 +300,14 @@ export default {
 
     },
     resetData () {
+      this.demandUserList = []
+      this.optionsG = []
       this.formData = {
         serviceType: 0,
         gridId: '',
         applicantAddress: '',
         applicantName: '',
+        applicantId: '',
         serviceContent: '',
         applicantMobile: '',
         principalName: '',

From bde62b0237c97f5d4fcb7a0fc92c467a94aab49e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Aug 2022 09:33:33 +0800
Subject: [PATCH 32/60] =?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/worklog/workLogDetail.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLogDetail.vue b/src/views/modules/communityService/worklog/workLogDetail.vue
index 86c44280c..2bee32d29 100644
--- a/src/views/modules/communityService/worklog/workLogDetail.vue
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@@ -7,7 +7,7 @@
                :model="formData"
                class="form">
 
-        <el-form-item label="服务类型"
+        <el-form-item label="服务类型："
                       prop="serviceTypeName"
                       label-width="150px"
                       style="display: block"
@@ -15,14 +15,14 @@
           <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"
@@ -30,37 +30,37 @@
           <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="服务内容"
+        <el-form-item label="服务内容："
                       prop="serviceContent"
                       label-width="150px"
                       style="display: block">
           <span>{{formData.serviceContent}}</span>
         </el-form-item>
-        <el-form-item label="联系电话"
+        <el-form-item label="联系电话："
                       prop="mobile"
                       label-width="150px"
                       style="display: block">
           <span>{{formData.applicantMobile}}</span>
         </el-form-item>
-        <el-form-item label="负责人"
+        <el-form-item label="负责人："
                       style="display: block"
                       prop="address"
                       label-width="150px">
           <span>{{formData.principalName}}</span>
         </el-form-item>
-        <el-form-item label="服务时间"
+        <el-form-item label="服务时间："
                       style="display: block"
                       prop="address"
                       label-width="150px">
           <span>{{formData.serviceTime}}</span>
         </el-form-item>
-        <el-form-item label="备注"
+        <el-form-item label="备注："
                       style="display: block"
                       prop="address"
                       label-width="150px">

From 4e1a9207d9f4f4bb71c59e185dce9ede394fab7b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Aug 2022 13:24:00 +0800
Subject: [PATCH 33/60] emm

---
 .../modules/communityService/worklog/workLog.vue    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 4bf2e50ab..fbf20cd25 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -269,9 +269,6 @@ export default {
       pageNo: 0,
       tableLoading: false,
       agencyId: '',
-
-      unitList: [],//单位list
-      serviceList: [],//服务list
       typeList: [],//分类list
       formData: {
         gridId: '',
@@ -285,14 +282,11 @@ export default {
 
       //form相关
       formShow: false,
-      formTitle: '新增单位',
+      formTitle: '新增',
       detailShow: false,
 
-      //完成情况
-      finishDiaTitle: '区域化党建单位完成情况',
       finishDiaShow: false,
-      //积分记录
-      scoreDiaTitle: '积分记录',
+
       scoreDiaShow: false,
 
       files: "",
@@ -446,7 +440,6 @@ export default {
 
     //完成情况
     handleFinish (row) {
-      this.finishDiaTitle = row.name + '完成情况'
       this.finishDiaShow = true
       this.$nextTick(() => {
         this.$refs.ref_finish.initTable(row)
@@ -462,7 +455,7 @@ export default {
 
     handleAdd () {
       this.formTitle = '新增'
-      this.formShow = 'add'
+      this.formShow = true
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('add', null)
       })

From 3c0ac6b7b6d68b530d456d5ddee1c8e8e44fa2d6 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Aug 2022 15:47:33 +0800
Subject: [PATCH 34/60] emm

---
 .../communityService/worklog/workLogForm.vue  | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index cbb3a06f1..7310a9973 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -49,6 +49,7 @@
           <el-select v-model="formData.applicantId"
                      filterable
                      placeholder="请选择"
+                     @change="handleUserChange"
                      clearable>
             <el-option v-for="item in demandUserList"
                        :key="item.demandUserId"
@@ -132,6 +133,7 @@
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
+import {requestGet} from "../../../../js/dai/request";
 
 
 
@@ -168,7 +170,7 @@ export default {
       optionsG: [],
       serviceTypeList: [],
       publicServiceData: {},
-      demandUserList: []
+      demandUserList: [],
     }
   },
   components: {},
@@ -253,7 +255,22 @@ export default {
     handleGridChange (val) {
       this.getDemandUserList(this.formData.gridId);
     },
-
+    async handleUserChange () {
+      let homeId
+      this.demandUserList.forEach(d => {
+        if (d.demandUserId === this.formData.applicantId){
+           homeId = d.houseId
+        }
+      })
+      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
@@ -289,7 +306,7 @@ export default {
         this.btnDisable = false
       } else {
         this.btnDisable = false
-        this.$message.error(internalMsg)
+        this.$message.error(msg)
       }
 
     },

From 6edd1e4cf1540a37416466b72e410dff99077a24 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Aug 2022 16:14:24 +0800
Subject: [PATCH 35/60] emm

---
 .../communityService/worklog/workLogForm.vue        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 7310a9973..223120606 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -31,8 +31,9 @@
                       style="display: block"
                       prop="serviceType">
           <el-select v-model="formData.serviceType"
-                     placeholder="请选择"
                      filterable
+                     :disabled="disabled"
+                     placeholder="请选择"
                      clearable>
             <el-option v-for="item in serviceTypeList"
                        :key="item.serviceType"
@@ -130,7 +131,6 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
 import {requestGet} from "../../../../js/dai/request";
@@ -150,7 +150,7 @@ export default {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
       agencyId: '',
       btnDisable: false,
-
+      disabled: false,
       applicantId: '',
       keyWords: '',
       formData: {
@@ -190,6 +190,11 @@ export default {
 
       //获取服务事项
       await this.getServiceTypeList()
+      this.serviceTypeList.forEach(s => {
+        if (s.serviceType === this.formData.serviceType){
+          this.disabled = s.enabled
+        }
+      })
       this.getGridList(type)
       this.formType = type
       if (type === 'edit'){
@@ -201,7 +206,7 @@ export default {
 
     //获取服务事项下拉框
     async getServiceTypeList () {
-      const url = "/heart/workdiaryService/serviceType/page"
+      const url = "/heart/workdiaryService/serviceType/avaliableList"
       // let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
       let params = {
         pageNo: 1,

From f716e19b35913fad5c7412cd7335844b501583d7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Aug 2022 16:17:14 +0800
Subject: [PATCH 36/60] emm

---
 src/views/modules/communityService/worklog/workLog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index fbf20cd25..b95f7d8a7 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -126,7 +126,7 @@
         <el-table-column prop="gridName"
                          header-align="center"
                          align="center"
-                         label="场所名称"
+                         label="所属网格"
                          min-width="100">
         </el-table-column>
         <el-table-column prop="serviceTypeName"

From 989cf77b313f5a4715400e4cb31aa7e812d65bae Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 25 Aug 2022 16:50:31 +0800
Subject: [PATCH 37/60] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=A1=B5=20=E4=B8=8B=E6=8B=89=E6=94=AF=E6=8C=81=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 842806954..abff9a4ea 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -48,6 +48,7 @@
                   v-model.trim="form.VILLAGE_ID"
                   placeholder="请选择小区"
                   size="small"
+                  filterable
                   clearable
                   class="resi-cell-select"
                   @clear="handleClearVillage"
@@ -65,6 +66,7 @@
                   v-model.trim="form.BUILD_ID"
                   placeholder="楼号"
                   size="small"
+                  filterable
                   clearable
                   style="width: 120px;"
                   class="resi-cell-select"
@@ -85,6 +87,7 @@
                   :disabled="changeBDisabled"
                   placeholder="单元"
                   size="small"
+                  filterable
                   clearable
                   style="width: 120px;"
                   class="resi-cell-select"
@@ -104,6 +107,7 @@
                   :disabled="changeDDisabled"
                   placeholder="房号"
                   size="small"
+                  filterable
                   clearable
                   style="width: 120px;"
                   class="resi-cell-select"

From b5520008f36d18f56daaa81cfce3298472771806 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Aug 2022 17:03:20 +0800
Subject: [PATCH 38/60] =?UTF-8?q?=E5=86=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/worklog/workLogForm.vue  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 223120606..8d3fdeb06 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -30,10 +30,7 @@
                       label-width="150px"
                       style="display: block"
                       prop="serviceType">
-          <el-select v-model="formData.serviceType"
-                     filterable
-                     :disabled="disabled"
-                     placeholder="请选择"
+          <el-select v-model="formData.serviceType" filterable placeholder="请选择"
                      clearable>
             <el-option v-for="item in serviceTypeList"
                        :key="item.serviceType"
@@ -190,16 +187,19 @@ export default {
 
       //获取服务事项
       await this.getServiceTypeList()
-      this.serviceTypeList.forEach(s => {
-        if (s.serviceType === this.formData.serviceType){
-          this.disabled = s.enabled
-        }
-      })
       this.getGridList(type)
       this.formType = type
       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()
     },
@@ -324,6 +324,7 @@ export default {
     resetData () {
       this.demandUserList = []
       this.optionsG = []
+      this.disabled = false
       this.formData = {
         serviceType: 0,
         gridId: '',

From 03e37456b7f197faabce0a6045c7b97365cd4f72 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 09:11:01 +0800
Subject: [PATCH 39/60] =?UTF-8?q?=E5=86=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/worklog/workLogForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 8d3fdeb06..4bc20acf8 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -265,6 +265,7 @@ export default {
       this.demandUserList.forEach(d => {
         if (d.demandUserId === this.formData.applicantId){
            homeId = d.houseId
+           this.formData.applicantMobile = d.demandUserMobile
         }
       })
       let url = '/gov/org/ichouse/'+homeId

From e7265af6f85fb7601145a15abf39025d49007743 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 09:18:20 +0800
Subject: [PATCH 40/60] =?UTF-8?q?=E7=94=B5=E8=AF=9D=E6=94=B9=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/worklog/workLogForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 4bc20acf8..9566bd64d 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -51,7 +51,7 @@
                      clearable>
             <el-option v-for="item in demandUserList"
                        :key="item.demandUserId"
-                       :label="item.label"
+                       :label="item.demandUserName + '（' +item.idCard + '）'"
                        :value="item.demandUserId">
             </el-option>
           </el-select>

From 8aef831a443d5f9fcb1f984e9d1f76f50542db7e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 10:09:17 +0800
Subject: [PATCH 41/60] =?UTF-8?q?=E6=82=AC=E6=B5=AE=E4=B8=8B=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/worklog/workLog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index b95f7d8a7..1a25382ae 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -144,6 +144,7 @@
         </el-table-column>
         <el-table-column prop="applicantAddress"
                          header-align="center"
+                         show-overflow-tooltip
                          align="center"
                          label="住址"
                          width="80">

From 9c8d6d4bb1cb32087b46d44876efa46698a514a0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 10:40:31 +0800
Subject: [PATCH 42/60] =?UTF-8?q?=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/worklog/workLog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 1a25382ae..94b2f0445 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -526,7 +526,7 @@ export default {
       }
       this.pageSize = 10
       this.pageNo = 0
-      // this.loadTable()
+      this.loadTable()
     },
 
     //导出表格

From ec944c3e24e059b22d20d3156f8ef5845d509773 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 14:11:41 +0800
Subject: [PATCH 43/60] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/shzz/index.vue   | 179 ++++++++----------
 1 file changed, 78 insertions(+), 101 deletions(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 46c1405c9..fe7fe4566 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -1,108 +1,85 @@
 <template>
-  <div>
-    <div class="resi-container">
-      <el-card class="resi-card">
-        <el-row class="resi-row-box"
-                :class="openSearch && 'resi-row-more'">
-          <el-row class="resi-row"
-                  :gutter="20">
-            <el-col :span="8">
-              <div class="resi-cell">
-                <div class="resi-cell-label">组织名称</div>
-                <div class="resi-cell-value"
-                     :class="'resi-cell-value-radio'">
-                  <el-input v-model="fmData.societyName"
-                            class="resi-cell-input"
-                            size="small"
-                            clearable
-                            placeholder="请输入">
-                  </el-input>
-                </div>
-              </div>
-            </el-col>
-
-            <!--            <el-col :span="8">
-                          <div class="resi-cell">
-                            <div class="resi-cell-label">负责人</div>
-                            <div class="resi-cell-value"
-                                 :class="'resi-cell-value-radio'">
-                              <el-input v-model="fmData.personInCharge"
-                                        class="resi-cell-input"
-                                        size="small"
-                                        clearable
-                                        placeholder="请输入">
-                              </el-input>
-                            </div>
-                          </div>
-                        </el-col>-->
-
-            <el-col :span="8">
-              <div class="resi-cell">
-                <div class="resi-cell-label">服务电话</div>
-                <div class="resi-cell-value"
-                     :class="'resi-cell-value-radio'">
-                  <el-input v-model="fmData.mobile"
-                            class="resi-cell-input"
-                            size="small"
-                            clearable
-                            placeholder="请输入">
-                  </el-input>
-                </div>
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div class="resi-cell">
-                <div class="resi-cell-label">服务时间</div>
-                <div class="resi-cell-value"
-                     :class="'resi-cell-value-radio'">
-                  <el-input v-model="fmData.serviceTimeStr"
-                            class="resi-cell-input"
-                            size="small"
-                            clearable
-                            placeholder="请输入">
-                  </el-input>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <!--          <el-row>
-                      <el-col :span="24">
-                        <div class="resi-cell">
-                          <div class="resi-cell-label">服务时间</div>
-                          <div class="resi-cell-value"
-                               :class="'resi-cell-value-radio'">
-                            <el-input v-model="fmData.serviceTimeStr"
-                                      class="resi-cell-input"
-                                      size="small"
-                                      clearable
-                                      placeholder="请输入">
-                            </el-input>
-          &lt;!&ndash;                  <el-date-picker v-model="fmData.serviceTime"
-                                            type="daterange"
-                                            range-separator="至"
-                                            start-placeholder="开始日期"
-                                            end-placeholder="结束日期"
-                                            value-format="yyyy-MM-dd">
-                            </el-date-picker>&ndash;&gt;
-                          </div>
-                        </div>
-                      </el-col>
-                    </el-row>-->
-        </el-row>
-        <el-row class="resi-search">
-          <el-col :span="24">
-            <el-button type="primary"
-                       size="small"
-                       @click="handleSearch">查询
-            </el-button>
-          </el-col>
-        </el-row>
-      </el-card>
-    </div>
+  <div class="resi-container">
+    <el-card class="resi-card">
+      <div class="">
+        <el-form ref="searchForm" :inline="true" :model="searchForm" class="demo-form-inline">
+          <el-form-item label="组织名称" prop="societyName">
+            <el-input v-model="fmData.societyName" placeholder="请输入" class="input-width" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="服务电话" prop="mobile">
+            <el-input v-model="fmData.mobile" placeholder="请输入" class="input-width" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="服务时间" prop="serviceTimeStr">
+            <el-input v-model="fmData.serviceTimeStr" placeholder="请输入" class="input-width" clearable></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <!--        <el-row class="resi-row-box"
+                      :class="openSearch && 'resi-row-more'">
+                <el-row class="resi-row"
+                        :gutter="20">
+                  <el-col :span="8">
+                    <div class="resi-cell">
+                      <div class="resi-cell-label">组织名称</div>
+                      <div class="resi-cell-value"
+                           :class="'resi-cell-value-radio'">
+                        <el-input v-model="fmData.societyName"
+                                  class="resi-cell-input"
+                                  size="small"
+                                  clearable
+                                  placeholder="请输入">
+                        </el-input>
+                      </div>
+                    </div>
+                  </el-col>
+
+                  <el-col :span="8">
+                    <div class="resi-cell">
+                      <div class="resi-cell-label">服务电话</div>
+                      <div class="resi-cell-value"
+                           :class="'resi-cell-value-radio'">
+                        <el-input v-model="fmData.mobile"
+                                  class="resi-cell-input"
+                                  size="small"
+                                  clearable
+                                  placeholder="请输入">
+                        </el-input>
+                      </div>
+                    </div>
+                  </el-col>
+                  <el-col :span="8">
+                    <div class="resi-cell">
+                      <div class="resi-cell-label">服务时间</div>
+                      <div class="resi-cell-value"
+                           :class="'resi-cell-value-radio'">
+                        <el-input v-model="fmData.serviceTimeStr"
+                                  class="resi-cell-input"
+                                  size="small"
+                                  clearable
+                                  placeholder="请输入">
+                        </el-input>
+                      </div>
+                    </div>
+                  </el-col>
+                </el-row>
+              </el-row>
+              <el-row class="resi-search">
+                <el-col :span="24">
+                  <el-button class="diy-button&#45;&#45;add"
+                             size="small"
+                             @click="handleSearch">查询
+                  </el-button>
+                </el-col>
+              </el-row>-->
+    </el-card>
 
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button type="success"
+        <el-button class="diy-button--add"
                    size="small"
                    @click="handleAdd">新增
         </el-button>

From 9631254a94b3fe60ec3aafc1ba023cff206f49ba Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 14:19:49 +0800
Subject: [PATCH 44/60] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index fe7fe4566..a21c87ebb 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -318,7 +318,7 @@ export default {
 
             this.getTableData();
             if (res.data.code == 0) {
-              return this.$message.success(res.data.data || '导入成功');
+              return this.$message.success(res.data.data || '导入中，请到系统管理-导入记录中查看进度');
             } else {
               return this.$message.error(res.data.msg);
             }

From 25934a91a4d54ffc5b7031290346fca2dd94bb74 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 14:41:32 +0800
Subject: [PATCH 45/60] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/cpts/edit.vue | 2 ++
 src/views/modules/communityService/shzz/index.vue     | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index 993ca6ab8..92802a0ba 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -402,12 +402,14 @@ export default {
         this.uploading = false
         this.unloadPencent = 0
         this.dataForm.imageList.push(res.data.url)
+        console.log('handleImgSuccess after',this.dataForm.imageList)
       } else {
         this.$message.error(res.msg)
       }
     },
     handleDelimg(item, index) {
       this.dataForm.imageList.splice(index, 1)
+      console.log('handleDelimg after',this.dataForm.imageList)
     },
     handleMoveCenter() {
       //修改地图中心点
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index a21c87ebb..0b2d8729d 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -2,7 +2,7 @@
   <div class="resi-container">
     <el-card class="resi-card">
       <div class="">
-        <el-form ref="searchForm" :inline="true" :model="searchForm" class="demo-form-inline">
+        <el-form ref="fmData" :inline="true" :model="fmData" class="demo-form-inline">
           <el-form-item label="组织名称" prop="societyName">
             <el-input v-model="fmData.societyName" placeholder="请输入" class="input-width" clearable></el-input>
           </el-form-item>
@@ -14,7 +14,7 @@
           </el-form-item>
           <el-form-item>
             <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('fmData')">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -349,7 +349,10 @@ export default {
       this.pageNo = 1;
       this.getTableData();
     },
-
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+      this.handleSearch()
+    },
     async handleAdd() {
       this.formShow = true;
       await nextTick();

From 32fd9bfae7496d30886ea8546b616e6a6552e530 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 14:42:18 +0800
Subject: [PATCH 46/60] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/cpts/edit.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index 92802a0ba..f92de0974 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -294,7 +294,6 @@ export default {
   props: {},
   watch: {
     "dataForm.serviceTime": function (val) {
-      console.log("watch start"+val+'_'+Array.isArray(val))
       if (Array.isArray(val) && val.length == 2) {
         this.dataForm.serviceStartTime = val[0];
         this.dataForm.serviceEndTime = val[1];
@@ -391,25 +390,20 @@ export default {
       return isPNG && isLt1M
     },
     handleProgress(event, file, fileList) {
-      console.log('percentage', event, file.percentage)
       this.uploading = true
       this.unloadPencent = Number(file.percentage.toFixed(0))
     },
     handleImgSuccess(res, file) {
       if (res.code === 0 && res.msg === 'success') {
-
-        console.log('res.data.url', res.data.url)
         this.uploading = false
         this.unloadPencent = 0
         this.dataForm.imageList.push(res.data.url)
-        console.log('handleImgSuccess after',this.dataForm.imageList)
       } else {
         this.$message.error(res.msg)
       }
     },
     handleDelimg(item, index) {
       this.dataForm.imageList.splice(index, 1)
-      console.log('handleDelimg after',this.dataForm.imageList)
     },
     handleMoveCenter() {
       //修改地图中心点
@@ -425,7 +419,6 @@ export default {
       this.$refs.ref_form.resetFields();
 
       this.formType = type;
-      console.log(row);
       this.dataForm.imageList = []
       if (row) {
         this.dataForm = {...this.dataForm, ...row};
@@ -443,7 +436,6 @@ export default {
     async loadAgency() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
-      console.log("======loadAgency")
       const {data, code, msg} = await requestPost(url, params);
 
       if (code === 0) {

From e12aac98a949fc35c9d3aa15c70198135ab8aa28 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 14:44:22 +0800
Subject: [PATCH 47/60] =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/worklog/workLog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 94b2f0445..347ef2ca3 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -611,8 +611,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是要传的文件名
 

From c0149db1024ac6e7c95e566ab0ff1eaff253bd73 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 15:04:44 +0800
Subject: [PATCH 48/60] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA123?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 0b2d8729d..141df65fe 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -317,11 +317,11 @@ export default {
             console.log("resresresresresresres", res);
 
             this.getTableData();
-            if (res.data.code == 0) {
-              return this.$message.success(res.data.data || '导入中，请到系统管理-导入记录中查看进度');
-            } else {
-              return this.$message.error(res.data.msg);
-            }
+            this.$message({
+              showClose: true,
+              message: '导入中，请到系统管理-导入记录中查看进度',
+              duration: 0
+            })
           })
           .catch((err) => {
             console.log("失败", err);

From 1914822e4956adb9b746b0d26eba647cbaba930f Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 15:07:03 +0800
Subject: [PATCH 49/60] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA123?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 141df65fe..89a559968 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -313,7 +313,7 @@ export default {
       })
           .then((res) => {
             this.importLoading = false;
-            this.importBtnTitle = "excel导入";
+            this.importBtnTitle = "导入";
             console.log("resresresresresresres", res);
 
             this.getTableData();

From 59c1fcb8b25cd0ba03d8c3b6c38050385982e6e0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 15:09:08 +0800
Subject: [PATCH 50/60] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/worklog/workLog.vue      | 31 +++++++++++++++++--
 .../communityService/worklog/workLogForm.vue  | 10 ++++--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 347ef2ca3..397e07ce3 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -70,6 +70,18 @@
                       placeholder="请输入内容">
             </el-input>
           </el-form-item>
+          <el-form-item label="服务时间"
+                        prop="wantServiceStartTime">
+            <el-date-picker v-model="serviceTimeArea"
+                            type="daterange"
+                            format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                            clearable>
+            </el-date-picker>
+          </el-form-item>
           <el-button style="margin-left:10px"
                      class="diy-button--search"
                      size="small"
@@ -265,6 +277,7 @@ export default {
   data () {
     return {
       loading: false,
+      serviceTimeArea: '',
       total: 0,
       pageSize: 20,
       pageNo: 0,
@@ -277,7 +290,9 @@ export default {
         applicantName: '',
         applicantAddress: '',
         applicantMobile: '',
-        serviceContent: ''
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       },
       tableData: [],
 
@@ -301,7 +316,9 @@ export default {
         applicantName: '',
         applicantAddress: '',
         applicantMobile: '',
-        serviceContent: ''
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       },
       serviceTypeList: [],
 
@@ -405,6 +422,11 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
+      if (Array.isArray(this.serviceTimeArea) && this.serviceTimeArea.length > 0) {
+        this.workLog.serviceTimeStart = this.serviceTimeArea[0];
+        this.workLog.serviceTimeEnd = this.serviceTimeArea[1];
+      }
+
       const url = "/heart/workdiaryService/record/page"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page"
       let params = {
@@ -522,8 +544,11 @@ export default {
         applicantName: '',
         applicantAddress: '',
         applicantMobile: '',
-        serviceContent: ''
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       }
+      this.serviceTimeArea = ''
       this.pageSize = 10
       this.pageNo = 0
       this.loadTable()
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 9566bd64d..0920d3e60 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -97,9 +97,13 @@
                       style="display: block"
                       label-width="150px"
                       prop="serviceTime">
-          <el-input v-model="formData.serviceTime"
-                    class="item_width_1"
-                    placeholder="请输入服务时间"></el-input>
+          <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="备注"

From 879fbdb40adb0394d2d9dd38050197c22b6eb63f Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 15:07:03 +0800
Subject: [PATCH 51/60] =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 141df65fe..9eb8398f2 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -99,7 +99,7 @@
                    :on-success="handleExcelSuccess"
                    :before-upload="beforeExcelUpload"
                    :http-request="uploadHttpRequest">
-          <el-button type="warning"
+          <el-button class="diy-button--delete"
                      size="small"
                      :loading="importLoading">{{
               importBtnTitle
@@ -108,7 +108,7 @@
         </el-upload>
 
         <el-button @click="handleChu"
-                   type="danger"
+                   class="diy-button--reset"
                    size="small">导出
         </el-button>
       </div>
@@ -313,7 +313,7 @@ export default {
       })
           .then((res) => {
             this.importLoading = false;
-            this.importBtnTitle = "excel导入";
+            this.importBtnTitle = "导入";
             console.log("resresresresresresres", res);
 
             this.getTableData();

From 6b730dd63d8fdfc2cb8a0e624e8b35ece286316e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 16:49:22 +0800
Subject: [PATCH 52/60] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 397e07ce3..ec639db5d 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -71,15 +71,15 @@
             </el-input>
           </el-form-item>
           <el-form-item label="服务时间"
-                        prop="wantServiceStartTime">
+                        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="结束日期"
-                            clearable>
+                            end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
           <el-button style="margin-left:10px"
@@ -425,6 +425,9 @@ export default {
       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"

From 739ac95197185e70935f524c562d2436509bcc81 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 26 Aug 2022 17:12:56 +0800
Subject: [PATCH 53/60] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/change/changedeath.vue      | 2 --
 src/views/modules/plugins/change/changerelocation.vue | 2 --
 src/views/modules/plugins/change/changewelfare.vue    | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index 7b691ab07..d82ec3e3c 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -1,5 +1,4 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentDeath} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
@@ -135,7 +134,6 @@
                    :gridName="lookInfo.gridName"
                    @close="handleCancleLook" />
     </div>
-  </el-card>
 </template>
 
 <script>
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 3a1343bb1..ca2d5d0dc 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -1,5 +1,4 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-change__changeRelocation} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
@@ -213,7 +212,6 @@
                    :gridName="lookInfo.gridName"
                    @close="handleCancleLook" />
     </div>
-  </el-card>
 </template>
 
 <script>
diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index 81374dfae..f25e3efa7 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -1,5 +1,4 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentDeath} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
@@ -132,7 +131,6 @@
       </span>
       </el-dialog>
     </div>
-  </el-card>
 </template>
 
 <script>

From 9c5dcc212571717a1695bc116b5af9484c3fbb3a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 29 Aug 2022 10:16:32 +0800
Subject: [PATCH 54/60] emm

---
 .../modules/communityParty/stas/index.vue     | 339 ++++++++++++++++++
 1 file changed, 339 insertions(+)
 create mode 100644 src/views/modules/communityParty/stas/index.vue

diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
new file mode 100644
index 000000000..0f2842adb
--- /dev/null
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -0,0 +1,339 @@
+<template>
+  <div class="mod-rent__rentDeath resi-container">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+        label-width="100px">
+        <el-form-item prop="mySelectOrg" label="所属党组织">
+          <el-cascader
+            class="list_item_width_1"
+            v-model="mySelectOrg"
+            size="small"
+            :options="orgList"
+            placeholder="请选择党组织"
+            :props="{
+              checkStrictly: true,
+              label: 'partyOrgName',
+              value: 'id',
+              children: 'children'
+            }"
+            @change="handleChangeOrg"
+            clearable/>
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            v-model="dataForm.name"
+            size="small"
+            class="list_item_width_1"
+            clearable
+            placeholder="请输入姓名">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="手机" prop="mobile">
+          <el-input
+            v-model="dataForm.mobile"
+            size="small"
+            class="list_item_width_1"
+            clearable
+            placeholder="请输入手机">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="身份证" prop="idCard">
+          <el-input
+            v-model="dataForm.idCard"
+            size="small"
+            class="list_item_width_1"
+            clearable
+            placeholder="请输入身份证">
+          </el-input>
+        </el-form-item>
+        <br />
+        <el-form-item label="评分年度" prop="year">
+          <el-date-picker
+            class="list_item_width_1"
+            v-model="dataForm.year"
+            type="year"
+            size="small"
+            placeholder="选择年"
+            value-format="yyyy">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            class="diy-button--search"
+            @click="getDataList()"
+            size="small">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="resi-card-table">
+      <el-table
+        class="resi-table"
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+        :height="tableHeight">
+        <el-table-column
+          label="序号"
+          header-align="center"
+          align="center"
+          width="50px"
+        >
+          <template slot-scope="scope">
+            {{ scope.$index + 1 }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="year"
+          label="年度"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="partyOrg"
+          label="所属党组织"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="name"
+          label="姓名"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="idCard"
+          label="身份证"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="mobile"
+          label="手机号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="totalScore"
+          label="总分"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="basePoint"
+          label="基础积分分值"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="reviewPoint"
+          label="民主评议积分分值"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="inspirePoint"
+          label="激励积分分值"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="warnPoint"
+          label="警示扣分分值"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="remark"
+          label="备注"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </el-card>
+  </div>
+  <!-- </el-card> -->
+</template>
+
+<script>
+import viewPost from '@/mixins/view-post'
+import { mapGetters } from 'vuex'
+export default {
+  mixins: [viewPost],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/resi/partymember/icPartyMemberPoint/getList',
+        getDataListIsPage: true
+      },
+      mySelectOrg: '',
+      orgList: [],
+      searchH: 0,
+      dataForm: {
+        id: '',
+        orgId: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        year: ''
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 230 + this.iframeHeigh
+      const _h = this.clientHeight - 230 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
+  created() {
+    this.getOrgList()
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.searchH = this.$refs.searchCard.$el.offsetHeight
+      console.log('tableHeight', this.tableHeight)
+    })
+  },
+  methods: {
+    resetForm(formName) {
+      for (const n in this.dataForm) {
+        this.dataForm[n] = ''
+      }
+      this.getDataList()
+      this.mySelectOrg = ''
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getDataList()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.currentPage = val
+      this.getDataList()
+    },
+    deepArrTOnull(arr) {
+      let a = []
+      a = arr.map(item => {
+        return {
+          ...item,
+          children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+        }
+      })
+      return a
+    },
+    // 获取党组织列表
+    getOrgList() {
+      return this.$http
+        .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
+          params: { agencyId: localStorage.getItem('agencyId') }
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.orgList = this.deepArrTOnull(res.data)
+        })
+        .catch(() => {})
+    },
+    // 党组织选中事件
+    handleChangeOrg(e) {
+      if (this.mySelectOrg.length > 0 && this.mySelectOrg) {
+        this.dataForm.orgId = this.mySelectOrg[this.mySelectOrg.length - 1]
+      } else {
+        this.dataForm.orgId = ''
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+.form-wr {
+  .input-width {
+    width: 260px;
+  }
+  .input-width-textarea {
+    width: 500px;
+  }
+  .imsg-list {
+    display: flex;
+    align-items: center;
+    .imgs-item {
+      position: relative;
+      margin-right: 10px;
+      .el-icon-delete {
+        position: absolute;
+        top: 0;
+        right: 0;
+        font-size: 18px;
+        color: red;
+        z-index: 3;
+        cursor: pointer;
+      }
+    }
+  }
+}
+.div-content {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.resi-row-btn {
+  display: flex;
+  margin-bottom: 13px;
+  .el-button {
+    margin-left: 10px;
+    border: 0;
+  }
+  // .el-button--success {
+  //   background: rgba(34, 193, 195, 1);
+  // }
+  // .el-button--warning {
+  //   background: rgba(254, 179, 73, 1);
+  // }
+  // .el-button--danger {
+  //   background: rgba(254, 98, 82, 1);
+  // }
+}
+</style>

From 3fe6cc06ddd70648a708dc48956544c2438bd693 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 29 Aug 2022 16:03:29 +0800
Subject: [PATCH 55/60] emm

---
 .../modules/communityParty/stas/index.vue     | 597 +++++++++---------
 1 file changed, 306 insertions(+), 291 deletions(-)

diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index 0f2842adb..f6d3b989f 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -1,235 +1,180 @@
 <template>
-  <div class="mod-rent__rentDeath resi-container">
-    <el-card ref="searchCard" class="search-card">
-      <el-form
-        :inline="true"
-        :model="dataForm"
-        @keyup.enter.native="getDataList()"
-        label-width="100px">
-        <el-form-item prop="mySelectOrg" label="所属党组织">
-          <el-cascader
-            class="list_item_width_1"
-            v-model="mySelectOrg"
-            size="small"
-            :options="orgList"
-            placeholder="请选择党组织"
-            :props="{
-              checkStrictly: true,
-              label: 'partyOrgName',
-              value: 'id',
-              children: 'children'
-            }"
-            @change="handleChangeOrg"
-            clearable/>
-        </el-form-item>
-        <el-form-item label="姓名" prop="name">
-          <el-input
-            v-model="dataForm.name"
-            size="small"
-            class="list_item_width_1"
-            clearable
-            placeholder="请输入姓名">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="手机" prop="mobile">
-          <el-input
-            v-model="dataForm.mobile"
-            size="small"
-            class="list_item_width_1"
-            clearable
-            placeholder="请输入手机">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="身份证" prop="idCard">
-          <el-input
-            v-model="dataForm.idCard"
-            size="small"
-            class="list_item_width_1"
-            clearable
-            placeholder="请输入身份证">
-          </el-input>
-        </el-form-item>
-        <br />
-        <el-form-item label="评分年度" prop="year">
-          <el-date-picker
-            class="list_item_width_1"
-            v-model="dataForm.year"
-            type="year"
-            size="small"
-            placeholder="选择年"
-            value-format="yyyy">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            class="diy-button--search"
-            @click="getDataList()"
-            size="small">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
-        </el-form-item>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="form"
+               ref="ref_searchform"
+               :label-width="'100px'">
+        <div>
+          <el-form-item prop="mySelectOrg" label-width="130px" label="参加活动党组织">
+            <el-cascader
+                    class="list_item_width_1"
+                    v-model="joinOrgIds"
+                    size="small"
+                    :options="orgList"
+                    placeholder="请选择党组织"
+                    :props="partyProps"
+                    @change="handleChangeOrg"
+                    clearable/>
+          </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"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     class="diy-button--reset"
+                     size="small"
+                     @click="handleExport">导出报表</el-button>
+        </div>
       </el-form>
-    </el-card>
-    <el-card class="resi-card-table">
-      <el-table
-        class="resi-table"
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        style="width: 100%"
-        :height="tableHeight">
-        <el-table-column
-          label="序号"
-          header-align="center"
-          align="center"
-          width="50px"
-        >
-          <template slot-scope="scope">
-            {{ scope.$index + 1 }}
-          </template>
+    </div>
+    <div class="div_table">
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="joinOrgName"
+                         header-align="center"
+                         align="center"
+                         label="参加活动党组织"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="dydhNum"
+                         header-align="center"
+                         align="center"
+                         label="支部党员大会(次)"
+                         min-width="80">
+        </el-table-column>
+        <el-table-column prop="wyhNum"
+                         header-align="center"
+                         align="center"
+                         label="支部委员会(次)"
+                         show-overflow-tooltip
+                         max-width="100">
+        </el-table-column>
+        <el-table-column prop="dxzhNum"
+                         header-align="center"
+                         show-overflow-tooltip
+                         align="center"
+                         label="党小组会(次)"
+                         width="80">
+        </el-table-column>
+        <el-table-column prop="dkNum"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="党课(次)"
+                         mix-width="230">
+        </el-table-column>
+        <el-table-column prop="ztdrNum"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="主题党日(次)"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="wmfwNum"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="为民服务活动(次)"
+                         width="130">
         </el-table-column>
-        <el-table-column
-          prop="year"
-          label="年度"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="partyOrg"
-          label="所属党组织"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="name"
-          label="姓名"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="idCard"
-          label="身份证"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="mobile"
-          label="手机号"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="totalScore"
-          label="总分"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="basePoint"
-          label="基础积分分值"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="reviewPoint"
-          label="民主评议积分分值"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="inspirePoint"
-          label="激励积分分值"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="warnPoint"
-          label="警示扣分分值"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="remark"
-          label="备注"
-          header-align="center"
-          align="center"
-        ></el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle"
-      >
-      </el-pagination>
-    </el-card>
+    </div>
   </div>
-  <!-- </el-card> -->
 </template>
 
 <script>
-import viewPost from '@/mixins/view-post'
+import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
 export default {
-  mixins: [viewPost],
-  data() {
+  data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/resi/partymember/icPartyMemberPoint/getList',
-        getDataListIsPage: true
+      form: {
+        joinOrgId: '',
+        joinOrgType: '',
+        startTime: '',
+        endTime: ''
       },
-      mySelectOrg: '',
+      tableData: [],
       orgList: [],
-      searchH: 0,
-      dataForm: {
-        id: '',
-        orgId: '',
-        name: '',
-        idCard: '',
-        mobile: '',
-        year: ''
+      allOrgList: [],
+      serviceTimeArea: '',
+      partyOrg: {
+        partyOrgType: '',
+        id: ''
+      },
+      joinOrgIds: [],
+      tableLoading: false,
+      partyProps: {
+        label: 'partyOrgName',
+        value: 'id',
+        checkStrictly: true,
+        joinOrgType: 'partyOrgType'
       }
     }
   },
-  computed: {
-    ...mapGetters(['clientHeight', 'iframeHeight']),
-    tableHeight() {
-      const h = this.clientHeight - this.searchH - 230 + this.iframeHeigh
-      const _h = this.clientHeight - 230 - this.searchH
-      return this.$store.state.inIframe ? h : _h
-    }
+  components: {
+
   },
-  created() {
+  async created () {
     this.getOrgList()
   },
-  mounted() {
-    this.$nextTick(() => {
-      this.searchH = this.$refs.searchCard.$el.offsetHeight
-      console.log('tableHeight', this.tableHeight)
-    })
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    this.handleSearch()
   },
+
   methods: {
-    resetForm(formName) {
-      for (const n in this.dataForm) {
-        this.dataForm[n] = ''
-      }
-      this.getDataList()
-      this.mySelectOrg = ''
+    handleSearch () {
+      this.loadTable()
     },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getDataList()
+    handleChangeOrg () {
+      if (this.joinOrgIds.length > 0 && this.joinOrgIds) {
+        this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1]
+
+      } else {
+        this.form.joinOrgId = ''
+      }
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`)
-      this.currentPage = val
-      this.getDataList()
+    getOrgList() {
+      return this.$http
+          .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
+            params: { agencyId: localStorage.getItem('agencyId') }
+          })
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            }
+            this.orgList = this.deepArrTOnull(res.data)
+          })
+          .catch(() => {})
     },
     deepArrTOnull(arr) {
       let a = []
@@ -239,101 +184,171 @@ export default {
           children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
         }
       })
+      this.allOrgList = a
       return a
     },
-    // 获取党组织列表
-    getOrgList() {
-      return this.$http
-        .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
-          params: { agencyId: localStorage.getItem('agencyId') }
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.orgList = this.deepArrTOnull(res.data)
-        })
-        .catch(() => {})
-    },
-    // 党组织选中事件
-    handleChangeOrg(e) {
-      if (this.mySelectOrg.length > 0 && this.mySelectOrg) {
-        this.dataForm.orgId = this.mySelectOrg[this.mySelectOrg.length - 1]
+    async loadTable () {
+      this.tableLoading = true
+      if (Array.isArray(this.serviceTimeArea) && this.serviceTimeArea.length > 0) {
+        this.form.startTime = this.serviceTimeArea[0];
+        this.form.endTime = this.serviceTimeArea[1];
+      }else {
+        this.form.startTime = '';
+        this.form.endTime = '';
+      }
+      if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined){
+        let a = this.orgList[0]
+        this.form.joinOrgId = a.id;
+        this.form.joinOrgType = a.partyOrgType;
+      }else {
+        this.form.joinOrgId = this.partyProps.value;
+        this.form.joinOrgType = this.partyProps.joinOrgType;
+      }
+      console.log('start')
+      const url = "/resi/partymember/icPartyAct/patryactstatis"
+      // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/patryactstatis"
+      let params = {
+        ...this.form
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.tableData = data
       } else {
-        this.dataForm.orgId = ''
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.form = {
+        joinOrgId: '',
+        joinOrgType: '',
+        startTime: '',
+        endTime: ''
+      }
+      this.serviceTimeArea = ''
+      this.joinOrgIds = []
+      this.partyOrg = {
+        id: '',
+        partyOrgType: ''
+      }
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = '党建数据统计'
+      const url = "/resi/partymember/icPartyAct/export"
+      // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/export"
+      let params = {
+        ...this.form
+      }
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      if (loading) {
+        loading.close()
       }
     }
+  },
+  computed: {
+    tableHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 350 + this.iframeHeight : this.clientHeight - 350
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
   }
 }
 </script>
-<style lang="scss" scoped>
-@import '@/assets/scss/buttonstyle.scss';
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+.div_main {
+  width: 100%;
+}
 
-.resi-container .resi-card-table {
-  ::v-deep .el-table th {
-    color: #fff;
-    background-color: rgba(33, 149, 254, 1);
-    // border-right: 1px solid rgba(33, 149, 254, 1);
-  }
+.div_search {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 30px 20px 5px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
 }
-.resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
+
+.item_width_1 {
+  width: 260px;
 }
-.form-wr {
-  .input-width {
-    width: 260px;
-  }
-  .input-width-textarea {
-    width: 500px;
-  }
-  .imsg-list {
-    display: flex;
-    align-items: center;
-    .imgs-item {
-      position: relative;
-      margin-right: 10px;
-      .el-icon-delete {
-        position: absolute;
-        top: 0;
-        right: 0;
-        font-size: 18px;
-        color: red;
-        z-index: 3;
-        cursor: pointer;
-      }
-    }
-  }
+.item_width_2 {
+  width: 620px;
 }
-.div-content {
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+
+.div_table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  // padding: 23px 30px 10px;
+
+  .table {
+    margin-top: 20px;
+  }
 }
-.resi-row-btn {
+
+.el-row {
+  /* margin-bottom: 20px; */
   display: flex;
-  margin-bottom: 13px;
-  .el-button {
-    margin-left: 10px;
-    border: 0;
-  }
-  // .el-button--success {
-  //   background: rgba(34, 193, 195, 1);
-  // }
-  // .el-button--warning {
-  //   background: rgba(254, 179, 73, 1);
-  // }
-  // .el-button--danger {
-  //   background: rgba(254, 98, 82, 1);
-  // }
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
 }
 </style>

From 0784911c73ee6c844ef9591f6376ea6a538e6551 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 29 Aug 2022 16:30:27 +0800
Subject: [PATCH 56/60] emm

---
 .../modules/communityParty/stas/index.vue     | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index f6d3b989f..45042991e 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -13,7 +13,12 @@
                     size="small"
                     :options="orgList"
                     placeholder="请选择党组织"
-                    :props="partyProps"
+                    :props="{
+                      checkStrictly: true,
+                      label: 'partyOrgName',
+                      value: 'id',
+                      children: 'children'
+                    }"
                     @change="handleChangeOrg"
                     clearable/>
           </el-form-item>
@@ -123,7 +128,6 @@ export default {
       },
       tableData: [],
       orgList: [],
-      allOrgList: [],
       serviceTimeArea: '',
       partyOrg: {
         partyOrgType: '',
@@ -131,12 +135,7 @@ export default {
       },
       joinOrgIds: [],
       tableLoading: false,
-      partyProps: {
-        label: 'partyOrgName',
-        value: 'id',
-        checkStrictly: true,
-        joinOrgType: 'partyOrgType'
-      }
+      agencyId: ''
     }
   },
   components: {
@@ -148,7 +147,7 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
-    this.handleSearch()
+    await this.handleSearch()
   },
 
   methods: {
@@ -158,7 +157,6 @@ export default {
     handleChangeOrg () {
       if (this.joinOrgIds.length > 0 && this.joinOrgIds) {
         this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1]
-
       } else {
         this.form.joinOrgId = ''
       }
@@ -171,10 +169,10 @@ export default {
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg)
+            }else {
+              this.orgList = this.deepArrTOnull(res.data)
             }
-            this.orgList = this.deepArrTOnull(res.data)
-          })
-          .catch(() => {})
+          }).catch(() => {return this.$message.error("网络错误");})
     },
     deepArrTOnull(arr) {
       let a = []
@@ -184,7 +182,6 @@ export default {
           children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
         }
       })
-      this.allOrgList = a
       return a
     },
     async loadTable () {
@@ -199,10 +196,8 @@ export default {
       if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined){
         let a = this.orgList[0]
         this.form.joinOrgId = a.id;
-        this.form.joinOrgType = a.partyOrgType;
       }else {
-        this.form.joinOrgId = this.partyProps.value;
-        this.form.joinOrgType = this.partyProps.joinOrgType;
+        this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1];
       }
       console.log('start')
       const url = "/resi/partymember/icPartyAct/patryactstatis"

From 02b8925ab38a90c1101382581d7304a593fbb1fd Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 29 Aug 2022 16:40:28 +0800
Subject: [PATCH 57/60] emm

---
 src/views/modules/communityParty/stas/index.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index 45042991e..6f2cf1861 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -142,12 +142,13 @@ export default {
 
   },
   async created () {
-    this.getOrgList()
+    await this.getOrgList()
+    await this.handleSearch()
   },
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
-    await this.handleSearch()
+
   },
 
   methods: {
@@ -193,9 +194,12 @@ export default {
         this.form.startTime = '';
         this.form.endTime = '';
       }
+
       if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined){
+        console.log(this.orgList)
         let a = this.orgList[0]
         this.form.joinOrgId = a.id;
+        this.joinOrgIds = this.form.joinOrgId
       }else {
         this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1];
       }

From 30810691be839c4b4933ecde1b772e702f9c65eb Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 29 Aug 2022 16:51:03 +0800
Subject: [PATCH 58/60] emm

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

diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index 6f2cf1861..827dd7494 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -196,14 +196,14 @@ export default {
       }
 
       if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined){
-        console.log(this.orgList)
         let a = this.orgList[0]
         this.form.joinOrgId = a.id;
         this.joinOrgIds = this.form.joinOrgId
       }else {
-        this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1];
+        if (Array.isArray(this.joinOrgIds)){
+          this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1];
+        }
       }
-      console.log('start')
       const url = "/resi/partymember/icPartyAct/patryactstatis"
       // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/patryactstatis"
       let params = {

From 8a0c3e8a0500f6bbd780c7eb5aa67ef28cef003c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 30 Aug 2022 14:41:12 +0800
Subject: [PATCH 59/60] yangshi

---
 src/views/modules/communityParty/stas/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index 827dd7494..515af7aca 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -83,14 +83,14 @@
                          show-overflow-tooltip
                          align="center"
                          label="党小组会(次)"
-                         width="80">
+                         mix-width="80">
         </el-table-column>
         <el-table-column prop="dkNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="党课(次)"
-                         mix-width="230">
+                         mix-width="80">
         </el-table-column>
         <el-table-column prop="ztdrNum"
                          header-align="center"

From ab92c951ef3727a6637063a90711cc2bbc94acbf Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 2 Sep 2022 13:37:03 +0800
Subject: [PATCH 60/60] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/stas/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index 515af7aca..b063e674b 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -41,11 +41,17 @@
           <el-button style="margin-left:10px"
                      class="diy-button--reset"
                      size="small"
-                     @click="handleExport">导出报表</el-button>
+                     @click="resetSearch">重置</el-button>
         </div>
       </el-form>
     </div>
     <div class="div_table">
+      <div class="div_btn">
+      <el-button style="margin-left:10px"
+                 class="diy-button--reset"
+                 size="small"
+                 @click="handleExport">导出</el-button>
+      </div>
       <el-table class="table"
                 :data="tableData"
                 border