From 628f543f30e3779e1d3d0bf068d187ce822409f6 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 16 Feb 2022 16:56:53 +0800
Subject: [PATCH 01/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BC=8F=E6=8E=89?=
 =?UTF-8?q?=E7=9A=84cokkie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/tinymce/index.vue | 2 +-
 src/views/main-content.vue             | 6 +++---
 src/views/main-shuju/main-content.vue  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/components/tinymce/index.vue b/src/views/components/tinymce/index.vue
index 8403b43cb..73c48e26a 100644
--- a/src/views/components/tinymce/index.vue
+++ b/src/views/components/tinymce/index.vue
@@ -137,7 +137,7 @@ export default {
       })
     },
     getUserToken () {
-      let token = Cookie.get('token')
+      let token = localStorage.getItem('token')
       // console.log('获取token', token)
       // return this.$store.getters['user/isLogin']
       return token
diff --git a/src/views/main-content.vue b/src/views/main-content.vue
index 890964127..08c7e2491 100644
--- a/src/views/main-content.vue
+++ b/src/views/main-content.vue
@@ -87,7 +87,7 @@ export default {
     // this.$nextTick(() => {
     //   this.sendMessage()
     // })
-    this.token = Cookie.get("token");
+    this.token = localStorage.getItem("token");
     this.customerId = localStorage.getItem("customerId");
   },
   methods: {
@@ -100,7 +100,7 @@ export default {
       this.iframeUrl =
         url +
         "?token=" +
-        Cookie.get("token") +
+        localStorage.getItem("token") +
         "&customerId=" +
         localStorage.getItem("customerId");
       return isURL(url);
@@ -169,7 +169,7 @@ export default {
 
       console.log("iframe", iframe);
       // iframe.postMessage({
-      //   token: Cookie.get('token'),
+      //   token: localStorage.getItem('token'),
       //   customerId: localStorage.getItem('customerId')
       // }, '*')
       iframe.postMessage({ name: "lalalal" }, "*");
diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue
index b2da8855f..e78235c60 100644
--- a/src/views/main-shuju/main-content.vue
+++ b/src/views/main-shuju/main-content.vue
@@ -24,7 +24,7 @@ export default {
     // this.$nextTick(() => {
     //   this.sendMessage()
     // })
-    this.token = Cookie.get('token')
+    this.token = localStorage.getItem('token')
     this.customerId = localStorage.getItem('customerId')
   },
   methods: {
@@ -34,7 +34,7 @@ export default {
     // tabs, 是否通过iframe展示
     tabIsIframe (url) {
       // this.appendIframe(url)
-      this.iframeUrl = url + '?token=' + Cookie.get('token') + '&customerId=' + localStorage.getItem('customerId')
+      this.iframeUrl = url + '?token=' + localStorage.getItem('token') + '&customerId=' + localStorage.getItem('customerId')
       return isURL(url)
     },
     // tabs, 选中tab
@@ -85,7 +85,7 @@ export default {
 
       console.log('iframe', iframe)
       // iframe.postMessage({
-      //   token: Cookie.get('token'),
+      //   token: localStorage.getItem('token'),
       //   customerId: localStorage.getItem('customerId')
       // }, '*')
       iframe.postMessage({ name: 'lalalal' }, '*')

From bd1b591cda6fef6338c7e694a4c876b12d71e3e2 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 17 May 2022 15:26:55 +0800
Subject: [PATCH 02/78] =?UTF-8?q?=E8=BF=81=E5=85=A5=E6=AD=BB=E4=BA=A1?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E6=96=B0=E5=A2=9E=E6=AD=BB=E4=BA=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/change/resideath.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index cf791d50b..6a07e6f1e 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -86,7 +86,7 @@
               <el-button @click="joinBlacklist(scope.row)"
                        type="text"
                        size="small"
-                       class="div-table-button--detail">迁入死亡人口</el-button>
+                       class="div-table-button--detail">新增死亡人口</el-button>
             <!-- <el-button @click="handleLook(scope.row)"
                        type="text"
                        size="small"
@@ -261,8 +261,8 @@
                  :userId="lookInfo.userId"
                  :gridName="lookInfo.gridName"
                  @close="handleCancleLook" />
-    <el-dialog title="迁入死亡人口的原因" :visible.sync="blacklistVisible" width="40%">
-      <textarea v-model="blacklistReason" placeholder="请输入迁入死亡人口的原因" class="blacklist-reason"></textarea>
+    <el-dialog title="新增死亡人口的原因" :visible.sync="blacklistVisible" width="40%">
+      <textarea v-model="blacklistReason" placeholder="请输入新增死亡人口的原因" class="blacklist-reason"></textarea>
       <div>
         <br/>
       </div>

From 438d2195b7d5ef9156248bd5c0964fe199ab9ef3 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 25 May 2022 09:51:37 +0800
Subject: [PATCH 03/78] =?UTF-8?q?=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/measure/info.vue   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue
index 74193bd21..5d84e0cde 100644
--- a/src/views/modules/communityService/measure/info.vue
+++ b/src/views/modules/communityService/measure/info.vue
@@ -301,17 +301,17 @@ export default {
       type: String,
       default: "",
     },
-    addType: {
-      type: String,
-      default: "look",
-    },
+    // addType: {
+    //   type: String,
+    //   default: "look",
+    // },
   },
 
   data () {
     return {
       btnLoading: false,
       pageLoading: false,
-
+      addType: 'look',
       form: {
         gridId: "",
         categoryCodeArr: [],
@@ -476,9 +476,14 @@ export default {
           "";
       }
       if (addType == "finish") {
-        if (row.serviceStartTime)
+        if (row.serviceStartTime && row.serviceEndTime) {
           this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime];
 
+        } else {
+          this.finishServiceTime = []
+        }
+
+
         this.form.finishResult = "resolved";
         this.form.score = 5;
       }

From f153f5c36274aee061b10722933de118bcbd5da7 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 25 May 2022 14:38:27 +0800
Subject: [PATCH 04/78] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/community.vue      | 46 ++++++++++++++++--
 src/views/modules/base/community/roomForm.vue | 48 ++++++++++++-------
 2 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index caf105692..118fe34c0 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -43,7 +43,6 @@
           <div class="resi-cell-label">房主手机</div>
           <div class="resi-cell-value">
             <el-input v-model="ownerPhone"
-                      class="resi-cell-input"
                       size="small"
                       clearable
                       placeholder="请输入内容">
@@ -70,6 +69,32 @@
 
           </div>
         </div>
+
+        <div class="resi-cell">
+          <div class="resi-cell-label">房屋用途</div>
+          <div class="resi-cell-value">
+
+            <el-select v-model="purpose" placeholder="房屋用途" clearable>
+              <el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+              </el-option>
+            </el-select>
+
+          </div>
+        </div>
+
+        <div class="resi-cell">
+          <div class="resi-cell-label">备注</div>
+          <div class="resi-cell-value">
+
+            <el-input v-model="remark"
+                      size="small"
+                      clearable
+                      placeholder="请输入备注">
+            </el-input>
+
+          </div>
+        </div>
+
         <el-button style="margin-left:10px"
                    class="diy-button--search"
                    size="small"
@@ -152,8 +177,19 @@ export default {
       ownerName: '',
       ownerPhone: '',
       rentState: '',
+      purpose: '',
+      remark: '',
       showRoomTable: false,
       selObj: {},
+      purposeArr: [
+          { dictValue: '1', dictName: '住宅' },
+          { dictValue: '2', dictName: '商业' },
+          { dictValue: '3', dictName: '办公' },
+          { dictValue: '4', dictName: '工业' },
+          { dictValue: '5', dictName: '仓储' },
+          { dictValue: '6', dictName: '商住混用' },
+          { dictValue: '7', dictName: '其他' }
+      ]
     }
   },
   components: {
@@ -192,10 +228,10 @@ export default {
   methods: {
 
     handleSearch () {
-      if (this.ownerName || this.ownerPhone || this.rentState) {
+      if (this.ownerName || this.ownerPhone || this.rentState || this.purpose || this.remark) {
         this.showRoomTable = true
         this.$nextTick(() => {
-          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState)
+          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState, this.purpose, this.remark)
         })
       } else {
         this.$message.warning('请输入查询条件')
@@ -209,6 +245,8 @@ export default {
       this.ownerName = ''
       this.ownerPhone = ''
       this.rentState = ''
+      this.purpose = ''
+      this.remark = ''
 
       this.pageSize = 10
       this.pageNo = 1
@@ -280,6 +318,8 @@ export default {
       this.ownerName = ''
       this.ownerPhone = ''
       this.rentState = ''
+      this.purpose = ''
+      this.remark = ''
       this.showRoomTable = false
 
       this.selObj = JSON.parse(JSON.stringify(obj))
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 37316861c..6ec07da86 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -109,6 +109,15 @@
                     v-model="dataForm.ownerIdCard">
           </el-input>
         </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入备注"
+                    v-model="dataForm.remark">
+          </el-input>
+        </el-form-item>
       </el-form>
 
     </div>
@@ -145,14 +154,15 @@ export default {
       dataForm: {
         neighborHoodId: '', // 所属小区ID
         buildingId: '',//所属楼栋ID
-        buildingUnitId: '',//所属单元ID	
-        doorName: '',//门牌号	
-        houseType: '',//房屋类型【楼房，平房，别墅】		
-        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '',//房屋类型【楼房，平房，别墅】
+        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
         rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
-        ownerPhone: '', //房主电话	
-        ownerName: '', //房主名字		
-        ownerIdCard: '' //房主身份证	
+        ownerPhone: '', //房主电话
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '' // 备注
       },
 
       keyWords: '',
@@ -254,7 +264,7 @@ export default {
     },
 
     async addRoom () {
-      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
       if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
         this.btnDisable = false
         this.$message({
@@ -313,14 +323,15 @@ export default {
       this.dataForm = {
         neighborHoodId: '', // 所属小区ID
         buildingId: '',//所属楼栋ID
-        buildingUnitId: '',//所属单元ID	
-        doorName: '',//门牌号	
-        houseType: '1',//房屋类型【楼房，平房，别墅】		
-        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
-        rentFlag: 0,//是否出租【是：1，否：0】		
-        ownerPhone: '', //房主电话	
-        ownerName: '', //房主名字		
-        ownerIdCard: '' //房主身份证	
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '1',//房屋类型【楼房，平房，别墅】
+        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//是否出租【是：1，否：0】
+        ownerPhone: '', //房主电话
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '' // 备注
       }
 
     },
@@ -367,6 +378,9 @@ export default {
         ownerIdCard: [
           { required: false }
         ],
+        remark: [
+            { required: false }
+        ]
       }
     },
 
@@ -376,4 +390,4 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManageForm.scss";
-</style>
\ No newline at end of file
+</style>

From 1d1366319d42d5af8f56d0cd942edf35f88edd54 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 25 May 2022 15:07:52 +0800
Subject: [PATCH 05/78] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/roomTable.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index a866b6f3c..29324579b 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -198,7 +198,7 @@ let loading // 加载动画
 export default {
   data () {
     return {
-      source: 'tree',//来源  
+      source: 'tree',//来源
       importRoomLoading: false,
       total: 0,
       pageSize: 20,
@@ -347,6 +347,8 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
         sortType: this.sortType,
       }
 
@@ -541,6 +543,8 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
         buildingId: this.agencyObj.id
       }
 
@@ -619,6 +623,8 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
         buildingId: '',
         neighborHoodId: ''
       }
@@ -799,6 +805,14 @@ export default {
       type: String,
       default: '',
     },
+    purpose: {
+        type: String,
+        default: '',
+    },
+    remark: {
+        type: String,
+        default: '',
+    }
   }
 }
 </script>

From d4615a65c0e5d880d75ab1236181ad0939959638 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 25 May 2022 15:22:09 +0800
Subject: [PATCH 06/78] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/community.vue      | 726 +++++++++---------
 src/views/modules/base/community/roomForm.vue | 506 ++++++------
 2 files changed, 643 insertions(+), 589 deletions(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 01f94046b..e89875332 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -48,7 +48,6 @@
           <div class="resi-cell-label">房主手机</div>
           <div class="resi-cell-value">
             <el-input v-model="ownerPhone"
-                      class="resi-cell-input"
                       size="small"
                       clearable
                       placeholder="请输入内容">
@@ -75,6 +74,32 @@
 
           </div>
         </div>
+
+        <div class="resi-cell">
+          <div class="resi-cell-label">房屋用途</div>
+          <div class="resi-cell-value">
+
+            <el-select v-model="purpose" placeholder="房屋用途" clearable>
+              <el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+              </el-option>
+            </el-select>
+
+          </div>
+        </div>
+
+        <div class="resi-cell">
+          <div class="resi-cell-label">备注</div>
+          <div class="resi-cell-value">
+
+            <el-input v-model="remark"
+                      size="small"
+                      clearable
+                      placeholder="请输入备注">
+            </el-input>
+
+          </div>
+        </div>
+
         <el-button style="margin-left:10px"
                    class="diy-button--search"
                    size="small"
@@ -122,376 +147,391 @@
 </template>
 
 <script>
-import CDialog from '@c/CDialog'
-import communityTable from './communityTable'
-import buildTable from './buildTable'
-import roomTable from './roomTable'
-import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-
-let loading // 加载动画
-export default {
-  data () {
-    return {
-      filterText: '',
-      treeLoading: true,
-      treeData: [],
-      openNodes: [],
-      defaultProps: {
-        children: 'children',
-        label: 'showName'
-      },
-
-      selTreeObj: {},
-
-      centerPoint: [],
-      staffAgencyId: localStorage.getItem("agencyId"),
-      showImportBtn: false,
-
-      rentList: [
-        {
-          value: '1',
-          label: '出租'
+    import CDialog from '@c/CDialog'
+    import communityTable from './communityTable'
+    import buildTable from './buildTable'
+    import roomTable from './roomTable'
+    import { requestPost } from "@/js/dai/request";
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
+
+    let loading // 加载动画
+    export default {
+        data () {
+            return {
+                filterText: '',
+                treeLoading: true,
+                treeData: [],
+                openNodes: [],
+                defaultProps: {
+                    children: 'children',
+                    label: 'showName'
+                },
+
+                selTreeObj: {},
+
+                centerPoint: [],
+                staffAgencyId: localStorage.getItem("agencyId"),
+                showImportBtn: false,
+
+                rentList: [
+                    {
+                        value: '1',
+                        label: '出租'
+                    },
+                    {
+                        value: '2',
+                        label: '闲置'
+                    },
+                    {
+                        value: '0',
+                        label: '自住'
+                    },
+                ],
+                ownerName: '',
+                ownerPhone: '',
+                rentFlag: '',
+                purpose: '',
+                remark: '',
+                showRoomTable: false,
+                selObj: {},
+                purposeArr: [
+                    { dictValue: '1', dictName: '住宅' },
+                    { dictValue: '2', dictName: '商业' },
+                    { dictValue: '3', dictName: '办公' },
+                    { dictValue: '4', dictName: '工业' },
+                    { dictValue: '5', dictName: '仓储' },
+                    { dictValue: '6', dictName: '商住混用' },
+                    { dictValue: '7', dictName: '其他' }
+                ]
+            }
         },
-        {
-          value: '2',
-          label: '闲置'
+        components: {
+            CDialog
         },
-        {
-          value: '0',
-          label: '自住'
-        },
-      ],
-      ownerName: '',
-      ownerPhone: '',
-      rentFlag: '',
-      showRoomTable: false,
-      selObj: {},
-    }
-  },
-  components: {
-    CDialog
-  },
-  async mounted () {
-    this.treeLoading = true
-
-    await this.loadOrgData()
-    await this.loadTree()
-    await this.loadOpenNode()
-
-    await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
-    if (this.treeData.length > 0) {
-      this.$nextTick(() => {
-        // ref_tree 元素的ref   value 绑定的node-key
-        this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
-      });
-    }
-    this.treeLoading = false
-
-  },
-  computed: {
-    rowHeight () {
+        async mounted () {
+            this.treeLoading = true
+
+            await this.loadOrgData()
+            await this.loadTree()
+            await this.loadOpenNode()
+
+            await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
+            if (this.treeData.length > 0) {
+                this.$nextTick(() => {
+                    // ref_tree 元素的ref   value 绑定的node-key
+                    this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
+                });
+            }
+            this.treeLoading = false
 
-      return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px'
-
-    },
-    treeHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
-
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  methods: {
-
-    handleSearch () {
-      if (this.ownerName || this.ownerPhone || this.rentFlag) {
-        this.showRoomTable = true
-
-        this.$nextTick(() => {
-          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentFlag)
-        })
-      } else {
-        this.$message.warning('请输入查询条件')
-      }
-
-
-    },
+        },
+        computed: {
+            rowHeight () {
 
-    //重置搜索条件
-    resetSearch () {
-      this.ownerName = ''
-      this.ownerPhone = ''
-      this.rentFlag = ''
+                return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px'
 
-      this.pageSize = 10
-      this.pageNo = 1
-      this.handleNodeClick(this.selObj)
-      // this.loadTable()
-    },
+            },
+            treeHeight () {
+                return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
 
-    async loadOpenNode () {
-      const url = "/gov/org/building/tree-ids"
-      let params = {}
+            },
 
-      const { data, code, msg } = await requestPost(url, params)
+            ...mapGetters(['clientHeight', 'iframeHeight'])
+        },
+        methods: {
 
-      if (code === 0) {
-        this.openNodes = data
+            handleSearch () {
+                if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
+                    this.showRoomTable = true
 
+                    this.$nextTick(() => {
+                        this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
+                    })
+                } else {
+                    this.$message.warning('请输入查询条件')
+                }
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    async loadTree (isRefresh) {
-      const url = "/gov/org/building/treelist"
-      let params = {}
 
-      const { data, code, msg } = await requestPost(url, params)
+            },
 
-      if (code === 0) {
+            //重置搜索条件
+            resetSearch () {
+                this.ownerName = ''
+                this.ownerPhone = ''
+                this.rentFlag = ''
+                this.purpose = ''
+                this.remark = ''
+
+                this.pageSize = 10
+                this.pageNo = 1
+                this.handleNodeClick(this.selObj)
+                // this.loadTable()
+            },
 
-        this.treeData = data
-        if (!isRefresh && data.length > 0) {
+            async loadOpenNode () {
+                const url = "/gov/org/building/tree-ids"
+                let params = {}
+
+                const { data, code, msg } = await requestPost(url, params)
+
+                if (code === 0) {
+                    this.openNodes = data
 
-          this.selTreeObj = data[0]
-          if (!this.selTreeObj.latitude) {
-            this.selTreeObj.latitude = this.centerPoint[0]
-          }
 
-          if (!this.selTreeObj.longitude) {
-            this.selTreeObj.longitude = this.centerPoint[1]
-          }
+                } else {
+                    this.$message.error(msg)
+                }
+            },
+            async loadTree (isRefresh) {
+                const url = "/gov/org/building/treelist"
+                let params = {}
+
+                const { data, code, msg } = await requestPost(url, params)
+
+                if (code === 0) {
+
+                    this.treeData = data
+                    if (!isRefresh && data.length > 0) {
+
+                        this.selTreeObj = data[0]
+                        if (!this.selTreeObj.latitude) {
+                            this.selTreeObj.latitude = this.centerPoint[0]
+                        }
+
+                        if (!this.selTreeObj.longitude) {
+                            this.selTreeObj.longitude = this.centerPoint[1]
+                        }
+                    }
+
+                } else {
+                    this.$message.error(msg)
+                }
+            },
+
+            //加载组织数据
+            async loadOrgData () {
+                const url = "/gov/org/agency/maporg"
+                // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
+                let params = {}
+
+                const { data, code, msg } = await requestPost(url, params)
+
+                if (code === 0) {
+                    this.centerPoint = []
+
+                    this.centerPoint.push(data.latitude)
+                    this.centerPoint.push(data.longitude)
+
+                } else {
+                    this.$message.error(msg)
+                }
+
+            },
+
+            handleNodeClick (obj) {
+                this.ownerName = ''
+                this.ownerPhone = ''
+                this.rentFlag = ''
+                this.purpose = ''
+                this.remark = ''
+                this.showRoomTable = false
+
+                this.selObj = JSON.parse(JSON.stringify(obj))
+                this.getTreeObj(obj)
+
+                this.$nextTick(() => {
+                    if (obj.level === 'building') {//点击楼栋
+                        this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
+
+                    } else if (obj.level === 'neighborHood') {//点击小区
+                        this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
+
+                    } else {
+                        this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
+                    }
+                })
+
+            },
+
+            //添加小区结束
+            async refreshTree () {
+                this.treeLoading = true
+                await this.loadTree(this.selTreeObj.id)
+                this.$nextTick(() => {
+                    // ref_tree 元素的ref   value 绑定的node-key
+                    this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
+                });
+                this.treeLoading = false
+            },
+
+            //进入下一级
+            toNextLevel (row, level) {
+
+                if (level === 'community') {
+                    this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data
+                    this.openNodes.push(this.selTreeObj.id)
+                } else {
+                    this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data
+                }
+
+
+                this.handleNodeClick(this.selTreeObj)
+                this.$nextTick(() => {
+                    // ref_tree 元素的ref   value 绑定的node-key
+                    this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
+                });
+
+                const node = document.getElementById(this.selTreeObj.id) // 通过Id获取到对应的dom元素
+                setTimeout(() => {
+                    if (node) {
+                        this.$nextTick(() => {
+                            node.scrollIntoView({ block: 'center' }) // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示
+                        })
+                    }
+                }, 100)
+
+
+            },
+
+            //解析树数据
+            getTreeObj (obj) {
+                // 树接口：
+                // 组织：组织id、组织名称、type、经度、纬度
+                // 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
+                // 楼：楼id、楼名称、type、所属小区id、所属小区名称
+                if (obj.level === 'building') {//点击楼栋
+                    let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid)//所属小区
+
+                    let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid)//所属网格
+                    let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)//所属社区
+                    obj.agencyId = agencyNode.data.id
+                    obj.agencyName = agencyNode.data.label
+                    obj.gridId = gridNode.data.id
+                    obj.gridName = gridNode.data.label
+                    obj.neighborHoodId = neighborHoodNode.data.id
+                    obj.neighborHoodName = neighborHoodNode.data.label
+                    if (obj.agencyId === this.staffAgencyId) {
+                        this.showImportBtn = true
+                    } else {
+                        this.showImportBtn = false
+                    }
+
+                } else if (obj.level === 'neighborHood') {//点击小区
+                    let gridNode = this.$refs.ref_tree.getNode(obj.pid)
+                    let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)
+                    obj.gridId = gridNode.data.id
+                    obj.gridName = gridNode.data.label
+                    obj.agencyId = agencyNode.data.id
+                    obj.agencyName = agencyNode.data.label
+                    if (obj.agencyId === this.staffAgencyId) {
+                        this.showImportBtn = true
+                    } else {
+                        this.showImportBtn = false
+                    }
+
+                } else {
+
+                }
+
+                if (!obj.latitude) {
+                    obj.latitude = this.centerPoint[0]
+                }
+
+                if (!obj.longitude) {
+                    obj.longitude = this.centerPoint[1]
+                }
+                this.selTreeObj = obj
+                console.log(this.selTreeObj)
+
+            },
+
+            filterNode (value, data) {
+                if (!value) return true;
+                return data.label.indexOf(value) !== -1;
+            },
+
+            // 开启加载动画
+            startLoading () {
+                loading = Loading.service({
+                    lock: true, // 是否锁定
+                    text: '正在加载……', // 加载中需要显示的文字
+                    background: 'rgba(0,0,0,.7)' // 背景颜色
+                })
+            },
+            // 结束加载动画
+            endLoading () {
+                // clearTimeout(timer);
+                if (loading) {
+                    loading.close()
+                }
+            }
+        },
+        watch: {
+            filterText (val) {
+                this.$refs.ref_tree.filter(val);
+            }
+        },
+        components: {
+            communityTable, buildTable, roomTable
         }
+    }
+</script>
+<style lang="scss" scoped >
+  .div_main {
+    display: flex;
+  }
+  .scrollar {
+    margin-top: 10px;
+  }
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    //加载组织数据
-    async loadOrgData () {
-      const url = "/gov/org/agency/maporg"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.centerPoint = []
-
-        this.centerPoint.push(data.latitude)
-        this.centerPoint.push(data.longitude)
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    handleNodeClick (obj) {
-      this.ownerName = ''
-      this.ownerPhone = ''
-      this.rentFlag = ''
-      this.showRoomTable = false
-
-      this.selObj = JSON.parse(JSON.stringify(obj))
-      this.getTreeObj(obj)
-
-      this.$nextTick(() => {
-        if (obj.level === 'building') {//点击楼栋
-          this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
-
-        } else if (obj.level === 'neighborHood') {//点击小区
-          this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
+  .div_tree {
+    flex: 0 0 280px;
+    background-color: #ffffff;
+    border-radius: 5px;
+    padding: 10px;
+    overflow-y: hidden;
+  }
+  .filter_tree {
+    overflow-x: auto;
+  }
 
-        } else {
-          this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
-        }
-      })
-
-    },
-
-    //添加小区结束
-    async refreshTree () {
-      this.treeLoading = true
-      await this.loadTree(this.selTreeObj.id)
-      this.$nextTick(() => {
-        // ref_tree 元素的ref   value 绑定的node-key
-        this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
-      });
-      this.treeLoading = false
-    },
-
-    //进入下一级
-    toNextLevel (row, level) {
-
-      if (level === 'community') {
-        this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data
-        this.openNodes.push(this.selTreeObj.id)
-      } else {
-        this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data
-      }
-
-
-      this.handleNodeClick(this.selTreeObj)
-      this.$nextTick(() => {
-        // ref_tree 元素的ref   value 绑定的node-key
-        this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
-      });
-
-      const node = document.getElementById(this.selTreeObj.id) // 通过Id获取到对应的dom元素
-      setTimeout(() => {
-        if (node) {
-          this.$nextTick(() => {
-            node.scrollIntoView({ block: 'center' }) // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示
-          })
-        }
-      }, 100)
-
-
-    },
-
-    //解析树数据
-    getTreeObj (obj) {
-      // 树接口：
-      // 组织：组织id、组织名称、type、经度、纬度
-      // 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
-      // 楼：楼id、楼名称、type、所属小区id、所属小区名称
-      if (obj.level === 'building') {//点击楼栋
-        let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid)//所属小区
-
-        let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid)//所属网格
-        let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)//所属社区
-        obj.agencyId = agencyNode.data.id
-        obj.agencyName = agencyNode.data.label
-        obj.gridId = gridNode.data.id
-        obj.gridName = gridNode.data.label
-        obj.neighborHoodId = neighborHoodNode.data.id
-        obj.neighborHoodName = neighborHoodNode.data.label
-        if (obj.agencyId === this.staffAgencyId) {
-          this.showImportBtn = true
-        } else {
-          this.showImportBtn = false
-        }
+  .div_table {
+    margin-left: 15px;
+    // flex: 1;
+    width: calc(100% - 300px);
+    background-color: #ffffff;
+    border-radius: 5px;
+    padding: 10px;
+  }
 
-      } else if (obj.level === 'neighborHood') {//点击小区
-        let gridNode = this.$refs.ref_tree.getNode(obj.pid)
-        let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)
-        obj.gridId = gridNode.data.id
-        obj.gridName = gridNode.data.label
-        obj.agencyId = agencyNode.data.id
-        obj.agencyName = agencyNode.data.label
-        if (obj.agencyId === this.staffAgencyId) {
-          this.showImportBtn = true
-        } else {
-          this.showImportBtn = false
-        }
+  .div_btn {
+    margin-top: 20px;
+  }
 
-      } else {
-
-      }
-
-      if (!obj.latitude) {
-        obj.latitude = this.centerPoint[0]
-      }
-
-      if (!obj.longitude) {
-        obj.longitude = this.centerPoint[1]
-      }
-      this.selTreeObj = obj
-      console.log(this.selTreeObj)
-
-    },
-
-    filterNode (value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  watch: {
-    filterText (val) {
-      this.$refs.ref_tree.filter(val);
-    }
-  },
-  components: {
-    communityTable, buildTable, roomTable
+  .row {
+    padding: 10px;
   }
-}
-</script>
-<style lang="scss" scoped >
-.div_main {
-  display: flex;
-}
-.scrollar {
-  margin-top: 10px;
-}
-
-.div_tree {
-  flex: 0 0 280px;
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
-  overflow-y: hidden;
-}
-.filter_tree {
-  overflow-x: auto;
-}
-
-.div_table {
-  margin-left: 15px;
-  // flex: 1;
-  width: calc(100% - 300px);
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
-}
-
-.div_btn {
-  margin-top: 20px;
-}
-
-.row {
-  padding: 10px;
-}
 </style>
 
 <style>
-/* .aui-content > .el-tabs > .el-tabs__content {
-  padding: 0px;
-} */
-
-.el-tree-node:focus > .el-tree-node__content {
-  /* background-color: #ccc !important; */
-  color: #2195fe;
-}
+  /* .aui-content > .el-tabs > .el-tabs__content {
+    padding: 0px;
+  } */
+
+  .el-tree-node:focus > .el-tree-node__content {
+    /* background-color: #ccc !important; */
+    color: #2195fe;
+  }
 </style>
 <style lang="scss" scoped>
-.div_tree {
-  /deep/ .el-scrollbar__wrap {
-    overflow-x: hidden !important;
+  .div_tree {
+    /deep/ .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
   }
-}
 </style>
 
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManage.scss";
+  @import "@/assets/scss/modules/visual/communityManage.scss";
 </style>
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index aaf8d1a54..bc77f3d5d 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -110,6 +110,15 @@
                     v-model="dataForm.ownerIdCard">
           </el-input>
         </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入备注"
+                    v-model="dataForm.remark">
+          </el-input>
+        </el-form-item>
       </el-form>
 
     </div>
@@ -126,255 +135,260 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost, requestGet } from '@/js/dai/request'
-
-
-let loading // 加载动画
-export default {
-  data () {
-    return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-      btnDisable: false,
-      unitList: [],
-
-      houseId: '', //房屋ID
-      houseType: '1',
-      purpose: '1',
-      rentFlag: 0,
-      dataForm: {
-        neighborHoodId: '', // 所属小区ID
-        buildingId: '',//所属楼栋ID
-        buildingUnitId: '',//所属单元ID	
-        doorName: '',//门牌号	
-        houseType: '',//房屋类型【楼房，平房，别墅】		
-        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
-        rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
-        ownerPhone: '', //房主电话	
-        ownerName: '', //房主名字		
-        ownerIdCard: '' //房主身份证	
-      },
-
-      keyWords: '',
-      agencyObj: {},
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
+    import { requestPost, requestGet } from '@/js/dai/request'
 
-    }
-  },
-  components: {},
-  mounted () {
 
-  },
+    let loading // 加载动画
+    export default {
+        data () {
+            return {
+                formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+                btnDisable: false,
+                unitList: [],
 
-  methods: {
-    async initForm (type, row, agencyObj) {
-
-      this.$refs.ref_form.resetFields();
-      this.agencyObj = agencyObj
-      this.formType = type
-      if (row) {
-
-        this.houseId = row.houseId
-        await this.loadHouseInfo()
-        // this.dataForm = JSON.parse(JSON.stringify(row))
-        // this.houseId = this.dataForm.houseId
-
-        // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
-        // this.dataForm = { ...  this.dataForm }
-        // this.houseType = this.dataForm.houseTypeKey
-        // this.purpose = this.dataForm.purposeKey
-        // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
-
-      } else {
-
-        this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
-        this.dataForm.buildingId = this.agencyObj.id
-      }
-
-
-      await this.loadUnitList()
-
-    },
-
-    async loadHouseInfo () {
-
-      const url = "/gov/org/ichouse/" + this.houseId
-
-      const { data, code, msg } = await requestGet(url)
-
-      if (code === 0) {
-        // debugger
-        this.dataForm = { ...data }
-
-        this.houseType = this.dataForm.houseType
-        this.purpose = this.dataForm.purpose
-        this.rentFlag = parseInt(this.dataForm.rentFlag)
-
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    //加载单元
-    async loadUnitList () {
-      const url = '/gov/org/building/buildingunitlist'
-
-      let params = {
-        buildingId: this.dataForm.buildingId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.unitList = data
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    async handleComfirm () {
-      this.btnDisable = true
-      setTimeout(() => {
-        this.btnDisable = false
-      }, 10000)
-
-      this.dataForm.houseType = this.houseType
-      this.dataForm.purpose = this.purpose
-      this.dataForm.rentFlag = this.rentFlag
-      this.$refs['ref_form'].validate((valid, messageObj) => {
-        if (!valid) {
-          this.btnDisable = false
-          app.util.validateRule(messageObj)
-        } else {
-          this.addRoom()
-        }
-
-      })
-    },
-
-    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) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的身份证号码'
-        })
-        return false;
-      }
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的手机号码'
-        })
-        return false;
-      }
-
-      let url = ''
-
-      if (this.formType === 'add') {
-        url = '/gov/org/house/houseadd'
-      } else {
-        url = '/gov/org/house/houseupdate'
-        this.dataForm.houseId = this.houseId
-      }
-
-      const { data, code, msg } = await requestPost(url, this.dataForm)
-      this.btnDisable = false
-      if (code === 0) {
-        this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.resetData()
-        this.$emit('dialogOk')
-
-      } else {
-
-        this.$message.error(msg)
-      }
-
-    },
-
-    handleCancle () {
-      this.resetData()
-      this.$emit('dialogCancle')
-
-    },
-
-    resetData () {
-      this.houseId = '' //房屋ID
-      this.houseType = '1'
-      this.purpose = '1'
-      this.rentFlag = 0
-      this.dataForm = {
-        neighborHoodId: '', // 所属小区ID
-        buildingId: '',//所属楼栋ID
-        buildingUnitId: '',//所属单元ID	
-        doorName: '',//门牌号	
-        houseType: '1',//房屋类型【楼房，平房，别墅】		
-        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
-        rentFlag: 0,//是否出租【是：1，否：0】		
-        ownerPhone: '', //房主电话	
-        ownerName: '', //房主名字		
-        ownerIdCard: '' //房主身份证	
-      }
-
-    },
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
+                houseId: '', //房屋ID
+                houseType: '1',
+                purpose: '1',
+                rentFlag: 0,
+                dataForm: {
+                    neighborHoodId: '', // 所属小区ID
+                    buildingId: '',//所属楼栋ID
+                    buildingUnitId: '',//所属单元ID
+                    doorName: '',//门牌号
+                    houseType: '',//房屋类型【楼房，平房，别墅】
+                    purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+                    rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
+                    ownerPhone: '', //房主电话
+                    ownerName: '', //房主名字
+                    ownerIdCard: '', //房主身份证
+                    remark: '' // 备注
+                },
+
+                keyWords: '',
+                agencyObj: {},
+
+            }
+        },
+        components: {},
+        mounted () {
+
+        },
+
+        methods: {
+            async initForm (type, row, agencyObj) {
+
+                this.$refs.ref_form.resetFields();
+                this.agencyObj = agencyObj
+                this.formType = type
+                if (row) {
+
+                    this.houseId = row.houseId
+                    await this.loadHouseInfo()
+                    // this.dataForm = JSON.parse(JSON.stringify(row))
+                    // this.houseId = this.dataForm.houseId
+
+                    // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
+                    // this.dataForm = { ...  this.dataForm }
+                    // this.houseType = this.dataForm.houseTypeKey
+                    // this.purpose = this.dataForm.purposeKey
+                    // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
+
+                } else {
+
+                    this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+                    this.dataForm.buildingId = this.agencyObj.id
+                }
+
+
+                await this.loadUnitList()
+
+            },
+
+            async loadHouseInfo () {
+
+                const url = "/gov/org/ichouse/" + this.houseId
+
+                const { data, code, msg } = await requestGet(url)
+
+                if (code === 0) {
+                    // debugger
+                    this.dataForm = { ...data }
+
+                    this.houseType = this.dataForm.houseType
+                    this.purpose = this.dataForm.purpose
+                    this.rentFlag = parseInt(this.dataForm.rentFlag)
+
+
+                } else {
+                    this.$message.error(msg)
+                }
+
+            },
+
+            //加载单元
+            async loadUnitList () {
+                const url = '/gov/org/building/buildingunitlist'
+
+                let params = {
+                    buildingId: this.dataForm.buildingId
+                }
+
+                const { data, code, msg } = await requestPost(url, params)
+
+                if (code === 0) {
+                    this.unitList = data
+                } else {
+                    this.$message.error(msg)
+                }
+            },
+
+            async handleComfirm () {
+                this.btnDisable = true
+                setTimeout(() => {
+                    this.btnDisable = false
+                }, 10000)
+
+                this.dataForm.houseType = this.houseType
+                this.dataForm.purpose = this.purpose
+                this.dataForm.rentFlag = this.rentFlag
+                this.$refs['ref_form'].validate((valid, messageObj) => {
+                    if (!valid) {
+                        this.btnDisable = false
+                        app.util.validateRule(messageObj)
+                    } else {
+                        this.addRoom()
+                    }
+
+                })
+            },
+
+            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) {
+                    this.btnDisable = false
+                    this.$message({
+                        type: 'warning',
+                        message: '请输入正确的身份证号码'
+                    })
+                    return false;
+                }
+                const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+                if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
+                    this.btnDisable = false
+                    this.$message({
+                        type: 'warning',
+                        message: '请输入正确的手机号码'
+                    })
+                    return false;
+                }
+
+                let url = ''
+
+                if (this.formType === 'add') {
+                    url = '/gov/org/house/houseadd'
+                } else {
+                    url = '/gov/org/house/houseupdate'
+                    this.dataForm.houseId = this.houseId
+                }
+
+                const { data, code, msg } = await requestPost(url, this.dataForm)
+                this.btnDisable = false
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+
+                } else {
+
+                    this.$message.error(msg)
+                }
+
+            },
+
+            handleCancle () {
+                this.resetData()
+                this.$emit('dialogCancle')
+
+            },
+
+            resetData () {
+                this.houseId = '' //房屋ID
+                this.houseType = '1'
+                this.purpose = '1'
+                this.rentFlag = 0
+                this.dataForm = {
+                    neighborHoodId: '', // 所属小区ID
+                    buildingId: '',//所属楼栋ID
+                    buildingUnitId: '',//所属单元ID
+                    doorName: '',//门牌号
+                    houseType: '1',//房屋类型【楼房，平房，别墅】
+                    purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+                    rentFlag: 0,//是否出租【是：1，否：0】
+                    ownerPhone: '', //房主电话
+                    ownerName: '', //房主名字
+                    ownerIdCard: '', //房主身份证
+                    remark: '' // 备注
+                }
+
+            },
+            // 开启加载动画
+            startLoading () {
+                loading = Loading.service({
+                    lock: true, // 是否锁定
+                    text: '正在加载……', // 加载中需要显示的文字
+                    background: 'rgba(0,0,0,.7)' // 背景颜色
+                })
+            },
+            // 结束加载动画
+            endLoading () {
+                // clearTimeout(timer);
+                if (loading) {
+                    loading.close()
+                }
+            }
+        },
+        computed: {
+            dataRule () {
+                return {
+                    buildingUnitId: [
+                        { required: true, message: '所属单元不能为空', trigger: 'blur' },
+                    ],
+                    doorName: [
+                        { required: true, message: '门牌号不能为空', trigger: 'blur' }
+                    ],
+                    houseType: [
+                        { required: true, message: '房屋类型不能为空', trigger: 'blur' }
+                    ],
+                    purpose: [
+                        { required: true, message: '房屋用途不能为空', trigger: 'blur' }
+                    ],
+                    rentFlag: [
+                        { required: true, message: '是否出租不能为空', trigger: 'blur' }
+                    ],
+                    ownerPhone: [
+                        { required: false }
+                    ],
+                    ownerName: [
+                        { required: false }
+                    ],
+                    ownerIdCard: [
+                        { required: false }
+                    ],
+                    remark: [
+                        { required: false }
+                    ]
+                }
+            },
+
+        },
+        props: {}
     }
-  },
-  computed: {
-    dataRule () {
-      return {
-        buildingUnitId: [
-          { required: true, message: '所属单元不能为空', trigger: 'blur' },
-        ],
-        doorName: [
-          { required: true, message: '门牌号不能为空', trigger: 'blur' }
-        ],
-        houseType: [
-          { required: true, message: '房屋类型不能为空', trigger: 'blur' }
-        ],
-        purpose: [
-          { required: true, message: '房屋用途不能为空', trigger: 'blur' }
-        ],
-        rentFlag: [
-          { required: true, message: '是否出租不能为空', trigger: 'blur' }
-        ],
-        ownerPhone: [
-          { required: false }
-        ],
-        ownerName: [
-          { required: false }
-        ],
-        ownerIdCard: [
-          { required: false }
-        ],
-      }
-    },
-
-  },
-  props: {}
-}
 </script>
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManageForm.scss";
-</style>
\ No newline at end of file
+  @import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>

From 86de1272f5f3ed504def5e9c00abb99e806eeb6a Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 25 May 2022 15:32:09 +0800
Subject: [PATCH 07/78] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/roomTable.vue      | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index a3b8a17ad..04488e517 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -198,7 +198,7 @@ let loading // 加载动画
 export default {
   data () {
     return {
-      source: 'tree',//来源  
+      source: 'tree',//来源
       importRoomLoading: false,
       total: 0,
       pageSize: 20,
@@ -212,6 +212,8 @@ export default {
       ownerName: '',
       ownerPhone: '',
       rentFlag: '',
+        purpose: '',
+        remark: '',
 
       validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
       selection: [],
@@ -323,7 +325,7 @@ export default {
 
     },
 
-    async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag) {
+    async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag, purpose, remark) {
 
       this.source = source
       this.tableLoading = true
@@ -334,11 +336,15 @@ export default {
         this.ownerName = null
         this.ownerPhone = null
         this.rentFlag = null
+          this.purpose = null
+          this.remark = null
       } else if (source === 'search') {//来源于查询
         this.agencyObj = treeObj
         this.ownerName = ownerName
         this.ownerPhone = ownerPhone
         this.rentFlag = rentFlag
+          this.purpose = purpose
+          this.remark = remark
       }
 
       // if (fromTree) {
@@ -354,6 +360,8 @@ export default {
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
         sortType: this.sortType,
+        purpose: this.purpose,
+        remark: this.remark
       }
 
       const url = "/gov/org/house/houselist"
@@ -547,6 +555,8 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+          purpose: this.purpose,
+          remark: this.remark,
         buildingId: this.agencyObj.id
       }
 
@@ -624,11 +634,11 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+          purpose: this.purpose,
+          remark: this.remark,
         buildingId: this.agencyObj.id
       }
 
-
-
       app.ajax.exportFilePost(
         url,
         params,
@@ -782,6 +792,14 @@ export default {
       type: String,
       default: '',
     },
+      purpose: {
+          type: String,
+          default: '',
+      },
+      remark: {
+          type: String,
+          default: '',
+      }
   }
 }
 </script>

From 3e2dd6df409d690bf903b7d6b8e3fe8b151b3b45 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Fri, 17 Jun 2022 14:57:49 +0800
Subject: [PATCH 08/78] =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/caloudong.vue  | 2 +-
 src/views/modules/cabaseinfo/capingfang.vue | 2 +-
 src/views/modules/cabaseinfo/carental.vue   | 2 +-
 src/views/modules/cabaseinfo/caresident.vue | 2 +-
 src/views/modules/cabaseinfo/carotators.vue | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 5d4f74ad1..c87496271 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -181,7 +181,7 @@ export default {
   },
   methods:{
     getloudongOptions(){
-      this.$http.post(`/opendata/cabmGrid/getCascadeMenu`).then(resp => {
+      this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
         if(resp.data.code === 0){
           this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
         }
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index 4226a1aa6..0e9cffa0a 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -181,7 +181,7 @@ export default {
   },
   methods:{
     getloudongOptions(){
-      this.$http.post(`/opendata/cabmGrid/getCascadeMenu`).then(resp => {
+      this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
         if(resp.data.code === 0){
           this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
         }
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index 47a0c4236..40697e389 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -182,7 +182,7 @@ export default {
   },
   methods:{
     getloudongOptions(){
-      this.$http.post(`/opendata/cabmGrid/getCascadeMenu`).then(resp => {
+      this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
         if(resp.data.code === 0){
           this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
         }
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index 2b08a8e3b..03e065533 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -173,7 +173,7 @@ export default {
   },
   methods:{
     getloudongOptions(){
-      this.$http.post(`/opendata/cabmGrid/getCascadeMenu`).then(resp => {
+      this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
         if(resp.data.code === 0){
           this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
         }
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index 330a848af..52d12b947 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -167,7 +167,7 @@ export default {
   },
   methods:{
     getloudongOptions(){
-      this.$http.post(`/opendata/cabmGrid/getCascadeMenu`).then(resp => {
+      this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
         if(resp.data.code === 0){
           this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
         }

From dfc58d3d2bae6e9c9b3577f5f955c999b1dafbf1 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 22 Jun 2022 17:23:08 +0800
Subject: [PATCH 09/78] =?UTF-8?q?=E6=94=B9=E4=BA=86editResi=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index db0aba95f..ad7b9b0b1 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -235,9 +235,8 @@
                       v-else-if="n.itemType === 'cascader'"
                       v-model.trim="form[n.columnName]"
                       :options="n.options"
-                      :props="{ checkStrictly: true }"
+                      :props="{ checkStrictly: true, emitPath: false }"
                       :disabled="disabled"
-                      :props="{ emitPath: false }"
                       clearable
                       size="small"
                       class="resi-cell-select">

From 50273a1c2642c49c6209a231fb61c93f3c2edc37 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 23 Jun 2022 10:27:50 +0800
Subject: [PATCH 10/78] 11

---
 .../modules/base/community/community.vue      | 95 +++++++++++++++++--
 1 file changed, 86 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 18ba594ac..03b19b0de 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -131,15 +131,50 @@
                        class="diy-button--reset"
                        @click="resetSearch">重置</el-button>
           </div>
-        </div>
-        <div class="resi-cell">
-          <div class="resi-cell-label">房主手机</div>
-          <div class="resi-cell-value">
-            <el-input v-model="ownerPhone"
-                      size="small"
-                      clearable
-                      placeholder="请输入内容">
-            </el-input>
+        </el-form>
+      </div>
+      <div class=div_left_table>
+        <build-table v-if="selTreeObj.level==='neighborHood'&&!showRoomTable"
+                     ref="ref_neighTable"
+                     :staffAgencyId="staffAgencyId"
+                     :showImportBtn="showImportBtn"
+                     :ownerName="ownerName"
+                     :ownerPhone="ownerPhone"
+                     :rentFlag="rentFlag"
+                     :purpose="purpose"
+                     :remark="remark"
+                     :updateStartDate="updateStartDate"
+                     :updateEndDate="updateEndDate"
+                     @toNextLevel="toNextLevel"
+                     @refreshTree="refreshTree"></build-table>
+
+        <room-table v-if="showRoomTable||selTreeObj.level==='building'"
+                    :staffAgencyId="staffAgencyId"
+                    :showImportBtn="showImportBtn"
+                    :ownerName="ownerName"
+                    :ownerPhone="ownerPhone"
+                    :rentFlag="rentFlag"
+                    :purpose="purpose"
+                    :remark="remark"
+                    :updateStartDate="updateStartDate"
+                    :updateEndDate="updateEndDate"
+                    ref="ref_buildingTable"
+                    @refreshTree="refreshTree"></room-table>
+
+        <community-table v-if="selTreeObj.level!=='building'&&selTreeObj.level!=='neighborHood'&&!showRoomTable"
+                         @toNextLevel="toNextLevel"
+                         :staffAgencyId="staffAgencyId"
+                         :ownerName="ownerName"
+                         :ownerPhone="ownerPhone"
+                         :rentFlag="rentFlag"
+                         :purpose="purpose"
+                         :remark="remark"
+                         :updateStartDate="updateStartDate"
+                         :updateEndDate="updateEndDate"
+                         ref="ref_communityTable"
+                         @refreshTree="refreshTree"></community-table>
+      </div>
+    </div>
 
   </div>
 </template>
@@ -508,6 +543,7 @@ export default {
 }
 </script>
 
+
 <style>
 /* .aui-content > .el-tabs > .el-tabs__content {
     padding: 0px;
@@ -528,6 +564,47 @@ export default {
 
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManage.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+</style>
+
+<style lang="scss" scoped >
+.div_main {
+  display: flex;
+}
+.scrollar {
+  margin-top: 10px;
+}
+
+.div_tree {
+  flex: 0 0 280px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+  overflow-y: hidden;
+}
+.filter_tree {
+  overflow-x: auto;
+}
+
+// .div_table {
+//   margin-left: 15px;
+//   // flex: 1;
+//   width: calc(100% - 300px);
+//   background-color: #ffffff;
+//   border-radius: 5px;
+//   padding: 10px;
+// }
+.div_left {
+  // flex: 1;
+  width: calc(100% - 300px);
+}
+.div_left_table {
+  margin-top: 10px;
+  margin-left: 15px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+}
 </style>
 
 

From a82f146fc1119650060a4cacfe29f7ab55f2442f Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 23 Jun 2022 10:28:37 +0800
Subject: [PATCH 11/78] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BA=94=E5=A4=A7?=
 =?UTF-8?q?=E5=9B=BE=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue | 494 ++++++++++++++++--------------
 1 file changed, 262 insertions(+), 232 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index db0aba95f..05e086d92 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -1,92 +1,120 @@
 <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>
-        <edit-form v-for="(item, index) in addList" :key="index"  :ref="'baseForms' + index" :columns="3"
-        :form-list="item.itemList || formList" :form-id="'baseForms' + item.row" />
+        <edit-form v-for="(item, index) in addList"
+                   :key="index"
+                   :ref="'baseForms' + index"
+                   :columns="3"
+                   :form-list="item.itemList || formList"
+                   :form-id="'baseForms' + item.row" />
       </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" :disabled="disabled" 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"
+                           :disabled="disabled"
+                           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" :disabled="disabled" @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 :disabled="disabled" 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 :disabled="disabled" 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 :disabled="disabled" 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"
+                               :disabled="disabled"
+                               @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
+                               :disabled="disabled"
+                               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
+                               :disabled="disabled"
+                               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
+                               :disabled="disabled"
+                               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">
@@ -98,7 +126,7 @@
                   <el-col :span="6">
                     
                   </el-col> -->
-                </div>
+              </div>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
@@ -134,37 +162,38 @@
             </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]"
-                        :disabled="disabled"
-                        class="resi-cell-input"
-                        size="small"
-                        clearable
-                        placeholder="请输入内容"
-                        >
-                      </el-input>
-                      <el-input
-                        v-else
-                        v-model.trim="form[n.columnName]"
-                        :disabled="disabled"
-                        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]"
+                            :disabled="disabled"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容">
+                  </el-input>
+                  <el-input v-else
+                            v-model.trim="form[n.columnName]"
+                            :disabled="disabled"
+                            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"
@@ -175,90 +204,92 @@
                         >
                       </el-input>
                     </template> -->
-                    <el-date-picker
-                      v-else-if="n.itemType === 'datepicker'"
-                      v-model.trim="form[n.columnName]"
-                      :disabled="disabled"
-                      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]"
-                      :disabled="disabled"
-                      type="daterange"
-                      align="right"
-                      unlink-panels
-                      value-format="yyyy-MM-dd"
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                      >
-                    </el-date-picker>
-                    <el-time-picker
-                      v-else-if="n.itemType === 'timepicker'"
-                      v-model.trim="form[n.columnName]"
-                      :disabled="disabled"
-                      placeholder="任意时间点">
-                    </el-time-picker>
-                    <el-time-picker
-                      v-else-if="n.itemType === 'timerange'"
-                      v-model.trim="form[n.columnName]"
-                      :disabled="disabled"
-                      is-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"
-                    :disabled="disabled"
-                    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]"
+                                :disabled="disabled"
+                                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]"
+                                :disabled="disabled"
+                                type="daterange"
+                                align="right"
+                                unlink-panels
+                                value-format="yyyy-MM-dd"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期">
+                </el-date-picker>
+                <el-time-picker v-else-if="n.itemType === 'timepicker'"
+                                v-model.trim="form[n.columnName]"
+                                :disabled="disabled"
+                                placeholder="任意时间点">
+                </el-time-picker>
+                <el-time-picker v-else-if="n.itemType === 'timerange'"
+                                v-model.trim="form[n.columnName]"
+                                :disabled="disabled"
+                                is-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"
+                           :disabled="disabled"
+                           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="{ checkStrictly: true }"
-                      :disabled="disabled"
-                      :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]" :disabled="disabled"
-                      :label="ns.value">
-                        {{ 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]">
-                        <el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value" :disabled="disabled">{{ns.label}}</el-checkbox>
-                        <!-- <el-checkbox label="n.la"></el-checkbox> -->
-                      </el-checkbox-group>
-                    </template>
-                  </div>
-                <!-- </div> -->
-              </el-form-item>
-            </el-col>
+                <el-cascader v-else-if="n.itemType === 'cascader'"
+                             v-model.trim="form[n.columnName]"
+                             :options="n.options"
+                             :props="{ checkStrictly: true }"
+                             :disabled="disabled"
+                             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]"
+                            :disabled="disabled"
+                            :label="ns.value">
+                    {{ 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]">
+                    <el-checkbox v-for="ns in n.options"
+                                 :key="ns.value"
+                                 :label="ns.value"
+                                 :disabled="disabled">{{ns.label}}</el-checkbox>
+                    <!-- <el-checkbox label="n.la"></el-checkbox> -->
+                  </el-checkbox-group>
+                </template>
+              </div>
+              <!-- </div> -->
+            </el-form-item>
+          </el-col>
         </el-row>
       </template>
     </el-form>
@@ -349,7 +380,7 @@ export default {
         _form = { ...obj }
         // return _form
       }
-      const itemTypes = ['daterange', 'timerange']
+      const itemTypes = ['cascader', 'daterange', 'timerange']
       arr.forEach(item => {
         if (item.multiSelect || itemTypes.includes(item.itemType)) {
           if (item.columnValue && item.columnValue.indexOf(',') > -1) _form[item.columnName] = item.columnValue.split(',')
@@ -382,7 +413,7 @@ export default {
     }
     let form = initForm(this.formInfo, this.formList)
     let rules = initRules(this.formList)
-    let tempFormList = [ ...this.formList ]
+    let tempFormList = [...this.formList]
     let constForm = {
       ...form
     }
@@ -526,13 +557,13 @@ export default {
         }
       })
     },
-    getTreeData(data){
+    getTreeData (data) {
       if (!Array.isArray(data)) return []
       let arr = data.map(item => {
         let _item = {}
         if (item.children) {
           if (item.children.length === 0) _item = { ...item, children: undefined }
-          else _item = { ...item, children: this.getTreeData(item.children)}
+          else _item = { ...item, children: this.getTreeData(item.children) }
         } else {
           _item = { ...item }
         }
@@ -614,9 +645,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'
@@ -625,7 +656,7 @@ export default {
       let arr = []
       this.addList.forEach(item => {
         // console.log('handlerMuscForm----000', this.$refs['baseForms' + item.row || item][0].handleForm())
-        arr.push([ ...this.$refs['baseForms' + item.row][0].handleForm() ])
+        arr.push([...this.$refs['baseForms' + item.row][0].handleForm()])
       })
       if (arr.length === 0) return arr
       let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
@@ -808,17 +839,16 @@ 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;
 }
-
 </style>
 <style lang="scss" scoped>
-
 .resi-form .resi-row {
   margin-bottom: 0;
 }
@@ -826,43 +856,43 @@ export default {
 // .resi-form .resi-cell {
 //   display: flex;
 //   align-items: center;
-  // .resi-cell-label {
-  //   width: 70px;
-  //   box-sizing: border-box;
-  //   margin-right: 15px;
-  //   text-align: right;
-  // }
-  // .resi-cell-value-radio {
-  //   display: flex;
-  //   align-items: center;
-  //   min-height: 36px;
-  // }
-  //  .resi-cell-value .resi-cell-input {
-  //   width: 180px;
-  // }
+// .resi-cell-label {
+//   width: 70px;
+//   box-sizing: border-box;
+//   margin-right: 15px;
+//   text-align: right;
+// }
+// .resi-cell-value-radio {
+//   display: flex;
+//   align-items: center;
+//   min-height: 36px;
+// }
+//  .resi-cell-value .resi-cell-input {
+//   width: 180px;
+// }
 
-  .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 ab6e512aa251dd6483ae917b0e6902b86f9e3aef Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 24 Jun 2022 17:36:28 +0800
Subject: [PATCH 12/78] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/communityGovern/fivelayers/mapIndex.vue   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 21db55adf..0529b496f 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -1250,8 +1250,9 @@ const vueGis = {
         coverageTypes: this.coverageTypes,
         categoryKeys: this.categoryKeys,
         search: this.search,
-
-        isPage: false
+        pageNo: 1,
+        pageSize: 2000,
+        isPage: true
       };
 
       const { data, code, msg } = await requestPost(url, params);

From 81e4df7224cba0c66be0e889694735b8303a8948 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 30 Jun 2022 15:01:51 +0800
Subject: [PATCH 13/78] bug

---
 src/views/modules/plugins/change/resideath.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index cf791d50b..df96eb706 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -442,7 +442,14 @@ export default {
         userId: this.rowData.icResiUserId,
         joinReason: this.blacklistReason,
         welfareFlag: this.welfareFlag,
-          deathDate: this.deathDate
+        deathDate: this.deathDate
+      }
+      if (this.deathDate === '') {
+        this.$message({
+          message: '请选择死亡日期',
+          type:'warning'
+        })
+        return false
       }
       this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => {
         if (res.code !== 0) {

From b20ce235ee4faa2506d94d41102a261a85700099 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Tue, 5 Jul 2022 15:59:03 +0800
Subject: [PATCH 14/78] append

---
 src/views/modules/visual/components/screen-map/index.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index f13b09158..21c95ff9e 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -189,13 +189,8 @@ const vueGis = {
       ],
       //icon图标样式
       iconUrlArray: [],
-<<<<<<< HEAD
-      iconTextColor: "#ffffff",
-      distanceMax: null, //显示的坐标距离中心点的范围
-=======
       iconTextColor: '#ffffff',
       distanceMax: null,//显示的坐标距离中心点的范围
->>>>>>> feature/dev_party_mange
 
       input_lat: null,
       input_lon: null,
@@ -925,8 +920,4 @@ export default vueGis;
   // color: rgba(1, 17, 104, 1);
   color: #fff;
 }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> feature/dev_party_mange

From 5af5cb9e7e70363d16106edc127924b093f11c6f Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 25 Jul 2022 14:26:01 +0800
Subject: [PATCH 15/78] =?UTF-8?q?=E5=85=A8=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 4415 ++++++++---------
 1 file changed, 2058 insertions(+), 2357 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index d2da6092b..63e85731d 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,2252 +1,2071 @@
 <template>
-  <div class="app-container">
-    <el-row>
-      <el-col :span="24"
-              style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
-        <el-breadcrumb separator-class="el-icon-arrow-right">
-          <el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbArr"
-                              :key="breadcrumb.id">
-            <el-link v-if="breadcrumb.id === currentBreadcrumbKey"
-                     type="primary"
-                     @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
-            <el-link v-else
-                     type="info"
-                     @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
-            <el-link v-if="index === breadcrumbArr.length - 1"
-                     type="primary"
-                     @click.native="modifyOrgInfo"
-                     style="margin-left:10px;margin-top:0px;color:#3E8EF7;cursor:pointer"
-                     icon="el-icon-edit">修改</el-link>
-          </el-breadcrumb-item>
-        </el-breadcrumb>
-      </el-col>
-
-    </el-row>
-    <!-- 组织列表 -->
-    <el-table v-show="agencyTableFlag"
-              height="250"
-              :data="agencyTableListData"
-              style="width: 100%">
-      <el-table-column prop="agencyName"
-                       label="下级组织"></el-table-column>
-      <el-table-column prop="contacts"
-                       label="联系人"></el-table-column>
-      <el-table-column prop="mobile"
-                       label="联系人电话"></el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
-        <template slot="header">
-          <el-button size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addAgency()">新增</el-button>
-        </template>
-        <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-arrow-right"
-                     @click="entryAgency(scope.row.agencyId)">进入</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 下级机关单位/基层科室列表 -->
-    <el-table v-show="departmentTableFlag"
-              height="250"
-              :data="departmentTableListData"
-              style="width: 100%">
-      <el-table-column prop="departmentName"
-                       label="下级机关单位/基层科室"></el-table-column>
-      <el-table-column prop="contacts"
-                       label="联系人"></el-table-column>
-      <el-table-column prop="mobile"
-                       label="联系人电话"></el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
-        <template slot="header"
-                  slot-scope="scope">
-          <el-button size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addCommunity(scope.row)">新增</el-button>
-        </template>
-        <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-arrow-right"
-                     @click="entryDepartment(scope.row.departmentId)">进入</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 网格列表 -->
-    <el-table v-show="gridTableFlag"
-              height="250"
-              :data="gridTableListData"
-              style="width: 100%">
-      <el-table-column prop="gridName"
-                       label="直属网格"></el-table-column>
-      <el-table-column prop="gridTypeName"
-                       label="网格类型"></el-table-column>
-      <el-table-column prop="contacts"
-                       label="联系人"></el-table-column>
-      <el-table-column prop="mobile"
-                       label="联系人电话"></el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
-        <template slot="header"
-                  slot-scope="scope">
-          <el-button size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addGrid(scope.row)">新增</el-button>
-        </template>
-        <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-arrow-right"
-                     @click="entryGrid(scope.row.gridId)">进入</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 本级工作人员 -->
-    <el-table v-show="currentAgencyStaffTableFlag"
-              :data="agencyStaffTableListData"
-              style="width: 100%"
-              height="350">
-      <el-table-column prop="name"
-                       label="本级工作人员名字"
-                       width="260"></el-table-column>
-      <el-table-column prop="roles"
-                       label="本级工作人员职责"
-                       width="260">
-        <template slot-scope="scope">
-          <el-tag type="primary"
-                  size="mini"
-                  v-for="(role, index) in scope.row.roles"
-                  :key="index"
-                  disable-transitions>{{ role }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
-        <template slot="header"
-                  slot-scope="scope">
-          <el-button size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addPeo(scope.row)">新增</el-button>
-        </template>
-        <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-edit"
-                     @click="xiuPeo(scope.row)">修改</el-button>
-          <el-button size="mini"
-                     type="success"
-                     icon="el-icon-view"
-                     @click="lookAngency(scope.row)">查看</el-button>
-          <el-button size="mini"
-                     type="info"
-                     icon="el-icon-rank"
-                     @click="transfer(scope.row)">调动</el-button>
-          <el-button size="mini"
-                     type="danger"
-                     icon="el-icon-circle-close"
-                     @click="DisablePeo(scope.row)">禁用</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 下级机关单位/基层科室工作人员 -->
-    <el-table height="350"
-              v-show="departmentStaffTableFlag"
-              :data="departmentStaffTableListData"
-              style="width: 100%">
-      <el-table-column prop="name"
-                       label="下级机关单位/基层科室工作人员"
-                       width="260"></el-table-column>
-      <el-table-column prop="roles"
-                       label="下级机关单位/基层科室工作人员职责"
-                       width="260">
-        <template slot-scope="scope">
-          <el-tag type="primary"
-                  size="mini"
-                  v-for="(role, index) in scope.row.roles"
-                  :key="index"
-                  disable-transitions>{{ role }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
-        <template slot="header"
-                  slot-scope="scope">
-          <el-button size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addCommunityPeo(scope.row)">新增</el-button>
-        </template>
-        <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-edit"
-                     @click="xiuCommunityPeo(scope.row)">修改</el-button>
-          <el-button size="mini"
-                     type="success"
-                     icon="el-icon-view"
-                     @click="lookAngency(scope.row)">查看</el-button>
-          <el-button size="mini"
-                     type="info"
-                     icon="el-icon-rank"
-                     @click="transfer(scope.row)">调动</el-button>
-          <el-button size="mini"
-                     type="danger"
-                     icon="el-icon-circle-close"
-                     @click="DisablePeo(scope.row)">禁用</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 网格工作人员 -->
-    <el-table v-show="gridStaffTableFlag"
-              :data="gridStaffTableListData"
-              style="width: 100%"
-              height="350">
-      <el-table-column prop="name"
-                       label="网格工作人员名字"
-                       width="260"></el-table-column>
-      <el-table-column prop="roles"
-                       label="网格工作人员职责"
-                       width="260">
-        <template slot-scope="scope">
-          <el-tag type="primary"
-                  size="mini"
-                  v-for="(role, index) in scope.row.roles"
-                  :key="index"
-                  disable-transitions>{{ role }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
-        <template slot="header"
-                  slot-scope="scope">
-          <el-button size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addGridPeo(scope.row)">新增</el-button>
-        </template>
-        <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-edit"
-                     @click="xiuGridPeo(scope.row)">修改</el-button>
-          <el-button size="mini"
-                     type="success"
-                     icon="el-icon-view"
-                     @click="lookAngency(scope.row)">查看</el-button>
-          <el-button size="mini"
-                     type="info"
-                     icon="el-icon-rank"
-                     @click="transfer(scope.row)">调动</el-button>
-          <el-button size="mini"
-                     type="danger"
-                     icon="el-icon-circle-close"
-                     @click="DisablePeo(scope.row)">禁用</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 新增下级机关单位/基层科室 -->
-    <el-dialog title="新增部门"
-               :visible.sync="dialogVisible"
-               width="30%"
-               :before-close="handleClose">
-      <el-form :rules="rules">
-        <el-form-item label="部门名称"
-                      prop="addDepartmentName">
-          <el-input v-model="insertForm.departmentName"
-                    placeholder="请输入部门名称"></el-input>
-        </el-form-item>
-        <el-form-item label="组织编码"
-                      prop="code">
-          <el-input v-model="insertForm.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-        <el-form-item label="联系人"
-                      prop="contacts">
-          <el-input v-model="insertForm.contacts"
-                    placeholder="请输入联系人姓名"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话"
-                      prop="mobile">
-          <el-input v-model="insertForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary"
-                   @click="submit">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 新增网格 -->
-    <div v-if="dialogVisibleGrid">
-      <el-dialog title="新增网格"
-                 :visible.sync="dialogVisibleGrid"
-                 width="60%"
-                 :before-close="handleClose">
-        <el-form :rules="rules">
-          <el-form-item label="网格名称"
-                        prop="gridName">
-            <el-input v-model="GridForm.gridName"
-                      placeholder="请输入部门名称"></el-input>
-          </el-form-item>
-          <el-form-item label="网格编码"
-                        prop="GridCode">
-            <el-input v-model="GridForm.code"
-                      placeholder="请输入网格编码"></el-input>
-          </el-form-item>
-
-          <!-- 网格类型，下拉框 -->
-          <el-form-item label="网格类型"
-                        prop="typeTag">
-            <el-select v-model="GridForm.gridType"
-                       clearable
-                       placeholder="网格类型">
-              <el-option v-for="item in typeList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="联系人"
-                        prop="GridContacts">
-            <el-input v-model="GridForm.contacts"
-                      placeholder="请输入联系人姓名"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话"
-                        prop="GridMobile">
-            <el-input v-model="GridForm.mobile"
-                      placeholder="请输入联系电话"></el-input>
-          </el-form-item>
-
-          <!-- 组织位置 -->
-          <el-form-item>
-            <div id="container">当前点击坐标为：<span id="position"></span></div>
-          </el-form-item>
-
-        </el-form>
-
-        <div slot="footer">
-          <el-button @click="cancelGrid">取 消</el-button>
-          <el-button type="primary"
-                     @click="submitGrid">确 定</el-button>
+    <div class="app-container">
+        <el-row>
+            <el-col :span="24" style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
+                <el-breadcrumb separator-class="el-icon-arrow-right">
+                    <el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbArr" :key="breadcrumb.id">
+                        <el-link v-if="breadcrumb.id === currentBreadcrumbKey" type="primary" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
+                        <el-link v-else type="info" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
+                        <el-link v-if="index === breadcrumbArr.length - 1" type="primary" @click.native="modifyOrgInfo" style="margin-left:10px;margin-top:0px;color:#3E8EF7;cursor:pointer" icon="el-icon-edit">修改</el-link>
+                    </el-breadcrumb-item>
+                </el-breadcrumb>
+            </el-col>
+            
+        </el-row>
+        <!-- 组织列表 -->
+        <el-table v-show="agencyTableFlag"
+        height="250"
+        :data="agencyTableListData"
+        style="width: 100%">
+            <el-table-column prop="agencyName" label="下级组织" ></el-table-column>
+            <el-table-column prop="contacts" label="联系人"></el-table-column>
+            <el-table-column prop="mobile" label="联系人电话"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini"
+                        type="primary"
+                        icon="el-icon-plus"
+                        @click="addAgency(scope.row)"
+                    >新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                <el-button size="mini"
+                    type="warning"
+                    icon="el-icon-arrow-right"
+                    @click="entryAgency(scope.row.agencyId)"
+                >进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        
+         <!-- 下级机关单位/基层科室列表 -->
+        <el-table v-show="departmentTableFlag"
+        height="250"
+        :data="departmentTableListData"
+        style="width: 100%">
+            <el-table-column prop="departmentName" label="下级机关单位/基层科室"></el-table-column>
+            <el-table-column prop="contacts" label="联系人"></el-table-column>
+            <el-table-column prop="mobile" label="联系人电话"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini"
+                        type="primary"
+                        icon="el-icon-plus"
+                        @click="addCommunity(scope.row)"
+                    >新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button 
+                        size="mini"
+                        type="warning"
+                        icon="el-icon-arrow-right"
+                        @click="entryDepartment(scope.row.departmentId)"
+                    >进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 网格列表 -->
+        <el-table v-show="gridTableFlag"
+        height="250" 
+        :data="gridTableListData"
+        style="width: 100%">
+            <el-table-column prop="gridName" label="直属网格"></el-table-column>
+            <el-table-column prop="gridTypeName" label="网格类型"></el-table-column>
+            <el-table-column prop="contacts" label="联系人"></el-table-column>
+            <el-table-column prop="mobile" label="联系人电话"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini"
+                        type="primary"
+                        icon="el-icon-plus"
+                        @click="addGrid(scope.row)"
+                    >新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button 
+                        size="mini"
+                        type="warning"
+                        icon="el-icon-arrow-right"
+                        @click="entryGrid(scope.row.gridId)"
+                    >进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 本级工作人员 -->
+        <el-table v-show="currentAgencyStaffTableFlag"
+        :data="agencyStaffTableListData"
+        style="width: 100%"
+        height="250">
+            <el-table-column prop="name" label="本级工作人员名字" width="260"></el-table-column>
+            <el-table-column prop="roles" label="本级工作人员职责" width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+                <template slot="header" slot-scope="scope">
+                <el-button size="mini"
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="addPeo(scope.row)"
+                >新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                <el-button 
+                    size="mini"
+                    type="warning"
+                    icon="el-icon-edit"
+                    @click="xiuPeo(scope.row)"
+                >修改</el-button>
+                <el-button 
+                    size="mini"
+                    type="success"
+                    icon="el-icon-view"
+                    @click="lookAngency(scope.row)"
+                >查看</el-button>
+                <el-button 
+                    size="mini"
+                    type="info"
+                    icon="el-icon-rank"
+                    @click="transfer(scope.row)"
+                >调动</el-button>
+                <el-button 
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-circle-close"
+                    @click="DisablePeo(scope.row)"
+                >禁用</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 下级机关单位/基层科室工作人员 -->
+        <el-table height="250" v-show="departmentStaffTableFlag"
+        :data="departmentStaffTableListData"
+        style="width: 100%">
+            <el-table-column prop="name" label="下级机关单位/基层科室工作人员" width="260"></el-table-column>
+            <el-table-column prop="roles" label="下级机关单位/基层科室工作人员职责" width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini" type="primary" icon="el-icon-plus" @click="addCommunityPeo(scope.row)">新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuCommunityPeo(scope.row)">修改</el-button>
+                    <el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
+                    <el-button size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
+                    <el-button size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 网格工作人员 -->
+        <el-table v-show="gridStaffTableFlag"
+        :data="gridStaffTableListData"
+        style="width: 100%"
+        height="250">
+            <el-table-column prop="name" label="网格工作人员名字" width="260"></el-table-column>
+            <el-table-column prop="roles" label="网格工作人员职责" width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini" type="primary" icon="el-icon-plus" @click="addGridPeo(scope.row)">新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuGridPeo(scope.row)">修改</el-button>
+                    <el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
+                    <el-button size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
+                    <el-button size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+  
+        <!-- 新增下级机关单位/基层科室 -->
+        <el-dialog 
+        title="新增部门"
+        :visible.sync="dialogVisible"
+        width="30%"
+        :before-close="handleClose">
+            <el-form :rules="rules">
+                <el-form-item label="部门名称" prop="addDepartmentName">
+                    <el-input v-model="insertForm.departmentName" placeholder="请输入部门名称"></el-input>
+                </el-form-item>
+                <el-form-item label="组织编码" prop="code">
+                    <el-input v-model="insertForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="联系人" prop="contacts">
+                    <el-input  v-model="insertForm.contacts" placeholder="请输入联系人姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" prop="mobile">
+                    <el-input v-model="insertForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancel">取 消</el-button>
+                <el-button type="primary" @click="submit">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 新增网格 -->
+        <div v-if="dialogVisibleGrid">
+            <el-dialog 
+            title="新增网格"
+            :visible.sync="dialogVisibleGrid"
+            width="60%"
+            :before-close="handleClose">
+                <el-form :rules="rules">
+                    <el-form-item label="网格名称" prop="gridName">
+                        <el-input v-model="GridForm.gridName" placeholder="请输入部门名称"></el-input>
+                    </el-form-item>
+                    <el-form-item label="网格编码" prop="GridCode">
+                        <el-input v-model="GridForm.code" placeholder="请输入网格编码"></el-input>
+                    </el-form-item>
+
+                    <!-- 网格类型，下拉框 -->
+                    <el-form-item label="网格类型" prop="typeTag">
+                        <el-select v-model="GridForm.gridType" clearable placeholder="网格类型">
+                            <el-option v-for="item in typeList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="联系人" prop="GridContacts">
+                        <el-input  v-model="GridForm.contacts" placeholder="请输入联系人姓名"></el-input>
+                    </el-form-item>
+                    <el-form-item label="联系电话" prop="GridMobile">
+                        <el-input v-model="GridForm.mobile" placeholder="请输入联系电话"></el-input>
+                    </el-form-item>
+
+                    <!-- 组织位置 -->
+                    <el-form-item>
+                        <div id="container">当前点击坐标为：<span id="position"></span></div>
+                    </el-form-item>
+
+                </el-form>
+
+                <div slot="footer" >
+                    <el-button @click="cancelGrid">取 消</el-button>
+                    <el-button type="primary" @click="submitGrid">确 定</el-button>
+                </div>
+            </el-dialog>
         </div>
-      </el-dialog>
-    </div>
 
-    <!-- 新增人员 -->
-    <div v-if="dialogVisiblePeo">
-      <el-dialog title="新增人员"
-                 :visible.sync="dialogVisiblePeo"
-                 width="30%"
-                 :before-close="handleClose">
-        <el-form>
-          <el-form-item label="姓名"
-                        prop="peoName">
-            <el-input v-model="peoForm.name"
-                      placeholder="请输入姓名"></el-input>
-          </el-form-item>
-          <el-form-item label="手机号"
-                        prop="mobile">
-            <el-input v-model="peoForm.mobile"
-                      placeholder="请输入手机号"></el-input>
-          </el-form-item>
-          <!-- 性别下拉框 -->
-          <el-form-item label="性别"
-                        prop="gender">
-            <el-select v-model="peoForm.gender"
-                       clearable
-                       placeholder="性别">
-              <el-option v-for="item in genderList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <!-- 专兼职下拉框 -->
-          <el-form-item label="专兼职"
-                        prop="post">
-            <el-select v-model="peoForm.post"
-                       clearable
-                       placeholder="专兼职">
-              <el-option v-for="item in postList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <!-- 职责下拉框 -->
-          <el-form-item label="职责"
-                        prop="duty">
-            <el-select v-model="peoForm.duty"
-                       multiple
-                       placeholder="请选择">
-              <el-option v-for="item in dutyList"
-                         :key="item.roleId"
-                         :label="item.roleName"
-                         :value="item.roleId"
-                         :disabled="item.disabled">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="角色"
-                        prop="newRoles">
-            <el-select v-model="peoForm.newRoles"
-                       multiple
-                       placeholder="请选择">
-              <el-option v-for="item in roleList"
-                         :key="item.id"
-                         :label="item.name"
-                         :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-        </el-form>
-        <div slot="footer">
-          <el-button @click="cancelPeo">取 消</el-button>
-          <el-button type="primary"
-                     @click="submitPeo">确 定</el-button>
+        <!-- 新增人员 -->
+        <div v-if="dialogVisiblePeo">
+            <el-dialog 
+            title="新增人员"
+            :visible.sync="dialogVisiblePeo"
+            width="30%"
+            :before-close="handleClose">
+                <el-form>
+                    <el-form-item label="姓名" prop="peoName">
+                        <el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input>
+                    </el-form-item>
+                    <el-form-item label="手机号" prop="mobile">
+                        <el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input>
+                    </el-form-item>
+                    <!-- 性别下拉框 -->
+                    <el-form-item label="性别" prop="gender">
+                        <el-select v-model="peoForm.gender" clearable placeholder="性别">
+                            <el-option v-for="item in genderList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- 专兼职下拉框 -->
+                    <el-form-item label="专兼职" prop="post">
+                        <el-select v-model="peoForm.post" clearable placeholder="专兼职">
+                            <el-option v-for="item in postList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- 职责下拉框 -->
+                    <el-form-item label="职责" prop="duty">
+                        <el-select v-model="peoForm.duty" multiple placeholder="请选择">
+                            <el-option
+                            v-for="item in dutyList"
+                            :key="item.roleId"
+                            :label="item.roleName"
+                            :value="item.roleId"
+                            :disabled="item.disabled">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                </el-form>
+                <div slot="footer" >
+                    <el-button @click="cancelPeo">取 消</el-button>
+                    <el-button type="primary" @click="submitPeo">确 定</el-button>
+                </div>
+            </el-dialog>
         </div>
-      </el-dialog>
-    </div>
 
-    <!-- 人员修改 -->
-    <el-dialog title="人员修改"
-               :visible.sync="modifyPeo"
-               width="30%"
-               :before-close="handleClose">
-      <el-form>
-        <el-form-item label="姓名"
-                      prop="peoName">
-          <el-input v-model="peoForm.name"
-                    placeholder="请输入姓名"></el-input>
-        </el-form-item>
-        <el-form-item label="手机号"
-                      prop="mobile">
-          <el-input v-model="peoForm.mobile"
-                    placeholder="请输入手机号"></el-input>
-        </el-form-item>
-        <el-form-item label="性别"
-                      prop="gender">
-          <el-select v-model="peoForm.gender"
-                     clearable
-                     placeholder="性别">
-            <el-option v-for="item in genderList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="专兼职"
-                      prop="post">
-          <el-select v-model="peoForm.post"
-                     clearable
-                     placeholder="专兼职">
-            <el-option v-for="item in postList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="职责"
-                      prop="duty">
-          <el-select v-model="peoForm.duty"
-                     multiple
-                     placeholder="请选择">
-            <el-option v-for="item in dutyList"
-                       :key="item.roleId"
-                       :label="item.roleName"
-                       :value="item.roleId"
-                       :disabled="item.disabled">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="角色"
-                      prop="newRoles">
-          <el-select v-model="peoForm.newRoles"
-                     multiple
-                     placeholder="请选择">
-            <el-option v-for="item in roleList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancelXiugai">取 消</el-button>
-        <el-button type="primary"
-                   @click="updatePeo">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 禁用弹窗 -->
-    <el-dialog title="确认禁用"
-               :visible.sync="Disable"
-               width="30%"
-               :before-close="handleClose">
-      <span>禁用后该用户将无法登录系统，是否继续？</span>
-      <div slot="footer">
-        <el-button @click="cancelDisable">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitDisable">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 人员查看 -->
-    <el-dialog title="人员详情"
-               :visible.sync="details"
-               width="30%"
-               :before-close="handleClosePeoView">
-      <el-form>
-        <el-form-item label="姓名">
-          <el-input v-model="peoForm.name"
-                    placeholder="姓名"
-                    :disabled="true"></el-input>
-        </el-form-item>
-        <el-form-item label="手机号">
-          <el-input v-model="peoForm.mobile"
-                    placeholder="手机号"
-                    :disabled="true"></el-input>
-        </el-form-item>
-        <el-form-item label="组织/部门">
-          <el-input v-model="peoForm.zuzhi"
-                    placeholder="组织/部门"
-                    :disabled="true"></el-input>
-        </el-form-item>
-        <el-form-item label="激活时间">
-          <el-input v-model="peoForm.activeTime"
-                    placeholder="激活时间"
-                    :disabled="true"></el-input>
-        </el-form-item>
-        <el-form-item label="职位">
-          <el-input v-model="peoForm.duty"
-                    placeholder="职位"
-                    :disabled="true"></el-input>
-        </el-form-item>
-        <el-form-item label="是否禁用">
-          <el-input v-model="peoForm.disableFlag"
-                    placeholder="是否禁用"
-                    :disabled="true"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button type="primary"
-                   style="margin-right:170px"
-                   @click="cancelDetails">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 人员调动 -->
-    <el-dialog title="人员调动"
-               :visible.sync="transferPeo"
-               width="30%"
-               :before-close="handleClose">
-      <el-form :model="agencyForm">
-        <el-form-item label="姓名">
-          <el-input v-model="transferForm.name"
-                    placeholder="姓名"></el-input>
-        </el-form-item>
-        <el-form-item label="调动至">
-          <el-cascader clearable
-                       :props="{ checkStrictly: true }"
-                       v-model="selectValue"
-                       :options="options"
-                       @change="handleChange">
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="调动原因">
-          <el-input type="textarea"
+        <!-- 人员修改 -->
+        <el-dialog 
+        title="人员修改"
+        :visible.sync="modifyPeo"
+        width="30%"
+        :before-close="handleClose">
+            <el-form >
+                <el-form-item label="姓名" prop="peoName">
+                    <el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="手机号" prop="mobile">
+                    <el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input>
+                </el-form-item>
+                <el-form-item label="性别" prop="gender">
+                    <el-select v-model="peoForm.gender" clearable placeholder="性别">
+                        <el-option v-for="item in genderList" 
+                            :key="item.value" 
+                            :label="item.label" 
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="专兼职" prop="post">
+                    <el-select v-model="peoForm.post" clearable placeholder="专兼职">
+                        <el-option v-for="item in postList" 
+                            :key="item.value" 
+                            :label="item.label" 
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="职责" prop="duty">
+                    <el-select v-model="peoForm.duty" multiple placeholder="请选择">
+                        <el-option
+                        v-for="item in dutyList"
+                        :key="item.roleId"
+                        :label="item.roleName"
+                        :value="item.roleId"
+                        :disabled="item.disabled">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelXiugai">取 消</el-button>
+                <el-button type="primary" @click="updatePeo">确 定</el-button>
+            </div>
+        </el-dialog>
+
+        <!-- 禁用弹窗 -->
+        <el-dialog 
+        title="确认禁用"
+        :visible.sync="Disable"
+        width="30%"
+        :before-close="handleClose"
+        >
+            <span>禁用后该用户将无法登录系统，是否继续？</span>
+            <div slot="footer" >
+                <el-button @click="cancelDisable">取 消</el-button>
+                <el-button type="primary" @click="submitDisable">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 人员查看 -->
+        <el-dialog
+        title="人员详情"
+        :visible.sync="details"
+        width="30%"
+        :before-close="handleClosePeoView">
+            <el-form>
+                <el-form-item label="姓名" >
+                    <el-input  v-model="peoForm.name" placeholder="姓名" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="手机号" >
+                    <el-input  v-model="peoForm.mobile" placeholder="手机号" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="组织/部门" >
+                    <el-input  v-model="peoForm.zuzhi" placeholder="组织/部门" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="激活时间" >
+                    <el-input  v-model="peoForm.activeTime" placeholder="激活时间" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="职位" >
+                    <el-input  v-model="peoForm.duty" placeholder="职位" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="是否禁用">
+                    <el-input v-model="peoForm.disableFlag" placeholder="是否禁用" :disabled="true"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button type="primary" style="margin-right:170px" @click="cancelDetails">关 闭</el-button>
+            </div>
+        </el-dialog>
+
+        <!-- 人员调动 -->
+        <el-dialog 
+        title="人员调动"
+        :visible.sync="transferPeo"
+        width="30%"
+        :before-close="handleClose">
+            <el-form :model="agencyForm">
+                <el-form-item label="姓名">
+                    <el-input v-model="transferForm.name" placeholder="姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="调动至">
+                    <el-cascader 
+                        clearable
+                        :props="{ checkStrictly: true }"
+                        v-model="selectValue"
+                        :options="options"
+                        @change="handleChange">
+                    </el-cascader>
+                </el-form-item>
+                <el-form-item label="调动原因">
+                    <el-input
+                    type="textarea"
                     :rows="2"
                     placeholder="请输入内容"
                     maxlength="500"
                     show-word-limit
                     v-model="transferForm.remarks">
-          </el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancelTransfer">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitTransfer">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 新增组织 -->
-    <el-dialog title="新增组织"
-               :visible.sync="createAgencyDialogFlag"
-               width="60%"
-               :before-close="handleClose">
-      <el-form>
-        <el-form-item label="组织名称">
-          <el-input v-model="agencyForm.agencyName"
-                    placeholder="请输入组织名称"></el-input>
-        </el-form-item>
-
-        <!-- 组织区划 -->
-        <el-form-item label="组织区划">
-          <el-select v-model="agencyForm.areaCode"
-                     placeholder="请选择组织区划"
-                     @change="handelZoing">
-            <el-option v-for="item in zonings"
-                       :key="item.areaCode"
-                       :label="item.areaName"
-                       :value="item.areaCode">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="组织编码">
-          <el-input v-model="agencyForm.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人">
-          <el-input v-model="agencyForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model="agencyForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <div id="con"></div>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="canceladdNewAgency">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitaddNewAgency">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 修改市区级组织 -->
-    <el-dialog title="修改组织"
-               :visible.sync="modifyCityOrgPop"
-               width="60%"
-               :before-close="handleClose">
-      <el-form>
-        <el-form-item label="组织名称">
-          <el-input v-model="OrgDetailsForm.agencyName"
-                    placeholder="请输入组织名称"></el-input>
-        </el-form-item>
-
-        <el-form-item label="组织编码">
-          <el-input v-model="OrgDetailsForm.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人">
-          <el-input v-model="OrgDetailsForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model="OrgDetailsForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <div id="con"></div>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancelModifyCityOrgPop">取 消</el-button>
-        <el-button type="primary"
-                   @click="sunmitModifyCityOrgPop">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 修改街道/社区级组织 -->
-    <el-dialog title="修改组织"
-               :visible.sync="streetOrCommunity"
-               width="60%"
-               :before-close="handleClose">
-      <el-form>
-        <el-form-item label="组织名称">
-          <el-input v-model="OrgDetailsForm.agencyName"
-                    placeholder="请输入组织名称"></el-input>
-        </el-form-item>
-
-        <!-- 组织区划 -->
-        <el-form-item label="组织区划">
-          <el-select v-model="OrgDetailsForm.areaCode"
-                     placeholder="请选择组织区划"
-                     @change="handelStreeOrCommunityZoing">
-            <el-option v-for="item in zonings"
-                       :key="item.areaCode"
-                       :label="item.areaName"
-                       :value="item.areaCode">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="组织编码">
-          <el-input v-model="OrgDetailsForm.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人">
-          <el-input v-model="OrgDetailsForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model="OrgDetailsForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <div id="con"></div>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancelstreetOrCommunity">取 消</el-button>
-        <el-button type="primary"
-                   @click="sunmitModifyCityOrgPop">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 修改下级机关单位 -->
-    <el-dialog title="修改部门"
-               :visible.sync="OrgUnitPop"
-               width="60%"
-               :before-close="handleClose">
-      <el-form>
-        <el-form-item label="部门名称">
-          <el-input v-model="OrgUnitDetailsForm.departmentName"
-                    placeholder="请输入组织名称"></el-input>
-        </el-form-item>
-
-        <el-form-item label="组织编码">
-          <el-input v-model="OrgUnitDetailsForm.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人">
-          <el-input v-model="OrgUnitDetailsForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model="OrgUnitDetailsForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancelOrgUnitPop">取 消</el-button>
-        <el-button type="primary"
-                   @click="sunmitOrgUnitForm">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 修改网格 -->
-    <el-dialog title="修改网格"
-               :visible.sync="modifyGridPop"
-               width="60%"
-               :before-close="handleClose">
-      <el-form>
-        <el-form-item label="网格名称">
-          <el-input v-model="modifyGridFrom.gridName"
-                    placeholder="请输入组织名称"></el-input>
-        </el-form-item>
-
-        <el-form-item label="组织编码">
-          <el-input v-model="modifyGridFrom.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-
-        <!-- 网格类型下拉框 -->
-        <el-form-item label="网格类型"
-                      prop="typeTag">
-          <el-select v-model="modifyGridFrom.gridType"
-                     clearable
-                     placeholder="网格类型">
-            <el-option v-for="item in typeList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="负责人">
-          <el-input v-model="modifyGridFrom.contacts"
-                    placeholder="请输入负责人名字"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model="modifyGridFrom.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-
-        <!-- 组织位置,地图 -->
-        <el-form-item>
-          <div id="con"></div>
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancelModifyGridPop">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitModifyGrid">确 定</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
+                    </el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelTransfer">取 消</el-button>
+                <el-button type="primary" @click="submitTransfer">确 定</el-button>
+            </div>
+        </el-dialog>
+
+        <!-- 新增组织 -->
+        <el-dialog
+        title="新增组织"
+        :visible.sync="createAgencyDialogFlag"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="组织名称">
+                    <el-input v-model="agencyForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <!-- 组织区划 -->
+                <el-form-item label="组织区划">
+                    <el-select v-model="agencyForm.areaCode" placeholder="请选择组织区划" @change="handelZoing">
+                        <el-option 
+                        v-for="item in zonings"
+                        :key="item.areaCode"
+                        :label="item.areaName"
+                        :value="item.areaCode">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="agencyForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="agencyForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="agencyForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="canceladdNewAgency">取 消</el-button>
+                <el-button type="primary" @click="submitaddNewAgency">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改市区级组织 -->
+        <el-dialog
+        title="修改组织"
+        :visible.sync="modifyCityOrgPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="组织名称">
+                    <el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelModifyCityOrgPop">取 消</el-button>
+                <el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改街道/社区级组织 -->
+        <el-dialog
+        title="修改组织"
+        :visible.sync="streetOrCommunity"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="组织名称">
+                    <el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                 <!-- 组织区划 -->
+                <el-form-item label="组织区划">
+                    <el-select v-model="OrgDetailsForm.areaCode" placeholder="请选择组织区划" @change="handelStreeOrCommunityZoing">
+                        <el-option 
+                        v-for="item in zonings"
+                        :key="item.areaCode"
+                        :label="item.areaName"
+                        :value="item.areaCode">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelstreetOrCommunity">取 消</el-button>
+                <el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改下级机关单位 -->
+        <el-dialog
+        title="修改部门"
+        :visible.sync="OrgUnitPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="部门名称">
+                    <el-input v-model="OrgUnitDetailsForm.departmentName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgUnitDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgUnitDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgUnitDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelOrgUnitPop">取 消</el-button>
+                <el-button type="primary" @click="sunmitOrgUnitForm">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改网格 -->
+        <el-dialog
+        title="修改网格"
+        :visible.sync="modifyGridPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="网格名称">
+                    <el-input v-model="modifyGridFrom.gridName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="modifyGridFrom.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+
+                <!-- 网格类型下拉框 -->
+                <el-form-item label="网格类型" prop="typeTag">
+                        <el-select v-model="modifyGridFrom.gridType" clearable placeholder="网格类型">
+                            <el-option v-for="item in typeList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                <el-form-item label="负责人">
+                    <el-input v-model="modifyGridFrom.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="modifyGridFrom.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+
+                <!-- 组织位置,地图 -->
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelModifyGridPop">取 消</el-button>
+                <el-button type="primary" @click="submitModifyGrid">确 定</el-button>
+            </div>
+        </el-dialog>
+
+    </div>
 </template>
 
 <script>
 
-import { requestPost, requestGet } from "@/js/dai/request";
+import { requestPost } from "@/js/dai/request";
 
 export default {
-  data () {
-    return {
-      // 新增组织弹窗
-      createAgencyDialogFlag: false,
-      // 修改市区级组织弹窗
-      modifyCityOrgPop: false,
-      // 修改街道/社区级组织弹窗
-      streetOrCommunity: false,
-      // 修改下级机关单位弹窗
-      OrgUnitPop: false,
-      // 修改网格弹窗
-      modifyGridPop: false,
-      // 组织列表展示标识
-      agencyTableFlag: true,
-      // 组织工作人员列表展示标识
-      currentAgencyStaffTableFlag: true,
-      // 组织列表数据
-      agencyTableListData: [],
-      // 组织工作人员列表数据
-      agencyStaffTableListData: [],
-
-      // 部门列表（机关、科室列表）列表展示标识
-      departmentTableFlag: true,
-      // 部门人员列表展示标识
-      departmentStaffTableFlag: false,
-      // 部门列表数据
-      departmentTableListData: [],
-      // 部门工作人员列表数据
-      departmentStaffTableListData: [],
-
-      // 网格列表展示标识
-      gridTableFlag: true,
-      // 网格人员列表展示标识
-      gridStaffTableFlag: false,
-      // 网格列表数据
-      gridTableListData: [],
-      // 网格工作人员列表数据
-      gridStaffTableListData: [],
-
-      // 用户所属组织ID
-      userAgencyId: localStorage.getItem("agencyId"),
-      // 修改时操作的用户staffId
-      userStaffId: '',
-      // 当前被操作的组织的ID
-      currentAgencyId: localStorage.getItem("agencyId"),
-      // 当前被操作的部门的ID
-      currentDepartmentId: '14f572e724eecf7668b655505d789cab',
-      // 当前被操作的网格的ID
-      currentGridOrgId: '63d5ff92ea981b1c58e4914ac894c610',
-
-      // 当前被操作的组织的级别
-      currentAgencyLevel: localStorage.getItem("level"),
-      currentAreaCode: '',
-      parentAreaCode: '',
-      parentAgencyId: localStorage.getItem("agencyId"),
-      parentAgencyLevel: localStorage.getItem("level"),
-
-      // 经纬度坐标
-      lat: '11',
-      lng: '11',
-      latitude: '11',
-      longitude: '11',
-      Navigation: '',
-      // 查询参数
-      queryParams: {
-        deptName: undefined,
-        status: undefined
-      },
-      // 状态列表
-      dictList: [],
-      // 重新渲染表格状态
-      refreshTable: true,
-      // 是否展开，默认全部展开
-      isExpandAll: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 遮罩层
-      loading: true,
-      // 表格树数据
-      deptList: [],
-
-      // 弹窗开关
-      dialogVisible: false,
-      dialogVisibleGrid: false,
-      dialogVisiblePeo: false,
-      Disable: false,
-      details: false,
-      transferPeo: false,
-      // 社区添加表单项
-      insertForm: {
-        departmentName: '',
-        code: '',
-        contacts: '',
-        mobile: '',
-        agencyId: '',
-        departmentDuty: '123'
-      },
-      // 网格添加表单项
-      GridForm: {
-        gridName: '',
-        code: '',
-        contacts: '',
-        mobile: '',
-        agencyId: '',
-        manageDistrict: '',
-        gridType: '',
-        location: '', //坐标位置
-        longitude: '11', //经度
-        latitude: '11',//纬度
-        centerAddress: ''
-      },
-      // 新增组织
-      agencyForm: {
-        parentAgencyId: '',
-        agencyName: '',
-        level: '',
-        areaCodeSwitch: '',
-        areaCode: '',
-        areaName: '',
-        contacts: '',
-        mobile: '',
-        code: ''
-      },
-      // 树
-      tree: [],
-      // 新增人员表单项
-      peoForm: {
-        name: '',
-        mobile: '',
-        gender: '',
-        post: '',
-        duty: [],
-        orgType: '',
-        activeTime: '',
-        zuzhi: '',
-        disableFlag: '',
-        newRoles: []
-      },
-      // 人员调动
-      transferForm: {
-        name: '',
-        remarks: '',
-        transferTo: '',
-        staffId: '',
-        orgId: '',
-        orgType: ''
-      },
-      // 人员禁用
-      DisableForm: {
-        staffId: '',
-        agencyId: '',
-        customerId: ''
-      },
-      // 组织详细信息
-      OrgDetailsForm: {
-        level: '',
-        agencyName: '',
-        code: '',
-        contacts: '',
-        mobile: '',
-        centerAddress: '',
-        areaCode: '',
-        agencyId: '',
-        areaName: ''
-      },
-      // 下级机关单位
-      OrgUnitDetailsForm: {
-        code: '',
-        contacts: '',
-        departmentId: '',
-        departmentName: '',
-        mobile: ''
-      },
-      // 网格修改表单
-      modifyGridFrom: {
-        gridName: '',
-        code: '',
-        gridTypeName: '',
-        contacts: '',
-        mobile: '',
-        latitude: '',
-        longitude: '',
-        agencyId: '',
-        gridType: '',
-        manageDistrict: '',
-        griId: ''
-      },
-      judgeOrgInfoLevel: [],
-      keyWords: '',
-      typeList: [],
-      // 性别字典
-      genderList: [
-        { value: '1', label: '男' },
-        { value: '2', label: '女' },
-      ],
-      // 专兼职字典
-      postList: [
-        { value: 'fulltime', label: '专职' },
-        { value: 'parttime', label: '兼职' }
-      ],
-      // 职责字典
-      dutyList: [],
-      // 修改操作是否展示
-      modifyPeo: false,
-
-      roleList: [],
-
-      // 级联数据
-      options: [
-        {
-          value: '',
-          label: '',
-          children: [
-            {
-              value: '',
-              label: '',
-              children: []
+    data(){
+        return{
+            // 新增组织弹窗
+            createAgencyDialogFlag: false,
+            // 修改市区级组织弹窗
+            modifyCityOrgPop:false,
+            // 修改街道/社区级组织弹窗
+            streetOrCommunity:false,
+            // 修改下级机关单位弹窗
+            OrgUnitPop:false,
+            // 修改网格弹窗
+            modifyGridPop:false,
+            // 组织列表展示标识
+            agencyTableFlag: true,
+            // 组织工作人员列表展示标识
+            currentAgencyStaffTableFlag: true,
+            // 组织列表数据
+            agencyTableListData: [],
+            // 组织工作人员列表数据
+            agencyStaffTableListData:[],
+
+            // 部门列表（机关、科室列表）列表展示标识
+            departmentTableFlag: true,
+            // 部门人员列表展示标识
+            departmentStaffTableFlag: false,
+            // 部门列表数据
+            departmentTableListData: [],
+            // 部门工作人员列表数据
+            departmentStaffTableListData:[],
+
+            // 网格列表展示标识
+            gridTableFlag:true,
+            // 网格人员列表展示标识
+            gridStaffTableFlag: false,
+            // 网格列表数据
+            gridTableListData: [],
+            // 网格工作人员列表数据
+            gridStaffTableListData:[],
+
+            // 用户所属组织ID
+            userAgencyId: localStorage.getItem("agencyId"),
+            // 修改时操作的用户staffId
+            userStaffId: '',
+            // 当前被操作的组织的ID
+            currentAgencyId: localStorage.getItem("agencyId"),
+            // 当前被操作的部门的ID
+            currentDepartmentId:'14f572e724eecf7668b655505d789cab',
+            // 当前被操作的网格的ID
+            currentGridOrgId:'63d5ff92ea981b1c58e4914ac894c610',
+           
+            // 经纬度坐标
+            lat:'11',
+            lng:'11',
+            latitude:'11',
+            longitude:'11',
+            Navigation:'',
+            // 查询参数
+            queryParams: {
+                deptName: undefined,
+                status: undefined
+            },
+            // 状态列表
+            dictList:[],
+            // 重新渲染表格状态
+            refreshTable: true,
+            // 是否展开，默认全部展开
+            isExpandAll: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 遮罩层
+            loading: true,
+            // 表格树数据
+            deptList: [],
+
+            // 弹窗开关
+            dialogVisible: false,
+            dialogVisibleGrid: false,
+            dialogVisiblePeo: false,
+            Disable: false,
+            details: false,
+            transferPeo: false,
+            // 社区添加表单项
+            insertForm:{
+                departmentName:'',
+                code:'',
+                contacts:'',
+                mobile:'',
+                agencyId:'',
+                departmentDuty:'123'
+            },
+            // 网格添加表单项
+            GridForm:{
+                gridName:'',
+                code:'',
+                contacts:'',
+                mobile:'',
+                agencyId:'',
+                manageDistrict:'',
+                gridType:'',
+                location: '', //坐标位置
+                longitude: '11', //经度
+                latitude: '11' ,//纬度
+                centerAddress:''
+            },
+            // 新增组织
+            agencyForm:{
+                parentAgencyId:'',
+                agencyName:'',
+                level:'',
+                areaCodeSwitch:'',
+                areaCode:'',
+                areaName:'',
+                contacts:'',
+                mobile:'',
+                code:''
+            },
+            // 树
+            tree:[],
+            // 新增人员表单项
+            peoForm:{
+                name:'',
+                mobile:'',
+                gender:'',
+                post:'',
+                duty:[],
+                orgType:'',
+                activeTime:'',
+                zuzhi:'',
+                disableFlag:''
             },
-            {
-              value: '',
-              label: '',
-              children: []
+            // 人员调动
+            transferForm:{
+                name:'',
+                remarks:'',
+                transferTo:'',
+                staffId:'',
+                orgId:'',
+                orgType:''
+            },
+            // 人员禁用
+            DisableForm:{
+                staffId:'',
+                agencyId:'',
+                customerId:''
+            },
+            // 当前用户信息,用于获取组织区划
+            userForm:{
+                areaCode:'',
+                level:'',
+                parentAgencyId:''
+            },
+            // 组织详细信息
+            OrgDetailsForm:{
+                level:'',
+                agencyName:'',
+                code:'',
+                contacts:'',
+                mobile:'',
+                centerAddress:'',
+                areaCode:'',
+                agencyId:'',
+                areaName:''
+            },
+            // 下级机关单位
+            OrgUnitDetailsForm:{
+                code:'',
+                contacts:'',
+                departmentId:'',
+                departmentName:'',
+                mobile:''
+            },
+            // 网格修改表单
+            modifyGridFrom:{
+                gridName:'',
+                code:'',
+                gridTypeName:'',
+                contacts:'',
+                mobile:'',
+                latitude:'',
+                longitude:'',
+                agencyId:'',
+                gridType:'',
+                manageDistrict:'',
+                griId:''
+            },
+            judgeOrgInfoLevel:[],
+            keyWords: '',
+            typeList:[],
+            // 性别字典
+            genderList: [
+                {value: '1', label: '男'},
+                {value: '2', label: '女'},
+            ],
+            // 专兼职字典
+            postList:[
+                {value: 'fulltime' , label: '专职'},
+                {value: 'parttime' , label: '兼职'}
+            ],
+            // 职责字典
+            dutyList:[],
+            // 修改操作是否展示
+            modifyPeo:false,
+            submitOrgid:'',
+            // 级联数据
+            options:[
+                {
+                    value:'',
+                    label:'',
+                    children:[
+                        {
+                            value:'',
+                            label:'',
+                            children:[]
+                        },
+                        {
+                            value:'',
+                            label:'',
+                            children:[]
+                        }
+                    ],
+                }
+            ],
+            selectValue: [],
+            // 顶部 面包屑
+            breadcrumbArr: [],
+            // 面包屑 当前所属机构ID
+            currentBreadcrumbKey: '',
+            // 组织区划数据
+            zonings:[],
+            // 校验
+            rules: {
+                departmentName:[
+                    { required: true, message: '社区名称必填', trigger: 'blur' }
+                ],
+                gridName:[
+                    { required: true, message: '网格名称必填', trigger: 'blur' }
+                ],
+                addDepartmentName:[
+                    { required: true, message: '部门名称必填', trigger: 'blur' }
+                ]
             }
-          ],
         }
-      ],
-      selectValue: [],
-      // 顶部 面包屑
-      breadcrumbArr: [],
-      // 面包屑 当前所属机构ID
-      currentBreadcrumbKey: '',
-      // 组织区划数据
-      zonings: [],
-      // 校验
-      rules: {
-        departmentName: [
-          { required: true, message: '社区名称必填', trigger: 'blur' }
-        ],
-        gridName: [
-          { required: true, message: '网格名称必填', trigger: 'blur' }
-        ],
-        addDepartmentName: [
-          { required: true, message: '部门名称必填', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created () {
-    this.getAgencyList()
-    this.getDepartmentList()
-    this.getGridList()
-    this.getAgencyStaffListData()
-    this.getDutyList()
-    this.getRoleList()
-    // this.getNavigation()
-    // 更新顶部面包屑
-    this.assembleBreadcrumbArr(localStorage.getItem('agencyId'), 'agency')
-  },
-
-  watch: {
-    dialogVisibleGrid (val) {
-      if (val) {
-        setTimeout(() => {
-          let _that = this
-          this.initMap(_that)
-        }, 1000);
-      }
     },
-    createAgencyDialogFlag (val) {
-      if (val) {
-        setTimeout(() => {
-          let _t = this
-          this.createMap(_t)
-        }, 1000);
-      }
-    },
-    modifyCityOrgPop (val) {
-      if (val) {
-        setTimeout(() => {
-          let _t = this
-          this.createMap(_t)
-        }, 1000);
-      }
-    },
-    streetOrCommunity (val) {
-      if (val) {
-        setTimeout(() => {
-          let _t = this
-          this.createMap(_t)
-        }, 1000);
-      }
-    },
-    modifyGridPop (val) {
-      if (val) {
-        setTimeout(() => {
-          let _t = this
-          this.createMap(_t)
-        }, 1000);
-      }
-    }
-  },
-  mounted () {
-    // this.initMap()
-  },
-  methods: {
-    // 点击后获取id
-    handleChange (e) {
-      this.transferForm.orgId = e[1]
-      if (this.transferForm.orgId != null || '') {
-        if (this.transferForm.orgId === 0) {
-          if (e[2] == null || '') {
-            this.transferForm.orgType = 'dept'
-            this.transferForm.orgId = "14f572e724eecf7668b655505d789cab"
-          } else {
-            this.transferForm.orgId = e[2]
-            this.transferForm.orgType = 'dept'
-          }
-        } else {
-          if (e[2] == null || '') {
-            this.transferForm.orgType = 'grid'
-            this.transferForm.orgId = "63d5ff92ea981b1c58e4914ac894c610"
-          } else {
-            this.transferForm.orgId = e[2]
-            this.transferForm.orgType = 'grid'
-          }
-
+    created(){
+        this.getAgencyList()
+        this.getDepartmentList()
+        this.getGridList()
+        this.getAgencyStaffListData()
+        this.getRoleList()
+        // this.getNavigation()
+        // 更新顶部面包屑
+        this.assembleBreadcrumbArr(localStorage.getItem('agencyId'), 'agency')
+    },
+    
+    watch: {
+        dialogVisibleGrid(val) {
+            if (val) {
+                setTimeout(() => {
+                    let _that = this
+                    this.initMap(_that)
+                }, 1000);
+            }
+        },
+        createAgencyDialogFlag(val) {
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
+        },
+        modifyCityOrgPop(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
+        },
+        streetOrCommunity(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
+        },
+        modifyGridPop(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
         }
-      } else {
-        this.transferForm.orgId = e[0]
-        this.transferForm.orgType = 'agency'
-      }
     },
-    /** 查询系统工作人员角色（职责） */
-    async getDutyList () {
-      const url = "/gov/org/staff/rolelist"
-      let params = {
-        agencyId: this.currentAgencyId
-      }
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.dutyList = data
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    /** 查询系统工作人员角色（职责） */
-    async getRoleList () {
-      this.tableLoading = true
+    mounted(){
+        // this.initMap()
+    },
+    methods:{
+        // 点击后获取id
+        handleChange (e) {
+            this.transferForm.orgId = e[1]
+            if(this.transferForm.orgId != null || ''){
+                if(this.transferForm.orgId === 0){
+                    if(e[2] == null || ''){
+                        this.transferForm.orgType = 'dept'
+                        this.transferForm.orgId = "14f572e724eecf7668b655505d789cab"
+                    }else{
+                        this.transferForm.orgId = e[2]
+                        this.transferForm.orgType = 'dept'
+                    }
+                } else {
+                    if(e[2] == null || ''){
+                        this.transferForm.orgType = 'grid'
+                        this.transferForm.orgId = "63d5ff92ea981b1c58e4914ac894c610"
+                    } else {
+                        this.transferForm.orgId = e[2]
+                        this.transferForm.orgType = 'grid'
+                    }
+                    
+                }
+            }else{
+                this.transferForm.orgId = e[0]
+                this.transferForm.orgType = 'agency'
+            }
+        },
+        /** 查询系统工作人员角色（职责） */
+        async getRoleList () {
+            const url = "/gov/org/staff/rolelist"
+            let params = {
+                agencyId: this.currentAgencyId
+            }
+            const { data, code, msg } = await requestPost(url,params)
+            if(code === 0){
+                this.dutyList = data
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        /** 查询组织列表 */
+        async getAgencyList(){
+            const url = "/gov/org/agency/agencylist"
+            let params = {
+                agencyId: this.currentAgencyId
+            }
 
-      const url = "/gov/access/govrole/list"
+            const { data, code, msg } = await requestPost(url,params)
 
-      let params = {
+            if(code === 0){
+                this.agencyTableListData = data
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        /** 查询社区列表 */
+        async getDepartmentList(){
+            const url = "/gov/org/department/departmentlist"
 
-      }
+            let params = {
+                agencyId: this.currentAgencyId
+            }
 
-      const { data, code, msg } = await requestGet(url, params)
+            const { data, code, msg } = await requestPost(url,params)
 
-      if (code === 0) {
+            if(code === 0){
+                this.departmentTableListData = data
+            }else{
+                this.$message.error(msg)
+                
+            }
+        },
+        /** 查询网格列表 */
+        async getGridList(){
+            const url = "/gov/org/grid/allgrids"
 
-        this.roleList = data
+            let params = {
+                agencyId: this.currentAgencyId
+            }
 
-      } else {
-        this.$message.error(msg)
-      }
-      this.tableLoading = false
-    },
-    /** 查询组织列表 */
-    async getAgencyList () {
-      const url = "/gov/org/agency/agencylist"
-      let params = {
-        agencyId: this.currentAgencyId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.agencyTableListData = data
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    /** 查询社区列表 */
-    async getDepartmentList () {
-      const url = "/gov/org/department/departmentlist"
+            const { data, code, msg } = await requestPost(url,params)
 
-      let params = {
-        agencyId: this.currentAgencyId
-      }
+            if(code === 0){
+                this.gridTableListData = data
+            }else{
+                this.$message.error(msg)
+            }
+        },
 
-      const { data, code, msg } = await requestPost(url, params)
+        // 查询网格人员列表
+        async getGridStaffListData(){
+           const url = "/data/aggregator/org/stafflist"
 
-      if (code === 0) {
-        this.departmentTableListData = data
-      } else {
-        this.$message.error(msg)
+           let params = {
+               orgId:this.currentGridOrgId,
+               orgType:'grid',
+               pageNo:1,
+               pageSize:100
+           }
 
-      }
-    },
-    /** 查询网格列表 */
-    async getGridList () {
-      const url = "/gov/org/grid/allgrids"
+           const { data, code, msg } = await requestPost(url,params)
 
-      let params = {
-        agencyId: this.currentAgencyId
-      }
+           if(code === 0){
+               this.gridStaffTableListData = data.staffList
+           } else {
+               this.$message.error(msg)
+           }
+        },
+        // 查询组织工作人员
+        async getAgencyStaffListData(){
+            const url = "/data/aggregator/org/stafflist"
 
-      const { data, code, msg } = await requestPost(url, params)
+            let params = {
+                orgId: this.currentAgencyId,
+                orgType:'agency',
+                pageNo:1,
+                pageSize:100
+            }
 
-      if (code === 0) {
-        this.gridTableListData = data
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            const { data, code, msg } = await requestPost(url,params)
 
-    // 查询网格人员列表
-    async getGridStaffListData () {
-      const url = "/data/aggregator/org/stafflist"
+            if(code === 0) {
+                this.agencyStaffTableListData = data.staffList
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-      let params = {
-        orgId: this.currentGridOrgId,
-        orgType: 'grid',
-        pageNo: 1,
-        pageSize: 100
-      }
+        // 查询部门人员
+        async getDepartmentStaffListData(){
+            const url = "/data/aggregator/org/stafflist"
 
-      const { data, code, msg } = await requestPost(url, params)
+            let params = {
+               orgId:this.currentDepartmentId,
+               orgType:'dept',
+               pageNo:1,
+               pageSize:100
+            }
 
-      if (code === 0) {
-        this.gridStaffTableListData = data.staffList
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    // 查询组织工作人员
-    async getAgencyStaffListData () {
-      const url = "/data/aggregator/org/stafflist"
-
-      let params = {
-        orgId: this.currentAgencyId,
-        orgType: 'agency',
-        pageNo: 1,
-        pageSize: 100
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.agencyStaffTableListData = data.staffList
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            const { data, code, msg } = await requestPost(url,params)
 
-    // 查询部门人员
-    async getDepartmentStaffListData () {
-      const url = "/data/aggregator/org/stafflist"
+            if(code === 0){
+                this.departmentStaffTableListData = data.staffList
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 添加组织
+        async submit(){
+            
+            const url = "/gov/org/department/adddepartment"
 
-      let params = {
-        orgId: this.currentDepartmentId,
-        orgType: 'dept',
-        pageNo: 1,
-        pageSize: 100
-      }
+            let params = {
+                agencyId:this.insertForm.agencyId,
+                departmentName:this.insertForm.departmentName,
+                departmentDuty:this.insertForm.departmentDuty,
+                contacts:this.insertForm.contacts,
+                mobile:this.insertForm.mobile,
+                code:this.insertForm.code
+            }
 
-      const { data, code, msg } = await requestPost(url, params)
+            const { data, code, msg } = await requestPost(url,params)
 
-      if (code === 0) {
-        this.departmentStaffTableListData = data.staffList
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    // 添加组织
-    async submit () {
-
-      const url = "/gov/org/department/adddepartment"
-
-      let params = {
-        agencyId: this.insertForm.agencyId,
-        departmentName: this.insertForm.departmentName,
-        departmentDuty: this.insertForm.departmentDuty,
-        contacts: this.insertForm.contacts,
-        mobile: this.insertForm.mobile,
-        code: this.insertForm.code
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message.success("添加成功")
-        this.dialogVisible = false
-        this.insertForm = []
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    // 添加网格
-    async submitGrid () {
-      const url = "/gov/org/grid/addgrid"
-
-      let params = {
-        agencyId: this.GridForm.agencyId,
-        gridName: this.GridForm.gridName,
-        contacts: this.GridForm.contacts,
-        mobile: this.GridForm.mobile,
-        code: this.GridForm.code,
-        manageDistrict: this.GridForm.manageDistrict,
-        gridType: this.GridForm.gridType,
-        latitude: this.lat,
-        longitude: this.lng
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message.success("添加成功")
-        this.dialogVisibleGrid = false
-        this.GridForm = []
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
+            if(code === 0){
+                this.$message.success("添加成功")
+                this.dialogVisible = false
+                this.insertForm = []
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        // 添加网格
+        async submitGrid(){
+            const url = "/gov/org/grid/addgrid"
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            let params = {
+                agencyId:this.GridForm.agencyId,
+                gridName:this.GridForm.gridName,
+                contacts:this.GridForm.contacts,
+                mobile:this.GridForm.mobile,
+                code:this.GridForm.code,
+                manageDistrict:this.GridForm.manageDistrict,
+                gridType:this.GridForm.gridType,
+                latitude:this.lat,
+                longitude:this.lng
+            }
 
-    // 添加人员
-    async submitPeo () {
-      const url = "/gov/org/staff/addstaffv2"
+            const { data, code, msg } = await requestPost(url,params)
 
-      let params = {
-        orgType: this.peoForm.orgType,
-        name: this.peoForm.name,
-        mobile: this.peoForm.mobile,
-        gender: this.peoForm.gender,
-        workType: this.peoForm.post,
-        roles: this.peoForm.duty,
-        newRoles: this.peoForm.newRoles,
-        orgId: this.currentAgencyId,
+            if(code === 0){
+                this.$message.success("添加成功")
+                this.dialogVisibleGrid = false
+                this.GridForm = []
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-      }
+        // 添加人员
+        async submitPeo(){
+            const url = "/gov/org/staff/addstaffv2"
 
-      const { data, code, msg } = await requestPost(url, params)
+            let params = {
+                orgType:this.peoForm.orgType,
+                name:this.peoForm.name,
+                mobile:this.peoForm.mobile,
+                gender:this.peoForm.gender,
+                workType:this.peoForm.post,
+                roles:this.peoForm.duty,
+                orgId:this.submitOrgid
+            }
 
-      if (code === 0) {
+            const { data, code, msg } = await requestPost(url,params)
 
-        this.$message.success("添加成功")
-        this.dialogVisiblePeo = false
-        this.peoForm = []
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
-        this.insertFormRest()
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            if(code === 0){
+                
+                this.$message.success("添加成功")
+                this.dialogVisiblePeo = false
+                this.peoForm = []
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-    // 人员修改
-    async updatePeo () {
-      const url = "/gov/org/staff/editstaff"
+        // 人员修改
+        async updatePeo(){
+            const url = "/gov/org/staff/editstaff"
 
-      let params = {
-        staffId: this.userStaffId,
-        name: this.peoForm.name,
-        mobile: this.peoForm.mobile,
-        gender: this.peoForm.gender === '男' ? 1 : 0,
-        workType: this.peoForm.post,
-        roles: this.peoForm.duty,
-        newRoles: this.peoForm.newRoles,
-        agencyId: this.currentAgencyId,
-      }
+            let params = {
+                staffId:this.userStaffId,
+                name:this.peoForm.name,
+                mobile:this.peoForm.mobile,
+                gender:this.peoForm.gender === '男' ? 1 : 0,
+                workType:this.peoForm.post,
+                roles:this.peoForm.duty,
+                agencyId:this.userAgencyId,
+            }
 
-      const { data, code, msg } = await requestPost(url, params)
+            const { data, code, msg } = await requestPost(url,params)
 
-      if (code === 0) {
-        this.$message.success("修改成功")
-        this.modifyPeo = false
+            if(code === 0) {
+                this.$message.success("修改成功")
+                this.modifyPeo = false
+                
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+                this.getDepartmentStaffListData()
+                this.getGridStaffListData()
+                
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
-        this.getDepartmentStaffListData()
-        this.getGridStaffListData()
-        this.insertFormRest()
+        // 字典
+        async getDictionaries(){
+            const url = "/sys/dict/data/dictlist"
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            let params = {
+                dictType:'grid_type'
+            }
+            
+            const { data, code, msg } = await requestPost(url,params)
 
-    // 字典
-    async getDictionaries () {
-      const url = "/sys/dict/data/dictlist"
+            if(code === 0){
+                this.typeList = data
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-      let params = {
-        dictType: 'grid_type'
-      }
+        /** 搜索按钮操作 */
+        handleQuery(){
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams.deptName = undefined
+            this.queryParams.status = undefined
+            this.handleQuery();
+        },
+        /** 新增按钮操作 */
+        handleAdd(row){
+            this.dialogVisible=true
+        },
+        // 社区弹框关闭函数
+        handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            this.insertFormRest()
+            done();
+          })
+          .catch(_ => {});
+        },
+        // 人员查看叉号关闭
+        handleClosePeoView(done){
+            this.insertFormRest()
+            done();
+        },
+        // 社区新增弹框重置函数
+        insertFormRest(){
+            this.insertForm.name = '',
+            this.insertForm.contacts = '',
+            this.insertForm.code = '',
+            this.insertForm.mobile = '',
+            this.insertForm.departmentName = ''
+        },
+        // 网格新增弹框重置函数
+        GridFormRest(){
+            this.GridForm.gridName = '',
+            this.GridForm.code = '',
+            this.GridForm.centerAddress = '',
+            this.GridForm.contacts = '',
+            this.GridForm.mobile = '',
+            this.GridForm.agencyId = '',
+            this.GridForm.manageDistrict = '',
+            this.GridForm.gridType = '',
+            this.GridForm.location = '',
+            this.GridForm.longitude = '',
+            this.GridForm.latitude = ''
+        },
+        /** 人员清空 */
+        peoFormRest(){
+            this.peoForm.name = '',
+            this.peoForm.mobile = '',
+            this.peoForm.gender = '',
+            this.peoForm.post = '',
+            this.peoForm.duty = ''
+            
+        },
+        // 人员调动
+        transferRest(){
+            this.transferForm.name = '',
+            this.transferForm.remarks = '',
+            this.transferForm.transferTo = ''
+            this.transferForm.staffId = '',
+            this.transferForm.orgId = '',
+            this.transferForm.orgType = ''
+            this.selectValue = ''
+            this.options[0] = []
+        },
+        // 新增组织
+        addNewAgencyRest(){
+            this.agencyForm.parentAgencyId = '',
+            this.agencyForm.agencyName = '',
+            this.agencyForm.level = '', 
+            this.agencyForm.areaCodeSwitch = '',
+            this.agencyForm.areaCode = '',
+            this.agencyForm.areaName = '',
+            this.agencyForm.contacts = '',
+            this.agencyForm.mobile = '',
+            this.agencyForm.code = '',
+            this.latitude = '',
+            this.longitude = ''
+        },
+        // 修改市级组织
+        cancelModifyCityOrgPopRest(){
+            this.OrgDetailsForm.level = '',
+            this.OrgDetailsForm.agencyName = '',
+            this.OrgDetailsForm.code = '',
+            this.OrgDetailsForm.contacts = '',
+            this.OrgDetailsForm.mobile = '',
+            this.OrgDetailsForm.centerAddress = '',
+            this.OrgDetailsForm.areaCode = ''
+            this.OrgDetailsForm.agencyId = ''
+            this.latitude = '',
+            this.longitude = ''
+        },
+        // 修改下级机关单位
+        OrgUnitDetailsRest(){
+            this.OrgUnitDetailsForm.code = '',
+            this.OrgUnitDetailsForm.contacts = '',
+            this.OrgUnitDetailsForm.departmentId = '',
+            this.OrgUnitDetailsForm.departmentName = '',
+            this.OrgUnitDetailsForm.mobile = ''
+        },
+        // 修改网格清空
+        ModifyGridPopRest(){
+            this.modifyGridFrom.gridName = '',
+            this.modifyGridFrom.code = '',
+            this.modifyGridFrom.gridTypeName = '',
+            this.modifyGridFrom.contacts = '',
+            this.modifyGridFrom.mobile = '',
+            this.latitude = '',
+            this.longitude = '',
+            this.modifyGridFrom.agencyId = '',
+            this.modifyGridFrom.gridType = '',
+            this.modifyGridFrom.manageDistrict = '',
+            this.modifyGridFrom.griId = ''
+        },
+        // 社区新增弹框取消按钮
+        cancel(){
+            this.dialogVisible = false
+            this.insertFormRest()
+        },
+        // 网格新增弹框取消按钮
+        cancelGrid(){
+            this.dialogVisibleGrid = false
+            this.GridFormRest()
+            
+        },
+        /** 取消按钮 */
+        cancelPeo(){
+            this.dialogVisiblePeo = false
+            this.peoFormRest()
+        },
+        // 修改取消
+        cancelXiugai(){
+            this.modifyPeo = false
+            this.peoFormRest()
+        },
+        // 查看弹窗
+        cancelDetails(){
+            this.details = false
+        },
+        /** 人员调动取消按钮 */
+        cancelTransfer(){
+            this.transferRest()
+            this.transferPeo = false
+        },
+        // 新增组织取消按钮
+        canceladdNewAgency(){
+            this.addNewAgencyRest()
+            this.createAgencyDialogFlag = false
+        },
+        // 修改市级组织取消按钮
+        cancelModifyCityOrgPop(){
+            this.cancelModifyCityOrgPopRest()
+            this.modifyCityOrgPop = false
+        },
+        // 修改街道/社区级取消按钮
+        cancelstreetOrCommunity(){
+            this.cancelModifyCityOrgPopRest()
+            this.streetOrCommunity = false
+        },
+        // 取消修改下级机关单位按钮
+        cancelOrgUnitPop(){
+            this.OrgUnitPop = false
+            this.OrgUnitDetailsRest()
+        },
+        // 取消修改网格按钮
+        cancelModifyGridPop(){
+            this.modifyGridPop = false
+            this.ModifyGridPopRest()
+        },
+        // 进入网格，查询网格所属人员
+        entryGrid(gridId){
+            this.gridStaffTableListData = []
+            this.departmentStaffTableListData =[]
+            this.agencyStaffTableListData = []
+            this.currentGridOrgId = gridId
+            this.gridStaffTableFlag = true
+            this.departmentStaffTableFlag = false
+            this.currentAgencyStaffTableFlag = false
+            this.agencyTableFlag = false
+            this.departmentTableFlag = false
+            this.gridTableFlag = false
+            this.getGridStaffListData()
+            this.assembleBreadcrumbArr(gridId, 'grid')
+        },
+        // 进入部门，查询部门所属人员
+        entryDepartment(departmentId){
+            this.gridStaffTableListData = []
+            this.departmentStaffTableListData = []
+            this.agencyStaffTableListData = []
+            this.currentDepartmentId = departmentId
+            this.departmentStaffTableFlag = true
+            this.currentAgencyStaffTableFlag = false
+            this.gridStaffTableFlag = false
+            this.gridTableFlag = false
+            this.agencyTableFlag = false
+            this.departmentTableFlag = false
+            this.getDepartmentStaffListData()
+            this.assembleBreadcrumbArr(departmentId, 'department')
+        },
 
-      const { data, code, msg } = await requestPost(url, params)
+        // 进入组织，重新渲染
+        entryAgency(agencyId){
 
-      if (code === 0) {
-        this.typeList = data
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            this.currentAgencyId = agencyId
 
-    /** 搜索按钮操作 */
-    handleQuery () {
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery () {
-      this.queryParams.deptName = undefined
-      this.queryParams.status = undefined
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd (row) {
-      this.dialogVisible = true
-    },
-    // 社区弹框关闭函数
-    handleClose (done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          this.insertFormRest()
-          done();
-        })
-        .catch(_ => { });
-    },
-    // 人员查看叉号关闭
-    handleClosePeoView (done) {
-      this.insertFormRest()
-      done();
-    },
-    // 社区新增弹框重置函数
-    insertFormRest () {
-      this.insertForm.name = ''
-      this.insertForm.contacts = ''
-      this.insertForm.code = ''
-      this.insertForm.mobile = ''
-      this.insertForm.departmentName = ''
-
-      this.peoForm = {
-        name: '',
-        mobile: '',
-        gender: '',
-        post: '',
-        duty: [],
-        orgType: '',
-        activeTime: '',
-        zuzhi: '',
-        disableFlag: '',
-        newRoles: []
-      }
-    },
-    // 网格新增弹框重置函数
-    GridFormRest () {
-      this.GridForm.gridName = '',
-        this.GridForm.code = '',
-        this.GridForm.centerAddress = '',
-        this.GridForm.contacts = '',
-        this.GridForm.mobile = '',
-        this.GridForm.agencyId = '',
-        this.GridForm.manageDistrict = '',
-        this.GridForm.gridType = '',
-        this.GridForm.location = '',
-        this.GridForm.longitude = '',
-        this.GridForm.latitude = ''
-    },
-    /** 人员清空 */
-    peoFormRest () {
-      this.peoForm.name = '',
-        this.peoForm.mobile = '',
-        this.peoForm.gender = '',
-        this.peoForm.post = '',
-        this.peoForm.duty = ''
-      this.peoForm.newRoles = []
+            this.agencyTableListData = []
+            this.departmentTableListData = []
+            this.gridTableListData = []
+            this.gridStaffTableListData = []
+            this.agencyStaffTableListData = []
+            this.departmentStaffTableListData = []
 
-    },
-    // 人员调动
-    transferRest () {
-      this.transferForm.name = '',
-        this.transferForm.remarks = '',
-        this.transferForm.transferTo = ''
-      this.transferForm.staffId = '',
-        this.transferForm.orgId = '',
-        this.transferForm.orgType = ''
-      this.selectValue = ''
-      this.options[0] = []
-    },
-    // 新增组织
-    addNewAgencyRest () {
-      this.agencyForm.parentAgencyId = '',
-        this.agencyForm.agencyName = '',
-        this.agencyForm.level = '',
-        this.agencyForm.areaCodeSwitch = '',
-        this.agencyForm.areaCode = '',
-        this.agencyForm.areaName = '',
-        this.agencyForm.contacts = '',
-        this.agencyForm.mobile = '',
-        this.agencyForm.code = '',
-        this.latitude = '',
-        this.longitude = ''
-    },
-    // 修改市级组织
-    cancelModifyCityOrgPopRest () {
-      this.OrgDetailsForm.level = '',
-        this.OrgDetailsForm.agencyName = '',
-        this.OrgDetailsForm.code = '',
-        this.OrgDetailsForm.contacts = '',
-        this.OrgDetailsForm.mobile = '',
-        this.OrgDetailsForm.centerAddress = '',
-        this.OrgDetailsForm.areaCode = ''
-      this.OrgDetailsForm.agencyId = ''
-      this.latitude = '',
-        this.longitude = ''
-    },
-    // 修改下级机关单位
-    OrgUnitDetailsRest () {
-      this.OrgUnitDetailsForm.code = '',
-        this.OrgUnitDetailsForm.contacts = '',
-        this.OrgUnitDetailsForm.departmentId = '',
-        this.OrgUnitDetailsForm.departmentName = '',
-        this.OrgUnitDetailsForm.mobile = ''
-    },
-    // 修改网格清空
-    ModifyGridPopRest () {
-      this.modifyGridFrom.gridName = '',
-        this.modifyGridFrom.code = '',
-        this.modifyGridFrom.gridTypeName = '',
-        this.modifyGridFrom.contacts = '',
-        this.modifyGridFrom.mobile = '',
-        this.latitude = '',
-        this.longitude = '',
-        this.modifyGridFrom.agencyId = '',
-        this.modifyGridFrom.gridType = '',
-        this.modifyGridFrom.manageDistrict = '',
-        this.modifyGridFrom.griId = ''
-    },
-    // 社区新增弹框取消按钮
-    cancel () {
-      this.dialogVisible = false
-      this.insertFormRest()
-    },
-    // 网格新增弹框取消按钮
-    cancelGrid () {
-      this.dialogVisibleGrid = false
-      this.GridFormRest()
+            this.getDepartmentList()
+            this.getGridList()
+            this.getAgencyStaffListData()
+            this.getAgencyList()
+            this.assembleBreadcrumbArr(agencyId, 'agency')
+        },
+        // 新增组织
+        addCommunity(row){
+            this.insertForm.agencyId = this.currentAgencyId
+            this.dialogVisible = true
+        },
+        // 新增网格
+        addGrid(row){
+            this.GridForm.agencyId = this.currentAgencyId
+            this.getDictionaries()
+            this.dialogVisibleGrid = true
+        },
 
-    },
-    /** 取消按钮 */
-    cancelPeo () {
-      this.dialogVisiblePeo = false
-      this.peoFormRest()
-    },
-    // 修改取消
-    cancelXiugai () {
-      this.modifyPeo = false
-      this.peoFormRest()
-    },
-    // 查看弹窗
-    cancelDetails () {
-      this.details = false
-    },
-    /** 人员调动取消按钮 */
-    cancelTransfer () {
-      this.transferRest()
-      this.transferPeo = false
-    },
-    // 新增组织取消按钮
-    canceladdNewAgency () {
-      this.addNewAgencyRest()
-      this.createAgencyDialogFlag = false
-    },
-    // 修改市级组织取消按钮
-    cancelModifyCityOrgPop () {
-      this.cancelModifyCityOrgPopRest()
-      this.modifyCityOrgPop = false
-    },
-    // 修改街道/社区级取消按钮
-    cancelstreetOrCommunity () {
-      this.cancelModifyCityOrgPopRest()
-      this.streetOrCommunity = false
-    },
-    // 取消修改下级机关单位按钮
-    cancelOrgUnitPop () {
-      this.OrgUnitPop = false
-      this.OrgUnitDetailsRest()
-    },
-    // 取消修改网格按钮
-    cancelModifyGridPop () {
-      this.modifyGridPop = false
-      this.ModifyGridPopRest()
-    },
-    // 进入网格，查询网格所属人员
-    entryGrid (gridId) {
-      this.gridStaffTableListData = []
-      this.departmentStaffTableListData = []
-      this.agencyStaffTableListData = []
-      this.currentGridOrgId = gridId
-      this.gridStaffTableFlag = true
-      this.departmentStaffTableFlag = false
-      this.currentAgencyStaffTableFlag = false
-      this.agencyTableFlag = false
-      this.departmentTableFlag = false
-      this.gridTableFlag = false
-      this.getGridStaffListData()
-      this.assembleBreadcrumbArr(gridId, 'grid')
-    },
-    // 进入部门，查询部门所属人员
-    entryDepartment (departmentId) {
-      this.gridStaffTableListData = []
-      this.departmentStaffTableListData = []
-      this.agencyStaffTableListData = []
-      this.currentDepartmentId = departmentId
-      this.departmentStaffTableFlag = true
-      this.currentAgencyStaffTableFlag = false
-      this.gridStaffTableFlag = false
-      this.gridTableFlag = false
-      this.agencyTableFlag = false
-      this.departmentTableFlag = false
-      this.getDepartmentStaffListData()
-      this.assembleBreadcrumbArr(departmentId, 'department')
-    },
+        // 新增人员
+        addPeo(row){
+            this.dialogVisiblePeo = true
+            this.peoForm.orgType = 'agency'
+            this.submitOrgid = this.currentAgencyId
+        },
+        
+        // 新增社区人员
+        addCommunityPeo(){
+            this.dialogVisiblePeo = true
+            this.peoForm.orgType = 'dept'
+            this.submitOrgid = this.currentDepartmentId
+        },
 
-    // 进入组织，重新渲染
-    entryAgency (agencyId) {
+        // 新增网格人员
+        addGridPeo(){
+            this.dialogVisiblePeo = true
+            this.peoForm.orgType = 'grid'
+            this.submitOrgid = this.currentGridOrgId
+        },
+        // 修改网格人员
+        async xiuGridPeo(row){
+            this.modifyPeo = true
+            this.peoForm.orgType = 'grid'
+            this.submitOrgid = this.currentGridOrgId
+            this.userStaffId = row.staffId
+
+            const url = "/gov/org/staff/editstaffinit"
+            let params = {
+                staffId: row.staffId,
+                agencyId: this.currentAgencyId
+            }
+            const { data, code, msg } = await requestPost(url,params)
+            if(code === 0){
+                
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile
+                this.peoForm.gender = data.gender === 1 ? '男' : '女'
+                this.peoForm.post = data.workType
+                // 已有的权限（职责）
+                let existedRoleArr = []
+                data.roleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId)
+                    }
+                })
+                this.peoForm.duty = existedRoleArr
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 修改人员
+        async xiuPeo(row){
+            this.modifyPeo = true
+            this.peoForm.orgType = 'agency'
+            this.submitOrgid = this.currentAgencyId
+            this.userStaffId = row.staffId
 
-      this.currentAgencyId = agencyId
+            const url = "/gov/org/staff/editstaffinit"
 
-      this.agencyTableListData = []
-      this.departmentTableListData = []
-      this.gridTableListData = []
-      this.gridStaffTableListData = []
-      this.agencyStaffTableListData = []
-      this.departmentStaffTableListData = []
+            let params = {
+                staffId:row.staffId,
+                agencyId:this.currentAgencyId
+            }
 
-      this.getDepartmentList()
-      this.getGridList()
-      this.getAgencyStaffListData()
-      this.getAgencyList()
-      this.assembleBreadcrumbArr(agencyId, 'agency')
-    },
-    // 新增组织
-    addCommunity (row) {
-      this.insertForm.agencyId = this.currentAgencyId
-      this.dialogVisible = true
-    },
-    // 新增网格
-    addGrid (row) {
-      this.GridForm.agencyId = this.currentAgencyId
-      this.getDictionaries()
-      this.dialogVisibleGrid = true
-    },
+            const { data, code, msg } = await requestPost(url,params)
 
-    // 新增人员
-    addPeo (row) {
-      this.dialogVisiblePeo = true
-      this.peoForm.orgType = 'agency'
+            if(code === 0){
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile
+                this.peoForm.post = data.workType
+                this.peoForm.gender = data.gender === 1 ? '男' : '女'
+                // 已有的权限（职责）
+                let existedRoleArr = []
+                data.roleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId)
+                    }
+                })
+                this.peoForm.duty = existedRoleArr
+            } else {
+                this.$message.error(msg)
+            }
 
-    },
+            
+        },
+        // 修改社区人员
+        async xiuCommunityPeo(row){
+            this.modifyPeo = true
+            this.peoForm.orgType = 'dept'
+            this.submitOrgid = this.currentDepartmentId
+            this.userStaffId = row.staffId
 
-    // 新增社区人员
-    addCommunityPeo () {
-      this.dialogVisiblePeo = true
-      this.peoForm.orgType = 'dept'
+            const url = '/gov/org/staff/editstaffinit'
 
-    },
+            let params = {
+                staffId:row.staffId,
+                agencyId:this.currentAgencyId
+            }
 
-    // 新增网格人员
-    addGridPeo () {
-      this.dialogVisiblePeo = true
-      this.peoForm.orgType = 'grid'
+            const { data, code, msg } = await requestPost(url,params)
 
-    },
-    // 修改网格人员
-    async xiuGridPeo (row) {
-      this.modifyPeo = true
-      this.peoForm.orgType = 'grid'
-
-      this.userStaffId = row.staffId
-
-      const url = "/gov/org/staff/editstaffinit"
-      let params = {
-        staffId: row.staffId,
-        agencyId: this.currentAgencyId
-      }
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-
-        this.peoForm.name = data.name
-        this.peoForm.mobile = data.mobile
-        this.peoForm.gender = data.gender === 1 ? '男' : '女'
-        this.peoForm.post = data.workType
-        // 已有的权限（职责）
-        let existedDutyArr = []
-        data.roleList.forEach(function (sysDuty) {
-          if (sysDuty.selected === true) {
-            existedDutyArr.push(sysDuty.roleId)
-          }
-        })
-        this.peoForm.duty = existedDutyArr
-        // 已有的权限（角色）
-        let existedRoleArr = []
-        data.newRoleList.forEach(function (sysRole) {
-          if (sysRole.selected === true) {
-            existedRoleArr.push(sysRole.roleId)
-          }
-        })
-        this.peoForm.newRoles = existedRoleArr
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    // 修改人员
-    async xiuPeo (row) {
-      this.modifyPeo = true
-      this.peoForm.orgType = 'agency'
-
-      this.userStaffId = row.staffId
-
-      const url = "/gov/org/staff/editstaffinit"
-
-      let params = {
-        staffId: row.staffId,
-        agencyId: this.currentAgencyId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.peoForm.name = data.name
-        this.peoForm.mobile = data.mobile
-        this.peoForm.post = data.workType
-        this.peoForm.gender = data.gender === 1 ? '男' : '女'
-        // 已有的权限（职责）
-        let existedDutyArr = []
-        data.roleList.forEach(function (sysDuty) {
-          if (sysDuty.selected === true) {
-            existedDutyArr.push(sysDuty.roleId)
-          }
-        })
-        this.peoForm.duty = existedDutyArr
-        // 已有的权限（角色）
-        let existedRoleArr = []
-        data.newRoleList.forEach(function (sysRole) {
-          if (sysRole.selected === true) {
-            existedRoleArr.push(sysRole.roleId)
-          }
-        })
-        this.peoForm.newRoles = existedRoleArr
-      } else {
-        this.$message.error(msg)
-      }
+            if(code === 0){
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile
+                this.peoForm.gender = data.gender === 1 ? '男' : '女'
+                this.peoForm.post = data.workType
+                // 已有的权限（职责）
+                let existedRoleArr = []
+                data.roleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId)
+                    }
+                })
+                this.peoForm.duty = existedRoleArr
+            }else {
+                this.$message.error(msg)
+            }
 
+            
+        },
+        // 取消禁用按钮
+        cancelDisable(){
+            this.Disable = false
+        },
+        // 人员禁用
+        DisablePeo(row){
+            this.DisableForm.staffId = row.staffId
+            this.Disable = true
+        },
+        // 确定禁用
+        async submitDisable(){
+            const url = "/epmetuser/customerstaff/disabledstaff"
 
-    },
-    // 修改社区人员
-    async xiuCommunityPeo (row) {
-      this.modifyPeo = true
-      this.peoForm.orgType = 'dept'
-
-      this.userStaffId = row.staffId
-
-      const url = '/gov/org/staff/editstaffinit'
-
-      let params = {
-        staffId: row.staffId,
-        agencyId: this.currentAgencyId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.peoForm.name = data.name
-        this.peoForm.mobile = data.mobile
-        this.peoForm.gender = data.gender === 1 ? '男' : '女'
-        this.peoForm.post = data.workType
-        // 已有的权限（职责）
-        let existedDutyArr = []
-        data.roleList.forEach(function (sysDuty) {
-          if (sysDuty.selected === true) {
-            existedDutyArr.push(sysDuty.roleId)
-          }
-        })
-        this.peoForm.duty = existedDutyArr
-        // 已有的权限（角色）
-        let existedRoleArr = []
-        data.newRoleList.forEach(function (sysRole) {
-          if (sysRole.selected === true) {
-            existedRoleArr.push(sysRole.roleId)
-          }
-        })
-        this.peoForm.newRoles = existedRoleArr
-      } else {
-        this.$message.error(msg)
-      }
+            let params = {
+                staffId:this.DisableForm.staffId,
+                agencyId:this.DisableForm.agencyId,
+                customerId:this.DisableForm.customerId
+            }
 
+            const { data, code, msg } = await requestPost(url,params)
 
-    },
-    // 取消禁用按钮
-    cancelDisable () {
-      this.Disable = false
-    },
-    // 人员禁用
-    DisablePeo (row) {
-      this.DisableForm.staffId = row.staffId
-      this.Disable = true
-    },
-    // 确定禁用
-    async submitDisable () {
-      const url = "/epmetuser/customerstaff/disabledstaff"
+            if(code === 0){
+                this.$message.success("禁用成功")
+                this.Disable = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 查看按钮
+        async lookAngency(row){
+            const url = "/data/aggregator/org/staffdetailv2"
 
-      let params = {
-        staffId: this.DisableForm.staffId,
-        agencyId: this.DisableForm.agencyId,
-        customerId: this.DisableForm.customerId
-      }
+            let params = {
+                staffId:row.staffId
+            }
 
-      const { data, code, msg } = await requestPost(url, params)
+            const { data, code, msg } = await requestPost(url,params)
 
-      if (code === 0) {
-        this.$message.success("禁用成功")
-        this.Disable = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    // 查看按钮
-    async lookAngency (row) {
-      const url = "/data/aggregator/org/staffdetailv2"
-
-      let params = {
-        staffId: row.staffId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.peoForm.name = data.name
-        this.peoForm.mobile = data.mobile.substr(0, 3) + "****" + data.mobile.substr(7)
-        this.peoForm.activeTime = data.activeTime
-        this.peoForm.duty = data.roles
-        this.peoForm.zuzhi = data.orgName
-        if (data.enableFlag === 'enable') {
-          this.peoForm.disableFlag = '已启用'
-        } else {
-          this.peoForm.disableFlag = '已禁用'
-        }
-      }
-      this.details = true
-    },
+            if(code === 0){
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile.substr(0,3) + "****" + data.mobile.substr(7)
+                this.peoForm.activeTime = data.activeTime
+                this.peoForm.duty = data.roles
+                this.peoForm.zuzhi = data.orgName
+                if (data.enableFlag === 'enable') {
+                    this.peoForm.disableFlag = '已启用'
+                } else {
+                    this.peoForm.disableFlag = '已禁用'
+                }
+            }
+            this.details = true
+        },
+        
+        // 人员调动
+        async transfer(row){
 
-    // 人员调动
-    async transfer (row) {
-
-      this.transferForm.name = row.name
-      this.transferForm.staffId = row.staffId
-
-      this.transferPeo = true
-      const url = "/gov/org/customeragency/orgtree"
-
-      let params = {
-
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.options[0].label = data.agencyName
-        this.options[0].value = data.agencyId
-
-        console.log('--------', this.options)
-        let depart = Array.from(data.departmentList)
-        let gr = Array.from(data.gridList)
-
-        depart.forEach(item => {
-          const ob = {
-            value: item.deptId,
-            label: item.deptName
-          }
-          this.options[0].children[0].children.push(ob)
-        })
-        this.options[0].children[0].value = 0
-        this.options[0].children[0].label = "部门"
-        this.options[0].children[1].value = 1
-        this.options[0].children[1].label = "网格"
-        gr.forEach(item => {
-          const obj = {
-            value: item.gridId,
-            label: item.gridName
-          }
-          this.options[0].children[1].children.push(obj)
-        })
-      } else {
-        this.$message.error("树查询失败", msg)
-      }
+            this.transferForm.name = row.name
+            this.transferForm.staffId = row.staffId
 
-    },
-    // 人员调动确定
-    async submitTransfer () {
-      const url = "/gov/org/staff/stafftransferv2"
-
-      let params = {
-        staffId: this.transferForm.staffId,
-        orgId: this.transferForm.orgId,
-        orgType: this.transferForm.orgType,
-        remarks: this.transferForm.remarks
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message.success("调动成功")
-        this.transferRest()
-        this.transferPeo = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
-        this.getDepartmentStaffListData()
-        this.getAgencyStaffListData()
-        this.getGridStaffListData()
+            this.transferPeo = true
+            const url = "/gov/org/customeragency/orgtree"
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            let params = {
 
-    // 获取导航
-    // async getNavigation(){
+            }
+            
+            const { data, code, msg } = await requestPost(url,params)
 
-    //     const url = "/gov/org/customeragency/orgtree"
+            if(code === 0){
+                this.options[0].label = data.agencyName
+                this.options[0].value = data.agencyId
+
+                    console.log('--------',this.options)
+                let depart = Array.from(data.departmentList)
+                let gr = Array.from(data.gridList)
+
+                depart.forEach(item => {
+                    const ob = {
+                        value:item.deptId,
+                        label:item.deptName                        
+                    }
+                    this.options[0].children[0].children.push(ob)
+                })
+                    this.options[0].children[0].value = 0
+                    this.options[0].children[0].label = "部门"
+                    this.options[0].children[1].value = 1
+                    this.options[0].children[1].label = "网格"
+                gr.forEach(item => {
+                    const obj = {
+                        value:item.gridId,
+                        label:item.gridName                        
+                    }
+                    this.options[0].children[1].children.push(obj)
+                })
+            }else{
+                this.$message.error("树查询失败",msg)
+            }
+            
+        },
+        // 人员调动确定
+        async submitTransfer(){
+            const url = "/gov/org/staff/stafftransferv2"
 
-    //     let params = {
+            let params = {
+                staffId:this.transferForm.staffId,
+                orgId:this.transferForm.orgId,
+                orgType:this.transferForm.orgType,
+                remarks:this.transferForm.remarks
+            }
 
-    //     }
+            const { data, code, msg } = await requestPost(url,params)
 
-    //     const { data, code, msg } = await requestPost(url,params)
+            if(code === 0){
+                this.$message.success("调动成功")
+                this.transferRest()
+                this.transferPeo = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+                this.getDepartmentStaffListData()
+                this.getAgencyStaffListData()
+                this.getGridStaffListData()
 
-    //     if(code === 0){
-    //         this.Navigation = data.agencyName
-    //     }
-    // 组装顶部面包屑数组
-    async assembleBreadcrumbArr (id, orgType) {
-      this.currentBreadcrumbKey = id
-      if (orgType === 'agency') {
-        const url = '/gov/org/agency/agencydetail'
-        let params = {
-          agencyId: id,
-        }
-        const { data, code, msg } = await requestPost(url, params)
-        if (code === 0) {
-          // 社区级为最低级组织，不展示下级组织列表
-          this.currentAgencyLevel = data.level
-          this.currentAreaCode = data.areaCode
-          if (data.parentList && data.parentList.length > 0) {
-            this.parentAreaCode = data.parentList[data.parentList.length - 1].areaCode
-            this.parentAgencyId = data.parentList[data.parentList.length - 1].id
-            this.parentAgencyLevel = data.parentList[data.parentList.length - 1].level
-          }
-          if (data.level === 'community') {
-            this.agencyTableFlag = false
-          } else {
-            this.agencyTableFlag = true
-          }
-          if (this.breadcrumbArr.length === 0) {
-            this.breadcrumbArr = [{ id: data.agencyId, name: data.agencyName, type: orgType }]
-          } else {
-            let hasBreadcrumbArr = false
-            this.breadcrumbArr.forEach(function (bc) {
-              if (bc.id === id) {
-                hasBreadcrumbArr = true
-              }
-            })
-            if (hasBreadcrumbArr === false) {
-              let breadcrumb = { id: data.agencyId, name: data.agencyName, type: orgType }
-              this.breadcrumbArr.push(breadcrumb)
+            } else {
+                this.$message.error(msg)
             }
-          }
-        } else {
-          this.$message.error(msg)
-        }
-      } else if (orgType === 'department') {
-        const url = '/gov/org/department/departmentdetail'
-        let params = {
-          departmentId: id,
-        }
-        const { data, code, msg } = await requestPost(url, params)
-        if (code === 0) {
-          if (this.breadcrumbArr.length === 0) {
-            this.breadcrumbArr = [{ id: data.departmentId, name: data.departmentName, type: orgType }]
-          } else {
-            let hasBreadcrumbArr = false
-            this.breadcrumbArr.forEach(function (bc) {
-              if (bc.id === id) {
-                hasBreadcrumbArr = true
-              }
-            })
-            if (hasBreadcrumbArr === false) {
-              let breadcrumb = { id: data.departmentId, name: data.departmentName, type: orgType }
-              this.breadcrumbArr.push(breadcrumb)
+        },
+
+        // 获取导航
+        // async getNavigation(){
+
+        //     const url = "/gov/org/customeragency/orgtree"
+
+        //     let params = {
+
+        //     }
+            
+        //     const { data, code, msg } = await requestPost(url,params)
+
+        //     if(code === 0){
+        //         this.Navigation = data.agencyName
+        //     }
+        // 组装顶部面包屑数组
+        async assembleBreadcrumbArr (id, orgType) {
+            this.currentBreadcrumbKey = id
+            if (orgType === 'agency') {
+                const url = '/gov/org/agency/agencydetail'
+                let params = {
+                    agencyId : id,
+                }
+                const { data, code, msg } = await requestPost(url, params)
+                if(code === 0){
+                    // 社区级为最低级组织，不展示下级组织列表
+                    if (data.level === 'community') {
+                        this.agencyTableFlag = false
+                    } else {
+                        this.agencyTableFlag = true
+                    }
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [{id: data.agencyId, name: data.agencyName, type: orgType}]
+                    } else {
+                        let hasBreadcrumbArr = false
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true
+                            }
+                        })
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {id: data.agencyId, name: data.agencyName, type: orgType}
+                            this.breadcrumbArr.push(breadcrumb)
+                        } 
+                    }
+                } else {
+                    this.$message.error(msg)
+                }
+            } else if (orgType === 'department') {
+                const url = '/gov/org/department/departmentdetail'
+                let params = {
+                    departmentId : id,
+                }
+                const { data, code, msg } = await requestPost(url, params)
+                if(code === 0){
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [{id: data.departmentId, name: data.departmentName, type: orgType}]
+                    } else {
+                        let hasBreadcrumbArr = false
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true
+                            }
+                        })
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {id: data.departmentId, name: data.departmentName, type: orgType}
+                            this.breadcrumbArr.push(breadcrumb)
+                        } 
+                    }
+                } else {
+                    this.$message.error(msg)
+                }
+            } else if (orgType === 'grid') {
+                const url = '/gov/org/grid/griddetail'
+                let params = {
+                    gridId : id,
+                }
+                const { data, code, msg } = await requestPost(url, params)
+                if(code === 0){
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [{id: data.grid, name: data.gridName, type: orgType}]
+                    } else {
+                        let hasBreadcrumbArr = false
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true
+                            }
+                        })
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {id: data.grid, name: data.gridName, type: orgType}
+                            this.breadcrumbArr.push(breadcrumb)
+                        } 
+                    }
+                } else {
+                    this.$message.error(msg)
+                }
             }
-          }
-        } else {
-          this.$message.error(msg)
-        }
-      } else if (orgType === 'grid') {
-        const url = '/gov/org/grid/griddetail'
-        let params = {
-          gridId: id,
-        }
-        const { data, code, msg } = await requestPost(url, params)
-        if (code === 0) {
-          if (this.breadcrumbArr.length === 0) {
-            this.breadcrumbArr = [{ id: data.grid, name: data.gridName, type: orgType }]
-          } else {
-            let hasBreadcrumbArr = false
-            this.breadcrumbArr.forEach(function (bc) {
-              if (bc.id === id) {
-                hasBreadcrumbArr = true
-              }
+        },
+
+        async refreshThisPage (index) {
+
+            // 点击最后一级不触发响应
+            if (index === this.breadcrumbArr.length - 1) {
+                return
+            }
+
+            const selectOrg = this.breadcrumbArr[index]
+            this.breadcrumbArr = this.breadcrumbArr.slice(0, index + 1)
+
+            const orgId = selectOrg.id
+            const orgType = selectOrg.type
+
+            if (orgType === 'agency') {
+                this.agencyTableListData = []
+                this.agencyStaffTableListData = []
+                this.departmentTableListData = []
+                this.departmentStaffTableListData = []
+                this.gridTableListData = []
+                this.gridStaffTableListData = []
+                this.userAgencyId = orgId
+                this.currentAgencyId = orgId
+
+                this.agencyTableFlag = true
+                this.currentAgencyStaffTableFlag = true
+                this.departmentTableFlag = true
+                this.departmentStaffTableFlag = false
+                this.gridTableFlag = true
+                this.gridStaffTableFlag = false
+
+                this.assembleBreadcrumbArr(orgId, 'agency')
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            } 
+            // 当点击最后一级不触发响应
+            // 其父级及以上，只可能属于组织，而非部门或网格，注释以下代码即可
+            // 若需要点击最后一级触发刷新，可释放以下代码
+            /* else if (orgType === 'department') {
+                this.agencyStaffTableListData = []
+                this.departmentStaffTableListData = []
+                this.gridStaffTableListData = []
+
+                this.currentDepartmentId = orgId
+
+                this.agencyTableFlag = false
+                this.currentAgencyStaffTableFlag = false
+                this.departmentTableFlag = false
+                this.departmentStaffTableFlag = true
+                this.gridTableFlag = false
+                this.gridStaffTableFlag = false
+
+                this.getDepartmentStaffListData()
+                this.assembleBreadcrumbArr(orgId, 'department')
+            } else if (orgType === 'grid') {
+                this.agencyStaffTableListData = []
+                this.departmentStaffTableListData =[]
+                this.gridStaffTableListData = []
+
+                this.currentGridOrgId = orgId
+
+                this.agencyTableFlag = false
+                this.currentAgencyStaffTableFlag = false
+                this.departmentTableFlag = false
+                this.departmentStaffTableFlag = false
+                this.gridTableFlag = false
+                this.gridStaffTableFlag = true
+                this.getGridStaffListData()
+                this.assembleBreadcrumbArr(orgId, 'grid')
+            } */
+        },
+        // 获取当前用户信息
+        async getUser(){
+            const url = '/gov/org/agency/agencydetail'
+
+            let params = {
+                agencyId: this.currentAgencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.userForm.areaCode = data.areaCode
+                this.userForm.level = data.level
+                this.userForm.parentAgencyId = data.agencyId
+                this.getZoning()
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        // 获取组织区划信息
+        async getZoning(){
+            const url = '/data/aggregator/org/nextlevelareacodelist'
+
+            let params = {
+                areaCode:this.userForm.areaCode,
+                level:this.userForm.level,
+                parentAgencyId:this.userForm.parentAgencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.zonings = data
+            }else{
+                this.$message.error(msg)
+            }
+
+        },
+
+        handelZoing(val){
+            this.zonings.forEach(item => {
+                if (item.areaCode == val) {
+                    this.agencyForm.level = item.level
+                    this.agencyForm.areaName = item.areaName
+                    this.agencyForm.areaCode = item.areaCode
+                }
             })
-            if (hasBreadcrumbArr === false) {
-              let breadcrumb = { id: data.grid, name: data.gridName, type: orgType }
-              this.breadcrumbArr.push(breadcrumb)
+        },
+        handelStreeOrCommunityZoing(val){
+            this.zonings.forEach(item => {
+                if (item.areaCode == val) {
+                    this.OrgDetailsForm.level = item.level
+                    this.OrgDetailsForm.areaName = item.areaName
+                    this.OrgDetailsForm.areaCode = item.areaCode
+                }
+            })
+        },
+
+        addAgency(row){
+            this.createAgencyDialogFlag = true
+            this.addNewAgencyRest()
+            this.getUser()
+        },
+        // 新增组织确定按钮
+        async submitaddNewAgency(){
+            const url = '/gov/org/agency/addagency-v2'
+
+            let params = {
+                parentAgencyId:this.userForm.parentAgencyId,
+                agencyName:this.agencyForm.agencyName,
+                level:this.agencyForm.level,
+                areaCodeSwitch:'closed',
+                areaCode:this.agencyForm.areaCode,
+                areaName:this.agencyForm.areaName,
+                contacts:this.agencyForm.contacts,
+                mobile:this.agencyForm.mobile,
+                code:this.agencyForm.code,
+                latitude:this.latitude,
+                longitude:this.longitude
             }
-          }
-        } else {
-          this.$message.error(msg)
-        }
-      }
-    },
 
-    async refreshThisPage (index) {
-
-      // 点击最后一级不触发响应
-      if (index === this.breadcrumbArr.length - 1) {
-        return
-      }
-
-      const selectOrg = this.breadcrumbArr[index]
-      this.breadcrumbArr = this.breadcrumbArr.slice(0, index + 1)
-
-      const orgId = selectOrg.id
-      const orgType = selectOrg.type
-
-      if (orgType === 'agency') {
-        this.agencyTableListData = []
-        this.agencyStaffTableListData = []
-        this.departmentTableListData = []
-        this.departmentStaffTableListData = []
-        this.gridTableListData = []
-        this.gridStaffTableListData = []
-        this.userAgencyId = orgId
-        this.currentAgencyId = orgId
-
-        this.agencyTableFlag = true
-        this.currentAgencyStaffTableFlag = true
-        this.departmentTableFlag = true
-        this.departmentStaffTableFlag = false
-        this.gridTableFlag = true
-        this.gridStaffTableFlag = false
-
-        this.assembleBreadcrumbArr(orgId, 'agency')
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
-      }
-      // 当点击最后一级不触发响应
-      // 其父级及以上，只可能属于组织，而非部门或网格，注释以下代码即可
-      // 若需要点击最后一级触发刷新，可释放以下代码
-      /* else if (orgType === 'department') {
-          this.agencyStaffTableListData = []
-          this.departmentStaffTableListData = []
-          this.gridStaffTableListData = []
-
-          this.currentDepartmentId = orgId
-
-          this.agencyTableFlag = false
-          this.currentAgencyStaffTableFlag = false
-          this.departmentTableFlag = false
-          this.departmentStaffTableFlag = true
-          this.gridTableFlag = false
-          this.gridStaffTableFlag = false
-
-          this.getDepartmentStaffListData()
-          this.assembleBreadcrumbArr(orgId, 'department')
-      } else if (orgType === 'grid') {
-          this.agencyStaffTableListData = []
-          this.departmentStaffTableListData =[]
-          this.gridStaffTableListData = []
-
-          this.currentGridOrgId = orgId
-
-          this.agencyTableFlag = false
-          this.currentAgencyStaffTableFlag = false
-          this.departmentTableFlag = false
-          this.departmentStaffTableFlag = false
-          this.gridTableFlag = false
-          this.gridStaffTableFlag = true
-          this.getGridStaffListData()
-          this.assembleBreadcrumbArr(orgId, 'grid')
-      } */
-    },
-    // 获取组织区划信息
-    async getZoning (areaCode, parentAgencyId, parentAgencyLevel) {
-      const url = '/data/aggregator/org/nextlevelareacodelist'
+            const { data, code, msg } = await requestPost(url,params)
 
-      let params = {
-        areaCode: areaCode,
-        level: parentAgencyLevel,
-        parentAgencyId: parentAgencyId
-      }
+            if(code === 0){
+                this.$message.success("添加成功")
+                this.createAgencyDialogFlag = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            }else {
+                this.$message.error(msg)
+            }
+        },
 
-      const { data, code, msg } = await requestPost(url, params)
+        // 修改面包屑
+        modifyOrgInfo(){
+            this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length-1]
+            console.log(this.judgeOrgInfoLevel)
+            if(this.judgeOrgInfoLevel.type === "agency"){
+                this.getOrgDetailsById()
+                setTimeout(() => {
+                    if(this.OrgDetailsForm.level === "district"){
+                    /** 修改市区级弹窗 */
+                    this.modifyCityOrgPop = true
+                    }else {
+                        /** 街道级和社区级弹窗 */
+                        this.getUser()
+                        this.streetOrCommunity = true
+                    }
+                }, 1000);
+            } else if(this.judgeOrgInfoLevel.type === "department"){
+                /** 下级机关单位修改 */
+                this.OrgUnitPop = true
+                this.getOrgUnitDetailsById()
+            } else {
+                /** 网格修改 */
+                this.getDictionaries()
+                this.modifyGridPop = true
+                this.getGridDetailsById()
+            }
+        },
 
-      if (code === 0) {
-        this.zonings = data
-      } else {
-        this.$message.error(msg)
-      }
+        // 根据id获取组织机构详细信息
+        async getOrgDetailsById(){
+            const url = '/gov/org/agency/agencydetail'
 
-    },
+            let params = {
+                agencyId:this.judgeOrgInfoLevel.id
+            }
 
-    handelZoing (val) {
-      this.zonings.forEach(item => {
-        if (item.areaCode == val) {
-          this.agencyForm.level = item.level
-          this.agencyForm.areaName = item.areaName
-          this.agencyForm.areaCode = item.areaCode
-        }
-      })
-    },
-    handelStreeOrCommunityZoing (val) {
-      this.zonings.forEach(item => {
-        if (item.areaCode == val) {
-          this.OrgDetailsForm.level = item.level
-          this.OrgDetailsForm.areaName = item.areaName
-          this.OrgDetailsForm.areaCode = item.areaCode
-        }
-      })
-    },
+            const { data, code, msg } = await requestPost(url,params)
 
-    addAgency () {
-      this.createAgencyDialogFlag = true
-      this.addNewAgencyRest()
-      this.getZoning(this.currentAreaCode, this.currentAgencyId, this.currentAgencyLevel)
-    },
-    // 新增组织确定按钮
-    async submitaddNewAgency () {
-      const url = '/gov/org/agency/addagency-v2'
-
-      let params = {
-        parentAgencyId: this.parentAgencyId,
-        agencyName: this.agencyForm.agencyName,
-        level: this.agencyForm.level,
-        areaCodeSwitch: 'closed',
-        areaCode: this.agencyForm.areaCode,
-        areaName: this.agencyForm.areaName,
-        contacts: this.agencyForm.contacts,
-        mobile: this.agencyForm.mobile,
-        code: this.agencyForm.code,
-        latitude: this.latitude,
-        longitude: this.longitude
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message.success("添加成功")
-        this.createAgencyDialogFlag = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            if(code === 0){
+                this.OrgDetailsForm.level = data.level
+                this.OrgDetailsForm.agencyName = data.agencyName
+                this.OrgDetailsForm.code = data.code
+                this.OrgDetailsForm.contacts = data.contacts
+                this.OrgDetailsForm.centerAddress = data.centerAddress
+                this.OrgDetailsForm.areaCode = data.areaCode
+                this.OrgDetailsForm.mobile = data.mobile
+                this.latitude = data.latitude
+                this.longitude = data.longitude
+                this.OrgDetailsForm.agencyId = data.agencyId
+            }else {
+                this.$message.error(msg)
+            }
+        },
 
-    // 修改面包屑
-    modifyOrgInfo () {
-      this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length - 1]
-      if (this.judgeOrgInfoLevel.type === "agency") {
-        this.getOrgDetailsById()
-        setTimeout(() => {
-          if (this.OrgDetailsForm.level === "district") {
-            /** 修改市区级弹窗 */
-            this.modifyCityOrgPop = true
-          } else {
-            /** 街道级和社区级弹窗 */
-            this.getZoning(this.parentAreaCode, this.parentAgencyId, this.parentAgencyLevel)
-            this.streetOrCommunity = true
-          }
-        }, 1000);
-      } else if (this.judgeOrgInfoLevel.type === "department") {
-        /** 下级机关单位修改 */
-        this.OrgUnitPop = true
-        this.getOrgUnitDetailsById()
-      } else {
-        /** 网格修改 */
-        this.getDictionaries()
-        this.modifyGridPop = true
-        this.getGridDetailsById()
-      }
-    },
+        // 根据id获取下级机关单位详情
+        async getOrgUnitDetailsById(){
+            const url = '/gov/org/department/departmentdetail'
+
+            let params = {
+                departmentId:this.judgeOrgInfoLevel.id
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.OrgUnitDetailsForm.code = data.code
+                this.OrgUnitDetailsForm.contacts = data.contacts
+                this.OrgUnitDetailsForm.departmentId = data.departmentId
+                this.OrgUnitDetailsForm.departmentName = data.departmentName
+                this.OrgUnitDetailsForm.mobile = data.mobile
+            }else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 根据id获取网格详情
+        async getGridDetailsById(){
+            const url = '/gov/org/grid/griddetail'
 
-    // 根据id获取组织机构详细信息
-    async getOrgDetailsById () {
-      const url = '/gov/org/agency/agencydetail'
             let params = {
                 gridId: this.judgeOrgInfoLevel.id
             }
@@ -2308,226 +2127,108 @@ export default {
                 mobile: this.OrgUnitDetailsForm.mobile
             }
 
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-
-        this.currentAgencyLevel = data.level
-        this.currentAreaCode = data.areaCode
-        if (data.parentList && data.parentList.length > 0) {
-          this.parentAreaCode = data.parentList[data.parentList.length - 1].areaCode
-          this.parentAgencyId = data.parentList[data.parentList.length - 1].id
-          this.parentAgencyLevel = data.parentList[data.parentList.length - 1].level
-        }
-
-        this.OrgDetailsForm.level = data.level
-        this.OrgDetailsForm.agencyName = data.agencyName
-        this.OrgDetailsForm.code = data.code
-        this.OrgDetailsForm.contacts = data.contacts
-        this.OrgDetailsForm.centerAddress = data.centerAddress
-        this.OrgDetailsForm.areaCode = data.areaCode
-        this.OrgDetailsForm.mobile = data.mobile
-        this.latitude = data.latitude
-        this.longitude = data.longitude
-        this.OrgDetailsForm.agencyId = data.agencyId
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    // 根据id获取下级机关单位详情
-    async getOrgUnitDetailsById () {
-      const url = '/gov/org/department/departmentdetail'
-
-      let params = {
-        departmentId: this.judgeOrgInfoLevel.id
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.OrgUnitDetailsForm.code = data.code
-        this.OrgUnitDetailsForm.contacts = data.contacts
-        this.OrgUnitDetailsForm.departmentId = data.departmentId
-        this.OrgUnitDetailsForm.departmentName = data.departmentName
-        this.OrgUnitDetailsForm.mobile = data.mobile
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    // 根据id获取网格详情
-    async getGridDetailsById () {
-      const url = '/gov/org/grid/griddetail'
-
-      let params = {
-        gridId: this.judgeOrgInfoLevel.id
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.modifyGridFrom.gridName = data.gridName
-        this.modifyGridFrom.code = data.code
-        this.modifyGridFrom.gridTypeName = data.gridTypeName
-        this.modifyGridFrom.contacts = data.contacts
-        this.modifyGridFrom.mobile = data.mobile
-        this.modifyGridFrom.agencyId = data.agencyId
-        this.modifyGridFrom.gridType = data.gridType
-        this.modifyGridFrom.manageDistrict = data.manageDistrict
-        this.modifyGridFrom.griId = data.griId
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            const { data, code, msg } = await requestPost(url,params)
 
-    // 市级/街道/社区级组织修改确定按钮
-    async sunmitModifyCityOrgPop () {
-      const url = '/gov/org/agency/editagency'
-
-      let params = {
-        agencyId: this.OrgDetailsForm.agencyId,
-        agencyName: this.OrgDetailsForm.agencyName,
-        contacts: this.OrgDetailsForm.contacts,
-        mobile: this.OrgDetailsForm.mobile,
-        code: this.OrgDetailsForm.code,
-        latitude: this.latitude,
-        longitude: this.longitude
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message.success("修改成功")
-        this.modifyCityOrgPop = false
-        this.streetOrCommunity = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.agencyPeo()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    // 修改下级机关单位确定按钮
-    async sunmitOrgUnitForm () {
-      const url = '/gov/org/department/editdepartment'
-
-      let params = {
-        code: this.OrgUnitDetailsForm.code,
-        contacts: this.OrgUnitDetailsForm.contacts,
-        departmentId: this.OrgUnitDetailsForm.departmentId,
-        departmentName: this.OrgUnitDetailsForm.departmentName,
-        mobile: this.OrgUnitDetailsForm.mobile
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message.success("修改成功")
-        this.OrgUnitPop = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.agencyPeo()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    // 修改网格确定按钮
-    async submitModifyGrid () {
-      const url = '/gov/org/grid/editgrid'
-
-      let params = {
-        gridId: this.modifyGridFrom.griId,
-        gridName: this.modifyGridFrom.gridName,
-        manageDistrict: this.modifyGridFrom.manageDistrict,
-        contacts: this.modifyGridFrom.contacts,
-        mobile: this.modifyGridFrom.mobile,
-        code: this.modifyGridFrom.code,
-        gridType: this.modifyGridFrom.gridType
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message.success("修改成功")
-        this.modifyGridPop = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.agencyPeo()
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.OrgUnitPop = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 修改网格确定按钮
+        async submitModifyGrid(){
+            const url = '/gov/org/grid/editgrid'
 
-    /** 地图初始化 */
-    initMap (_that) {
+            let params = {
+                gridId: this.modifyGridFrom.griId,
+                gridName: this.modifyGridFrom.gridName,
+                manageDistrict: this.modifyGridFrom.manageDistrict,
+                contacts: this.modifyGridFrom.contacts,
+                mobile: this.modifyGridFrom.mobile,
+                code: this.modifyGridFrom.code,
+                gridType: this.modifyGridFrom.gridType
+            }
 
-      var position = document.getElementById("position");
+            const { data, code, msg } = await requestPost(url,params)
 
-      var center = new window.TMap.LatLng(39.984104, 116.307503);//设置中心点坐标
-      //初始化地图
-      var map = new window.TMap.Map("container", {
-        center: center
-      });
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.modifyGridPop = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            }else {
+                this.$message.error(msg)
+            }
+        },
 
-      //绑定点击事件
-      map.on("click", function (evt) {
-        _that.lat = evt.latLng.getLat().toFixed(6);
-        _that.lng = evt.latLng.getLng().toFixed(6);
-        position.innerHTML = _that.lat + "," + _that.lng;
-      })
-    },
-    createMap (_t) {
-      document.getElementById("con").innerHTML = ''
-      document.getElementById("con").innerHTML = '当前点击坐标为：<span id="pos"></span>'
-      var position = document.getElementById("pos");
-
-      if (this.latitude === null || this.latitude === "" || this.longitude === null || this.longitude === "") {
-        var center = new window.TMap.LatLng(36.116796, 120.339959);
-      } else {
-        var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
-      }
-
-      //初始化地图
-      var map = new window.TMap.Map("con", {
-        center: center
-      });
-
-      //绑定点击事件
-      map.on("click", function (evt) {
-        _t.latitude = evt.latLng.getLat().toFixed(6);
-        _t.longitude = evt.latLng.getLng().toFixed(6);
-        position.innerHTML = _t.latitude + "," + _t.longitude;
-      })
+       /** 地图初始化 */
+       initMap(_that) {
+           
+            var position = document.getElementById("position");
+
+            var center = new window.TMap.LatLng(39.984104, 116.307503);//设置中心点坐标
+            //初始化地图
+            var map = new window.TMap.Map("container", {
+                center: center
+            });
+            
+            //绑定点击事件
+            map.on("click",function(evt){
+                _that.lat = evt.latLng.getLat().toFixed(6);
+                _that.lng = evt.latLng.getLng().toFixed(6);
+                position.innerHTML = _that.lat + "," + _that.lng;
+            })
+        },
+        createMap(_t){
+            document.getElementById("con").innerHTML = ''
+            document.getElementById("con").innerHTML = '当前点击坐标为：<span id="pos"></span>'
+            var position = document.getElementById("pos");
+
+            var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
+            //初始化地图
+            var map = new window.TMap.Map("con", {
+                center: center
+            });
+            
+            //绑定点击事件
+            map.on("click",function(evt){
+                _t.latitude = evt.latLng.getLat().toFixed(6);
+                _t.longitude = evt.latLng.getLng().toFixed(6);
+                position.innerHTML = _t.latitude + "," + _t.longitude;
+            })
 
+        }
+        
     }
-
-  }
 }
 </script>
 
 <style scoped>
-#container {
-  width: 100%;
-  height: 100%;
-}
-#info {
-  left: 20px;
-  top: 20px;
-  font-size: 14px;
-  background: #fff;
-  width: 270px;
-  padding: 10px;
-  border-radius: 3px;
-}
-#con {
-  width: 100%;
-  height: 100%;
-}
-.el-tag + .el-tag {
-  margin-left: 10px;
-}
+    #container {
+        width: 100%;
+        height: 100%;
+    }
+    #info{
+        left: 20px;
+        top: 20px;
+        font-size: 14px;
+        background: #fff;
+        width: 270px;
+        padding: 10px;
+        border-radius: 3px;
+    }
+    #con {
+        width: 100%;
+        height: 100%;
+    }
+    .el-tag + .el-tag {
+        margin-left: 10px;
+    }
 </style>
\ No newline at end of file

From c24bbfa17613dec1ba3668a58001ae16ae8d7440 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 2 Aug 2022 16:39:52 +0800
Subject: [PATCH 16/78] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/icresicollect-add-or-update.vue      | 244 ++++++++++++++++++
 src/views/modules/user/icresicollect.vue      |  90 +++++++
 .../icresicollectvisitor-add-or-update.vue    | 237 +++++++++++++++++
 .../modules/user/icresicollectvisitor.vue     |  89 +++++++
 4 files changed, 660 insertions(+)
 create mode 100644 src/views/modules/user/icresicollect-add-or-update.vue
 create mode 100644 src/views/modules/user/icresicollect.vue
 create mode 100644 src/views/modules/user/icresicollectvisitor-add-or-update.vue
 create mode 100644 src/views/modules/user/icresicollectvisitor.vue

diff --git a/src/views/modules/user/icresicollect-add-or-update.vue b/src/views/modules/user/icresicollect-add-or-update.vue
new file mode 100644
index 000000000..c9761d39f
--- /dev/null
+++ b/src/views/modules/user/icresicollect-add-or-update.vue
@@ -0,0 +1,244 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="客户Id customer.id" prop="customerId">
+          <el-input v-model="dataForm.customerId" placeholder="客户Id customer.id"></el-input>
+      </el-form-item>
+          <el-form-item label="内部：internal；外部：external。" prop="origin">
+          <el-input v-model="dataForm.origin" placeholder="内部：internal；外部：external。"></el-input>
+      </el-form-item>
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+      </el-form-item>
+          <el-form-item label="组织Id" prop="agencyId">
+          <el-input v-model="dataForm.agencyId" placeholder="组织Id"></el-input>
+      </el-form-item>
+          <el-form-item label="组织的pids" prop="pids">
+          <el-input v-model="dataForm.pids" placeholder="组织的pids"></el-input>
+      </el-form-item>
+          <el-form-item label="所属小区ID；" prop="villageId">
+          <el-input v-model="dataForm.villageId" placeholder="所属小区ID；"></el-input>
+      </el-form-item>
+          <el-form-item label="所属小区名称" prop="villageName">
+          <el-input v-model="dataForm.villageName" placeholder="所属小区名称"></el-input>
+      </el-form-item>
+          <el-form-item label="所属楼宇Id" prop="buildId">
+          <el-input v-model="dataForm.buildId" placeholder="所属楼宇Id"></el-input>
+      </el-form-item>
+          <el-form-item label="所属楼宇名称" prop="buildName">
+          <el-input v-model="dataForm.buildName" placeholder="所属楼宇名称"></el-input>
+      </el-form-item>
+          <el-form-item label="单元id" prop="unitId">
+          <el-input v-model="dataForm.unitId" placeholder="单元id"></el-input>
+      </el-form-item>
+          <el-form-item label="单元名" prop="unitName">
+          <el-input v-model="dataForm.unitName" placeholder="单元名"></el-input>
+      </el-form-item>
+          <el-form-item label="所属家庭Id" prop="homeId">
+          <el-input v-model="dataForm.homeId" placeholder="所属家庭Id"></el-input>
+      </el-form-item>
+          <el-form-item label="房间名" prop="homeName">
+          <el-input v-model="dataForm.homeName" placeholder="房间名"></el-input>
+      </el-form-item>
+          <el-form-item label="详细地址" prop="address">
+          <el-input v-model="dataForm.address" placeholder="详细地址"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出" prop="houseType">
+          <el-input v-model="dataForm.houseType" placeholder="房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出"></el-input>
+      </el-form-item>
+          <el-form-item label="户主姓名" prop="houseHolderName">
+          <el-input v-model="dataForm.houseHolderName" placeholder="户主姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="居住成员人数" prop="totalResi">
+          <el-input v-model="dataForm.totalResi" placeholder="居住成员人数"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识 0.未删除 1.已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0.未删除 1.已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+          <el-form-item label="审核状态：0待审核 1未通过 2已通过" prop="checkState">
+          <el-input v-model="dataForm.checkState" placeholder="审核状态：0待审核 1未通过 2已通过"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+    import debounce from 'lodash/debounce'
+
+    export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {;
+        id: '',;
+        customerId: '',;
+        origin: '',;
+        gridId: '',;
+        agencyId: '',;
+        pids: '',;
+        villageId: '',;
+        villageName: '',;
+        buildId: '',;
+        buildName: '',;
+        unitId: '',;
+        unitName: '',;
+        homeId: '',;
+        homeName: '',;
+        address: '',;
+        houseType: '',;
+        houseHolderName: '',;
+        totalResi: '',;
+        delFlag: '',;
+        revision: '',;
+        createdBy: '',;
+        createdTime: '',;
+        updatedBy: '',;
+        updatedTime: '',;
+        checkState: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {;
+        customerId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        origin: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        agencyId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        pids: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        villageId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        villageName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        buildId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        buildName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        unitId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        unitName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        homeId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        homeName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        address: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        houseType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        houseHolderName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        totalResi: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        checkState: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id); {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.id}`;).then(({ data: res }) => {
+        if (res.code !== 0) {
+          ;return this.$message.error(res.msg);
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid); {
+          return false
+        }
+        this.$http]];#[!this.dataForm.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            #[[;return this.$message.error(res.msg);
+          }
+          this.$message({;
+            message;: this.$t('prompt.success'),;
+            type;: 'success',
+            duration;: 500,
+            onClose;: () => {
+              this.visible = false;
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/user/icresicollect.vue b/src/views/modules/user/icresicollect.vue
new file mode 100644
index 000000000..290db9dcf
--- /dev/null
+++ b/src/views/modules/user/icresicollect.vue
@@ -0,0 +1,90 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__icResiCollect}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':icResiCollect:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':icResiCollect:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </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="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="customerId" label="客户Id customer.id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="origin" label="内部：internal；外部：external。" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="agencyId" label="组织Id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="pids" label="组织的pids" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="villageId" label="所属小区ID；" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="villageName" label="所属小区名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildId" label="所属楼宇Id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildName" label="所属楼宇名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unitId" label="单元id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unitName" label="单元名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="homeId" label="所属家庭Id" 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="address" label="详细地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="houseType" label="房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="houseHolderName" label="户主姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="totalResi" label="居住成员人数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标识 0.未删除 1.已删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="checkState" label="审核状态：0待审核 1未通过 2已通过" 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">
+            <el-button v-if="$hasPermission(':icResiCollect:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':icResiCollect:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+    import mixinViewModule from '@/mixins/view-module'
+    import AddOrUpdate from './'
+
+    export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '//icResiCollect/page',
+        getDataListIsPage: true,
+        deleteURL: '//icResiCollect',
+        deleteIsBatch: true
+      },
+      dataForm: {;
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/user/icresicollectvisitor-add-or-update.vue b/src/views/modules/user/icresicollectvisitor-add-or-update.vue
new file mode 100644
index 000000000..4ca6d7740
--- /dev/null
+++ b/src/views/modules/user/icresicollectvisitor-add-or-update.vue
@@ -0,0 +1,237 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="客户Id customer.id" prop="customerId">
+          <el-input v-model="dataForm.customerId" placeholder="客户Id customer.id"></el-input>
+      </el-form-item>
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+      </el-form-item>
+          <el-form-item label="组织Id" prop="agencyId">
+          <el-input v-model="dataForm.agencyId" placeholder="组织Id"></el-input>
+      </el-form-item>
+          <el-form-item label="组织的pids" prop="pids">
+          <el-input v-model="dataForm.pids" placeholder="组织的pids"></el-input>
+      </el-form-item>
+          <el-form-item label="所属小区ID；" prop="villageId">
+          <el-input v-model="dataForm.villageId" placeholder="所属小区ID；"></el-input>
+      </el-form-item>
+          <el-form-item label="所属小区名称" prop="villageName">
+          <el-input v-model="dataForm.villageName" placeholder="所属小区名称"></el-input>
+      </el-form-item>
+          <el-form-item label="所属楼宇Id" prop="buildId">
+          <el-input v-model="dataForm.buildId" placeholder="所属楼宇Id"></el-input>
+      </el-form-item>
+          <el-form-item label="所属楼宇名称" prop="buildName">
+          <el-input v-model="dataForm.buildName" placeholder="所属楼宇名称"></el-input>
+      </el-form-item>
+          <el-form-item label="单元id" prop="unitId">
+          <el-input v-model="dataForm.unitId" placeholder="单元id"></el-input>
+      </el-form-item>
+          <el-form-item label="单元名" prop="unitName">
+          <el-input v-model="dataForm.unitName" placeholder="单元名"></el-input>
+      </el-form-item>
+          <el-form-item label="所属家庭Id" prop="homeId">
+          <el-input v-model="dataForm.homeId" placeholder="所属家庭Id"></el-input>
+      </el-form-item>
+          <el-form-item label="房间名" prop="homeName">
+          <el-input v-model="dataForm.homeName" placeholder="房间名"></el-input>
+      </el-form-item>
+          <el-form-item label="姓名" prop="name">
+          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="手机号" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+      </el-form-item>
+          <el-form-item label="身份证号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="身份证号"></el-input>
+      </el-form-item>
+          <el-form-item label="来访事由" prop="comeReason">
+          <el-input v-model="dataForm.comeReason" placeholder="来访事由"></el-input>
+      </el-form-item>
+          <el-form-item label="人脸照片" prop="faceImg">
+          <el-input v-model="dataForm.faceImg" placeholder="人脸照片"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识 0.未删除 1.已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0.未删除 1.已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+    import debounce from 'lodash/debounce'
+
+    export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {;
+        id: '',;
+        customerId: '',;
+        gridId: '',;
+        agencyId: '',;
+        pids: '',;
+        villageId: '',;
+        villageName: '',;
+        buildId: '',;
+        buildName: '',;
+        unitId: '',;
+        unitName: '',;
+        homeId: '',;
+        homeName: '',;
+        name: '',;
+        mobile: '',;
+        idCard: '',;
+        comeReason: '',;
+        faceImg: '',;
+        delFlag: '',;
+        revision: '',;
+        createdBy: '',;
+        createdTime: '',;
+        updatedBy: '',;
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {;
+        customerId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        agencyId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        pids: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        villageId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        villageName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        buildId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        buildName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        unitId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        unitName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        homeId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        homeName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        idCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        comeReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        faceImg: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id); {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.id}`;).then(({ data: res }) => {
+        if (res.code !== 0) {
+          ;return this.$message.error(res.msg);
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid); {
+          return false
+        }
+        this.$http]];#[!this.dataForm.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            #[[;return this.$message.error(res.msg);
+          }
+          this.$message({;
+            message;: this.$t('prompt.success'),;
+            type;: 'success',
+            duration;: 500,
+            onClose;: () => {
+              this.visible = false;
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/user/icresicollectvisitor.vue b/src/views/modules/user/icresicollectvisitor.vue
new file mode 100644
index 000000000..044f28af8
--- /dev/null
+++ b/src/views/modules/user/icresicollectvisitor.vue
@@ -0,0 +1,89 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__icResiCollectVisitor}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':icResiCollectVisitor:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':icResiCollectVisitor:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </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="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="customerId" label="客户Id customer.id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="agencyId" label="组织Id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="pids" label="组织的pids" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="villageId" label="所属小区ID；" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="villageName" label="所属小区名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildId" label="所属楼宇Id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildName" label="所属楼宇名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unitId" label="单元id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unitName" label="单元名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="homeId" label="所属家庭Id" 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="name" 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="idCard" label="身份证号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="comeReason" label="来访事由" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="faceImg" label="人脸照片" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标识 0.未删除 1.已删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" 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">
+            <el-button v-if="$hasPermission(':icResiCollectVisitor:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':icResiCollectVisitor:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+    import mixinViewModule from '@/mixins/view-module'
+    import AddOrUpdate from './'
+
+    export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '//icResiCollectVisitor/page',
+        getDataListIsPage: true,
+        deleteURL: '//icResiCollectVisitor',
+        deleteIsBatch: true
+      },
+      dataForm: {;
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From 6d3edcdade5e40c1e0a7f731c5e4e81ebf5a27c2 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 2 Aug 2022 17:38:31 +0800
Subject: [PATCH 17/78] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/icresicollect-add-or-update.vue      | 244 ------------------
 src/views/modules/user/icresicollect.vue      |  90 -------
 .../icresicollectvisitor-add-or-update.vue    | 237 -----------------
 .../modules/user/icresicollectvisitor.vue     |  89 -------
 4 files changed, 660 deletions(-)
 delete mode 100644 src/views/modules/user/icresicollect-add-or-update.vue
 delete mode 100644 src/views/modules/user/icresicollect.vue
 delete mode 100644 src/views/modules/user/icresicollectvisitor-add-or-update.vue
 delete mode 100644 src/views/modules/user/icresicollectvisitor.vue

diff --git a/src/views/modules/user/icresicollect-add-or-update.vue b/src/views/modules/user/icresicollect-add-or-update.vue
deleted file mode 100644
index c9761d39f..000000000
--- a/src/views/modules/user/icresicollect-add-or-update.vue
+++ /dev/null
@@ -1,244 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="客户Id customer.id" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户Id customer.id"></el-input>
-      </el-form-item>
-          <el-form-item label="内部：internal；外部：external。" prop="origin">
-          <el-input v-model="dataForm.origin" placeholder="内部：internal；外部：external。"></el-input>
-      </el-form-item>
-          <el-form-item label="网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="组织Id" prop="agencyId">
-          <el-input v-model="dataForm.agencyId" placeholder="组织Id"></el-input>
-      </el-form-item>
-          <el-form-item label="组织的pids" prop="pids">
-          <el-input v-model="dataForm.pids" placeholder="组织的pids"></el-input>
-      </el-form-item>
-          <el-form-item label="所属小区ID；" prop="villageId">
-          <el-input v-model="dataForm.villageId" placeholder="所属小区ID；"></el-input>
-      </el-form-item>
-          <el-form-item label="所属小区名称" prop="villageName">
-          <el-input v-model="dataForm.villageName" placeholder="所属小区名称"></el-input>
-      </el-form-item>
-          <el-form-item label="所属楼宇Id" prop="buildId">
-          <el-input v-model="dataForm.buildId" placeholder="所属楼宇Id"></el-input>
-      </el-form-item>
-          <el-form-item label="所属楼宇名称" prop="buildName">
-          <el-input v-model="dataForm.buildName" placeholder="所属楼宇名称"></el-input>
-      </el-form-item>
-          <el-form-item label="单元id" prop="unitId">
-          <el-input v-model="dataForm.unitId" placeholder="单元id"></el-input>
-      </el-form-item>
-          <el-form-item label="单元名" prop="unitName">
-          <el-input v-model="dataForm.unitName" placeholder="单元名"></el-input>
-      </el-form-item>
-          <el-form-item label="所属家庭Id" prop="homeId">
-          <el-input v-model="dataForm.homeId" placeholder="所属家庭Id"></el-input>
-      </el-form-item>
-          <el-form-item label="房间名" prop="homeName">
-          <el-input v-model="dataForm.homeName" placeholder="房间名"></el-input>
-      </el-form-item>
-          <el-form-item label="详细地址" prop="address">
-          <el-input v-model="dataForm.address" placeholder="详细地址"></el-input>
-      </el-form-item>
-          <el-form-item label="房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出" prop="houseType">
-          <el-input v-model="dataForm.houseType" placeholder="房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出"></el-input>
-      </el-form-item>
-          <el-form-item label="户主姓名" prop="houseHolderName">
-          <el-input v-model="dataForm.houseHolderName" placeholder="户主姓名"></el-input>
-      </el-form-item>
-          <el-form-item label="居住成员人数" prop="totalResi">
-          <el-input v-model="dataForm.totalResi" placeholder="居住成员人数"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识 0.未删除 1.已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0.未删除 1.已删除"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-          <el-form-item label="审核状态：0待审核 1未通过 2已通过" prop="checkState">
-          <el-input v-model="dataForm.checkState" placeholder="审核状态：0待审核 1未通过 2已通过"></el-input>
-      </el-form-item>
-      </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script>
-    import debounce from 'lodash/debounce'
-
-    export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {;
-        id: '',;
-        customerId: '',;
-        origin: '',;
-        gridId: '',;
-        agencyId: '',;
-        pids: '',;
-        villageId: '',;
-        villageName: '',;
-        buildId: '',;
-        buildName: '',;
-        unitId: '',;
-        unitName: '',;
-        homeId: '',;
-        homeName: '',;
-        address: '',;
-        houseType: '',;
-        houseHolderName: '',;
-        totalResi: '',;
-        delFlag: '',;
-        revision: '',;
-        createdBy: '',;
-        createdTime: '',;
-        updatedBy: '',;
-        updatedTime: '',;
-        checkState: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {;
-        customerId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        origin: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        agencyId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        pids: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        villageId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        villageName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        buildId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        buildName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        unitId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        unitName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        homeId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        homeName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        address: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        houseType: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        houseHolderName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        totalResi: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        checkState: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true;
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id); {
-          this.getInfo()
-        }
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.id}`;).then(({ data: res }) => {
-        if (res.code !== 0) {
-          ;return this.$message.error(res.msg);
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid); {
-          return false
-        }
-        this.$http]];#[!this.dataForm.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            #[[;return this.$message.error(res.msg);
-          }
-          this.$message({;
-            message;: this.$t('prompt.success'),;
-            type;: 'success',
-            duration;: 500,
-            onClose;: () => {
-              this.visible = false;
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
-}
-</script>
diff --git a/src/views/modules/user/icresicollect.vue b/src/views/modules/user/icresicollect.vue
deleted file mode 100644
index 290db9dcf..000000000
--- a/src/views/modules/user/icresicollect.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__icResiCollect}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission(':icResiCollect:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission(':icResiCollect:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-      </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="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="customerId" label="客户Id customer.id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="origin" label="内部：internal；外部：external。" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="agencyId" label="组织Id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pids" label="组织的pids" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="villageId" label="所属小区ID；" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="villageName" label="所属小区名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildId" label="所属楼宇Id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildName" label="所属楼宇名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="unitId" label="单元id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="unitName" label="单元名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="homeId" label="所属家庭Id" 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="address" label="详细地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseType" label="房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseHolderName" label="户主姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="totalResi" label="居住成员人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标识 0.未删除 1.已删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="checkState" label="审核状态：0待审核 1未通过 2已通过" 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">
-            <el-button v-if="$hasPermission(':icResiCollect:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':icResiCollect:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
-</template>
-
-<script>
-    import mixinViewModule from '@/mixins/view-module'
-    import AddOrUpdate from './'
-
-    export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '//icResiCollect/page',
-        getDataListIsPage: true,
-        deleteURL: '//icResiCollect',
-        deleteIsBatch: true
-      },
-      dataForm: {;
-        id: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
-}
-</script>
diff --git a/src/views/modules/user/icresicollectvisitor-add-or-update.vue b/src/views/modules/user/icresicollectvisitor-add-or-update.vue
deleted file mode 100644
index 4ca6d7740..000000000
--- a/src/views/modules/user/icresicollectvisitor-add-or-update.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="客户Id customer.id" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户Id customer.id"></el-input>
-      </el-form-item>
-          <el-form-item label="网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="组织Id" prop="agencyId">
-          <el-input v-model="dataForm.agencyId" placeholder="组织Id"></el-input>
-      </el-form-item>
-          <el-form-item label="组织的pids" prop="pids">
-          <el-input v-model="dataForm.pids" placeholder="组织的pids"></el-input>
-      </el-form-item>
-          <el-form-item label="所属小区ID；" prop="villageId">
-          <el-input v-model="dataForm.villageId" placeholder="所属小区ID；"></el-input>
-      </el-form-item>
-          <el-form-item label="所属小区名称" prop="villageName">
-          <el-input v-model="dataForm.villageName" placeholder="所属小区名称"></el-input>
-      </el-form-item>
-          <el-form-item label="所属楼宇Id" prop="buildId">
-          <el-input v-model="dataForm.buildId" placeholder="所属楼宇Id"></el-input>
-      </el-form-item>
-          <el-form-item label="所属楼宇名称" prop="buildName">
-          <el-input v-model="dataForm.buildName" placeholder="所属楼宇名称"></el-input>
-      </el-form-item>
-          <el-form-item label="单元id" prop="unitId">
-          <el-input v-model="dataForm.unitId" placeholder="单元id"></el-input>
-      </el-form-item>
-          <el-form-item label="单元名" prop="unitName">
-          <el-input v-model="dataForm.unitName" placeholder="单元名"></el-input>
-      </el-form-item>
-          <el-form-item label="所属家庭Id" prop="homeId">
-          <el-input v-model="dataForm.homeId" placeholder="所属家庭Id"></el-input>
-      </el-form-item>
-          <el-form-item label="房间名" prop="homeName">
-          <el-input v-model="dataForm.homeName" placeholder="房间名"></el-input>
-      </el-form-item>
-          <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
-      </el-form-item>
-          <el-form-item label="手机号" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
-      </el-form-item>
-          <el-form-item label="身份证号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证号"></el-input>
-      </el-form-item>
-          <el-form-item label="来访事由" prop="comeReason">
-          <el-input v-model="dataForm.comeReason" placeholder="来访事由"></el-input>
-      </el-form-item>
-          <el-form-item label="人脸照片" prop="faceImg">
-          <el-input v-model="dataForm.faceImg" placeholder="人脸照片"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识 0.未删除 1.已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0.未删除 1.已删除"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-      </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script>
-    import debounce from 'lodash/debounce'
-
-    export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {;
-        id: '',;
-        customerId: '',;
-        gridId: '',;
-        agencyId: '',;
-        pids: '',;
-        villageId: '',;
-        villageName: '',;
-        buildId: '',;
-        buildName: '',;
-        unitId: '',;
-        unitName: '',;
-        homeId: '',;
-        homeName: '',;
-        name: '',;
-        mobile: '',;
-        idCard: '',;
-        comeReason: '',;
-        faceImg: '',;
-        delFlag: '',;
-        revision: '',;
-        createdBy: '',;
-        createdTime: '',;
-        updatedBy: '',;
-        updatedTime: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {;
-        customerId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        agencyId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        pids: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        villageId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        villageName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        buildId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        buildName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        unitId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        unitName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        homeId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        homeName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        idCard: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        comeReason: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        faceImg: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true;
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id); {
-          this.getInfo()
-        }
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.id}`;).then(({ data: res }) => {
-        if (res.code !== 0) {
-          ;return this.$message.error(res.msg);
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid); {
-          return false
-        }
-        this.$http]];#[!this.dataForm.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            #[[;return this.$message.error(res.msg);
-          }
-          this.$message({;
-            message;: this.$t('prompt.success'),;
-            type;: 'success',
-            duration;: 500,
-            onClose;: () => {
-              this.visible = false;
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
-}
-</script>
diff --git a/src/views/modules/user/icresicollectvisitor.vue b/src/views/modules/user/icresicollectvisitor.vue
deleted file mode 100644
index 044f28af8..000000000
--- a/src/views/modules/user/icresicollectvisitor.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__icResiCollectVisitor}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission(':icResiCollectVisitor:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission(':icResiCollectVisitor:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-      </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="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="customerId" label="客户Id customer.id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="agencyId" label="组织Id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pids" label="组织的pids" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="villageId" label="所属小区ID；" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="villageName" label="所属小区名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildId" label="所属楼宇Id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildName" label="所属楼宇名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="unitId" label="单元id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="unitName" label="单元名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="homeId" label="所属家庭Id" 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="name" 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="idCard" label="身份证号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="comeReason" label="来访事由" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="faceImg" label="人脸照片" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标识 0.未删除 1.已删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" 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">
-            <el-button v-if="$hasPermission(':icResiCollectVisitor:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':icResiCollectVisitor:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
-</template>
-
-<script>
-    import mixinViewModule from '@/mixins/view-module'
-    import AddOrUpdate from './'
-
-    export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '//icResiCollectVisitor/page',
-        getDataListIsPage: true,
-        deleteURL: '//icResiCollectVisitor',
-        deleteIsBatch: true
-      },
-      dataForm: {;
-        id: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
-}
-</script>

From aa096921c951babc6d841d7d2056d64fad73e313 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 5 Aug 2022 15:10:55 +0800
Subject: [PATCH 18/78] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/collect.vue  | 262 ++++++++++++++---
 src/views/modules/base/roomForm.vue | 428 ++++++++++++++++++++++++++++
 src/views/modules/base/visitor.vue  | 246 ++++++++++++++++
 3 files changed, 899 insertions(+), 37 deletions(-)
 create mode 100644 src/views/modules/base/roomForm.vue
 create mode 100644 src/views/modules/base/visitor.vue

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 3d6cdb81a..4ea60259e 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -7,7 +7,7 @@
         :model="fmData"
         class="demo-form-inline"
       >
-        <el-form-item
+        <!-- <el-form-item
           v-if="communityList.length > 0"
           label="所在社区"
           prop="orgId"
@@ -27,7 +27,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="居住地址" prop="address">
           <el-input
             v-model="fmData.address"
@@ -38,6 +38,16 @@
           >
           </el-input>
         </el-form-item>
+        <el-form-item label="户籍地址" prop="domicilePlace">
+          <el-input
+            v-model="fmData.domicilePlace"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
         <el-form-item label="填写时间" prop="startTime">
           <el-date-picker
             v-model="timeRange"
@@ -51,16 +61,6 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="户籍地址" prop="domicilePlace">
-          <el-input
-            v-model="fmData.domicilePlace"
-            class="resi-cell-input"
-            size="small"
-            clearable
-            placeholder="请输入"
-          >
-          </el-input>
-        </el-form-item>
         <el-form-item>
           <el-button
             class="diy-button--search"
@@ -105,7 +105,12 @@
           min-width="140"
           label="居住地址"
           :show-overflow-tooltip="true"
-        />
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.homeId == 'other'" class="badge">房屋缺失</span>
+            <span>{{scope.row.address}}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="houseType"
           align="center"
@@ -146,6 +151,17 @@
           label="成员手机号"
           :show-overflow-tooltip="true"
         />
+        <el-table-column
+          prop="relationship"
+          min-width="120"
+          align="center"
+          label="与户主关系"
+          :show-overflow-tooltip="true"
+        >
+        <template slot-scope="scope">
+          <span>{{getRelationshipName(scope.row.relationship)}}</span>
+        </template>
+        </el-table-column>
         <el-table-column
           prop="heSuanCount"
           width="120"
@@ -169,14 +185,14 @@
           prop="domicilePlace"
           min-width="140"
           align="center"
-          label="户籍所在地"
+          label="户籍地址"
           :show-overflow-tooltip="true"
         />
         <el-table-column
           prop="workPlace"
           min-width="120"
           align="center"
-          label="单位或学校 "
+          label="单位名称"
           :show-overflow-tooltip="true"
         />
         <el-table-column
@@ -186,15 +202,54 @@
           :show-overflow-tooltip="true"
         >
         </el-table-column>
+        <el-table-column
+          prop="faceImg"
+          min-width="120"
+          align="center"
+          label="人脸"
+        >
+        <template slot-scope="scope">
+          <el-image 
+            style="max-height: 50px"
+            :src="scope.row.faceImg" 
+            :preview-src-list="[scope.row.faceImg]">
+            <div slot="error" class="image-slot">
+              <!-- <i class="el-icon-picture-outline"></i> -->
+            </div>
+          </el-image>
+        </template>
+        </el-table-column>
+        <el-table-column
+          prop="checkState"
+          min-width="120"
+          align="center"
+          label="状态"
+          :show-overflow-tooltip="true"
+        >
+        <template slot-scope="scope">
+          <span v-if="scope.row.checkState === '0'">未审核</span>
+          <span v-else-if="scope.row.checkState === '1'">未通过</span>
+          <span v-else-if="scope.row.checkState === '2'">已通过</span>
+          <span v-else></span>
+        </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
             <el-button
               type="text"
               class="div-table-button--detail"
               size="small"
-              @click="handleWatch(scope.row)"
+              @click="handleWatch('look', scope.row)"
               >查看</el-button
             >
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              v-if="scope.row.checkState === '0'"
+              @click="handleWatch('check', scope.row)"
+              >审核</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -274,7 +329,7 @@
           border
           style="width: 1060px; margin: 20px"
           class="resi-table"
-          :height="tableHeight"
+          :height="dialogTableHeight"
         >
           <el-table-column
             label="序号"
@@ -344,16 +399,35 @@
           >
           </el-table-column>
         </el-table>
+        <div class="resi-btns">
+          <el-button @click="formShow = false">{{ $t('cancel') }}</el-button>
+          <el-button v-if="dialogType == 'check'" type="danger" @click="checkHandle('1')">{{ $t('checkBTGBtn') }}</el-button>
+          <el-button v-if="dialogType == 'check'" type="danger" @click="showAddHouse">{{ $t('checkTGBtn') }}</el-button>
+        </div>
       </div>
     </el-dialog>
+    <!-- 新增房屋弹出框 -->
+    <el-dialog :visible.sync="addHouseShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="新增房屋"
+               width="900px"
+               top="5vh"
+               class="dialog-h"
+               @closed="addHouseShow = false">
+      <room-form ref="ref_form"
+                 @dialogCancle="addHouseShow = false"
+                 @dialogOk="checkHandle('2')"></room-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import axios from "axios";
+import roomForm from './roomForm'
 
 export default {
   data() {
@@ -381,7 +455,16 @@ export default {
       spanIndex: [], // 合并的行
       importBtnTitle: "导入",
       importLoading: false,
-    };
+      addHouseShow: false,
+      dialogType: 'look', // 对话框是check审核还是look查看
+      relationshipOptions: [
+        { label: '本人', value: '0' },
+        { label: '父母', value: '1' }
+      ]
+    }
+  },
+  components: {
+    roomForm
   },
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
@@ -390,6 +473,11 @@ export default {
       const _h = this.clientHeight - 360;
       return this.$store.state.inIframe ? h : _h;
     },
+    dialogTableHeight() {
+      const h = this.clientHeight - 460 + this.iframeHeigh;
+      const _h = this.clientHeight - 460;
+      return this.$store.state.inIframe ? h : _h;
+    },
   },
   watch: {
     timeRange(val) {
@@ -403,10 +491,30 @@ export default {
     },
   },
   mounted() {
-    this.getcommunityList();
-    this.getTableData();
+    // this.getcommunityList();
+    // this.getDictList()
+    this.getTableData()
   },
   methods: {
+    async getDictList() {
+      const url = "/sys/dict/data/relationship"
+      const { data, code, msg } = await requestGet(url)
+
+      if (code === 0) {
+        this.relationshipOptions = { ...res.data }
+      } else {
+        this.$message.success("操作失败！")
+      }
+    },
+    getRelationshipName (value) {
+      let label = ''
+      this.relationshipOptions.forEach(item => {
+        if (item.value == value) {
+          label = item.label
+        }
+      })
+      return label
+    },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
       // console.log('row-----r', row)
       // console.log('column-----c', column)
@@ -415,7 +523,9 @@ export default {
         columnIndex === 1 ||
         columnIndex === 2 ||
         columnIndex === 3 ||
-        columnIndex === 4
+        columnIndex === 4 ||
+        columnIndex === 15 ||
+        columnIndex === 16
       ) {
         let index = this.spanIndex.findIndex(
           (item) => item.firstIndex === rowIndex
@@ -493,7 +603,8 @@ export default {
       this.handleSearch();
     },
 
-    async handleWatch(row) {
+    async handleWatch(type, row) {
+      this.dialogType = type
       // this.formShow = true;
       await nextTick();
       const url = "/epmetuser/icresicollect/detail";
@@ -552,33 +663,33 @@ export default {
       }
     },
     async getTableData() {
-      const url = "/epmetuser/icresicollect/list";
-      const { pageSize, pageNo, fmData } = this;
+      const url = "/epmetuser/icresicollect/list"
+      const { pageSize, pageNo, fmData } = this
       const { data, code, msg } = await requestPost(url, {
         pageSize,
         pageNo,
         ...fmData,
-      });
+      })
       if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！");
-        this.total = data.total || 0;
-        let _i = 0;
-        let arr = [];
+        console.log("列表请求成功！！！！！！！！！！！！！！")
+        this.total = data.total || 0
+        let _i = 0
+        let arr = []
         this.spanIndex =
           data.list &&
           data.list.map((item, index) => {
-            if (index == 0) _i = 0;
+            if (index == 0) _i = 0
             else _i = _i + data.list[index - 1].list.length;
-            arr.push(_i);
-            console.log("_i-----", _i, arr);
+            arr.push(_i)
+            // console.log("_i-----", _i, arr)
             // if (index === data.list.length - 1) firstIndex = _i - item.list.length
             return {
               firstIndex: _i,
               len: item.list.length,
-            };
-          });
-        this.tableData = data.list && this.formatArr(data.list);
-        console.log("tableData----0", this.spanIndex);
+            }
+          })
+        this.tableData = data.list && this.formatArr(data.list)
+        console.log("tableData----0", this.spanIndex)
       } else {
       }
     },
@@ -608,6 +719,76 @@ export default {
       });
       return res;
     },
+    showAddHouse () {
+      if (this.dataForm.homeId == 'other') {
+        this.addHouseShow = true
+        this.$nextTick(() => {
+          this.$refs.ref_form.initForm('add', null, this.dataForm.id)
+        })
+      } else {
+        this.checkHandle('2')
+      }
+    },
+    // 审核提交方法
+    checkHandle (type) {
+      console.log('xxxxx', this.dataForm)
+      const params = {
+        id: this.dataForm.id,
+        checkState: type, // 0-未审核 1-未通过 2-已通过
+        checkReason: '',
+        buildingUnitId: this.dataForm.buildingUnitId || '',
+        doorName: this.dataForm.doorName || ''
+      }
+      if (type == '1') {
+        this.$prompt('请输入不通过的原因', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(({ value }) => {
+          params.checkReason = value
+          this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            }
+            this.formShow = false
+            this.getTableData()
+            // 调用文件下发权限接口
+            // this.fileJurisdiction(params)
+          }).catch(() => {})
+        }).catch(() => {
+          // 取消输入原因  
+        })
+      } else {
+        this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.addHouseShow = false
+          this.formShow = false
+          this.getTableData()
+          // 调用文件下发权限接口
+          // this.fileJurisdiction(params)
+        }).catch(() => {})
+      }
+    },
+    // 文件下发权限接口
+    fileJurisdiction (params) {
+      this.$http.post('/pli/power/rentContractInfo/send', params).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.disabledBtn = false
+              this.checkVisible = false
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+        })
+      }).catch(() => {})
+    },
   },
 };
 </script>
@@ -650,4 +831,11 @@ export default {
 .wd50 {
   min-width: 200px;
 }
+.badge {
+  display: block;
+  color: #F1F2E5;
+  background-color: #D7000F;
+  border-radius: 12px;
+  width: 70px;
+}
 </style>
diff --git a/src/views/modules/base/roomForm.vue b/src/views/modules/base/roomForm.vue
new file mode 100644
index 000000000..3d2c1b98c
--- /dev/null
+++ b/src/views/modules/base/roomForm.vue
@@ -0,0 +1,428 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="false"
+               :model="dataForm"
+               :rules="dataRule"
+               :disabled="formType === 'detail'"
+               class="form">
+
+        <el-form-item label="所属楼栋"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{ dataForm.neighborHoodName }}-{{dataForm.label}}</span>
+        </el-form-item>
+
+        <el-form-item label="单元号"
+                      prop="buildingUnitId"
+                      label-width="150px"
+                      style="display: block">
+          <el-select class="item_width_1"
+                     v-model="dataForm.buildingUnitId"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in unitList"
+                       :key="item.id"
+                       :label="item.unitName"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="门牌号"
+                      prop="doorName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入门牌号"
+                    v-model="dataForm.doorName">
+          </el-input>
+        </el-form-item>
+        <el-form-item v-if="formType != 'detail'" label="房屋编码"
+                      prop="coding"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    maxlength="50"
+                    placeholder="请输入楼栋编码"
+                    v-model="dataForm.coding">
+          
+          </el-input>
+          <el-button style="margin-left: 10px"
+                       type="primary"
+                       size="small"
+                       @click="handleCode">生成</el-button>
+        </el-form-item>
+        <div v-if="formType === 'detail'">
+          <el-form-item label="房屋编码"
+                        prop="houseCode"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      maxlength="30"
+                      v-model="dataForm.houseCode">
+            </el-input>
+          </el-form-item>
+          <div v-if="dataForm.houseQrcodeUrl"
+               style="display: flex;flex-direction: column;">
+            <img style="margin-left: 70px;width: 200px;"
+                 :src="dataForm.houseQrcodeUrl">
+            <a style="margin-left: 80px"
+               :href="dataForm.houseQrcodeUrl"
+               target="_blank">下载</a>
+          </div>
+        </div>
+        <!-- <el-form-item label="居住人数"
+                      style="display: block"
+                      prop="realPerson"
+                      label-width="150px">
+          <el-input-number class="item_width_4"
+                           v-model="dataForm.realPerson"
+                           :min="0"
+                           :max="9999"
+                           label="居住人数"></el-input-number>
+        </el-form-item> -->
+        <el-form-item label="房屋类型"
+                      prop="houseType"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="houseType">
+
+            <el-radio :label="'1'">楼房</el-radio>
+            <el-radio :label="'2'">平房</el-radio>
+            <el-radio :label="'3'">别墅</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="房屋用途"
+                      prop="purpose"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="purpose">
+
+            <el-radio :label="'1'">住宅</el-radio>
+            <el-radio :label="'2'">商业</el-radio>
+            <el-radio :label="'3'">办公</el-radio>
+            <el-radio :label="'4'">工业</el-radio>
+            <el-radio :label="'5'">仓储</el-radio>
+            <el-radio :label="'6'">商住混用</el-radio>
+            <el-radio :label="'7'">其他</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="房屋状态"
+                      prop="rentFlag"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="rentFlag">
+
+            <el-radio :label="1">出租</el-radio>
+            <el-radio :label="2">闲置</el-radio>
+            <el-radio :label="0">自住</el-radio>
+            <el-radio :label="3">未出售</el-radio>
+
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="房主姓名"
+                      prop="ownerName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="30"
+                    placeholder="请输入房主姓名"
+                    v-model="dataForm.ownerName">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="联系方式"
+                      prop="ownerPhone"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type='number'
+                    placeholder="请输入联系方式"
+                    v-model="dataForm.ownerPhone">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="房主身份证"
+                      prop="ownerIdCard"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入房主身份证"
+                    v-model="dataForm.ownerIdCard">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="30"
+                    placeholder="请输入备注"
+                    v-model="dataForm.remark">
+          </el-input>
+        </el-form-item>
+      </el-form>
+
+    </div>
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      btnDisable: false,
+      unitList: [],
+
+      houseId: '', //房屋ID
+      houseType: '1',
+      purpose: '1',
+      rentFlag: 0,
+      dataForm: {
+        neighborHoodId: '', // 所属小区ID
+        buildingId: '',//所属楼栋ID
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '',//房屋类型【楼房，平房，别墅】
+        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
+        ownerPhone: '', //联系方式
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '',
+        // realPerson: 0,
+        coding: '',
+        sysCoding: ''
+      },
+
+      keyWords: '',
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+    async initForm (type, row, id) {
+
+      this.$refs.ref_form.resetFields()
+      const url = '/epmetuser/icresicollect/getHouseDetailByCollect'
+      const params = {
+        id
+      }
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.formType = type
+
+        this.dataForm = { ...data }
+        // this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+        // this.dataForm.buildingId = this.agencyObj.id
+
+        await this.loadUnitList()
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //加载单元
+    async loadUnitList () {
+      const url = '/gov/org/building/buildingunitlist'
+
+      let params = {
+        buildingId: this.dataForm.buildingId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.unitList = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async handleCode() {
+      if (!this.dataForm.buildingUnitId) return this.$message.error('请选择单元')
+      const { data, code, msg } = await requestPost(
+        "/gov/org/houseInformation/getHouseCoding/" + this.dataForm.buildingUnitId);
+      if (msg == "success" && code == 0) {
+        this.dataForm.coding = data.coding
+        this.dataForm.sysCoding = data.sysCoding
+        
+      } 
+    },
+
+    async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+
+      this.dataForm.houseType = this.houseType
+      this.dataForm.purpose = this.purpose
+      this.dataForm.rentFlag = this.rentFlag
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          this.btnDisable = false
+          app.util.validateRule(messageObj)
+        } else {
+          this.addRoom()
+        }
+
+      })
+    },
+
+    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) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的身份证号码'
+        })
+        return false;
+      }
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
+
+      let url = ''
+
+      if (this.formType === 'add') {
+        url = '/gov/org/house/houseadd'
+      } else {
+        url = '/gov/org/house/houseupdate'
+        this.dataForm.houseId = this.houseId
+      }
+console.log('11111111111111111', this.dataForm)
+return
+      const { data, code, msg } = await requestPost(url, this.dataForm)
+      this.btnDisable = false
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.houseId = '' //房屋ID
+      this.houseType = '1'
+      this.purpose = '1'
+      this.rentFlag = 0
+      this.dataForm = {
+        neighborHoodId: '', // 所属小区ID
+        buildingId: '',//所属楼栋ID
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '1',//房屋类型【楼房，平房，别墅】
+        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//是否出租【是：1，否：0】
+        ownerPhone: '', //联系方式
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '', // 备注
+        coding: '',
+        sysCoding: ''
+      }
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        buildingUnitId: [
+          { required: true, message: '所属单元不能为空', trigger: 'blur' },
+        ],
+        doorName: [
+          { required: true, message: '门牌号不能为空', trigger: 'blur' }
+        ],
+        coding: [
+          { required: true, message: '房屋编码不能为空', trigger: 'blur' }
+        ],
+        houseType: [
+          { required: true, message: '房屋类型不能为空', trigger: 'blur' }
+        ],
+        purpose: [
+          { required: true, message: '房屋用途不能为空', trigger: 'blur' }
+        ],
+        rentFlag: [
+          { required: true, message: '是否出租不能为空', trigger: 'blur' }
+        ],
+        ownerPhone: [
+          { required: false }
+        ],
+        ownerName: [
+          { required: false }
+        ],
+        ownerIdCard: [
+          { required: false }
+        ],
+        remark: [
+          { required: false }
+        ],
+      }
+    },
+
+  },
+  props: {}
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
diff --git a/src/views/modules/base/visitor.vue b/src/views/modules/base/visitor.vue
new file mode 100644
index 000000000..3fd00ef88
--- /dev/null
+++ b/src/views/modules/base/visitor.vue
@@ -0,0 +1,246 @@
+<template>
+  <div class="resi-container">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        class="demo-form-inline"
+      >
+        <el-form-item label="填写时间" prop="startTime">
+          <el-date-picker
+            v-model="timeRange"
+            type="daterange"
+            clearable
+            size="small"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </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>
+    </el-card>
+    <el-card class="resi-card-table">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :height="tableHeight"
+      >
+        <el-table-column label="序号" type="index" align="center" width="50" />
+        <el-table-column
+          prop="address"
+          width="240"
+          label="目的地"
+          align="center"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="name"
+          width="150"
+          label="姓名"
+          align="center"
+        />
+        <el-table-column
+          prop="mobile"
+          width="180"
+          label="手机号"
+          align="center"
+        />
+        <el-table-column
+          prop="idCard"
+          width="240"
+          label="身份证号"
+          align="center"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="comeReason"
+          width="320"
+          label="来访事由"
+          align="center"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="faceImg"
+          min-width="120"
+          align="center"
+          label="人脸"
+        >
+        <template slot-scope="scope">
+          <el-image 
+            style="max-height: 50px"
+            :src="scope.row.faceImg" 
+            :preview-src-list="[scope.row.faceImg]">
+            <div slot="error" class="image-slot">
+              <!-- <i class="el-icon-picture-outline"></i> -->
+            </div>
+          </el-image>
+        </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="parseInt(pageSize)"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request"
+import { mapGetters } from "vuex"
+
+export default {
+  data() {
+    return {
+      openSearch: false,
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      tableData: [],
+      timeRange: "",
+      fmData: {
+        startTime: "",
+        endTime: "",
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    tableHeight() {
+      const h = this.clientHeight - 360 + this.iframeHeigh
+      const _h = this.clientHeight - 360
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.fmData.startTime = val[0]
+        this.fmData.endTime = val[1]
+      } else {
+        this.fmData.startTime = ""
+        this.fmData.endTime = ""
+      }
+    },
+  },
+  mounted() {
+    this.getTableData()
+  },
+  methods: {  
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      window.localStorage.setItem("pageSize", val)
+      this.getTableData()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.pageNo = val
+      this.getTableData()
+    },
+
+    handleSearch(val) {
+      console.log(this.fmData)
+      this.pageNo = 1
+      this.getTableData()
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+      this.timeRange = ""
+      this.fmData.startTime = ""
+      this.fmData.endTime = ""
+      this.handleSearch()
+    },
+    async getTableData() {
+      const url = "/epmetuser/icResiCollectVisitor/list"
+      const { pageSize, pageNo, fmData } = this
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...fmData,
+      })
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！")
+        this.total = data.total || 0
+        this.tableData = data.list
+      }
+    }
+  },
+};
+</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;
+  }
+}
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+.wd50 {
+  min-width: 200px;
+}
+.badge {
+  display: block;
+  color: #F1F2E5;
+  background-color: #D7000F;
+  border-radius: 12px;
+  width: 70px;
+}
+</style>

From a1489b654f29b375db0996639bcb6c8686044f8f Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 5 Aug 2022 15:34:24 +0800
Subject: [PATCH 19/78] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/visitor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/visitor.vue b/src/views/modules/base/visitor.vue
index 3fd00ef88..1a4695447 100644
--- a/src/views/modules/base/visitor.vue
+++ b/src/views/modules/base/visitor.vue
@@ -86,7 +86,7 @@
         >
         <template slot-scope="scope">
           <el-image 
-            style="max-height: 50px"
+            style="max-width: 100px"
             :src="scope.row.faceImg" 
             :preview-src-list="[scope.row.faceImg]">
             <div slot="error" class="image-slot">

From 04d2893e34eda90160c54c6ab534b45733338c1d Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Fri, 5 Aug 2022 17:17:47 +0800
Subject: [PATCH 20/78] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index caf9fbcbe..13186ceab 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -790,6 +790,11 @@
           </el-select>
         </el-form-item>
 
+        <!-- 排序 -->
+        <el-form-item label="排序">
+          <el-input-number v-model="modifyGridFrom.gridSort" :min="0" label="排序"></el-input-number>
+        </el-form-item>
+
         <el-form-item label="负责人">
           <el-input v-model="modifyGridFrom.contacts"
                     placeholder="请输入负责人名字"></el-input>
@@ -1005,7 +1010,9 @@ export default {
         agencyId: '',
         gridType: '',
         manageDistrict: '',
-        griId: ''
+        griId: '',
+        // 排序
+        gridSort: 0,
       },
       judgeOrgInfoLevel: [],
       keyWords: '',
@@ -2401,7 +2408,8 @@ export default {
         contacts: this.modifyGridFrom.contacts,
         mobile: this.modifyGridFrom.mobile,
         code: this.modifyGridFrom.code,
-        gridType: this.modifyGridFrom.gridType
+        gridType: this.modifyGridFrom.gridType,
+        sort:this.modifyGridFrom.gridSort
       }
 
       const { data, code, msg } = await requestPost(url, params)

From eac0e7a561efa9b1f867b6593c82905f086bcb77 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 5 Aug 2022 17:18:51 +0800
Subject: [PATCH 21/78] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=BF=E5=B1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/roomForm.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/roomForm.vue b/src/views/modules/base/roomForm.vue
index 3d2c1b98c..f47c52658 100644
--- a/src/views/modules/base/roomForm.vue
+++ b/src/views/modules/base/roomForm.vue
@@ -266,9 +266,9 @@ export default {
       const { data, code, msg } = await requestPost(
         "/gov/org/houseInformation/getHouseCoding/" + this.dataForm.buildingUnitId);
       if (msg == "success" && code == 0) {
-        this.dataForm.coding = data.coding
+        // this.dataForm.coding = data.coding
         this.dataForm.sysCoding = data.sysCoding
-        
+        this.$set(this.dataForm, 'coding', data.coding)
       } 
     },
 
@@ -320,8 +320,6 @@ export default {
         url = '/gov/org/house/houseupdate'
         this.dataForm.houseId = this.houseId
       }
-console.log('11111111111111111', this.dataForm)
-return
       const { data, code, msg } = await requestPost(url, this.dataForm)
       this.btnDisable = false
       if (code === 0) {

From 6f5328d0087033f0a9180e52d43ea7392615f42b Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 8 Aug 2022 09:27:18 +0800
Subject: [PATCH 22/78] worklog

---
 .../worklog/icworklog-add-or-update.vue       | 187 ++++++++++++++++++
 src/views/modules/worklog/icworklog.vue       |  81 ++++++++
 .../worklog/icworklogfile-add-or-update.vue   | 159 +++++++++++++++
 src/views/modules/worklog/icworklogfile.vue   |  77 ++++++++
 4 files changed, 504 insertions(+)
 create mode 100644 src/views/modules/worklog/icworklog-add-or-update.vue
 create mode 100644 src/views/modules/worklog/icworklog.vue
 create mode 100644 src/views/modules/worklog/icworklogfile-add-or-update.vue
 create mode 100644 src/views/modules/worklog/icworklogfile.vue

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
new file mode 100644
index 000000000..76aaa9e53
--- /dev/null
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -0,0 +1,187 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="客户Id" prop="customerId">
+          <el-input v-model="dataForm.customerId" placeholder="客户Id"></el-input>
+      </el-form-item>
+          <el-form-item label="组织Id" prop="agencyId">
+          <el-input v-model="dataForm.agencyId" placeholder="组织Id"></el-input>
+      </el-form-item>
+          <el-form-item label="agency_id的所有上级" prop="pids">
+          <el-input v-model="dataForm.pids" placeholder="agency_id的所有上级"></el-input>
+      </el-form-item>
+          <el-form-item label="网格Id【场所区域】" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格Id【场所区域】"></el-input>
+      </el-form-item>
+          <el-form-item label="标题" prop="title">
+          <el-input v-model="dataForm.title" placeholder="标题"></el-input>
+      </el-form-item>
+          <el-form-item label="日志类型【admin库sys_dict_data表value值】" prop="logType">
+          <el-input v-model="dataForm.logType" placeholder="日志类型【admin库sys_dict_data表value值】"></el-input>
+      </el-form-item>
+          <el-form-item label="日志日期" prop="logDate">
+          <el-input v-model="dataForm.logDate" placeholder="日志日期"></el-input>
+      </el-form-item>
+          <el-form-item label="内容" prop="content">
+          <el-input v-model="dataForm.content" placeholder="内容"></el-input>
+      </el-form-item>
+          <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      </el-form-item>
+          <el-form-item label="手机" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="手机"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识：0.未删除 1.已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标识：0.未删除 1.已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        customerId: '',
+        agencyId: '',
+        pids: '',
+        gridId: '',
+        title: '',
+        logType: '',
+        logDate: '',
+        content: '',
+        remark: '',
+        mobile: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        customerId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        agencyId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        pids: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        title: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        logType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        logDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/gov/icWorkLog/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/gov/icWorkLog/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue
new file mode 100644
index 000000000..045c46275
--- /dev/null
+++ b/src/views/modules/worklog/icworklog.vue
@@ -0,0 +1,81 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__icWorkLog}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+<!--        <el-form-item>-->
+<!--          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
+<!--        </el-form-item>-->
+      </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="id" label="唯一标识" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="customerId" label="客户Id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="agencyId" label="组织Id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="pids" label="agency_id的所有上级" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格Id【场所区域】" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="title" label="标题" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="logType" label="日志类型【admin库sys_dict_data表value值】" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="logDate" label="日志日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="content" 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-column prop="mobile" label="手机" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标识：0.未删除 1.已删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" 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">
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './icWorkLog-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/gov/icWorkLog/page',
+        getDataListIsPage: true,
+        deleteURL: '/gov/icWorkLog',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/worklog/icworklogfile-add-or-update.vue b/src/views/modules/worklog/icworklogfile-add-or-update.vue
new file mode 100644
index 000000000..93835243f
--- /dev/null
+++ b/src/views/modules/worklog/icworklogfile-add-or-update.vue
@@ -0,0 +1,159 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="客户Id" prop="customerId">
+          <el-input v-model="dataForm.customerId" placeholder="客户Id"></el-input>
+      </el-form-item>
+          <el-form-item label="日志Id" prop="logId">
+          <el-input v-model="dataForm.logId" placeholder="日志Id"></el-input>
+      </el-form-item>
+          <el-form-item label="地址" prop="url">
+          <el-input v-model="dataForm.url" placeholder="地址"></el-input>
+      </el-form-item>
+          <el-form-item label="文件名" prop="fileName">
+          <el-input v-model="dataForm.fileName" placeholder="文件名"></el-input>
+      </el-form-item>
+          <el-form-item label="文件类型，0图片" prop="fileType">
+          <el-input v-model="dataForm.fileType" placeholder="文件类型，0图片"></el-input>
+      </el-form-item>
+          <el-form-item label="内容" prop="sort">
+          <el-input v-model="dataForm.sort" placeholder="内容"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识：0.未删除 1.已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标识：0.未删除 1.已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        customerId: '',
+        logId: '',
+        url: '',
+        fileName: '',
+        fileType: '',
+        sort: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        customerId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        logId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        url: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        fileName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        fileType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/gov/icWorkLogFile/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/gov/icWorkLogFile/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/worklog/icworklogfile.vue b/src/views/modules/worklog/icworklogfile.vue
new file mode 100644
index 000000000..1fa295987
--- /dev/null
+++ b/src/views/modules/worklog/icworklogfile.vue
@@ -0,0 +1,77 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__icWorkLogFile}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+<!--        <el-form-item>-->
+<!--          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
+<!--        </el-form-item>-->
+      </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="id" label="唯一标识" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="customerId" label="客户Id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="logId" label="日志Id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="url" label="地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="fileName" label="文件名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="fileType" label="文件类型，0图片" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sort" label="内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标识：0.未删除 1.已删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" 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">
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './icWorkLogFile-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/gov/icWorkLogFile/page',
+        getDataListIsPage: true,
+        deleteURL: '/gov/icWorkLogFile',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From 2d9fec1c4c90dda75a051182003c0933f4544183 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 8 Aug 2022 09:31:35 +0800
Subject: [PATCH 23/78] bug

---
 src/views/modules/worklog/icworklog.vue     | 2 +-
 src/views/modules/worklog/icworklogfile.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue
index 045c46275..96d04c7e8 100644
--- a/src/views/modules/worklog/icworklog.vue
+++ b/src/views/modules/worklog/icworklog.vue
@@ -58,7 +58,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './icWorkLog-add-or-update'
+import AddOrUpdate from './icworklog-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
diff --git a/src/views/modules/worklog/icworklogfile.vue b/src/views/modules/worklog/icworklogfile.vue
index 1fa295987..e1ba0da8f 100644
--- a/src/views/modules/worklog/icworklogfile.vue
+++ b/src/views/modules/worklog/icworklogfile.vue
@@ -54,7 +54,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './icWorkLogFile-add-or-update'
+import AddOrUpdate from './icworklogfile-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {

From b5fa8a7cc176623de9e3932c50b2b0be0a28297c Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 8 Aug 2022 10:25:51 +0800
Subject: [PATCH 24/78] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/collect.vue  | 10 +++++++---
 src/views/modules/base/roomForm.vue |  3 +--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 4ea60259e..35dfb3b42 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -210,7 +210,7 @@
         >
         <template slot-scope="scope">
           <el-image 
-            style="max-height: 50px"
+            style="max-height: 50px; max-width: 50px;"
             :src="scope.row.faceImg" 
             :preview-src-list="[scope.row.faceImg]">
             <div slot="error" class="image-slot">
@@ -417,7 +417,7 @@
                @closed="addHouseShow = false">
       <room-form ref="ref_form"
                  @dialogCancle="addHouseShow = false"
-                 @dialogOk="checkHandle('2')"></room-form>
+                 @dialogOk="roomFormOk"></room-form>
     </el-dialog>
   </div>
 </template>
@@ -731,7 +731,6 @@ export default {
     },
     // 审核提交方法
     checkHandle (type) {
-      console.log('xxxxx', this.dataForm)
       const params = {
         id: this.dataForm.id,
         checkState: type, // 0-未审核 1-未通过 2-已通过
@@ -789,6 +788,11 @@ export default {
         })
       }).catch(() => {})
     },
+    roomFormOk (e) {
+      this.dataForm.buildingUnitId = e.buildingUnitId
+      this.dataForm.doorName = e.doorName
+      this.checkHandle('2')
+    }
   },
 };
 </script>
diff --git a/src/views/modules/base/roomForm.vue b/src/views/modules/base/roomForm.vue
index f47c52658..704fad4ff 100644
--- a/src/views/modules/base/roomForm.vue
+++ b/src/views/modules/base/roomForm.vue
@@ -327,9 +327,8 @@ export default {
           type: 'success',
           message: '操作成功'
         })
+        this.$emit('dialogOk', { doorName: this.dataForm.doorName, buildingUnitId: this.dataForm.buildingUnitId })
         this.resetData()
-        this.$emit('dialogOk')
-
       } else {
 
         this.$message.error(msg)

From c69cf57afc65de34139c0377a5900477b41a3cce Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 8 Aug 2022 13:47:48 +0800
Subject: [PATCH 25/78] dd

---
 .../modules/shequzhili/xiangmu/cpts/project-info.vue      | 3 +--
 .../visual/communityGovern/shijianchuli/event-info.vue    | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 4860e5939..53ea7053c 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -335,9 +335,8 @@
                 >
                 </el-input>
               </el-form-item>
-
+              <!-- v-if="fmData.operateType != 'close'" -->
               <el-form-item
-                v-if="fmData.operateType != 'close'"
                 label="图片/附件："
                 prop="internalFile"
               >
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index 2aed96664..8668aad4b 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -97,13 +97,13 @@
                   <div class="detail-value">{{ item.departmentName }}</div>
                 </div>
 
-                <!-- <div class="detail"
-                     v-if="item.processName != '转项目' && item.wantServiceTime">
+                <div class="detail"
+                     v-if="item.processName != '转项目' && item.publicReply">
                   <div class="detail-field">说 明：</div>
                   <div class="detail-value">
-                    <fold-text :row="3">{{ item.wantServiceTime }}</fold-text>
+                    <fold-text :row="3">{{ item.publicReply }}</fold-text>
                   </div>
-                </div> -->
+                </div>
 
                 <div class="detail"
                      v-if="item.processName != '转项目' && item.internalRemark">

From f9862ee9bc5776179ceb07dd8b4955956f67bc39 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 8 Aug 2022 13:50:32 +0800
Subject: [PATCH 26/78] dd

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

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 53ea7053c..a174146c8 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -335,7 +335,7 @@
                 >
                 </el-input>
               </el-form-item>
-              <!-- v-if="fmData.operateType != 'close'" -->
+              
               <el-form-item
                 label="图片/附件："
                 prop="internalFile"

From da2e7a8ca20661712af18a98ae721b9fbf286022 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 8 Aug 2022 16:37:09 +0800
Subject: [PATCH 27/78] test

---
 .../modules/plugins/visit/visitvisitor.vue    |   4 +-
 .../worklog/icworklog-add-or-update.vue       | 303 ++++++++++++++----
 src/views/modules/worklog/icworklog.vue       | 302 +++++++++++++++--
 .../worklog/icworklogfile-add-or-update.vue   | 159 ---------
 src/views/modules/worklog/icworklogfile.vue   |  77 -----
 src/views/modules/worklog/upload-image.vue    | 130 ++++++++
 6 files changed, 648 insertions(+), 327 deletions(-)
 delete mode 100644 src/views/modules/worklog/icworklogfile-add-or-update.vue
 delete mode 100644 src/views/modules/worklog/icworklogfile.vue
 create mode 100644 src/views/modules/worklog/upload-image.vue

diff --git a/src/views/modules/plugins/visit/visitvisitor.vue b/src/views/modules/plugins/visit/visitvisitor.vue
index b51e5d20d..a7d573694 100644
--- a/src/views/modules/plugins/visit/visitvisitor.vue
+++ b/src/views/modules/plugins/visit/visitvisitor.vue
@@ -106,12 +106,12 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" size="small"  @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       </el-card>
       <el-card class="resi-card-table">
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+      <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>
diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index 76aaa9e53..8f9b87519 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -1,54 +1,80 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="客户Id" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户Id"></el-input>
-      </el-form-item>
-          <el-form-item label="组织Id" prop="agencyId">
-          <el-input v-model="dataForm.agencyId" placeholder="组织Id"></el-input>
-      </el-form-item>
-          <el-form-item label="agency_id的所有上级" prop="pids">
-          <el-input v-model="dataForm.pids" placeholder="agency_id的所有上级"></el-input>
-      </el-form-item>
-          <el-form-item label="网格Id【场所区域】" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格Id【场所区域】"></el-input>
-      </el-form-item>
+        <el-form-item label="所属网格"
+                      prop="gridId">
+            <el-select
+                    v-model.trim="dataForm.gridId"
+                    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="title">
           <el-input v-model="dataForm.title" placeholder="标题"></el-input>
       </el-form-item>
-          <el-form-item label="日志类型【admin库sys_dict_data表value值】" prop="logType">
-          <el-input v-model="dataForm.logType" placeholder="日志类型【admin库sys_dict_data表value值】"></el-input>
+          <el-form-item label="日志类型" prop="logType">
+              <el-select v-model="dataForm.logType"
+                         placeholder="请选择"
+                         size="small"
+                         clearable>
+                  <el-option v-for="item in logTypeArr"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+              </el-select>
       </el-form-item>
           <el-form-item label="日志日期" prop="logDate">
-          <el-input v-model="dataForm.logDate" placeholder="日志日期"></el-input>
+              <el-date-picker
+                      v-model="dataForm.logDate"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      type="date"
+                      placeholder="选择日期">
+              </el-date-picker>
       </el-form-item>
           <el-form-item label="内容" prop="content">
-          <el-input v-model="dataForm.content" placeholder="内容"></el-input>
+          <el-input type="textarea" v-model="dataForm.content" placeholder="内容"></el-input>
       </el-form-item>
           <el-form-item label="备注" prop="remark">
-          <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
-      </el-form-item>
-          <el-form-item label="手机" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="手机"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识：0.未删除 1.已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识：0.未删除 1.已删除"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input type="textarea" v-model="dataForm.remark" placeholder="备注"></el-input>
       </el-form-item>
+        <el-form-item label="合同附件" prop="fileList" label-width="140px">
+            <template>
+                <upload-image :defaultFileList="dataForm.fileList" :limit="6" @change="onChangeFileList"></upload-image>
+            </template>
+        </el-form-item>
+<!--        <el-form-item-->
+<!--                label="图片/附件"-->
+<!--                label-width="150px"-->
+<!--                style="display: block"-->
+<!--                prop="fileList"-->
+<!--        >-->
+<!--            <el-upload-->
+<!--                    class="avatar-uploader"-->
+<!--                    :action="uploadUrl"-->
+<!--                    :data="{ customerId: customerId }"-->
+<!--                    :show-file-list="true"-->
+<!--                    :file-list="dataForm.fileList"-->
+<!--                    :on-preview="handleImgPreview"-->
+<!--                    :on-success="handleImgSuccess"-->
+<!--                    :on-remove="handleImgRemove"-->
+<!--                    :on-exceed="handleImgExceed"-->
+<!--                    :before-upload="beforeImgUpload"-->
+<!--                    :limit="3"-->
+<!--            >-->
+<!--                <i class="el-icon-plus avatar-uploader-icon"></i>-->
+<!--                <span style="color: #999"> 点击上传，支持图片、word、pdf格式</span>-->
+<!--            </el-upload>-->
+<!--        </el-form-item>-->
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -59,10 +85,16 @@
 
 <script>
 import debounce from 'lodash/debounce'
+import { requestPost } from "@/js/dai/request"
+import UploadImage from './upload-image.vue'
 export default {
   data () {
     return {
       visible: false,
+      uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+      customerId: localStorage.getItem("customerId"),
+      logTypeArr: [],
+      optionsG: [],
       dataForm: {
         id: '',
         customerId: '',
@@ -80,10 +112,18 @@ export default {
         createdBy: '',
         createdTime: '',
         updatedBy: '',
-        updatedTime: ''
+        updatedTime: '',
+        fileList: []
       }
     }
   },
+  components: {
+    UploadImage
+  },
+  created () {
+    this.getGridList()
+    this.getCategrayList()
+  },
   computed: {
     dataRule () {
       return {
@@ -110,30 +150,6 @@ export default {
         ],
         content: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        remark: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -150,7 +166,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/gov/icWorkLog/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/gov/org/icWorkLog/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -160,13 +176,132 @@ export default {
         }
       }).catch(() => {})
     },
+    // 字典
+    async getCategrayList () {
+      console.log(localStorage.getItem('token'))
+      const url = "/sys/dict/data/dictlist"
+
+      let params = {
+        dictType: 'log_type'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.logTypeArr = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    getGridList() {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsG = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    onChangeFileList (e, rowIndex=0) {
+      console.log('onChangeFileList', e)
+      if (e.length > 0) {
+        this.dataForm.fileList = []
+        e.forEach(item => {
+          let ob = {
+            fileType: '0',
+            fileUrl: item.response.data.url
+          }
+          this.dataForm.fileList.push(ob)
+        })
+      }
+    },
+    beforeImgUpload(file) {
+      console.log(file);
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      const srcType = file.type;
+      const format = file.name.split(".").pop();
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+        return false;
+      }
+      if (
+        srcType.indexOf("image") == -1 &&
+        srcType.indexOf("video") == -1 &&
+        ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf"].indexOf(format) ==
+        -1
+      ) {
+        this.$message.error("仅限图片、word和pdf文件!");
+        return false;
+      }
+      return true;
+    },
+
+    handleImgSuccess(res, file, fileList) {
+      console.log("handleImgSuccess", file);
+      if (res.code === 0 && res.msg === "success") {
+        let format = file.name.split(".").pop();
+        let srcType = file.raw.type;
+        let type = "file";
+        console.log("==============================srcType: ", srcType);
+        if (srcType.indexOf("image") != -1) {
+          type = "image";
+        } else if (srcType.indexOf("video") != -1) {
+          type = "video";
+        }
+        this.dataForm.fileList.push({
+          format,
+          name: file.name,
+          size: file.size,
+          type,
+          url: res.data.url,
+        });
+        console.log(this.dataForm.fileList);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+
+    handleImgPreview(file) {
+      console.log(file);
+      window.open(file.url || file.response.data.url);
+    },
+
+    handleImgRemove(file) {
+      console.log("handleImgRemove", file);
+      if (file.response) {
+        let index = this.dataForm.fileList.findIndex(
+          (item) => item.url == file.response.data.url
+        );
+        this.dataForm.fileList.splice(index, 1);
+      } else if (file.url) {
+        let index = this.dataForm.fileList.findIndex(
+          (item) => item.url == file.url
+        );
+        this.dataForm.fileList.splice(index, 1);
+      }
+    },
+
+    handleImgExceed() {
+      this.$message({
+        type: "warning",
+        message: "文件数量最多不超过三个",
+      });
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/gov/icWorkLog/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/gov/org/icWorkLog/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -185,3 +320,41 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+    .item_width_1 {
+        width: 500px;
+    }
+    .item_width_2 {
+        width: 400px;
+    }
+    .item_width_3 {
+        margin-left: 10px;
+        width: 200px;
+    }
+    .item_width_4 {
+        width: 200px;
+    }
+
+    .div_map {
+        margin-top: 10px;
+    }
+
+    .div_btn {
+        // display: flex;
+        // justify-content: flex-end;
+    }
+    .el-tabs {
+        margin: 0 20px;
+    }
+    .el-upload__tip {
+        color: rgb(155, 155, 155);
+        margin: 0;
+    }
+    .form {
+        margin-top: 30px;
+    }
+
+    .attachement-list {
+    }
+</style>
diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue
index 96d04c7e8..a2c6392ed 100644
--- a/src/views/modules/worklog/icworklog.vue
+++ b/src/views/modules/worklog/icworklog.vue
@@ -1,39 +1,100 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__icWorkLog}">
+    <div class="mod-__icWorkLog} resi-container">
+      <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item prop="gridId" label="所属组织">
+          <div class="resi-cell-value">
+            <el-cascader class="customer_cascader"
+                         ref="myCascader"
+                         clearable
+                         v-model="agencyIdArray"
+                         :options="orgOptions"
+                         :props="orgOptionProps"
+                         :show-all-levels="false"
+                         @change="handleChangeAgency"></el-cascader>
+          </div>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-form-item label="日志类型"
+                      prop="logType">
+          <el-select v-model="dataForm.logType"
+                     placeholder="请选择"
+                     size="small"
+                     clearable>
+            <el-option v-for="item in logTypeArr"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="上报人姓名"
+                      prop="createdUser">
+          <el-input v-model="dataForm.createdUser"
+                    size="small"
+                    clearable
+                    placeholder="请输入上报人姓名">
+          </el-input>
+        </el-form-item>
+        <br/>
+        <el-form-item label="联系电话"
+                                     prop="createdUser">
+        <el-input v-model="dataForm.mobile"
+                  size="small"
+                  clearable
+                  placeholder="请输入联系电话">
+        </el-input>
+      </el-form-item>
+        <el-form-item label="上报时间" prop="startTime" label-width="100px">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期"
+                          style="width:200px">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至" prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期"
+                          style="width:200px">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" size="small"  @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
 <!--        <el-form-item>-->
+<!--          <el-button type="primary" size="small"  @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item>-->
 <!--          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
 <!--        </el-form-item>-->
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+      </el-card>
+      <el-card class="resi-card-table">
+        <div class="resi-row-btn">
+          <el-button
+                  class="diy-button--add"
+                  size="small"
+                  @click="addOrUpdateHandle()"
+          >{{ $t('add') }}</el-button
+          >
+          <el-button @click="exportHandle()" class="diy-button--reset" size="small"
+          >导出</el-button
+          >
+        </div>
+      <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="id" label="唯一标识" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="customerId" label="客户Id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="agencyId" label="组织Id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pids" label="agency_id的所有上级" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格Id【场所区域】" header-align="center" align="center"></el-table-column>
         <el-table-column prop="title" label="标题" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="logType" label="日志类型【admin库sys_dict_data表value值】" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="logType" label="日志类型" :formatter="categoryCodeFormatter" header-align="center" align="center"></el-table-column>
         <el-table-column prop="logDate" label="日志日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="content" 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-column prop="createdUser" 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="delFlag" label="删除标识：0.未删除 1.已删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" 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">
             <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -50,6 +111,7 @@
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
+      </el-card>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     </div>
@@ -59,15 +121,27 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './icworklog-add-or-update'
+import { requestPost } from "@/js/dai/request";
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/gov/icWorkLog/page',
+        getDataListURL: '/gov/org/icWorkLog/page',
         getDataListIsPage: true,
-        deleteURL: '/gov/icWorkLog',
-        deleteIsBatch: true
+        deleteURL: '/gov/org/icWorkLog',
+        deleteIsBatch: true,
+        exportURL: '/gov/org/icWorkLog/export'
+      },
+      agencyIdArray:[],
+      orgOptions: [],
+      logTypeArr: [],
+      orgOptionProps:{
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
       },
       dataForm: {
         id: ''
@@ -76,6 +150,186 @@ export default {
   },
   components: {
     AddOrUpdate
+  },
+  created () {
+    this.getGridList()
+    this.getCategrayList()
+  },
+  methods: {
+    getGridList() {
+      const { user } = this.$store.state
+      this.$http
+              .post('/gov/org/customeragency/agencygridtree', {})
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+                } else {
+                  console.log('获取组织树成功', res.data)
+                  this.orgOptions=[]
+                  this.orgOptions .push( res.data)
+                }
+              })
+              .catch(() => {
+                return this.$message.error('网络错误')
+              })
+    },
+    exportHandle () {
+      const url = this.mixinViewModuleOptions.exportURL
+      this.$http({
+        method: 'GET',
+        url,
+        responseType: 'blob',
+        params: this.dataForm
+      }).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 getCategrayList () {
+      console.log(localStorage.getItem('token'))
+      const url = "/sys/dict/data/dictlist"
+
+      let params = {
+        dictType: 'log_type'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.logTypeArr = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    categoryCodeFormatter (row) {
+      let ca = ''
+      this.logTypeArr.forEach((tagCategory) => {
+        if (tagCategory.value === row.logType) {
+          ca = tagCategory.label
+        }
+      })
+      return ca
+    },
+    handleChangeAgency(val) {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+
+      if (obj) {
+        if(obj.level === 'grid'){
+          this.dataForm.gridId =  this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.dataForm.agencyId=''
+        }else{
+          this.dataForm.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.dataForm.gridId = ''
+        }
+
+      }else{
+        this.dataForm.agencyId=''
+        this.dataForm.gridId = ''
+      }
+    },
+    pickerBeginDateBefore: {
+      disabledDate: (time) => {
+        let beginDateVal = this.dataForm.endTime
+        if (beginDateVal) {
+          return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+        }
+      }
+    },
+    pickerBeginDateAfter: {
+      disabledDate: (time) => {
+        let EndDateVal = this.dataForm.startTime
+        if (EndDateVal) {
+          return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+        }
+      }
+    }
   }
 }
 </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);
+    }
+  }
+
+  .resi-row-btn {
+    margin-bottom: 13px;
+    .upload-btn {
+      display: inline-block;
+      margin: 0 10px;
+    }
+  }
+
+  .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>
+  .el-table .warning-row {
+    background: #ffe168;
+  }
+</style>
diff --git a/src/views/modules/worklog/icworklogfile-add-or-update.vue b/src/views/modules/worklog/icworklogfile-add-or-update.vue
deleted file mode 100644
index 93835243f..000000000
--- a/src/views/modules/worklog/icworklogfile-add-or-update.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="客户Id" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户Id"></el-input>
-      </el-form-item>
-          <el-form-item label="日志Id" prop="logId">
-          <el-input v-model="dataForm.logId" placeholder="日志Id"></el-input>
-      </el-form-item>
-          <el-form-item label="地址" prop="url">
-          <el-input v-model="dataForm.url" placeholder="地址"></el-input>
-      </el-form-item>
-          <el-form-item label="文件名" prop="fileName">
-          <el-input v-model="dataForm.fileName" placeholder="文件名"></el-input>
-      </el-form-item>
-          <el-form-item label="文件类型，0图片" prop="fileType">
-          <el-input v-model="dataForm.fileType" placeholder="文件类型，0图片"></el-input>
-      </el-form-item>
-          <el-form-item label="内容" prop="sort">
-          <el-input v-model="dataForm.sort" placeholder="内容"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识：0.未删除 1.已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识：0.未删除 1.已删除"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-      </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script>
-import debounce from 'lodash/debounce'
-export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        id: '',
-        customerId: '',
-        logId: '',
-        url: '',
-        fileName: '',
-        fileType: '',
-        sort: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        customerId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        logId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        url: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        fileName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        fileType: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          this.getInfo()
-        }
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/gov/icWorkLogFile/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/gov/icWorkLogFile/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
-}
-</script>
diff --git a/src/views/modules/worklog/icworklogfile.vue b/src/views/modules/worklog/icworklogfile.vue
deleted file mode 100644
index e1ba0da8f..000000000
--- a/src/views/modules/worklog/icworklogfile.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__icWorkLogFile}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-<!--        <el-form-item>-->
-<!--          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
-<!--        </el-form-item>-->
-      </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="id" label="唯一标识" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="customerId" label="客户Id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="logId" label="日志Id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="url" label="地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="fileName" label="文件名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="fileType" label="文件类型，0图片" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" label="内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标识：0.未删除 1.已删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" 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">
-            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './icworklogfile-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/gov/icWorkLogFile/page',
-        getDataListIsPage: true,
-        deleteURL: '/gov/icWorkLogFile',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        id: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
-}
-</script>
diff --git a/src/views/modules/worklog/upload-image.vue b/src/views/modules/worklog/upload-image.vue
new file mode 100644
index 000000000..93bbc1616
--- /dev/null
+++ b/src/views/modules/worklog/upload-image.vue
@@ -0,0 +1,130 @@
+<template>
+    <div class="upload-image">
+        <el-upload list-type="picture-card"
+            :action="uploadUrl"
+            :data="{ customerId: customerId }"
+            :file-list="fileList"
+            :limit="limit"
+            :on-success="(res, file) => handleImgSuccess(res, file)"
+            :on-error="(res, file) => handleImgError(res, file)"
+            :on-remove="(res) => handleImgRemove(res)"
+            :on-exceed="(res) => handleImgExceed(res)"
+            :before-upload="(file) => beforeImgUpload(file)">
+            <i slot="default" class="el-icon-plus"></i>
+            <div slot="file" slot-scope="{file}">
+                <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                <span class="el-upload-list__item-actions">
+                    <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                        <i class="el-icon-zoom-in"></i>
+                    </span>
+                    <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
+                        <i class="el-icon-delete"></i>
+                    </span>
+                </span>
+            </div>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        limit: {
+            type: Number,
+            default: 3
+        },
+        rowIndex: {
+            type: Number,
+            default: 0
+        },
+        defaultFileList: {
+            type: Array
+        }
+    },
+    watch: {
+        defaultFileList: {
+            handler (newVal) {
+                newVal.forEach(item => {
+                    item.url = item.fileUrl
+                })
+                this.fileList = newVal
+            },
+            deep: true,
+            immediate: true          
+        }
+
+    },
+    data () {
+        return {
+            dialogImageUrl: '',
+            dialogVisible: false,
+            disabled: false,
+            uploadUrl: `${window.SITE_CONFIG['apiURL']}/oss/file/uploadqrcodeV2`,
+            customerId: localStorage.getItem("customerId"),
+            fileList: [],
+            imageUrls: []
+        }
+    },
+    created() {
+        console.log('xxxxxx', this.rowIndex)
+    },
+    methods: {
+        handleRemove(file) {
+            const delFile = file.url
+            this.fileList.forEach((item, key) => {
+                if (delFile == item.url) {
+                    this.fileList.splice(key, 1)
+                }
+            })
+        },
+        handlePictureCardPreview(file) {
+            this.dialogImageUrl = file.url
+            this.dialogVisible = true
+        },
+        beforeImgUpload(file) {
+            // console.log(file)
+        },
+        handleImgExceed(res) {
+            console.log(res)
+            this.$message({
+              type: "warning",
+              message: `文件数量最多不超过${this.limit}个`,
+            })
+        },
+        handleImgRemove(file) {
+            console.log("handleImgRemove", file)
+        },
+        handleImgSuccess(res, file) {
+            // console.log("handleImgSuccess", res, file)
+            if (res.code === 0 && res.msg === "success") {
+                this.fileList.push(file)
+                this.$emit('change', this.fileList, this.rowIndex)
+            } else {
+                this.$message.error(res.msg)
+            }
+        },
+
+        handleImgError(res, file) {
+            console.log(res)
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.upload-image {
+    // min-width: 120px;
+    // height: 80px;
+}
+/deep/ .el-upload--picture-card {
+    width: 60px;
+    height: 60px;
+    line-height: 70px;
+}
+/deep/ .el-upload-list--picture-card .el-upload-list__item {
+    width: 60px;
+    height: 60px;
+}
+</style>

From ceb762350306bca0290f3448009187ddaab5c46a Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 8 Aug 2022 16:53:30 +0800
Subject: [PATCH 28/78] =?UTF-8?q?=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/collect.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 35dfb3b42..457bfe585 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -423,7 +423,7 @@
 </template>
 
 <script>
-import { requestPost, requestGet } from "@/js/dai/request";
+import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import axios from "axios";
@@ -457,10 +457,7 @@ export default {
       importLoading: false,
       addHouseShow: false,
       dialogType: 'look', // 对话框是check审核还是look查看
-      relationshipOptions: [
-        { label: '本人', value: '0' },
-        { label: '父母', value: '1' }
-      ]
+      relationshipOptions: []
     }
   },
   components: {
@@ -492,16 +489,16 @@ export default {
   },
   mounted() {
     // this.getcommunityList();
-    // this.getDictList()
+    this.getDictList()
     this.getTableData()
   },
   methods: {
     async getDictList() {
       const url = "/sys/dict/data/relationship"
-      const { data, code, msg } = await requestGet(url)
+      const { data, code, msg } = await requestPost(url, { formCode: "resi_base_info" })
 
       if (code === 0) {
-        this.relationshipOptions = { ...res.data }
+        this.relationshipOptions = [ ...data ]
       } else {
         this.$message.success("操作失败！")
       }

From a6e459fc23118fe6522320c5c572f055a9175704 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 8 Aug 2022 17:18:11 +0800
Subject: [PATCH 29/78] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 457bfe585..541b7290a 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -303,7 +303,7 @@
           </el-form-item>
           <div>
             <el-form-item
-              label="自有/租住:"
+              label="房屋状态:"
               prop="houseType"
               label-width="150px"
             >
@@ -614,7 +614,7 @@ export default {
         console.log("data----de", data);
         this.dataForm = {
           ...data,
-          houseType: data.houseType == "1" ? "自有" : "租住",
+          houseType: data.houseType == '1' ? '出租' : data.houseType == '2' ? '闲置' : data.houseType == '3' ? '未售出' : '自住' // 1：出租 0：自住  2：闲置 3：未售出
         };
         // this.getTableData();
         this.formShow = true;

From 123077da743854084f8e9f1184deea930ac441f7 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 8 Aug 2022 17:26:08 +0800
Subject: [PATCH 30/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/command/cpts/map.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index d96b991a5..a6da55e74 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/src/views/modules/visual/command/cpts/map.vue
@@ -209,9 +209,8 @@ export default {
               //   level: item.level,
               center: [item.longitude, item.latitude],
               ...item,
-              dotCount2: 222,
-              dotCount: gridCountData.find((item2) => item2.id == item.orgId)
-                ? gridCountData.find((item2) => item2.id == item.orgId).total
+              dotCount: gridCountData.find((item2) => item2.orgId == item.id)
+                ? gridCountData.find((item2) => item2.orgId == item.id).total
                 : "",
             },
             geometry: {
@@ -801,13 +800,15 @@ export default {
 
     searchPos(name) {
       return new Promise((reslove) => {
-        window.AMap.plugin("AMap.PlaceSearch", function () {
+        window.AMap.plugin("AMap.PlaceSearch", () => {
+          const city = this.$store.state.user.areaCodePath[1] || "全国";
+          console.log("搜索区域", city);
           // 实例化Autocomplete
-          var autoOptions = {
+          let autoOptions = {
             //city 限定城市，默认全国
-            city: "全国",
+            city,
           };
-          var autoComplete = new window.AMap.PlaceSearch(autoOptions);
+          let autoComplete = new window.AMap.PlaceSearch(autoOptions);
           autoComplete.search(name, function (status, result) {
             reslove(result);
           });

From 93b811dc3d1078eb3403aa7f091d0d5ff7399b21 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 8 Aug 2022 17:46:56 +0800
Subject: [PATCH 31/78] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worklog/icworklog-add-or-update.vue       | 182 ++++++++----------
 src/views/modules/worklog/upload-image.vue    | 130 -------------
 2 files changed, 75 insertions(+), 237 deletions(-)
 delete mode 100644 src/views/modules/worklog/upload-image.vue

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index 8f9b87519..c83b21d45 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -47,34 +47,26 @@
           <el-form-item label="备注" prop="remark">
           <el-input type="textarea" v-model="dataForm.remark" placeholder="备注"></el-input>
       </el-form-item>
-        <el-form-item label="合同附件" prop="fileList" label-width="140px">
-            <template>
-                <upload-image :defaultFileList="dataForm.fileList" :limit="6" @change="onChangeFileList"></upload-image>
-            </template>
+        <el-form-item class="block"
+                      label="附件"
+                      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"
+                       :on-preview="handleFileDownload"
+                       :limit="3"
+                       :before-upload="beforeUpload"
+                       :file-list="dataForm.fileList">
+                <el-button size="small"
+                           :disabled="dataForm.fileList.length===3"
+                           type="primary">点击上传</el-button>
+                <div slot="tip"
+                     class="el-upload__tip">支持图片、word、pdf</div>
+            </el-upload>
         </el-form-item>
-<!--        <el-form-item-->
-<!--                label="图片/附件"-->
-<!--                label-width="150px"-->
-<!--                style="display: block"-->
-<!--                prop="fileList"-->
-<!--        >-->
-<!--            <el-upload-->
-<!--                    class="avatar-uploader"-->
-<!--                    :action="uploadUrl"-->
-<!--                    :data="{ customerId: customerId }"-->
-<!--                    :show-file-list="true"-->
-<!--                    :file-list="dataForm.fileList"-->
-<!--                    :on-preview="handleImgPreview"-->
-<!--                    :on-success="handleImgSuccess"-->
-<!--                    :on-remove="handleImgRemove"-->
-<!--                    :on-exceed="handleImgExceed"-->
-<!--                    :before-upload="beforeImgUpload"-->
-<!--                    :limit="3"-->
-<!--            >-->
-<!--                <i class="el-icon-plus avatar-uploader-icon"></i>-->
-<!--                <span style="color: #999"> 点击上传，支持图片、word、pdf格式</span>-->
-<!--            </el-upload>-->
-<!--        </el-form-item>-->
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -86,13 +78,11 @@
 <script>
 import debounce from 'lodash/debounce'
 import { requestPost } from "@/js/dai/request"
-import UploadImage from './upload-image.vue'
 export default {
   data () {
     return {
       visible: false,
-      uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
-      customerId: localStorage.getItem("customerId"),
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
       logTypeArr: [],
       optionsG: [],
       dataForm: {
@@ -117,9 +107,6 @@ export default {
       }
     }
   },
-  components: {
-    UploadImage
-  },
   created () {
     this.getGridList()
     this.getCategrayList()
@@ -209,94 +196,75 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    onChangeFileList (e, rowIndex=0) {
-      console.log('onChangeFileList', e)
-      if (e.length > 0) {
-        this.dataForm.fileList = []
-        e.forEach(item => {
-          let ob = {
-            fileType: '0',
-            fileUrl: item.response.data.url
-          }
-          this.dataForm.fileList.push(ob)
-        })
+    beforeUpload (file) {
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+
+      const formatarray = ['jpg', 'png', 'jpeg', 'bmp', 'mp4', 'wma', 'm4a', 'mp3', 'doc', 'docx', 'xls', 'xlsx', 'pdf']
+
+      if (formatarray.indexOf(extension) === -1) {
+        this.$message.error('只支持图片、word、pdf')
+        return false
       }
+
     },
-    beforeImgUpload(file) {
-      console.log(file);
-      const isLt1M = file.size / 1024 / 1024 < 10;
-      const srcType = file.type;
-      const format = file.name.split(".").pop();
 
-      if (!isLt1M) {
-        this.$message.error("上传文件大小不能超过 10MB!");
-        return false;
-      }
-      if (
-        srcType.indexOf("image") == -1 &&
-        srcType.indexOf("video") == -1 &&
-        ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf"].indexOf(format) ==
-        -1
-      ) {
-        this.$message.error("仅限图片、word和pdf文件!");
-        return false;
+    handleFileRemove (file) {
+
+      if (file && file.status === "success") {
+        this.dataForm.fileList.splice(this.dataForm.fileList.findIndex(item => item.uid === file.uid), 1)
       }
-      return true;
     },
 
-    handleImgSuccess(res, file, fileList) {
-      console.log("handleImgSuccess", file);
-      if (res.code === 0 && res.msg === "success") {
-        let format = file.name.split(".").pop();
-        let srcType = file.raw.type;
-        let type = "file";
-        console.log("==============================srcType: ", srcType);
-        if (srcType.indexOf("image") != -1) {
-          type = "image";
-        } else if (srcType.indexOf("video") != -1) {
-          type = "video";
+    handleFileSuccess (res, file) {
+
+      if (res.code === 0 && res.msg === 'success') {
+        const array = file.name.split('.')
+        const fileType = array[array.length - 1]
+
+        const picArray = ['jpg', 'png', 'jpeg', 'bmp']
+        const videoarray = ['mp4', 'wma', 'm4a']
+        const docArray = ['doc', 'docx', 'xls', 'xlsx', 'pdf']
+        const mp3Array = ['mp3']
+
+        if (picArray.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'image'
+        } else if (videoarray.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'video'
+        } else if (docArray.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'doc'
+        } else if (mp3Array.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'voice'
         }
-        this.dataForm.fileList.push({
-          format,
-          name: file.name,
-          size: file.size,
-          type,
-          url: res.data.url,
-        });
-        console.log(this.dataForm.fileList);
-      } else {
-        this.$message.error(res.msg);
-      }
-    },
 
-    handleImgPreview(file) {
-      console.log(file);
-      window.open(file.url || file.response.data.url);
-    },
+        file.url = res.data.url
+        file.type = fileType
 
-    handleImgRemove(file) {
-      console.log("handleImgRemove", file);
-      if (file.response) {
-        let index = this.dataForm.fileList.findIndex(
-          (item) => item.url == file.response.data.url
-        );
-        this.dataForm.fileList.splice(index, 1);
-      } else if (file.url) {
-        let index = this.dataForm.fileList.findIndex(
-          (item) => item.url == file.url
-        );
-        this.dataForm.fileList.splice(index, 1);
-      }
+        file.fileName = file.name
+        file.fileType = file.type
+        file.url = file.url
+
+        this.dataForm.fileList.push(file)
+        console.log(this.dataForm.fileList)
+      } else this.$message.error(res.msg)
     },
+    //下载
+    handleFileDownload (file) {
+
+      var a = document.createElement('a');
+      var event = new MouseEvent('click');
+      a.download = file.name;
+      console.log(a)
+      a.href = file.url;
+      a.dispatchEvent(event);
+
 
-    handleImgExceed() {
-      this.$message({
-        type: "warning",
-        message: "文件数量最多不超过三个",
-      });
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
+      if (this.dataForm.content.length < 70) {
+        return this.$message.error("内容不能少于70字")
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
diff --git a/src/views/modules/worklog/upload-image.vue b/src/views/modules/worklog/upload-image.vue
deleted file mode 100644
index 93bbc1616..000000000
--- a/src/views/modules/worklog/upload-image.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-    <div class="upload-image">
-        <el-upload list-type="picture-card"
-            :action="uploadUrl"
-            :data="{ customerId: customerId }"
-            :file-list="fileList"
-            :limit="limit"
-            :on-success="(res, file) => handleImgSuccess(res, file)"
-            :on-error="(res, file) => handleImgError(res, file)"
-            :on-remove="(res) => handleImgRemove(res)"
-            :on-exceed="(res) => handleImgExceed(res)"
-            :before-upload="(file) => beforeImgUpload(file)">
-            <i slot="default" class="el-icon-plus"></i>
-            <div slot="file" slot-scope="{file}">
-                <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                <span class="el-upload-list__item-actions">
-                    <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                        <i class="el-icon-zoom-in"></i>
-                    </span>
-                    <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                        <i class="el-icon-delete"></i>
-                    </span>
-                </span>
-            </div>
-        </el-upload>
-        <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-export default {
-    props: {
-        limit: {
-            type: Number,
-            default: 3
-        },
-        rowIndex: {
-            type: Number,
-            default: 0
-        },
-        defaultFileList: {
-            type: Array
-        }
-    },
-    watch: {
-        defaultFileList: {
-            handler (newVal) {
-                newVal.forEach(item => {
-                    item.url = item.fileUrl
-                })
-                this.fileList = newVal
-            },
-            deep: true,
-            immediate: true          
-        }
-
-    },
-    data () {
-        return {
-            dialogImageUrl: '',
-            dialogVisible: false,
-            disabled: false,
-            uploadUrl: `${window.SITE_CONFIG['apiURL']}/oss/file/uploadqrcodeV2`,
-            customerId: localStorage.getItem("customerId"),
-            fileList: [],
-            imageUrls: []
-        }
-    },
-    created() {
-        console.log('xxxxxx', this.rowIndex)
-    },
-    methods: {
-        handleRemove(file) {
-            const delFile = file.url
-            this.fileList.forEach((item, key) => {
-                if (delFile == item.url) {
-                    this.fileList.splice(key, 1)
-                }
-            })
-        },
-        handlePictureCardPreview(file) {
-            this.dialogImageUrl = file.url
-            this.dialogVisible = true
-        },
-        beforeImgUpload(file) {
-            // console.log(file)
-        },
-        handleImgExceed(res) {
-            console.log(res)
-            this.$message({
-              type: "warning",
-              message: `文件数量最多不超过${this.limit}个`,
-            })
-        },
-        handleImgRemove(file) {
-            console.log("handleImgRemove", file)
-        },
-        handleImgSuccess(res, file) {
-            // console.log("handleImgSuccess", res, file)
-            if (res.code === 0 && res.msg === "success") {
-                this.fileList.push(file)
-                this.$emit('change', this.fileList, this.rowIndex)
-            } else {
-                this.$message.error(res.msg)
-            }
-        },
-
-        handleImgError(res, file) {
-            console.log(res)
-        },
-    }
-}
-</script>
-<style lang="scss" scoped>
-.upload-image {
-    // min-width: 120px;
-    // height: 80px;
-}
-/deep/ .el-upload--picture-card {
-    width: 60px;
-    height: 60px;
-    line-height: 70px;
-}
-/deep/ .el-upload-list--picture-card .el-upload-list__item {
-    width: 60px;
-    height: 60px;
-}
-</style>

From 5ed9cc309396133ea4c9333ea10ae871ab0e39df Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 9 Aug 2022 10:11:08 +0800
Subject: [PATCH 32/78] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 13186ceab..7c67f55fd 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1588,6 +1588,7 @@ export default {
         this.modifyGridFrom.gridType = '',
         this.modifyGridFrom.manageDistrict = '',
         this.modifyGridFrom.griId = ''
+        this.modifyGridFrom.gridSort = 0
     },
     // 社区新增弹框取消按钮
     cancel () {
@@ -2339,6 +2340,7 @@ export default {
         this.modifyGridFrom.gridType = data.gridType
         this.modifyGridFrom.manageDistrict = data.manageDistrict
         this.modifyGridFrom.griId = data.grid
+        this.modifyGridFrom.gridSort = data.gridSort
       } else {
         this.$message.error(msg)
       }
@@ -2416,6 +2418,7 @@ export default {
 
       if (code === 0) {
         this.$message.success("修改成功")
+        this.modifyGridFrom.gridSort = 0
         this.modifyGridPop = false
         this.getAgencyList()
         this.getDepartmentList()

From 19c98e589b98b5f6e6dab4f7c3d20779dac01230 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 9 Aug 2022 10:30:40 +0800
Subject: [PATCH 33/78] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worklog/icworklog-add-or-update.vue        | 18 +++++++-----------
 src/views/modules/worklog/icworklog.vue        |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index c83b21d45..0e2b90212 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -48,12 +48,12 @@
           <el-input type="textarea" v-model="dataForm.remark" placeholder="备注"></el-input>
       </el-form-item>
         <el-form-item class="block"
-                      label="附件"
+                      label="照片"
                       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"
+                       accept=".jpg,.png,.jpeg,.bmp"
                        :on-success="handleFileSuccess"
                        :on-remove="handleFileRemove"
                        :on-preview="handleFileDownload"
@@ -64,7 +64,7 @@
                            :disabled="dataForm.fileList.length===3"
                            type="primary">点击上传</el-button>
                 <div slot="tip"
-                     class="el-upload__tip">支持图片、word、pdf</div>
+                     class="el-upload__tip">支持jpg、png、bmp</div>
             </el-upload>
         </el-form-item>
       </el-form>
@@ -114,15 +114,9 @@ export default {
   computed: {
     dataRule () {
       return {
-        customerId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         agencyId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        pids: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         gridId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -200,7 +194,7 @@ export default {
       const array = file.name.split('.')
       const extension = array[array.length - 1]
 
-      const formatarray = ['jpg', 'png', 'jpeg', 'bmp', 'mp4', 'wma', 'm4a', 'mp3', 'doc', 'docx', 'xls', 'xlsx', 'pdf']
+      const formatarray = ['jpg', 'png', 'jpeg', 'bmp']
 
       if (formatarray.indexOf(extension) === -1) {
         this.$message.error('只支持图片、word、pdf')
@@ -242,7 +236,6 @@ export default {
 
         file.fileName = file.name
         file.fileType = file.type
-        file.url = file.url
 
         this.dataForm.fileList.push(file)
         console.log(this.dataForm.fileList)
@@ -265,6 +258,9 @@ export default {
       if (this.dataForm.content.length < 70) {
         return this.$message.error("内容不能少于70字")
       }
+      if (this.dataForm.fileList.length < 1) {
+        return this.$message.error("照片不能为空")
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue
index a2c6392ed..4b80ef30e 100644
--- a/src/views/modules/worklog/icworklog.vue
+++ b/src/views/modules/worklog/icworklog.vue
@@ -129,7 +129,7 @@ export default {
       mixinViewModuleOptions: {
         getDataListURL: '/gov/org/icWorkLog/page',
         getDataListIsPage: true,
-        deleteURL: '/gov/org/icWorkLog',
+        deleteURL: '/gov/org/icWorkLog/delete',
         deleteIsBatch: true,
         exportURL: '/gov/org/icWorkLog/export'
       },

From 55e8eb9764437ec01c38a5015d35ec3b1360dc4f Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 9 Aug 2022 10:39:26 +0800
Subject: [PATCH 34/78] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/worklog/icworklog.vue | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue
index 4b80ef30e..802d22b38 100644
--- a/src/views/modules/worklog/icworklog.vue
+++ b/src/views/modules/worklog/icworklog.vue
@@ -68,6 +68,10 @@
         <el-form-item>
           <el-button type="primary" size="small"  @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <el-button style="margin-left:10px"
+                   size="small"
+                   class="diy-button--reset"
+                   @click="resetSearch">重置</el-button>
 <!--        <el-form-item>-->
 <!--          <el-button type="primary" size="small"  @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
 <!--        </el-form-item>-->
@@ -201,6 +205,21 @@ export default {
         return this.$message.error('网络错误')
       })
     },
+    //重置搜索条件
+    resetSearch () {
+      this.agencyIdArray = []
+      this.dataForm = {
+        agencyId: '',
+        gridId: '',
+        logType: '',
+        createdUser: '',
+        startTime: '',
+        endTime: '',
+        mobile: ''
+      }
+
+      this.getDataList()
+    },
     // 字典
     async getCategrayList () {
       console.log(localStorage.getItem('token'))

From d6e587ad2f88fffe638fa5d43df6767cd6264119 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 9 Aug 2022 10:40:05 +0800
Subject: [PATCH 35/78] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 7c67f55fd..128896a9e 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -792,7 +792,7 @@
 
         <!-- 排序 -->
         <el-form-item label="排序">
-          <el-input-number v-model="modifyGridFrom.gridSort" :min="0" label="排序"></el-input-number>
+          <el-input-number v-model="modifyGridFrom.gridSort" :min="1" label="排序"></el-input-number>
         </el-form-item>
 
         <el-form-item label="负责人">

From d7a022b98b803d92c5fb360aa0050c2da5a06810 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 9 Aug 2022 10:42:57 +0800
Subject: [PATCH 36/78] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 128896a9e..7e170800e 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2418,7 +2418,6 @@ export default {
 
       if (code === 0) {
         this.$message.success("修改成功")
-        this.modifyGridFrom.gridSort = 0
         this.modifyGridPop = false
         this.getAgencyList()
         this.getDepartmentList()

From e149e9740012e2b0ba1dbf066478aa75cb51fcf2 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 9 Aug 2022 10:51:20 +0800
Subject: [PATCH 37/78] =?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/communityForm.vue  |  9 +++++
 .../modules/base/community/communityTable.vue | 34 +++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 922082396..c3d8f4203 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -56,6 +56,15 @@
                        size="small"
                        @click="handleCode">生成</el-button>
         </el-form-item>
+
+        <div v-if="dataForm.qrcodeUrl"
+               style="display: flex;flex-direction: column;">
+            <img style="margin-left: 70px;width: 200px;"
+                 :src="dataForm.qrcodeUrl">
+            <a style="margin-left: 80px"
+               :href="dataForm.qrcodeUrl"
+               target="_blank">下载</a>
+          </div>
           <el-form-item label="关联物业"
                         prop="propertyId"
                         label-width="150px"
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index eb953177f..9097217b5 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="yhymLoading"
+                      @click="createBatchNeiQrUrl">补全小程序小区码</el-button>
       <el-button style=""
                  class="diy-button--add"
                  size="small"
@@ -412,6 +418,34 @@ export default {
       }
     },
 
+    // 补全小程序一户一码
+    async createBatchNeiQrUrl () {
+      this.yhymLoading = true
+      const url = "/gov/org/neighborhood/createBatchNeiQrUrl"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.yhymLoading = false
+        this.$message({
+          type: "success",
+          message: "批量生成成功"
+        });
+      } else if (code > 8000) {
+        this.yhymLoading = false
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0
+        })
+      } else {
+        this.yhymLoading = false
+        this.$message.error(msg)
+      }
+    },
+
     async handleEdit (row) {
       this.formTitle = '修改小区'
       this.formShow = true

From d49cf77822f1ac02aaff1c22d043f06281136f19 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 9 Aug 2022 10:57:30 +0800
Subject: [PATCH 38/78] =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/worklog/icworklog-add-or-update.vue | 2 +-
 src/views/modules/worklog/icworklog.vue               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index 0e2b90212..d3c4ce2e0 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -32,7 +32,7 @@
                   </el-option>
               </el-select>
       </el-form-item>
-          <el-form-item label="日志日期" prop="logDate">
+          <el-form-item label="日志时间" prop="logDate">
               <el-date-picker
                       v-model="dataForm.logDate"
                       format="yyyy-MM-dd"
diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue
index 802d22b38..59a9764da 100644
--- a/src/views/modules/worklog/icworklog.vue
+++ b/src/views/modules/worklog/icworklog.vue
@@ -28,7 +28,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="上报人姓名"
+        <el-form-item label="网格员"
                       prop="createdUser">
           <el-input v-model="dataForm.createdUser"
                     size="small"
@@ -45,7 +45,7 @@
                   placeholder="请输入联系电话">
         </el-input>
       </el-form-item>
-        <el-form-item label="上报时间" prop="startTime" label-width="100px">
+        <el-form-item label="日志时间" prop="startTime" label-width="100px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"

From 6398504000072afcc48ff3341343c140747f3b48 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 9 Aug 2022 11:17:27 +0800
Subject: [PATCH 39/78] table fixed

---
 src/views/modules/base/collect.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 541b7290a..2cbc3c2b1 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -91,13 +91,14 @@
         :height="tableHeight"
         :span-method="arraySpanMethod"
       >
-        <el-table-column label="序号" prop="desc" align="center" width="50" />
+        <el-table-column label="序号" prop="desc" align="center" width="50" fixed="left" />
         <el-table-column
           prop="houseHolderName"
           width="100"
           label="户主姓名"
           align="center"
           :show-overflow-tooltip="true"
+          fixed="left"
         />
         <el-table-column
           prop="address"
@@ -225,6 +226,7 @@
           align="center"
           label="状态"
           :show-overflow-tooltip="true"
+          fixed="right"
         >
         <template slot-scope="scope">
           <span v-if="scope.row.checkState === '0'">未审核</span>
@@ -233,7 +235,7 @@
           <span v-else></span>
         </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100">
+        <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button
               type="text"

From 97a440d794e68a74b913690ec192bc8b4501b681 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 9 Aug 2022 13:38:49 +0800
Subject: [PATCH 40/78] bug

---
 .../modules/visual/shundeju/controlCount.vue     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/visual/shundeju/controlCount.vue b/src/views/modules/visual/shundeju/controlCount.vue
index 3a00ce06f..9263b8886 100644
--- a/src/views/modules/visual/shundeju/controlCount.vue
+++ b/src/views/modules/visual/shundeju/controlCount.vue
@@ -104,7 +104,7 @@ export default {
           'min-width': '20px'
         },
         {
-          'min-width': '20px'
+          'min-width': '50px'
         },
         {
           'min-width': '20px'
@@ -113,7 +113,7 @@ export default {
           'min-width': '210px'
         },
         {
-          'min-width': '400px',
+          'min-width': '280px',
           'white-space':'pre-wrap'
         },
         {
@@ -213,9 +213,17 @@ export default {
           if (item.gender == "0") {
             item.gender = '女'
           } else if (item.gender == "1") {
-            item = '男'
+            item.gender = '男'
+          } else {
+            item.gender = '未知'
+          }
+
+          if (item.type == "0") {
+            item.type = '访客'
+          } else if (item.type == "1") {
+            item.type = '租客'
           } else {
-            item = '未知'
+            item.type = '未知'
           }
           return {
             ...item,

From e1fa541b6a4faec988a28bbfed077fc642ce03b6 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 9 Aug 2022 14:19:13 +0800
Subject: [PATCH 41/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 7e170800e..6ebc53925 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -792,7 +792,7 @@
 
         <!-- 排序 -->
         <el-form-item label="排序">
-          <el-input-number v-model="modifyGridFrom.gridSort" :min="1" label="排序"></el-input-number>
+          <el-input-number v-model="modifyGridFrom.gridSort" :min="0" label="排序"></el-input-number>
         </el-form-item>
 
         <el-form-item label="负责人">
@@ -1588,7 +1588,7 @@ export default {
         this.modifyGridFrom.gridType = '',
         this.modifyGridFrom.manageDistrict = '',
         this.modifyGridFrom.griId = ''
-        this.modifyGridFrom.gridSort = 0
+        
     },
     // 社区新增弹框取消按钮
     cancel () {

From 5afe8a5ad1f8603415ed2bcd2fde182d40310b2d Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 9 Aug 2022 14:25:05 +0800
Subject: [PATCH 42/78] =?UTF-8?q?=E6=9C=80=E5=B0=8F=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 6ebc53925..260ee6575 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -792,7 +792,7 @@
 
         <!-- 排序 -->
         <el-form-item label="排序">
-          <el-input-number v-model="modifyGridFrom.gridSort" :min="0" label="排序"></el-input-number>
+          <el-input-number v-model="modifyGridFrom.gridSort" :min="1" label="排序"></el-input-number>
         </el-form-item>
 
         <el-form-item label="负责人">

From bbec0e3f06a4ad5f7210d52d9fac27dcfb86e946 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 9 Aug 2022 16:43:33 +0800
Subject: [PATCH 43/78] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/collect.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 2cbc3c2b1..1f869873a 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -91,14 +91,13 @@
         :height="tableHeight"
         :span-method="arraySpanMethod"
       >
-        <el-table-column label="序号" prop="desc" align="center" width="50" fixed="left" />
+        <el-table-column label="序号" prop="desc" align="center" width="50"/>
         <el-table-column
           prop="houseHolderName"
           width="100"
           label="户主姓名"
           align="center"
           :show-overflow-tooltip="true"
-          fixed="left"
         />
         <el-table-column
           prop="address"
@@ -248,7 +247,7 @@
               type="text"
               class="div-table-button--detail"
               size="small"
-              v-if="scope.row.checkState === '0'"
+              v-if="scope.row.agencyId == agencyId && scope.row.checkState === '0'"
               @click="handleWatch('check', scope.row)"
               >审核</el-button
             >
@@ -434,6 +433,7 @@ import roomForm from './roomForm'
 export default {
   data() {
     return {
+      agencyId: '',
       openSearch: false,
 
       formShow: false,
@@ -489,7 +489,10 @@ export default {
       }
     },
   },
-  mounted() {
+  created () {
+    this.agencyId = localStorage.getItem('agencyId')
+  },
+  mounted () {
     // this.getcommunityList();
     this.getDictList()
     this.getTableData()

From f93364007cd74c9b6d02984d80c748b6ae563602 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 9 Aug 2022 16:53:18 +0800
Subject: [PATCH 44/78] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shequzhili/statics/index.vue      | 462 ++++++++++++++++++
 1 file changed, 462 insertions(+)
 create mode 100644 src/views/modules/shequzhili/statics/index.vue

diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue
new file mode 100644
index 000000000..396935fda
--- /dev/null
+++ b/src/views/modules/shequzhili/statics/index.vue
@@ -0,0 +1,462 @@
+<template>
+  <div class="mode-block resi-container">
+    <el-card ref="searchCard" class="search-card">
+      <el-form ref="searchForm" :inline="true" :model="dataForm" size="small">
+        <el-form-item label="所属组织" label-width="100px"
+                      prop="agencyId">
+          <el-cascader ref="cascaderUnit" v-model="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}" clearable />
+            <!-- <template slot-scope="{ node, data }">
+              <div @click="cascaderClick(data)">
+                <span>{{ data.objectName }}</span>
+                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+              </div>
+            </template> -->
+        </el-form-item>
+        <el-form-item label="统计类型"
+                      prop="startTime"  label-width="100px">
+          <el-radio v-model="dataForm.type" label="end" @change="handleRadioCHange">截止累计值</el-radio>
+          <el-radio v-model="dataForm.type" label="Interval" @change="handleRadioCHange">区间新增值</el-radio>     
+          <el-date-picker v-if="dataForm.type == 'end'" 
+            v-model="dataForm.startTime"
+            type="datetime"
+            clearable
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyyMMddHHmmss" 
+          />     
+          <el-date-picker v-if="dataForm.type == 'Interval'" v-model="timeRange"
+            type="datetimerange"
+            clearable
+            size="small"
+            :picker-options="pickerOptions"
+            range-separator="至"
+            start-placeholder="选择日期"
+            end-placeholder="选择日期"
+            value-format="yyyy-MM-dd HH:mm:ss" 
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" class="diy-button--search" @click="handleSearch">查询</el-button>
+          <el-button
+            class="diy-button--reset"
+            size="small"
+            @click="resetForm('searchForm')"
+            >重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button @click="totalHandle"
+                    class="diy-button--add"
+                    size="small">总计</el-button>
+        <el-button @click="exportHandle"
+                    class="diy-button--reset"
+                    size="small" :loading="exportLoading">导出</el-button>
+      </div>
+      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border  style="width: 100%"
+      :height="tableHeight" show-summary>
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
+        <el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column min-width="100" prop="resiUserCount" label="注册居民数" header-align="center" align="center" >
+          <!-- <template slot-scope="scope">
+            <span v-if="scope.row.orgType==='agency'"><a class="name-a" style="color: #2195fe;" @click="handleClick(scope.row)">{{scope.row.orgName}}</a></span>
+            <span v-else>{{scope.row.orgName}}</span>
+          </template> -->
+        </el-table-column>
+        <el-table-column min-width="100" prop="partyMemberCount" label="注册党员数" header-align="center" align="center" />
+        
+        <el-table-column min-width="100" prop="icEventCount" label="事件总数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="resiEventCount" label="居民上报事件数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="pcEventCount" label="平台录入事件数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="projectCount" label="项目总数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="issueProjectCount" label="议题转项目数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="icEventProjectCount" label="事件立项数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="agencyProjectCount" label="立项数" header-align="center" align="center" />
+      </el-table>
+      <div>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="pageNo"
+          :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="totalVisible"
+            width="60%">
+      <template>
+        <el-table
+                :data="tableData"
+                style="width: 100%"
+                height="200">
+          <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
+        <el-table-column min-width="100" prop="resiUserCount" label="注册居民数" header-align="center" align="center" />
+        <el-table-column min-width="100" prop="partyMemberCount" label="注册党员数" header-align="center" align="center" />
+        
+        <el-table-column min-width="100" prop="icEventCount" label="事件总数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="resiEventCount" label="居民上报事件数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="pcEventCount" label="平台录入事件数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="projectCount" label="项目总数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="issueProjectCount" label="议题转项目数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="icEventProjectCount" label="事件立项数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="agencyProjectCount" label="立项数" header-align="center" align="center" />
+        </el-table>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+// import AddOrUpdate from './factagencyuserhousedaily-add-or-update'
+import { dateFormats } from '@/utils/index'
+export default {
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/data/stats/factAgencyUserHouseDaily/page',
+        getDataListIsPage: true,
+        deleteURL: '/data/stats/factAgencyUserHouseDaily',
+        deleteIsBatch: true,
+        exportURL: '/data/stats/factAgencyUserHouseDaily/export'
+      },
+      exportLoading: false,
+      dataListLoading: false,
+      optionsA: [],
+      totalVisible: false,
+      pickerOptions: {
+        disabledDate(time) {
+            return time.getTime() > Date.now();
+          },
+      },
+      dataList: [],
+      timeRange: '',
+      dataForm: {
+        customerId: this.$store.state.user.customerId,
+        agencyId: '',
+        startTime: dateFormats('YYYY-mm-dd HH:MM:SS', new Date()),
+        endTime: '',
+        type: 'end'
+      },
+      total: 0,
+      tableData: [],
+      pageNo: 1,
+      pageSize: 20
+    }
+  },
+  components: {
+    // AddOrUpdate
+  },
+  created () {
+    this.getGridList()
+    this.getTableList()
+    // this.getValiheList()
+  },
+  watch: {
+    timeRange (val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.dataForm.startTime = val[0];
+        this.dataForm.endTime = val[1];
+      } else {
+        this.dataForm.startTime = "";
+        this.dataForm.endTime = "";
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    tableHeight() {
+      const h = this.clientHeight - 360 + this.iframeHeigh;
+      const _h = this.clientHeight - 360;
+      return this.$store.state.inIframe ? h : _h;
+    },
+  },
+  methods: {
+    handleClick(row) {
+      this.dataForm.agencyId = row.orgId
+      this.handleSearch()
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.timeRange = "";
+      this.dataForm.startTime = "";
+      this.dataForm.endTime = "";
+      this.dataForm.type = 'end';
+      this.pageNo = 1
+      this.getTableList()
+    },
+    handleSearch() {
+      this.dataForm.type = 1
+      this.pageNo = 1
+      this.getTableList()
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.getTableList();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNo = val;
+      this.getTableList();
+    },
+    handleRadioCHange(val) {
+      console.log('val----', val)
+      this.timeRange = ''
+      this.dataForm.startTime = ''
+      this.dataForm.endTime = ''
+      if (val == 'end') {
+        this.dataForm.startTime = dateFormats('YYYY-mm-dd HH:MM:SS', new Date())
+      }
+    },
+    exportHandle () {
+      const url = '/data/aggregator/org/orgProjectDetailList/export'
+      this.dataForm.type = 1
+      this.exportLoading = true
+      this.$http({
+        method: 'Post',
+        url,
+        responseType: 'blob',
+        data: this.dataForm
+      }).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对象
+          // this.exportLoading = false
+        } else this.$message.error('下载失败')
+        this.exportLoading = false
+      }).catch(err => {
+        console.log('err', err)
+        this.exportLoading = false
+        return this.$message.error('网络错误')
+      })
+    },
+    cascaderClick (nodeData) {
+      this.dataForm.agencyId = nodeData.objectId;
+      this.dataForm.level = nodeData.objectType
+      this.$refs.cascaderUnit.checkedValue = nodeData.objectId;
+      this.$refs.cascaderUnit.computePresentText();
+      this.$refs.cascaderUnit.toggleDropDownVisible(false);
+
+    },
+    totalHandle () {
+      this.tableData = []
+      let resiUserCount = 0, 
+      partyMemberCount = 0, 
+      icEventCount = 0, 
+      resiEventCount = 0, 
+      pcEventCount = 0, 
+      projectCount = 0, 
+      issueProjectCount = 0, 
+      icEventProjectCount = 0, 
+      agencyProjectCount = 0
+      if (this.dataList.length > 0) {
+        this.dataList.forEach(item => {
+          resiUserCount += item.resiUserCount
+          partyMemberCount += item.partyMemberCount
+          icEventCount += item.icEventCount
+          resiEventCount += item.resiEventCount
+          pcEventCount += item.pcEventCount
+          projectCount += item.projectCount
+          issueProjectCount += item.issueProjectCount
+          resiUicEventProjectCountserCount += item.icEventProjectCount
+          agencyProjectCount += item.agencyProjectCount
+        })
+      }
+      
+      this.tableData.push({
+        resiUserCount, 
+        partyMemberCount, 
+        icEventCount, 
+        resiEventCount, 
+        pcEventCount, 
+        projectCount, 
+        issueProjectCount, 
+        icEventProjectCount, 
+        agencyProjectCount
+      })
+      // this.$http
+      //         .post('/data/aggregator/org/orgProjectDetailList', this.dataForm)
+      //         .then(({ data: res }) => {
+      //           if (res.code !== 0) {
+      //             return this.$message.error(res.msg)
+      //           } else {
+      //             console.log('获取查询详情成功', res.data.list)
+      //             this.tableData = res.data.list
+      //           }
+      //         })
+      //         .catch(() => {
+      //           return this.$message.error('网络错误')
+      //         })
+
+      this.totalVisible = true
+    },
+    getTableList() {
+      const { user } = this.$store.state
+      const _data = {
+        ...this.dataForm,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize
+      }
+      this.$http
+        .post('/data/aggregator/datastats/nowstatsdata', _data)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.dataList = res.data.list
+            this.total = res.data.total
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getGridList() {
+      const { user } = this.$store.state
+      this.dataListLoading = true
+      const params = {
+        agencyId: user.agencyId,
+        client: 'gov'
+      }
+      this.$http
+        // .post('/gov/org/userhouse/service/serviceScopeTree')
+        // .post('/data/aggregator/org/agencytree', params)
+        .post('/gov/org/customeragency/staffinagencylist')
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            let { agencyList, subAgencyList } = res.data
+            // this.optionsA = res.data
+            // console.log(this.optionsA);
+            this.dataForm.agencyId = agencyList.agencyId
+            const _arr = [{...agencyList, subAgencyList: [...subAgencyList] }]
+            this.optionsA = this.deepTree(_arr)
+            console.log('optionsA----', this.optionsA)
+          }
+        })
+        .catch(() => {
+          this.dataListLoading = false
+          return this.$message.error('网络错误')
+        })
+        this.dataListLoading = false
+    },
+    deepTree(arr) {
+      if (Array.isArray(arr)) {
+        return arr.map(item => {
+          return {
+            ...item,
+            subAgencyList: item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList) || null
+          }
+        })
+      }
+    }
+  }
+}
+</script>
+<style>
+.block{
+  position: absolute;
+  left: 0px;
+  display: inline-block;
+  width: 35px;
+  height: 50px;
+  background: #fff;
+}
+.cascader-block .el-cascader-node>.el-radio{
+  display: none;
+}
+</style>
+<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;
+  }
+  .resi-row-btn {
+    margin-bottom: 13px;
+    .upload-btn {
+      display: inline-block;
+      margin: 0 10px;
+    }
+  }
+</style>

From cc5c052b996c4f9957604ab11a954c99ca9e743c Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 9 Aug 2022 17:03:42 +0800
Subject: [PATCH 45/78] =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/worklog/icworklog.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue
index 59a9764da..3b50a8e5b 100644
--- a/src/views/modules/worklog/icworklog.vue
+++ b/src/views/modules/worklog/icworklog.vue
@@ -33,7 +33,7 @@
           <el-input v-model="dataForm.createdUser"
                     size="small"
                     clearable
-                    placeholder="请输入上报人姓名">
+                    placeholder="请输入网格员姓名">
           </el-input>
         </el-form-item>
         <br/>
@@ -96,9 +96,9 @@
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="title" label="标题" header-align="center" align="center"></el-table-column>
         <el-table-column prop="logType" label="日志类型" :formatter="categoryCodeFormatter" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="logDate" label="日志日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdUser" 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="logDate" label="日志时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdUser" 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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>

From 6817d22353977bda33f29e3a213fea204fa14028 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 10 Aug 2022 10:18:01 +0800
Subject: [PATCH 46/78] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1123?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shequzhili/statics/index.vue      | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue
index 396935fda..5897a5d08 100644
--- a/src/views/modules/shequzhili/statics/index.vue
+++ b/src/views/modules/shequzhili/statics/index.vue
@@ -13,18 +13,18 @@
             </template> -->
         </el-form-item>
         <el-form-item label="统计类型"
-                      prop="startTime"  label-width="100px">
+                      prop="endTime"  label-width="100px">
           <el-radio v-model="dataForm.type" label="end" @change="handleRadioCHange">截止累计值</el-radio>
           <el-radio v-model="dataForm.type" label="Interval" @change="handleRadioCHange">区间新增值</el-radio>     
-          <el-date-picker v-if="dataForm.type == 'end'" 
-            v-model="dataForm.startTime"
+          <el-date-picker v-show="dataForm.type == 'end'" 
+            v-model="dataForm.endTime"
             type="datetime"
             clearable
             size="small"
             :picker-options="pickerOptions"
-            value-format="yyyyMMddHHmmss" 
+            value-format="yyyy-MM-dd HH:mm:ss" 
           />     
-          <el-date-picker v-if="dataForm.type == 'Interval'" v-model="timeRange"
+          <el-date-picker v-show="dataForm.type == 'Interval'" v-model="timeRange"
             type="datetimerange"
             clearable
             size="small"
@@ -58,6 +58,11 @@
       :height="tableHeight" show-summary>
         <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
         <el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column min-width="100" prop="orgName" label="所属组织" header-align="center" align="center" >
+          <template slot-scope="scope">
+            <a class="name-a" style="color: #2195fe;" @click="handleClick(scope.row)">{{scope.row.orgName}}</a>
+          </template>
+        </el-table-column>
         <el-table-column min-width="100" prop="resiUserCount" label="注册居民数" header-align="center" align="center" >
           <!-- <template slot-scope="scope">
             <span v-if="scope.row.orgType==='agency'"><a class="name-a" style="color: #2195fe;" @click="handleClick(scope.row)">{{scope.row.orgName}}</a></span>
@@ -74,7 +79,7 @@
         <el-table-column min-width="110" prop="icEventProjectCount" label="事件立项数" header-align="center" align="center" />
         <el-table-column min-width="110" prop="agencyProjectCount" label="立项数" header-align="center" align="center" />
       </el-table>
-      <div>
+      <!-- <div>
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
@@ -85,7 +90,7 @@
           :total="total"
         >
         </el-pagination>
-      </div>
+      </div> -->
     </el-card>
     <el-dialog
             title="总计"
@@ -97,6 +102,7 @@
                 style="width: 100%"
                 height="200">
           <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
+        <el-table-column min-width="100" prop="orgName" label="组织名称" header-align="center" align="center" />
         <el-table-column min-width="100" prop="resiUserCount" label="注册居民数" header-align="center" align="center" />
         <el-table-column min-width="100" prop="partyMemberCount" label="注册党员数" header-align="center" align="center" />
         
@@ -120,13 +126,6 @@ import { dateFormats } from '@/utils/index'
 export default {
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/data/stats/factAgencyUserHouseDaily/page',
-        getDataListIsPage: true,
-        deleteURL: '/data/stats/factAgencyUserHouseDaily',
-        deleteIsBatch: true,
-        exportURL: '/data/stats/factAgencyUserHouseDaily/export'
-      },
       exportLoading: false,
       dataListLoading: false,
       optionsA: [],
@@ -140,9 +139,9 @@ export default {
       timeRange: '',
       dataForm: {
         customerId: this.$store.state.user.customerId,
-        agencyId: '',
-        startTime: dateFormats('YYYY-mm-dd HH:MM:SS', new Date()),
-        endTime: '',
+        agencyId: this.$store.state.user.agencyId,
+        startTime: '',
+        endTime: dateFormats('YYYY-mm-dd HH:MM:SS', new Date()),
         type: 'end'
       },
       total: 0,
@@ -168,6 +167,7 @@ export default {
         this.dataForm.startTime = "";
         this.dataForm.endTime = "";
       }
+      console.log('startTime----w', this.dataForm.startTime)
     }
   },
   computed: {
@@ -187,13 +187,13 @@ export default {
       this.$refs[formName].resetFields();
       this.timeRange = "";
       this.dataForm.startTime = "";
-      this.dataForm.endTime = "";
+      this.dataForm.endTime = dateFormats('YYYY-mm-dd HH:MM:SS', new Date())
       this.dataForm.type = 'end';
       this.pageNo = 1
       this.getTableList()
     },
     handleSearch() {
-      this.dataForm.type = 1
+      // this.dataForm.type = 1
       this.pageNo = 1
       this.getTableList()
     },
@@ -213,12 +213,15 @@ export default {
       this.dataForm.startTime = ''
       this.dataForm.endTime = ''
       if (val == 'end') {
-        this.dataForm.startTime = dateFormats('YYYY-mm-dd HH:MM:SS', new Date())
+        this.$nextTick(() => {
+          this.dataForm.endTime = dateFormats('YYYY-mm-dd HH:MM:SS', new Date())
+        })
+        console.log('endTime----', this.dataForm.endTime)
       }
     },
     exportHandle () {
-      const url = '/data/aggregator/org/orgProjectDetailList/export'
-      this.dataForm.type = 1
+      const url = '/data/aggregator/datastats/nowstatsdataexport'
+      // this.dataForm.type = 1
       this.exportLoading = true
       this.$http({
         method: 'Post',
@@ -277,12 +280,13 @@ export default {
           pcEventCount += item.pcEventCount
           projectCount += item.projectCount
           issueProjectCount += item.issueProjectCount
-          resiUicEventProjectCountserCount += item.icEventProjectCount
+          icEventProjectCount += item.icEventProjectCount
           agencyProjectCount += item.agencyProjectCount
         })
       }
       
       this.tableData.push({
+        orgName: this.$store.state.user.agencyName,
         resiUserCount, 
         partyMemberCount, 
         icEventCount, 
@@ -313,8 +317,8 @@ export default {
       const { user } = this.$store.state
       const _data = {
         ...this.dataForm,
-        pageNo: this.pageNo,
-        pageSize: this.pageSize
+        // pageNo: this.pageNo,
+        // pageSize: this.pageSize
       }
       this.$http
         .post('/data/aggregator/datastats/nowstatsdata', _data)
@@ -322,8 +326,8 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            this.dataList = res.data.list
-            this.total = res.data.total
+            this.dataList = res.data
+            // this.total = res.data.total
           }
         })
         .catch(() => {
@@ -349,7 +353,7 @@ export default {
             let { agencyList, subAgencyList } = res.data
             // this.optionsA = res.data
             // console.log(this.optionsA);
-            this.dataForm.agencyId = agencyList.agencyId
+            // this.dataForm.agencyId = agencyList.agencyId
             const _arr = [{...agencyList, subAgencyList: [...subAgencyList] }]
             this.optionsA = this.deepTree(_arr)
             console.log('optionsA----', this.optionsA)

From 5563b30bc7c725229deca1d387fd354765e251c9 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 10 Aug 2022 10:41:50 +0800
Subject: [PATCH 47/78] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/collect.vue | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 1f869873a..0dabd1b4e 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -399,6 +399,23 @@
             :show-overflow-tooltip="true"
           >
           </el-table-column>
+          <el-table-column
+            prop="faceImg"
+            min-width="120"
+            align="center"
+            label="人脸"
+          >
+          <template slot-scope="scope">
+            <el-image 
+              style="max-height: 50px; max-width: 50px;"
+              :src="scope.row.faceImg" 
+              :preview-src-list="[scope.row.faceImg]">
+              <div slot="error" class="image-slot">
+                <!-- <i class="el-icon-picture-outline"></i> -->
+              </div>
+            </el-image>
+          </template>
+          </el-table-column>
         </el-table>
         <div class="resi-btns">
           <el-button @click="formShow = false">{{ $t('cancel') }}</el-button>

From 4d7dc61c3a0bcf05a4495958c299ea53082200e9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 10 Aug 2022 10:46:29 +0800
Subject: [PATCH 48/78] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=A1=AB=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildTable.vue     |  17 +++
 .../modules/base/community/communityTable.vue |  18 ++-
 .../modules/base/community/roomTable.vue      |  28 +++-
 src/views/modules/base/resi.vue               |  21 ++-
 src/views/modules/cpts/baobiao/index.vue      | 138 ++++++++++++++++++
 5 files changed, 215 insertions(+), 7 deletions(-)
 create mode 100644 src/views/modules/cpts/baobiao/index.vue

diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 486dc9ec7..9ccf0f897 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -57,6 +57,9 @@
                  size="small"
                  :disabled="yihuyidangDisabled"
                  @click="handleExportYihuyidang()">导出一户一档</el-button>
+      <el-button size="small"
+              class="diy-button--add"
+              @click="reportForm">智能填报</el-button>
     </div>
 
     <div class="div_table_item">
@@ -194,6 +197,7 @@
                   @dialogOk="addFormOk"></build-form>
     </el-dialog>
 
+    <baobiao ref="baobiao" />
   </div>
 </template>
 
@@ -204,6 +208,7 @@ import BuildForm from './buildForm'
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
+import baobiao from "@/views/modules/cpts/baobiao";
 
 let loading // 加载动画
 export default {
@@ -233,6 +238,7 @@ export default {
     }
   },
   components: {
+    baobiao,
     BuildForm
   },
   async mounted () {
@@ -248,6 +254,17 @@ export default {
     ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
+    reportForm(){
+      let paramMap = {
+        neighborHoodId: this.agencyObj.id
+      };
+      this.$refs.baobiao.init({
+        elseParams: {
+          categoryKeys:['house_info'], categoryKey: 'house_info', paramMap
+        }
+      })
+    },
+
     indexMethod (index) {
       return index + 1;
     },
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index eb953177f..b1d6f8eca 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -88,6 +88,9 @@
                  :disabled="yihuyidangDisabled"
                  @click="handleExportYihuyidang()">导出一户一档</el-button> -->
 
+      <el-button size="small"
+                   class="diy-button--add"
+                   @click="reportForm">智能填报</el-button>
     </div>
 
     <div class="div_table_item">
@@ -214,6 +217,7 @@
         </span>
     </el-dialog>
 
+    <baobiao ref="baobiao" />
   </div>
 </template>
 
@@ -225,6 +229,7 @@ import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import axios from 'axios'
+import baobiao from "@/views/modules/cpts/baobiao";
 
 let loading // 加载动画
 export default {
@@ -265,6 +270,7 @@ export default {
     }
   },
   components: {
+    baobiao,
     CommunityForm
   },
   async mounted () {
@@ -279,7 +285,17 @@ export default {
     ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
-
+    reportForm(){
+      let paramMap = {
+        level: this.agencyObj.level,
+        id: this.agencyObj.id
+      };
+      this.$refs.baobiao.init({
+        elseParams: {
+          categoryKeys:['house_info'], categoryKey: 'house_info', paramMap
+        }
+      })
+    },
     async loadTable (fromTree, treeObj) {
       console.log(111, this.staffAgencyId)
       // 是否显示补全一房一码信息按钮
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 8be48e23d..511bd5619 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -40,6 +40,9 @@
                  size="small"
                  :disabled="yihuyidangDisabled"
                  @click="handleExportYihuyidang()">导出一户一档</el-button>
+      <el-button size="small"
+                   class="diy-button--add"
+                   @click="reportForm">智能填报</el-button>
     </div>
 
     <div class="div_table_item ">
@@ -187,16 +190,16 @@
                  @dialogOk="addFormOk"></room-form>
     </el-dialog>
 
+    <baobiao ref="baobiao" />
   </div>
 </template>
 
 <script>
-
 import roomForm from './roomForm'
-
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
+import baobiao from "@/views/modules/cpts/baobiao";
 
 let loading // 加载动画
 export default {
@@ -242,11 +245,10 @@ export default {
       ],
 
       yihuyidangDisabled: false,
-
-
     }
   },
   components: {
+    baobiao,
     roomForm
   },
   async mounted () {
@@ -261,6 +263,24 @@ export default {
     ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
+    reportForm(){
+      let paramMap = {
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
+        buildingId: this.agencyObj.id
+      };
+      this.$refs.baobiao.init({
+        elseParams: {
+          categoryKeys:['house_info'], categoryKey: 'house_info', paramMap
+        }
+      })
+    },
+
     indexMethod (index) {
       return index + 1;
     },
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 5700c7756..f17ce3198 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -77,6 +77,9 @@
                      @click="deleteBatch">批量删除</el-button>
         <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
 
+        <el-button size="small"
+                   class="diy-button--add"
+                   @click="reportForm">智能填报</el-button>
       </div>
       <el-table ref="ref_table"
                 :data="tableData"
@@ -315,7 +318,7 @@
                  :userId="lookInfo.userId"
                  :gridName="lookInfo.gridName"
                  @close="handleCancleLook" />
-
+    <baobiao ref="baobiao" />
   </div>
 </template>
 
@@ -329,11 +332,13 @@ import { mapGetters } from 'vuex'
 import resiTransfer from '../../components/resiTransfer.vue'
 import resiChangeRecord from '../../components/resiChangeRecord.vue'
 import peopleMore from "@/views/modules/shequ/cpts/people-more";
+import baobiao from "@/views/modules/cpts/baobiao";
 import diyInfo from './diyInfo.vue'
 import { requestPost } from "@/js/dai/request";
 
 export default {
   components: {
+    baobiao,
     resiSearch,
     resiForm,
     editResi,
@@ -394,7 +399,7 @@ export default {
       lookInfo: {
         userId: '',
         gridName: ''
-      }
+      },
     }
   },
   props: {
@@ -449,6 +454,18 @@ export default {
     console.log('document.documentElement.clientWidth', document.documentElement.clientHeight)
   },
   methods: {
+    reportForm(){
+      this.$refs.baobiao.init({
+        elseParams: {
+          categoryKeys:['resi_info'], categoryKey: 'resi_info', paramMap:{
+          formCode: 'resi_base_info',
+          pageNo: this.currentPage,
+          pageSize: this.pageSize,
+          conditions: this.conditions
+          }
+        }
+      })
+    },
     checkSelect (row, index) {
 
       return row.isChecked
diff --git a/src/views/modules/cpts/baobiao/index.vue b/src/views/modules/cpts/baobiao/index.vue
new file mode 100644
index 000000000..5efd538b7
--- /dev/null
+++ b/src/views/modules/cpts/baobiao/index.vue
@@ -0,0 +1,138 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    :title="'智能填表'"
+    :close-on-click-modal="true"
+    :close-on-press-escape="true"
+    width="850px"
+    :top="diaTop"
+  >
+    <el-table
+      v-loading="loading"
+      :data="list"
+      row-key="id"
+      border
+      :height="tableHeight"
+      style="width: 100%"
+    >
+      <el-table-column type="index" label="序号" width="50" />
+      <el-table-column
+        prop="reportName"
+        label="模板名称"
+        header-align="center"
+        min-width="150"
+      ></el-table-column>
+      <el-table-column
+        label="客户配置"
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="fillIn(scope.row)"
+            >填写</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost, requestGet } from "@/js/dai/request";
+import { mapGetters } from "vuex";
+
+export default {
+  data() {
+    return {
+      loading: false,
+
+      visible: false,
+
+      list: [], //客户列表
+
+      elseParams: {},
+    };
+  },
+
+  computed: {
+    tableHeight() {
+      // return this.resolution === 'small' ? this.clientHeight - 210 : this.clientHeight - 220
+      return this.clientHeight - 300;
+    },
+    diaWidth() {
+      return this.resolution === "small" ? 60 : 50;
+    },
+    diaHeight() {
+      return this.resolution === "small" ? 350 : 600;
+    },
+    diaTop() {
+      return this.resolution === "small" ? "30px" : "100px";
+    },
+    ...mapGetters(["clientHeight", "resolution"]),
+  },
+
+  mounted() {},
+
+  methods: {
+    async init(row) {
+      console.log("1111111111", row);
+      const { elseParams } = row;
+      this.visible = true;
+      this.elseParams = { ...elseParams };
+
+      this.customerList = [];
+
+      await this.getList();
+    },
+
+    //获取所有客户列表
+    async getList() {
+      this.loading = true;
+      const { elseParams } = this;
+      const { data, code, msg } = await requestPost(
+        "/oper/customize/icCustomerReport/report-list",
+        {
+          ...elseParams,
+        }
+      );
+      this.loading = false;
+      if (code === 0) {
+        this.list = data.map((item) => {
+          return item;
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async fillIn(item) {
+      const { reportId } = item;
+      const url = "/oper/customize/icCustomerReport/preview";
+      const parmas = {
+        ...this.elseParams,
+        reportId,
+      };
+
+      const { data, code, msg } = await requestPost(url, parmas);
+
+      if (code === 0) {
+        let token = localStorage.getItem("token");
+        let prefix = window.SITE_CONFIG["apiURL"].slice(0, -4);
+        window.open(
+          `${prefix}/jmreport/view/${reportId}?token=${token}&paramKey=${data.paramKey}`
+        );
+
+        // this.visible = false;
+        this.$emit("afterFillIn");
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

From 81c292ad92ee6de8139927bd165ba63d9a359f9c Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 10 Aug 2022 10:54:50 +0800
Subject: [PATCH 49/78] dd

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

diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue
index 5897a5d08..90e0a32e0 100644
--- a/src/views/modules/shequzhili/statics/index.vue
+++ b/src/views/modules/shequzhili/statics/index.vue
@@ -55,7 +55,7 @@
                     size="small" :loading="exportLoading">导出</el-button>
       </div>
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border  style="width: 100%"
-      :height="tableHeight" show-summary>
+      :height="tableHeight">
         <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
         <el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column min-width="100" prop="orgName" label="所属组织" header-align="center" align="center" >
@@ -173,8 +173,8 @@ export default {
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
     tableHeight() {
-      const h = this.clientHeight - 360 + this.iframeHeigh;
-      const _h = this.clientHeight - 360;
+      const h = this.clientHeight - 330 + this.iframeHeigh;
+      const _h = this.clientHeight - 330;
       return this.$store.state.inIframe ? h : _h;
     },
   },

From f2122883efc2287cd2258bf6a848061e11e4e39e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 10 Aug 2022 14:00:44 +0800
Subject: [PATCH 50/78] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B9=9F=E4=B8=8D?=
 =?UTF-8?q?=E7=9F=A5=E9=81=93=E6=9C=89=E7=94=A8=E7=BE=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildTable.vue     |  13 +-
 .../modules/base/community/communityTable.vue |  12 +-
 .../modules/base/community/roomTable.vue      | 947 +++++++++---------
 src/views/modules/cpts/baobiao/index.vue      |   2 +-
 4 files changed, 492 insertions(+), 482 deletions(-)

diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 9ccf0f897..53dbad392 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -256,7 +256,18 @@ export default {
   methods: {
     reportForm(){
       let paramMap = {
-        neighborHoodId: this.agencyObj.id
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        level: this.agencyObj.level,
+        id: this.agencyObj.id,
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        sortType: this.sortType,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
       };
       this.$refs.baobiao.init({
         elseParams: {
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index b1d6f8eca..1c326ec10 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -287,8 +287,18 @@ export default {
   methods: {
     reportForm(){
       let paramMap = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
         level: this.agencyObj.level,
-        id: this.agencyObj.id
+        id: this.agencyObj.id,
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        sortType: this.sortType,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
       };
       this.$refs.baobiao.init({
         elseParams: {
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 511bd5619..15c62a15e 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -1,193 +1,215 @@
 <template>
   <div>
     <div class="div_btn">
-
-      <el-button v-if="agencyObj.level==='building'||source!=='search'"
-                 style="float:left"
-                 class="diy-button--add"
-                 size="small"
-                 @click="handleAdd">新增房屋</el-button>
-      <div class="btn_upload"
-           v-if="showImportBtn">
-        <el-button style="float:left"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule">下载房屋模板</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"
-                     size="small"
-                     class="diy-button--delete">导入房屋数据</el-button>
+      <el-button
+        v-if="agencyObj.level === 'building' || source !== 'search'"
+        style="float: left"
+        class="diy-button--add"
+        size="small"
+        @click="handleAdd"
+        >新增房屋</el-button
+      >
+      <div class="btn_upload" v-if="showImportBtn">
+        <el-button
+          style="float: left"
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule"
+          >下载房屋模板</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"
+            size="small"
+            class="diy-button--delete"
+            >导入房屋数据</el-button
+          >
         </el-upload>
       </div>
-      <el-button style="float:left;margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="handleExport">导出</el-button>
-      <el-button style="float:left;margin-left:10px"
-                 class="diy-button--more"
-                 size="small"
-                 @click="deleteBatch">批量删除</el-button>
-      <el-button style=";margin-left:10px"
-                 class="diy-button--export"
-                 size="small"
-                 :disabled="yihuyidangDisabled"
-                 @click="handleExportYihuyidang()">导出一户一档</el-button>
-      <el-button size="small"
-                   class="diy-button--add"
-                   @click="reportForm">智能填报</el-button>
+      <el-button
+        style="float: left; margin-left: 10px"
+        class="diy-button--reset"
+        size="small"
+        @click="handleExport"
+        >导出</el-button
+      >
+      <el-button
+        style="float: left; margin-left: 10px"
+        class="diy-button--more"
+        size="small"
+        @click="deleteBatch"
+        >批量删除</el-button
+      >
+      <el-button
+        style="margin-left: 10px"
+        class="diy-button--export"
+        size="small"
+        :disabled="yihuyidangDisabled"
+        @click="handleExportYihuyidang()"
+        >导出一户一档</el-button
+      >
+      <el-button size="small" class="diy-button--add" @click="reportForm"
+        >智能填报</el-button
+      >
     </div>
 
-    <div class="div_table_item ">
-      <el-table ref="ref_table"
-                :data="tableData"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                v-loading="tableLoading"
-                @sort-change="handleSortOrderChange"
-                border
-                :height="tableHeight"
-                style="width: 100%"
-                @select-all="selectAll"
-                @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         :selectable="checkSelect"
-                         width="55">
+    <div class="div_table_item">
+      <el-table
+        ref="ref_table"
+        :data="tableData"
+        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+        v-loading="tableLoading"
+        @sort-change="handleSortOrderChange"
+        border
+        :height="tableHeight"
+        style="width: 100%"
+        @select-all="selectAll"
+        @selection-change="selectionChange"
+      >
+        <el-table-column type="selection" :selectable="checkSelect" width="55">
         </el-table-column>
-        <el-table-column fixed="left"
-                         width="55"
-                         type="index"
-                         label="序号"
-                         :index="indexMethod">
+        <el-table-column
+          fixed="left"
+          width="55"
+          type="index"
+          label="序号"
+          :index="indexMethod"
+        >
         </el-table-column>
 
-        <el-table-column prop="houseNameShow"
-                         label="房屋名称"
-                         fixed="left"
-                         min-width="160">
+        <el-table-column
+          prop="houseNameShow"
+          label="房屋名称"
+          fixed="left"
+          min-width="160"
+        >
         </el-table-column>
-        <el-table-column prop="neighborHoodName"
-                         label="所属小区"
-                         min-width="150">
+        <el-table-column
+          prop="neighborHoodName"
+          label="所属小区"
+          min-width="150"
+        >
         </el-table-column>
-        <el-table-column prop="buildingName"
-                         label="所属楼栋"
-                         width="80">
+        <el-table-column prop="buildingName" label="所属楼栋" width="80">
         </el-table-column>
-        <el-table-column prop="unitNum"
-                         label="单元号"
-                         width="70">
+        <el-table-column prop="unitNum" label="单元号" width="70">
         </el-table-column>
-        <el-table-column prop="doorName"
-                         label="门牌号"
-                         width="70">
+        <el-table-column prop="doorName" label="门牌号" width="70">
         </el-table-column>
-        <el-table-column prop="houseType"
-                         label="类型"
-                         width="50">
+        <el-table-column prop="houseType" label="类型" width="50">
         </el-table-column>
-        <el-table-column prop="purpose"
-                         label="用途"
-                         width="50">
+        <el-table-column prop="purpose" label="用途" width="50">
         </el-table-column>
-        <el-table-column prop="rentFlag"
-                         label="房屋状态"
-                         width="80">
+        <el-table-column prop="rentFlag" label="房屋状态" width="80">
         </el-table-column>
-        <el-table-column prop="ownerName"
-                         label="房主姓名"
-                         width="90">
+        <el-table-column prop="ownerName" label="房主姓名" width="90">
         </el-table-column>
-        <el-table-column prop="ownerPhone"
-                         label="联系方式"
-                         width="110">
+        <el-table-column prop="ownerPhone" label="联系方式" width="110">
         </el-table-column>
-        <el-table-column prop="ownerIdCard"
-                         label="身份证"
-                         width="170">
+        <el-table-column prop="ownerIdCard" label="身份证" width="170">
         </el-table-column>
-        <el-table-column prop="remark"
-                         label="备注"
-                         width="170">
+        <el-table-column prop="remark" label="备注" width="170">
         </el-table-column>
 
-        <el-table-column prop="sort"
-                         sortable="custom"
-                         min-width="140"
-                         label="排序">
+        <el-table-column
+          prop="sort"
+          sortable="custom"
+          min-width="140"
+          label="排序"
+        >
           <template slot-scope="scope">
             <div @click="handleEditSort(scope.row)">
-              <span v-if="!scope.row.isChange">{{scope.row.sort}}</span>
-              <el-input-number v-else
-                               @change="handleChangeSort(scope.row)"
-                               v-model="scope.row.sort"
-                               class="item_width_4"
-                               :precision="2"
-                               size="small"
-                               :min="0"
-                               :max="9999"
-                               label="描述文字"></el-input-number>
+              <span v-if="!scope.row.isChange">{{ scope.row.sort }}</span>
+              <el-input-number
+                v-else
+                @change="handleChangeSort(scope.row)"
+                v-model="scope.row.sort"
+                class="item_width_4"
+                :precision="2"
+                size="small"
+                :min="0"
+                :max="9999"
+                label="描述文字"
+              ></el-input-number>
             </div>
-
           </template>
         </el-table-column>
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="140"
-                         header-align="center"
-                         align="center"
-                         class="operate">
+        <el-table-column
+          label="操作"
+          fixed="right"
+          width="140"
+          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 v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--delete"
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="handleDetail(scope.row)"
+              >查看</el-button
+            >
+            <el-button
+              v-if="scope.row.showBtn"
+              type="text"
+              class="div-table-button--edit"
+              size="small"
+              @click="handleEdit(scope.row)"
+              >修改</el-button
+            >
+
+            <el-button
+              v-if="scope.row.showBtn"
+              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="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="pageSize"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
         </el-pagination>
       </div>
-
     </div>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="900px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <room-form ref="ref_form"
-                 @dialogCancle="addFormCancle"
-                 @dialogOk="addFormOk"></room-form>
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <room-form
+        ref="ref_form"
+        @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"
+      ></room-form>
     </el-dialog>
 
     <baobiao ref="baobiao" />
@@ -195,31 +217,30 @@
 </template>
 
 <script>
-import roomForm from './roomForm'
+import roomForm from "./roomForm";
 import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
 import baobiao from "@/views/modules/cpts/baobiao";
 
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
+  data() {
     return {
-      source: 'tree',//来源
+      source: "tree", //来源
       importRoomLoading: false,
       total: 0,
       pageSize: 20,
       pageNo: 0,
-      sortType: 'asc',//asc：正，desc：倒
+      sortType: "asc", //asc：正，desc：倒
       tableLoading: true,
 
       // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
 
-      agencyObj: {},//树所选的小区对象
-      agencyLevel: '',//树对应的level， grid neighborHood building agency
+      agencyObj: {}, //树所选的小区对象
+      agencyLevel: "", //树对应的level， grid neighborHood building agency
 
-
-      validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
+      validTableDataNum: 0, //有效的数据数量，即有权限操作的数据数量
       selection: [],
       showDeletBtn: false,
 
@@ -227,151 +248,140 @@ export default {
 
       //form相关
       formShow: false,
-      formTitle: '新增房屋',
+      formTitle: "新增房屋",
 
       rentList: [
         {
-          value: '1',
-          label: '出租'
+          value: "1",
+          label: "出租",
         },
         {
-          value: '2',
-          label: '闲置'
+          value: "2",
+          label: "闲置",
         },
         {
-          value: '0',
-          label: '自住'
+          value: "0",
+          label: "自住",
         },
       ],
 
       yihuyidangDisabled: false,
-    }
+    };
   },
   components: {
     baobiao,
-    roomForm
-  },
-  async mounted () {
-
+    roomForm,
   },
+  async mounted() {},
   computed: {
-    tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
-
+    tableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 425 + this.iframeHeight
+        : this.clientHeight - 425;
     },
 
-    ...mapGetters(['clientHeight', 'iframeHeight'])
+    ...mapGetters(["clientHeight", "iframeHeight"]),
   },
   methods: {
-    reportForm(){
+    reportForm() {
       let paramMap = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        level: this.agencyLevel,
+        id: this.agencyObj.id,
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
         purpose: this.purpose,
         remark: this.remark,
+        sortType: this.sortType,
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
-        buildingId: this.agencyObj.id
       };
       this.$refs.baobiao.init({
         elseParams: {
-          categoryKeys:['house_info'], categoryKey: 'house_info', paramMap
-        }
-      })
+          categoryKeys: ["house_info"],
+          categoryKey: "house_info",
+          paramMap,
+        },
+      });
     },
 
-    indexMethod (index) {
+    indexMethod(index) {
       return index + 1;
     },
-    handleSortOrderChange (value) {
-
-      this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
-      this.loadTable()
-
+    handleSortOrderChange(value) {
+      this.sortType = value.order === "ascending" ? "asc" : "desc";
+      this.loadTable();
     },
-    handleSortChange (value) {
-
-      this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
-      this.loadTable()
-
+    handleSortChange(value) {
+      this.sortType = value.order === "ascending" ? "asc" : "desc";
+      this.loadTable();
     },
 
-    handleEditSort (row) {
+    handleEditSort(row) {
       if (!row.isChange) {
-        row.isChange = true
+        row.isChange = true;
       }
-
     },
 
-    async handleChangeSort (row, index) {
+    async handleChangeSort(row, index) {
       // row.isChange = false
 
       let params = {
         id: row.houseId,
         sort: row.sort,
-        type: 'house',
-      }
+        type: "house",
+      };
 
-      let url = '/gov/org/house/update-sort'
+      let url = "/gov/org/house/update-sort";
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         // this.$message({
         //   type: 'success',
         //   message: '修改成功'
         // })
-
-
       } else {
-
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
-
     },
 
-    checkSelect (row, index) {
+    checkSelect(row, index) {
       let isChecked = false;
-      if (row.showBtn) { // 判断里面是否存在某个参数
-        isChecked = true
+      if (row.showBtn) {
+        // 判断里面是否存在某个参数
+        isChecked = true;
       } else {
-        isChecked = false
+        isChecked = false;
       }
-      return isChecked
-    },
-
-    loadTreeFromSearch () {
-
+      return isChecked;
     },
 
-    async loadTable (source, treeObj) {
+    loadTreeFromSearch() {},
 
-      this.source = source
-      this.tableLoading = true
-
-      if (source === 'tree') {//来源于tree，查询数据清空
-        this.sortType = 'asc'
-        this.agencyObj = treeObj
-
-      } else if (source === 'search') {//来源于查询
-        this.agencyObj = treeObj
+    async loadTable(source, treeObj) {
+      this.source = source;
+      this.tableLoading = true;
 
+      if (source === "tree") {
+        //来源于tree，查询数据清空
+        this.sortType = "asc";
+        this.agencyObj = treeObj;
+      } else if (source === "search") {
+        //来源于查询
+        this.agencyObj = treeObj;
       }
 
-      if (this.agencyObj.level === 'grid') {
-        this.agencyLevel = 'grid'
-
-      } else if (this.agencyObj.level === 'neighborHood') {
-        this.agencyLevel = 'neighborHood'
-
-      } else if (this.agencyObj.level === 'building') {
-        this.agencyLevel = 'building'
-
+      if (this.agencyObj.level === "grid") {
+        this.agencyLevel = "grid";
+      } else if (this.agencyObj.level === "neighborHood") {
+        this.agencyLevel = "neighborHood";
+      } else if (this.agencyObj.level === "building") {
+        this.agencyLevel = "building";
       } else {
-        this.agencyLevel = 'agency'
-
+        this.agencyLevel = "agency";
       }
 
       // if (fromTree) {
@@ -391,195 +401,186 @@ export default {
         sortType: this.sortType,
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
-      }
+      };
 
-      const url = "/gov/org/house/houselist"
+      const url = "/gov/org/house/houselist";
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.total = data.total
-        this.validTableDataNum = 0
-        data.list.forEach(item => {
+        this.total = data.total;
+        this.validTableDataNum = 0;
+        data.list.forEach((item) => {
           item.sort = parseInt(item.sort) || 0;
-          item.sort = item.sort.toFixed(2)
-          item.isChange = false
-          item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName
+          item.sort = item.sort.toFixed(2);
+          item.isChange = false;
+          item.houseNameShow =
+            item.neighborHoodName +
+            item.buildingName +
+            item.unitNum +
+            item.doorName;
 
           if (item.agencyId === this.staffAgencyId) {
-            item.showBtn = true
-            this.validTableDataNum++
+            item.showBtn = true;
+            this.validTableDataNum++;
           } else {
-            item.showBtn = false
+            item.showBtn = false;
           }
-
         });
-        this.tableData = data.list
+        this.tableData = data.list;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-      this.tableLoading = false
+      this.tableLoading = false;
     },
 
-    diaClose () {
-      this.$refs.ref_form.resetData()
-      this.formShow = false
+    diaClose() {
+      this.$refs.ref_form.resetData();
+      this.formShow = false;
     },
 
-    handleDetail (row) {
-      this.formTitle = '房屋详情'
-      this.formShow = true
+    handleDetail(row) {
+      this.formTitle = "房屋详情";
+      this.formShow = true;
       this.$nextTick(() => {
-
-        this.$refs.ref_form.initForm('detail', row, this.agencyObj)
-      })
+        this.$refs.ref_form.initForm("detail", row, this.agencyObj);
+      });
     },
 
-    handleAdd () {
-
-      this.formTitle = '新增房屋'
-      this.formShow = true
+    handleAdd() {
+      this.formTitle = "新增房屋";
+      this.formShow = true;
       this.$nextTick(() => {
-
-        this.$refs.ref_form.initForm('add', null, this.agencyObj)
-      })
+        this.$refs.ref_form.initForm("add", null, this.agencyObj);
+      });
     },
 
-    handleEdit (row) {
-      this.formTitle = '修改房屋'
-      this.formShow = true
+    handleEdit(row) {
+      this.formTitle = "修改房屋";
+      this.formShow = true;
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
-      })
+        this.$refs.ref_form.initForm("edit", row, this.agencyObj);
+      });
     },
 
-    addFormCancle () {
-      this.formShow = false
+    addFormCancle() {
+      this.formShow = false;
     },
-    addFormOk () {
-      this.formShow = false
-      this.loadTable()
+    addFormOk() {
+      this.formShow = false;
+      this.loadTable();
     },
 
-
-    deleteBatch () {
+    deleteBatch() {
       if (this.selection.length > 0) {
         this.$confirm("确认删除选择的房屋?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
           .then(() => {
-            this.deleteCommunityBatch()
+            this.deleteCommunityBatch();
           })
-          .catch(err => {
+          .catch((err) => {
             if (err == "cancel") {
               // this.$message({
               //   type: "info",
               //   message: "已取消删除"
               // });
             }
-
           });
       } else {
-        this.$message.warning('请先选择要删除的房屋')
+        this.$message.warning("请先选择要删除的房屋");
       }
     },
-    selectAll (selection) {
-      this.selection = selection
-
+    selectAll(selection) {
+      this.selection = selection;
     },
-    selectionChange (selection) {
-      this.selection = selection
-
+    selectionChange(selection) {
+      this.selection = selection;
     },
 
-    async handleDelete (row) {
-
+    async handleDelete(row) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          this.deleteRoom(row)
+          this.deleteRoom(row);
         })
-        .catch(err => {
+        .catch((err) => {
           if (err == "cancel") {
             // this.$message({
             //   type: "info",
             //   message: "已取消删除"
             // });
           }
-
         });
-
-
     },
 
-    async deleteCommunityBatch () {
-      let ids = []
-      this.selection.forEach(element => {
-
-        ids.push(element.houseId)
+    async deleteCommunityBatch() {
+      let ids = [];
+      this.selection.forEach((element) => {
+        ids.push(element.houseId);
       });
 
-      const url = "/gov/org/house/delete"
+      const url = "/gov/org/house/delete";
 
       let params = {
-        type: 'house',
-        ids: ids
-      }
+        type: "house",
+        ids: ids,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.$message({
           type: "success",
-          message: "删除成功"
+          message: "删除成功",
         });
-        this.$emit('refreshTree')
-        this.loadTable()
+        this.$emit("refreshTree");
+        this.loadTable();
       } else if (code > 8000) {
         this.$message({
           showClose: true,
           message: msg,
-          duration: 0
-        })
-        this.$emit('refreshTree')
-        this.loadTable()
+          duration: 0,
+        });
+        this.$emit("refreshTree");
+        this.loadTable();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
-    async deleteRoom (row) {
-      const url = "/gov/org/house/housedel"
+    async deleteRoom(row) {
+      const url = "/gov/org/house/housedel";
 
       let params = {
-        houseId: row.houseId
-      }
+        houseId: row.houseId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.$message({
           type: "success",
-          message: "删除成功"
+          message: "删除成功",
         });
-        this.$emit('refreshTree')
-        this.loadTable()
+        this.$emit("refreshTree");
+        this.loadTable();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     //导出表格
-    async handleExport () {
-      let title = this.agencyObj.label
-      title = title + '—房屋列表'
+    async handleExport() {
+      let title = this.agencyObj.label;
+      title = title + "—房屋列表";
 
-      const url = "/gov/org/house/exporthouseinfo"
+      const url = "/gov/org/house/exporthouseinfo";
       let params = {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
@@ -588,63 +589,59 @@ export default {
         remark: this.remark,
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
-        buildingId: this.agencyObj.id
-      }
-
+        buildingId: this.agencyObj.id,
+      };
 
-      if (this.agencyObj.level === 'grid') {
-        params.gridId = this.agencyObj.id
-        params.agencyId = ''
-        params.buildingId = ''
-        params.neighborHoodId = ''
-      } else if (this.agencyObj.level === 'neighborHood') {
-        params.neighborHoodId = this.agencyObj.id
-        params.agencyId = ''
-        params.buildingId = ''
-        params.gridId = ''
-      } else if (this.agencyObj.level === 'building') {
-        params.buildingId = this.agencyObj.id
-        params.agencyId = ''
-        params.neighborHoodId = ''
-        params.gridId = ''
+      if (this.agencyObj.level === "grid") {
+        params.gridId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.neighborHoodId = "";
+      } else if (this.agencyObj.level === "neighborHood") {
+        params.neighborHoodId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.gridId = "";
+      } else if (this.agencyObj.level === "building") {
+        params.buildingId = this.agencyObj.id;
+        params.agencyId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
       } else {
-
-        params.agencyId = this.agencyObj.id
-        params.buildingId = ''
-        params.neighborHoodId = ''
-        params.gridId = ''
+        params.agencyId = this.agencyObj.id;
+        params.buildingId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
       }
 
       app.ajax.exportFilePost(
         url,
         params,
         (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
+          this.download(data, title + ".xls");
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
         }
       );
-
     },
 
     // 下载文件
-    download (data, fileName) {
+    download(data, fileName) {
       if (!data) {
-        return
+        return;
       }
 
-      var csvData = new Blob([data])
+      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');
+        var a = document.createElement("a");
         document.body.appendChild(a);
-        a.style = 'display: none';
+        a.style = "display: none";
         var url = window.URL.createObjectURL(csvData);
         a.href = url;
         a.download = fileName;
@@ -652,22 +649,20 @@ export default {
         a.remove();
         window.URL.revokeObjectURL(url);
       }
-
     },
 
-    handleExportModule () {
-      let title = ''
-      title = '房屋模板'
+    handleExportModule() {
+      let title = "";
+      title = "房屋模板";
 
-      const url = "/gov/org/house/exporttemplate"
-      let params = {}
+      const url = "/gov/org/house/exporttemplate";
+      let params = {};
 
       app.ajax.exportFilePost(
         url,
         params,
         (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
+          this.download(data, title + ".xls");
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -676,17 +671,15 @@ export default {
     },
 
     //导出一户一档
-    handleExportYihuyidang () {
-      this.yihuyidangDisabled = true
-      let title = this.agencyObj.label
-      title = title + '-一户一档'
-      let url = "/gov/org/house/exportHouseUser"
-
-
+    handleExportYihuyidang() {
+      this.yihuyidangDisabled = true;
+      let title = this.agencyObj.label;
+      title = title + "-一户一档";
+      let url = "/gov/org/house/exportHouseUser";
 
       let params = {
-        agencyId: '',
-        gridId: '',
+        agencyId: "",
+        gridId: "",
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
@@ -694,97 +687,95 @@ export default {
         remark: this.remark,
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
-        buildingId: '',
-        neighborHoodId: ''
-      }
+        buildingId: "",
+        neighborHoodId: "",
+      };
 
-      if (this.agencyObj.level === 'grid') {
-        params.gridId = this.agencyObj.id
-        params.agencyId = ''
-        params.buildingId = ''
-        params.neighborHoodId = ''
-      } else if (this.agencyObj.level === 'neighborHood') {
-        params.neighborHoodId = this.agencyObj.id
-        params.agencyId = ''
-        params.buildingId = ''
-        params.gridId = ''
-      } else if (this.agencyObj.level === 'building') {
-        params.buildingId = this.agencyObj.id
-        params.agencyId = ''
-        params.neighborHoodId = ''
-        params.gridId = ''
+      if (this.agencyObj.level === "grid") {
+        params.gridId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.neighborHoodId = "";
+      } else if (this.agencyObj.level === "neighborHood") {
+        params.neighborHoodId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.gridId = "";
+      } else if (this.agencyObj.level === "building") {
+        params.buildingId = this.agencyObj.id;
+        params.agencyId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
       } else {
-
-        params.agencyId = this.agencyObj.id
-        params.buildingId = ''
-        params.neighborHoodId = ''
-        params.gridId = ''
+        params.agencyId = this.agencyObj.id;
+        params.buildingId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
       }
 
       app.ajax.exportFilePost(
         url,
         params,
         (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-          this.yihuyidangDisabled = false
+          this.download(data, title + ".xls");
+          this.yihuyidangDisabled = false;
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
-          this.yihuyidangDisabled = false
+          this.yihuyidangDisabled = false;
         }
       );
     },
     // 上传文件之前的钩子
-    beforeUpload (file) {
+    beforeUpload(file) {
       this.files = file;
 
-      const isText = file.type === 'application/vnd.ms-excel'
-      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      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
+        this.$message.error("请选择正确格式的文件");
+        return false;
       } else {
         this.fileName = file.name;
-        return true
+        return true;
       }
-
     },
     // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
     },
 
-    async uploadFile () {
-
-
+    async uploadFile() {
       if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
+        this.$message.warning("请选择要上传的文件！");
+        return false;
       }
 
       this.$message({
         showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
 
       //清空上传列表
-      this.$refs['upload'].clearFiles()
+      this.$refs["upload"].clearFiles();
 
-      var url = '/gov/org/house/houseimport'
+      var url = "/gov/org/house/houseimport";
 
       let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("orgId", this.agencyObj.id); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("orgType", this.agencyObj.level); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
 
-      this.importRoomLoading = true
-      window.app.ajax.post2(url, fileFormData,
+      this.importRoomLoading = true;
+      window.app.ajax.post2(
+        url,
+        fileFormData,
         (data, rspMsg) => {
-
-          if (data.code === 0 && data.msg == 'success') {
+          if (data.code === 0 && data.msg == "success") {
             // this.$message.success('导入成功')
           } else {
             // this.$message({
@@ -795,68 +786,66 @@ export default {
             // })
             // this.$message.error(rspMsg)
           }
-          this.$emit('refreshTree')
-          this.loadTable()
-          this.importRoomLoading = false
+          this.$emit("refreshTree");
+          this.loadTable();
+          this.importRoomLoading = false;
         },
         (rspMsg, data) => {
-          this.importRoomLoading = false
-        }, { headers: { 'Content-Type': 'multipart/form-data' } })
-
-
+          this.importRoomLoading = false;
+        },
+        { headers: { "Content-Type": "multipart/form-data" } }
+      );
     },
 
-    showMessage (msg) {
-      this.$alert(msg, '操作结果', {
-        confirmButtonText: '关闭',
-        callback: action => {
-          this.$emit('refreshTree')
-          this.loadTable()
-
-        }
+    showMessage(msg) {
+      this.$alert(msg, "操作结果", {
+        confirmButtonText: "关闭",
+        callback: (action) => {
+          this.$emit("refreshTree");
+          this.loadTable();
+        },
       });
     },
 
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
     },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadTable();
     },
 
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
+        loading.close();
       }
-    }
+    },
   },
   watch: {
-    selection (val) {
-
+    selection(val) {
       if (val.length > 0) {
-        this.showDeletBtn = true
+        this.showDeletBtn = true;
       } else {
-        this.showDeletBtn = false
+        this.showDeletBtn = false;
       }
-    }
+    },
   },
   props: {
     staffAgencyId: {
       type: String,
-      default: '',
+      default: "",
     },
     showImportBtn: {
       type: Boolean,
@@ -864,36 +853,36 @@ export default {
     },
     ownerName: {
       type: String,
-      default: '',
+      default: "",
     },
     ownerPhone: {
       type: String,
-      default: '',
+      default: "",
     },
     rentFlag: {
       type: String,
-      default: '',
+      default: "",
     },
     purpose: {
       type: String,
-      default: '',
+      default: "",
     },
     remark: {
       type: String,
-      default: '',
+      default: "",
     },
     updateStartDate: {
       type: String,
-      default: '',
+      default: "",
     },
     updateEndDate: {
       type: String,
-      default: '',
+      default: "",
     },
-  }
-}
+  },
+};
 </script>
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/visual/communityManage.scss";
 
 .item_width_4 {
diff --git a/src/views/modules/cpts/baobiao/index.vue b/src/views/modules/cpts/baobiao/index.vue
index 5efd538b7..4408cec24 100644
--- a/src/views/modules/cpts/baobiao/index.vue
+++ b/src/views/modules/cpts/baobiao/index.vue
@@ -23,7 +23,7 @@
         min-width="150"
       ></el-table-column>
       <el-table-column
-        label="客户配置"
+        label="操作"
         fixed="right"
         header-align="center"
         align="center"

From 1757dc867b5c580121377118e0b7d87dc64df86c Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 10 Aug 2022 14:06:48 +0800
Subject: [PATCH 51/78] =?UTF-8?q?=E7=BE=A4=E4=BD=8F=E6=88=BFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/command/cpts/popup.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/command/cpts/popup.vue b/src/views/modules/visual/command/cpts/popup.vue
index 068a0a66c..0727e9fee 100644
--- a/src/views/modules/visual/command/cpts/popup.vue
+++ b/src/views/modules/visual/command/cpts/popup.vue
@@ -412,7 +412,7 @@
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 
 export default {
   name: "popup",

From 2fc08f37feb01d2ae070b3f4ad912b55f61c2bdc Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 10 Aug 2022 15:08:37 +0800
Subject: [PATCH 52/78] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BA=BA=E8=84=B8=E5=9B=BE=E7=89=87=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/visitor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/visitor.vue b/src/views/modules/base/visitor.vue
index 1a4695447..ab33ddc80 100644
--- a/src/views/modules/base/visitor.vue
+++ b/src/views/modules/base/visitor.vue
@@ -86,7 +86,7 @@
         >
         <template slot-scope="scope">
           <el-image 
-            style="max-width: 100px"
+            style="max-height: 50px; max-width: 50px;"
             :src="scope.row.faceImg" 
             :preview-src-list="[scope.row.faceImg]">
             <div slot="error" class="image-slot">

From 565631f748abb58c3b5638a2fa1a908b73dcf072 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 10 Aug 2022 15:51:32 +0800
Subject: [PATCH 53/78] dd

---
 .../shequzhili/xiangmu/cpts/project-info.vue  | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index a174146c8..1892c6df5 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -352,9 +352,21 @@
                   <i class="el-icon-plus avatar-uploader-icon"></i>
                 </el-upload>
               </el-form-item>
-
               <el-form-item
-                v-if="fmData.operateType != 'close'"
+                v-if="fmData.operateType == 'dispose'"
+                label="公开回复："
+                prop="publicReply"
+              >
+                <el-input
+                  type="textarea"
+                  :rows="2"
+                  placeholder="请输入内容"
+                  v-model="fmData.publicReply"
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item
+                v-if="fmData.operateType != 'close' && fmData.operateType != 'dispose'"
                 label="公开回复："
                 prop="publicReply"
               >
@@ -661,6 +673,10 @@ export default {
           obj.internalRemark = [
             { required: true, message: "请填写内部备注", trigger: "blur" },
           ];
+        } else if (operateType == "dispose") {
+          obj.publicReply = [
+            { required: true, message: "请填写公开回复", trigger: "blur" },
+          ]
         } else {
           obj.internalRemark = [
             { required: true, message: "请填写内部备注", trigger: "blur" },

From 23ca5ba2b09a7a3ddd39c0a60b48f8ebe3780bd4 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 11 Aug 2022 09:57:08 +0800
Subject: [PATCH 54/78] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue
index 90e0a32e0..40a9e4008 100644
--- a/src/views/modules/shequzhili/statics/index.vue
+++ b/src/views/modules/shequzhili/statics/index.vue
@@ -19,7 +19,7 @@
           <el-date-picker v-show="dataForm.type == 'end'" 
             v-model="dataForm.endTime"
             type="datetime"
-            clearable
+            :clearable="false"
             size="small"
             :picker-options="pickerOptions"
             value-format="yyyy-MM-dd HH:mm:ss" 

From 831744e79492e903126563f35fe564ca19231a39 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 11 Aug 2022 13:28:26 +0800
Subject: [PATCH 55/78] dd

---
 src/views/modules/base/diyInfo.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index 1f4b78ffc..aafdaa0f7 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -6,7 +6,7 @@
           <div class="left">
             <el-tabs v-model="leftActive" tab-position="left" class="left-h" @tab-click="handleTabsClick">
               <el-tab-pane v-for="item in leftList" :key="item.id" :label="item.label" :name="item.id">
-                <div class="pd10 dialog-h-content scroll-h">
+                <div class="pd10 check-boxwr scroll-h">
                   <checkBox v-if="item.queryItemList.length > 0" :ref="'checkbox' + item.id" 
                   :list="item.queryItemList" @change="handleChangeBox" />
                 </div>
@@ -466,6 +466,11 @@ export default {
   height: calc(80vh - 120px);
   .left {
     width: 49%;
+    height: 100%;
+    .check-boxwr  {
+      height: calc(80vh - 120px);
+      overflow: auto;
+    }
   }
   .right {
     flex-shrink: 0;
@@ -498,7 +503,7 @@ export default {
   margin-top: 10px;
 }
 .left-h {
-
+  height: 100%;
   ::v-deep .el-tabs__header.is-left,
   ::v-deep .el-tabs__nav-wrap.is-left::after {
     height: calc(80vh - 120px);

From 4589d29ab50a89bb43e8afe8ff8e2001f0ecfc61 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 11 Aug 2022 13:34:12 +0800
Subject: [PATCH 56/78] =?UTF-8?q?=E6=B2=A1=E7=94=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/worklog/icworklog-add-or-update.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index d3c4ce2e0..8fa5183d0 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -87,7 +87,6 @@ export default {
       optionsG: [],
       dataForm: {
         id: '',
-        customerId: '',
         agencyId: '',
         pids: '',
         gridId: '',
@@ -97,12 +96,6 @@ export default {
         content: '',
         remark: '',
         mobile: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: '',
         fileList: []
       }
     }

From ff742064b8a3cc653db5fe10a3305ade8902ae6a Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 11 Aug 2022 13:42:06 +0800
Subject: [PATCH 57/78] =?UTF-8?q?=E6=99=B4=E7=A9=BA=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/worklog/icworklog-add-or-update.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index 8fa5183d0..e3b72f34d 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -133,6 +133,7 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
+        this.dataForm.fileList = []
         if (this.dataForm.id) {
           this.getInfo()
         }

From a51c3cac117abc6b8e6795425e062cb697abb8a6 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 11 Aug 2022 14:54:02 +0800
Subject: [PATCH 58/78] 111

---
 .../modules/shequzhili/xiangmu/xiangmu-ling.vue     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
index a9b6fe717..00f16d600 100644
--- a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
+++ b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
@@ -104,10 +104,10 @@
               </el-select>
 
             </el-form-item>
-            <!-- <el-form-item label="解决状态"
+            <el-form-item label="解决状态"
                           prop="status">
               <el-select class="item_width_2"
-                         v-model="fmData.status"
+                         v-model="fmData.closedStatus"
                          placeholder="全部"
                          size="small"
                          clearable>
@@ -118,7 +118,7 @@
                 </el-option>
               </el-select>
 
-            </el-form-item> -->
+            </el-form-item>
             <el-form-item label="上报时间"
                           prop="startTime">
               <el-date-picker v-model="fmData.startTime"
@@ -288,10 +288,10 @@
                            align="center"
                            label="状态	"
                            width="70" />
-          <!-- <el-table-column prop="status"
+          <el-table-column prop="closedStatus"
                            align="center"
                            label="解决状态	"
-                           width="90" /> -->
+                           width="90" />
           <!-- <template slot-scope="scope">
               {{ scope.row.status == 'pending' ? '处理中' : '已结案' }}
             </template>
@@ -369,7 +369,8 @@ const _form = {
   status: '',
   firstIdList: [],
   secondIdList: [],
-  staffId: ''
+  staffId: '',
+  closedStatus: ''
 }
 export default {
   components: { projectInfo },

From 29ff57db735ac6609f8344579aedf9cf21bd9611 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 11 Aug 2022 14:59:42 +0800
Subject: [PATCH 59/78] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8C=87=E6=8C=A5?=
 =?UTF-8?q?=E8=B0=83=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../img/shuju/command/arrow-right-green.png   | Bin 0 -> 237 bytes
 src/assets/img/shuju/command/ico2/IS_XJC.png  | Bin 0 -> 274 bytes
 src/assets/img/shuju/command/ico3/IS_XJC.png  | Bin 0 -> 4275 bytes
 src/views/modules/visual/command/cpts/map.vue |   4 +-
 .../modules/visual/command/cpts/popup.vue     | 165 ++++++++++++------
 .../modules/visual/command/cpts/qsydw.vue     |  22 ++-
 .../visual/command/cpts/sidemenu-left.vue     |   1 +
 src/views/modules/visual/command/index.vue    |   1 +
 8 files changed, 138 insertions(+), 55 deletions(-)
 create mode 100644 src/assets/img/shuju/command/arrow-right-green.png
 create mode 100644 src/assets/img/shuju/command/ico2/IS_XJC.png
 create mode 100644 src/assets/img/shuju/command/ico3/IS_XJC.png

diff --git a/src/assets/img/shuju/command/arrow-right-green.png b/src/assets/img/shuju/command/arrow-right-green.png
new file mode 100644
index 0000000000000000000000000000000000000000..3210ed9fe870f2d1b83bf3a521bd21c17704a2d3
GIT binary patch
literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^AT}Qd8;}%R+`Ae`F%}28J29*~C-V}>S?=lL7@`r}
zJLw>AQ-FZWeF^<r?dpul_9{iw_!e+vIGt{gTfnU8uudlBtbM|T6W49u?YWtf9&S?h
z(D78D?L47g$qO4Fxh$yaoa?Z>UxGEds7%U^x47Vvl!982b^HECzj9$?C$A+JO{X2m
zjA-@XxcZlA?!x01|Jj{hvG>k0<*dFtZMvW(V{86QF+t%|N58E4eqdpW^E2)}hdnG-
je46`#Yl+LQ-}4@E)|q-IPn69Bd4s{z)z4*}Q$iB}RWew#

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/command/ico2/IS_XJC.png b/src/assets/img/shuju/command/ico2/IS_XJC.png
new file mode 100644
index 0000000000000000000000000000000000000000..5170a3b5577a5d9b22683a0ccba80cd222bd7219
GIT binary patch
literal 274
zcmV+t0qy>YP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#%t=H+R2UhZ!Obc}aU1~9-(#>*USQ;7VZq);QsYi33#BY54`4O1k!FwwP_~wq
zO3gdmCM7k+#Hdj=YHW_%wfHaYlyXiaGP#jl7UQT(vZ#_v@~ASBjG{^|$)n1Kq!Ht2
z==#>xh<`BQ#EWJ7b}f0;G8u`?z`2fX9|m^ZX?s_XU$*ouL^#v*?9q|a2y^;2Bf_+y
zS`-|(a_h#my(pM5G!-tjqGa8@V~09cqvS$6^vp-etS4($^wgqc(L?x>d`7`g@)m#j
Y0T+tXN@w;t^#A|>07*qoM6N<$f~VJbJ^%m!

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/command/ico3/IS_XJC.png b/src/assets/img/shuju/command/ico3/IS_XJC.png
new file mode 100644
index 0000000000000000000000000000000000000000..cad05a58b767de98139051a29d203cc98a057887
GIT binary patch
literal 4275
zcmV;k5KQlhP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00001b5ch_0Itp)
z=>Px_ZAnByRCwC$U3qj=)fuOIwYGNE)>^HtR=c<rQA8BP9j#lfTU!<Nv>s2FKYC72
zTWbZi2aZcyDr!-ymMT4FnSCZJ2?S8tLI{wAMGTSv2_%?hGRaKB?f1L)eaW4h_cCiH
z3Hr{thsm4w?)~m>zWsjpGHKE{xP%ZNNwrP-AYRD;Gk5OXk2<vv9I%N%%FE097+Pgz
z<;PQP{B9y}j~L+W09(9x{U_+}PjU-|LZ3o=rLywVX5;Vl=kdNBpc59zkvL78=pa}C
zhCUzV_xq1tQd066`g{yGuh;uoZu)&Zhv)Gg1IvBtU^;Q;ganQ`&6?~{761~E*FvGs
z<>i$f>vp?89|#1#fR>k6{6#dE%k?Gx%-`WTJg?r12b96oIdj|t=_IN;aLj3#EI102
zS3p=Gg+gDUe~+W@j?W7Qzgk#W{57-TKEB6u*7Fiv^n?D;uf@ejS>p`?=_K0Y3cQhk
zW03^sfQvAB34{XWggn3h>v=xkNrl1S$ppwZ(dh3}xbZ!FkLU2be2?BoKj=?!ZrQP#
z$R`ElxC2iYRpvP6HgFDu=J9yG0YC}^fp6t`y{Ecd!S59K{b!)%c|6}kEAaWgKlmB<
zz24LD9G=H}cpv>Rn6iJ1D|L=!(H=J-n&9aM0>Ao@jw?G>2X2tlXz~QeX%a93$>Ry0
z>GJ!}F7SHKb-M$T(F(l5^9p^wDfoBjp7&flhv)I01^8+5N3b|k2U3lncMRxZZq#+-
zn1E;pp5~57u7gfuQI&el0?zFYeOq!6aTGuZmQ-9&vw8E)tp^V-i1hZZ>hJGwI(+zW
zH}xH(c37wj|Hg11-}m<Ru54{RIDcbp?F~gm<x|iP`a{3yUy8XB@#9&vK@W4IF48#%
zF%fudRi!>6E|ALK;y5Xy#5Hbr@SKum%cixpwLck+M(YkA7EzJLMS%9v`&-cu`a{3y
zALB4bVtnXG29b5+n1JX69_u?6*+BzATmZ!n5tAH3qPJ$lhO64!-(TE6Fwi2hc%eV^
zi~cc=r87^H#)#-(L&GA?dNF4pCc}9Qo^nG%CrS%SN*^LtR#`c{rRBgQ5J54D7y94V
z(lW2A>dhHav}t_MA?Z;TI}XI0aiWv8wF3`U5xNKp9^6p5a^=j<uC6?Kf52(t9lb&n
z?+{`^l@RxNgt+`wAufDDh%*<dfAKf&&#zL?;rS7+fv&Ewcg5;8voOBP75Fab0bNcY
z+F9pO;l4!Rv7vwnK__`bp^GAs$U3K)u4@+Jcf~?XeqMo<Y{T<-5AQo&eSOhQrKJ@!
zK!>7-=z^tA0Akj;&=g&ERoL3HrDe{O`iI<&P-*FmXn+3>yUA^B72<AJYM?na^n?B!
zMEadTaq-2Vhe5RbMronhI%7U|qMUWnWupPV3XZDfsvHL$qk~6QaTbU-Cln(getNYK
zXFr=A@VKEr^c%BL647XEyT=olrh^E2**aq$m=7D3tctQ7_p#{8=mHL_^6^fA&V#rt
zU%u*!-rl}yb0P=ALi{v8yTF<4&U`hFc}4pA-VRyfEF&5iIM7Y>t0*a6l(Pb$sr#7w
zbkT*MC0zxCSfsF_b2>Xa^UVqD=@8<YC8G--H;mKNF&xDAJ35wvKI!HVy)w2|e&V1g
zXO#<`xQ|7b^&a9<xD0N;|NQrwn*IdUqZ8iVBgD1;%?)_mFdoJ=RpRcZrayvC%f&gB
z^&yLLR=LpRJ~kY%UZgX=%%ZE@guvvY(u&KX(f(a=`iG$Wc|qy`{3;;C8uA#!QPuDn
z_fqKt<3{@pec0c>3v_~B(9NPO=R@<-4T^4&(+1Fv`(%)Axhx2qAQBYxPo?;Dk@=JV
z{ms<DdtsfkYl81m=?mkV7w81N%15NQ+;VL&FDEX{SbSOc>D(tXD#(aXwxnXks@Y_9
z<HEE0145khT<V;c=t_kXVVyyT;o7u-UeFEtW!!9VA?BNr7@OkDmX~#(&VAG_+`qr&
zZ{|erb*IjKYmx}`@JuRwf)4Wny`Wp?Le_<Bkuwrwen}T!&1pVC*L}WFXhv^e-&Qli
zNJsg1Cy|%IGpY7#Ml5}OeRck#qM5ob#Jt!d>tdWXfTsAuUt*`3EpLG*c)?q1*WOC0
zrMT$y_a&nTU^oo`L64aVTUT9u2k2*u%+59DX(z^M188M(<HT3_QNeTa$;02%+`Pb?
z;FN!*2jFOkFdFDFe;lIwi9)aUA{i^ItWBI4vo%f|KwbaAI<ey{O}`9@0+S29!ArWk
zyI1IhEq^zC|1H}_L~o!gP8D=_F9-dYhg^4&X)onivo+TBU|Im``j4%zOv?uXKXAMK
z=NEbdmr_<Z&i8w2Rc20bHr*J#J-Nz^k)!Xre7;$jhnf$?@|HE$^<dfnvH?*GM3nlG
zDf-Zfaxuv3Jqx~6p(k)Txdn%G!hYe+Jd*fLP>E_!R5g75buhC&L6_mq90L8A2j(Le
zrz|~axob!3h9qqZtQ!z^Us(U;`~6o!A?t))y(G6`TPiWKX-Ggn=7IUJJEI$tv@Ed>
zptasH%z(({MW1hafhTa4wt6Nn&LpSWZl|1eXuFDGIl(&X6(P1A6k_^ILQGvu34w?Z
z%P2{9M;cij&}C+>LBE^_Qe8AJtmx^6ge`Ga0F-MTGyu{;#P&a=U+!YJ&v%VU)mdpw
z%-5iR`v-+y&7DHbwvrE}J5`_f{>G(3G?KD-Y`GA7JJr2Ze=PF?{g?;lBj<%BQJUwd
z0cfqVodL^*feSqT*(L{GusHb%&3svfTJE}`_n`0QSlQ}cD;aPoqIB5m_tgFK$So-#
z*L^#2=d72L8w>pp=Rp5#$p~1qm-C|3T&@8mT@vSEB|9OA>1K+apLsj}J~-<SrRsC-
ze%0rj1l+^RgmBfxKl|(&A?jL_^E;sqOdU980O}$<Ffb68zPzh2IRIbUAVhH6@cS>W
zAIjn^tsQb-77@_TtsVY6`gnC?;_*ON9QzU7EW$Yf5XzNxAR7^vH+VIb2kh1fn_H21
zGM5oIw2{uc)P`FhCmr|NCiVHDa@FT=Lqg<l5#kY>zAyQ=>g&q?j65djGW@{Zpx@Mi
zSv4Z;#_-~i?#3Vtf)%4R-zuFjh+rZB7rrIL8=LLFgTGhyj{1DV>y}y|z^fXCc)(}>
z&g%sDb8AK(6Ljep=mz~}ILC`kS#e`@M;aX?1+J&DTwd=L6jLsYOIUU%w!|AKJ959r
z{=3`WP`Z)xdDVN>XSg#rEwz6KMrYH0=kY)f=!%Pl_cSj8{d!tU%`Zbg&<y1Opc%?>
zCI+EUSw+R2q>$s1=ZV&QyZW465Lo8c@bLTa0jIs_Y+)m@k=Kq50}?B*toj+~=ZuUQ
z%5fx;wOE*Qft-m(?H&;@gW7eGNN>GPU|`$G0JerlP8b}p0Wd*1hd3B^9uM@yEptX9
z4WJwJ%Nj&0Gi{d>%m_eUOj21|wHBgVVm2hZ_v~31UoDlpWz1wkxPD{79rS{3(9Z^h
zEwC!g97<=U4WOP-<%M)z59$epLcjke3eMYgBFlD;4*<({4of1mgI+z6VCp~J0%x31
zwbO&97*ks7+U9*Nub5)>pnq(^!}#U}Izg`~zIOUABLGc3s4r>Cm{H40Bdg&Fg>LDK
z#rEmM!aqwkGRbzsxCg`LT1adk=+v_?oJ6o&+RS)SNiXTp#h8nUII)`V_RoY;u4~x-
zs2Lk097{LFpKil=90uyf7xaPqK(C%i)z?Gp^k3R*!{)-eSrfxi34TrZRP^_aZSCzv
zCgm&02|n-n+<=F1FrIm}wY3F6ALz`ts<qg7=ruA~EAOx??clJ^<U-bk2+rNX;H~5)
zY_lt-yy(Tz1rPn(6<zl9MCw5o=+kwdS?ZQG?lS>2jR|uh>q0K?P>!kpN6RX!?x$FD
zm=K|A3W?Lv01y4zRb|l{@V@fO757<w-z>eXLvHlZxKB48Sp(3lOf_o*r3JHA>6Bkc
z;gQdG!}67@AB@Ig2ZmSF3$dg|Wtg)89Qr|j{kFxG(N@p_dMvu8^I|$%UcE+8-;9&h
z8bPx*+OEWnMHx$lGF9#k+)SMK097s6uJ$4{Lq2b2npPU`;eGUDUnAYuOq};i(4mqB
z!Aqp7AvzP4wq?wHPF$#$xtXHO&b1XIOMOUs=Ewfx;yE3iosNr@17x#THmVBzoBt=o
zxef(MxR3Ag9G)LI>>Sp0baYi?+(M847MV09s|&i=X*NYSCw0<x75ZR(IG>0ihqBd_
z>OzD<YsMfRlW=+bcTw@>8)o*}e$$N7Whfk9+ob-*-~9tg?OuvC@7?Pv@CNS2xR%2#
z^&Xe^f=<v2y6wt)v&MbN>=Drm%~>BpzgU|BF9h*Yd3yst!KBu0*!XyFZ}h-uY_f^P
zVuxzCY<b$_56&UZzm<&!yDYli(+kXVx>v;9;>A|ku3Fzp`y)!Zj6w7ULifJCcKtj`
zX4YjByq-wpy_!v%pYjzK-_PJ-T#OGo?5gwG>N;)t8nvxnIv48t&<cYF_lsDuavX@5
z95|8owEgw{&d%CwfEVuRd3SSt{Xg;Jkl5Y^H%cZ7WTu(cIxK&WjRxq{^`4#89rgWk
zP9P53?j?zrD|pi|DILW1)inz;1u+~B@7h|w?HSUsa~M3hD>`_vxcUwyJMczjhf+Fw
z=5!FPDuz=TL`=#AvAU*aeph#Qy_wNYN^E-~ja%#M7ZR7>1MtXTT(A3jcHrf7k6fzT
z{GImBB?576b@ihFabO_6#%3f-3-D^UY<=3YwsGL0_8GpO+-5tpXE-VF#$?lVCLqGF
z_<}|E5Qy`-dwLoOoP^E_#o3LUHgA2xS5$PL{1Gg%oe<z<6GRvm_-XLh{GrfY8#Zp7
z+Z_(qjV!i3JIPg<?<*?3NBWoaBUnGi!~riI5P9pr4x&tfspJEk?VE@jZ?D<1<uNi0
zTO7b^sB36gK=0q7!ZV66<d2{X#)JYd8z9O>DRQ<|m=(ARqKMFs48y!|BoYTA{ar`k
zJ#Ix8*JD8lk&enL+k<CD8Dn<P#At!Yo3at3qP#--iUbURq|EU{bUFtNOPG=o+qdo5
z@fX}jEsOH;WMW{dOp2=GPX@uW3(>|cc$w%#J{CYGAV_~nUy*=;SeKNPU$=8t<DXFo
zzN@kE;ga(5>#VSFh80~*(YNzYXz<bnQKrG<hMl3~P^`mtrpo9ATxm6FxsjkC;AA<j
zN=coL*jAo^G||L18zAz5JnFnGiyP(MJMUQliBBuy6N@CLTBj931@Mt3ynTO6PU9FW
z5IJ^M2?(6dh9m?I7*i)3$rC?FJh`dA)yYJ7PUE`c^dp`oJb1~1XdVy6Kn@)dHFScT
z_W2|L&A{o$Ivr8qB?F>)K$#AtEabG#43x!8L!XbgJL+y+oQX9SAeu+y@u7?wm~o9y
zuXH+Wam-I;%Qc90r(5ztjR47Pe6XSk+_;P|as{H(p|pI?DmT8D=+N0C`k?Mar~85<
z&0~?x#?K@=t#{IqdS&B4?nDQ0Pdd`COpbz2bR7Jo57L#+e?agda2W#oAv#Ck^?x7$
VjGI=k@b>@!002ovPDHLkV1gFlX8HgC

literal 0
HcmV?d00001

diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index a6da55e74..cbcd444d3 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/src/views/modules/visual/command/cpts/map.vue
@@ -830,7 +830,9 @@ export default {
     background: rgba(#020340, 0.58);
   }
   /deep/ .l7-popup-close-button {
-    color: #fff;
+    padding: 4px;
+    font-size: 36px;
+    color: rgba(#fff, 0.8);
   }
 
   #app {
diff --git a/src/views/modules/visual/command/cpts/popup.vue b/src/views/modules/visual/command/cpts/popup.vue
index 0727e9fee..ab50e8e08 100644
--- a/src/views/modules/visual/command/cpts/popup.vue
+++ b/src/views/modules/visual/command/cpts/popup.vue
@@ -51,9 +51,10 @@
           人员类别：
           <span>{{ info.resiCategoryNames || "--" }}</span>
         </div>
-        <div class="operate">
-          <div @click="handleClickBtn('watch-resi')" class="btn">查看更多</div>
 
+        <div @click="handleClickBtn('watch-resi')" class="more-btn">更多</div>
+
+        <div class="operate">
           <div
             @click="handleClickBtn('create-demand')"
             v-if="info.agencyId == $store.state.user.agencyId"
@@ -218,9 +219,7 @@
           <span>{{ info.idCard || "--" }}</span>
         </div>
 
-        <div class="operate">
-          <div @click="handleClickBtn('watch-event')" class="btn">查看详情</div>
-        </div>
+        <div @click="handleClickBtn('watch-event')" class="more-btn">更多</div>
       </div>
 
       <div v-if="placeType === 'community_org'">
@@ -335,11 +334,7 @@
           <span>{{ info.mobile || "--" }}</span>
         </div>
 
-        <div class="operate">
-          <div @click="handleClickBtn('watch-xuncha')" class="btn">
-            查看更多
-          </div>
-        </div>
+        <div @click="handleClickBtn('watch-xuncha')" class="more-btn">更多</div>
       </div>
 
       <div v-if="placeType === 'party_unit'">
@@ -387,6 +382,27 @@
       </div>
 
       <div v-if="placeType === 'grid'">
+        <div class="info-title">网格信息</div>
+        <div class="item">
+          网格名称：
+          <span>{{ info.gridName || "--" }}</span>
+        </div>
+        <div class="item">
+          网格类型：
+          <span>{{ info.gridTypeName || "--" }}</span>
+        </div>
+        <div class="item">
+          联系人：
+          <span>{{ info.manageDistrict || "--" }}</span>
+        </div>
+        <div class="item">
+          联系人电话：
+          <span>{{ info.mobile || "--" }}</span>
+        </div>
+        <div class="item">
+          网格位置：
+          <span>{{ info.centerAddress || "--" }}</span>
+        </div>
         <div class="operate">
           <div @click="handleClickBtn('create-service')" class="btn z-yellow">
             发起服务
@@ -403,7 +419,12 @@
             :key="'list' + item.id"
             v-for="(item, index) in list"
           >
-            {{ index + 1 }}、{{ item.content }}
+            <div class="item-cnt">{{ index + 1 }}、{{ item.content }}</div>
+            <img
+              src="@/assets/img/shuju/command/arrow-right-green.png"
+              alt=""
+              class="i-arrow"
+            />
           </div>
         </div>
       </div>
@@ -475,7 +496,7 @@ export default {
       }
 
       if (placeType === "grid") {
-        this.info = { ...item };
+        await this.loadGridInfo(item);
       }
 
       if (
@@ -507,7 +528,7 @@ export default {
       }
       if (placeType === "superior_resource") {
         //优势资源
-        await this.loadSuperiorResource(item);
+        await this.loadGridInfo(item);
       }
       if (placeType === "group_rent") {
         //群租房
@@ -709,7 +730,7 @@ export default {
       }
     },
 
-    async loadSuperiorResource(info) {
+    async loadGridInfo(info) {
       const url = "/gov/org/icSuperiorResource/detail";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icSuperiorResource/detail"
 
@@ -783,6 +804,30 @@ export default {
       }
     },
 
+    async loadGridInfo(info) {
+      const url = "/gov/org/grid/griddetail";
+
+      let params = {
+        gridId: info.id,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.info = {
+          id: data.grid,
+          gridId: data.grid,
+          gridName: data.gridName,
+          manageDistrict: data.manageDistrict,
+          mobile: data.mobile,
+          centerAddress: data.centerAddress,
+          gridTypeName: data.gridTypeName,
+        };
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
     async requestList() {
       const url = "/data/aggregator/coverage/analysis/resourceCategories";
       let params = {
@@ -816,50 +861,27 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// @import "@/assets/scss/c/config";
-// @import "@/assets/scss/c/function";
-// @import "@/assets/scss/modules/visual/c/common";
-@mixin toe {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  word-wrap: normal;
-}
-
-@mixin scrollBar2 {
-  &::-webkit-scrollbar {
-    /*滚动条整体样式*/
-    width: 8px; /*高宽分别对应横竖滚动条的尺寸*/
-    height: 1px;
-  }
-  &::-webkit-scrollbar-thumb {
-    /*滚动条里面小方块*/
-    border-radius: 8px;
-    box-shadow: inset 0 0 5px rgba(#000, 0.1);
-    background: linear-gradient(270deg, #999, #ddd);
-  }
-  &::-webkit-scrollbar-track {
-    /*滚动条里面轨道*/
-    box-shadow: inset 0 0 5px rgba(#000, 0.1);
-    border-radius: 8px;
-    background: darken(#999, 20);
-  }
-}
+@import "@/assets/scss/c/config.scss";
+@import "@/assets/scss/c/function.scss";
+@import "@/assets/scss/modules/visual/c/common.scss";
 
 .m-pop {
   @include scrollBar2;
-  max-width: 380px;
+  width: 450px;
   color: #fff;
   font-size: 14px;
   line-height: 20px;
-  max-height: 321px;
+  max-height: 500px;
   overflow-y: auto;
 
   .info {
+    padding: 10px;
     .info-title {
       margin-bottom: 10px;
-      font-size: 16px;
+      font-size: 24px;
       font-weight: bold;
+      color: #69efff;
+      line-height: 40px;
     }
 
     .item-pics {
@@ -876,21 +898,66 @@ export default {
   }
   .item {
     @include toe;
+    font-size: 18px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 34px;
+  }
+
+  .list {
+    .item {
+      display: flex;
+      align-items: center;
+      margin-bottom: 5px;
+      padding: 5px;
+      border-bottom: 1px dashed #124584;
+      &:last-child {
+        border-bottom: none;
+      }
+      .item-cnt {
+        @include toe;
+        width: 90%;
+      }
+      .i-arrow {
+        margin-left: auto;
+      }
+    }
   }
 
   .operate {
     display: flex;
+    justify-content: center;
+  }
+
+  .more-btn {
+    position: absolute;
+    right: 20px;
+    top: 30px;
+    width: 60px;
+    height: 24px;
+    background: rgba(221, 141, 2, 0.57);
+    border: 1px solid #dd8d02;
+    border-radius: 2px;
+    font-size: 16px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 24px;
+    text-align: center;
+    cursor: pointer;
   }
 
   .btn {
     margin-top: 20px;
     margin-right: 20px;
-    width: 80px;
-    line-height: 24px;
+    width: 110px;
+    line-height: 30px;
     border: 1px solid #eee;
     text-align: center;
-    font-size: 14px;
+    font-size: 18px;
     border-radius: 2px;
+    cursor: pointer;
     &.z-blue {
       background: #09a5ff;
       border-color: #09a5ff;
diff --git a/src/views/modules/visual/command/cpts/qsydw.vue b/src/views/modules/visual/command/cpts/qsydw.vue
index f73b57773..18f48f873 100644
--- a/src/views/modules/visual/command/cpts/qsydw.vue
+++ b/src/views/modules/visual/command/cpts/qsydw.vue
@@ -65,7 +65,6 @@
 
 <script>
 import cptCard from "@/views/modules/visual/cpts/card";
-
 import { requestPost } from "@/js/dai/request";
 import record from "@/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record";
 
@@ -144,6 +143,7 @@ export default {
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/visual/a_customize.scss";
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
+@import "@/assets/scss/modules/visual/c/common.scss";
 
 .m-pop {
   color: #fff;
@@ -215,17 +215,29 @@ export default {
 
 /deep/ .el-table {
   color: #ffffff;
-  border-color: rgba(#000, 0.1) !important;
+  border-color: transparent !important;
+  border: none !important;
+
+  .el-table__body-wrapper {
+    // @include scrollBar;
+  }
 
   th {
-    background: rgba(8, 37, 134, 0.85) !important;
+    color: rgba(#fff, 0.8) !important;
+    background: #082586 !important;
+    border-color: transparent !important;
+    border: none !important;
   }
   tr {
-    background: rgba(16, 75, 164, 0.85) !important;
+    background: #021152 !important;
+    border-color: transparent !important;
+    border: none !important;
 
     &:hover,
     td {
-      background: rgba(16, 75, 164, 0.85) !important;
+      background: #021152 !important;
+      border-color: transparent !important;
+      border: none !important;
     }
     .el-button {
       color: #e4dc00;
diff --git a/src/views/modules/visual/command/cpts/sidemenu-left.vue b/src/views/modules/visual/command/cpts/sidemenu-left.vue
index 4b775ec12..c10bf9986 100644
--- a/src/views/modules/visual/command/cpts/sidemenu-left.vue
+++ b/src/views/modules/visual/command/cpts/sidemenu-left.vue
@@ -113,6 +113,7 @@ export default {
         IS_ENSURE_HOUSE: require("@/assets/img/shuju/command/ico2/IS_ENSURE_HOUSE.png"),
         IS_CJ: require("@/assets/img/shuju/command/ico2/IS_CJ.png"),
         IS_PARTY: require("@/assets/img/shuju/command/ico2/IS_PARTY.png"),
+        IS_XJC: require("@/assets/img/shuju/command/ico2/IS_XJC.png"),
       },
     };
   },
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index 577754cff..4c1fbe043 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -420,6 +420,7 @@ export default {
         IS_ENSURE_HOUSE: require("@/assets/img/shuju/command/ico3/IS_ENSURE_HOUSE.png"),
         IS_CJ: require("@/assets/img/shuju/command/ico3/IS_CJ.png"),
         IS_PARTY: require("@/assets/img/shuju/command/ico3/IS_PARTY.png"),
+        IS_XJC: require("@/assets/img/shuju/command/ico3/IS_XJC.png"),
       },
 
       searchName: "",

From 66a286c385ddb83cb8ba07a3546677114b1189e6 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 12 Aug 2022 09:54:03 +0800
Subject: [PATCH 60/78] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8C=87=E6=8C=A5?=
 =?UTF-8?q?=E8=B0=83=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/command/cpts/map.vue | 57 ++++++++++---------
 .../modules/visual/command/cpts/popup.vue     |  2 +-
 .../visual/command/cpts/sidemenu-left.vue     |  8 +--
 .../modules/visual/command/cpts/sidemenu.vue  |  1 +
 src/views/modules/visual/command/index.vue    | 10 +++-
 5 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index cbcd444d3..d09c8da8f 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/src/views/modules/visual/command/cpts/map.vue
@@ -201,32 +201,35 @@ export default {
       const polygon = [
         ...srcGridData.children
           .filter((item) => item.coordinates.length > 0)
-          .map((item) => ({
-            type: "Feature",
-            properties: {
-              //   id: item.id,
-              //   name: item.name,
-              //   level: item.level,
-              center: [item.longitude, item.latitude],
-              ...item,
-              dotCount: gridCountData.find((item2) => item2.orgId == item.id)
-                ? gridCountData.find((item2) => item2.orgId == item.id).total
-                : "",
-            },
-            geometry: {
-              type: "Polygon",
-              coordinates: [
-                item.latitude
-                  ? [[item.longitude, item.latitude]]
-                  : spliceIntoChunks(
-                      item.coordinates
-                        .split(",")
-                        .map((item) => parseFloat(item)),
-                      2
-                    ).filter((item) => item.length == 2),
-              ],
-            },
-          })),
+          .map((item) => {
+            let countItem = gridCountData.find(
+              (item2) => item2.orgId == item.id
+            );
+            console.log("countItem", countItem);
+            return {
+              type: "Feature",
+              properties: {
+                ...item,
+                center: [item.longitude, item.latitude],
+                dotCount: countItem
+                  ? countItem.categoryName + "：" + countItem.total
+                  : "",
+              },
+              geometry: {
+                type: "Polygon",
+                coordinates: [
+                  item.latitude
+                    ? [[item.longitude, item.latitude]]
+                    : spliceIntoChunks(
+                        item.coordinates
+                          .split(",")
+                          .map((item) => parseFloat(item)),
+                        2
+                      ).filter((item) => item.length == 2),
+                ],
+              },
+            };
+          }),
       ];
       return { type: "FeatureCollection", features: polygon };
     },
@@ -496,7 +499,7 @@ export default {
         .source(polygonDotData)
         .color("name", styleConfig.textColor)
         .shape("dotCount", "text")
-        .size(16)
+        .size(14)
         .style({
           textAnchor: "center", // 文本相对锚点的位置 center|left|right|top|bottom|top-left
           textOffset: [0, -80], // 文本相对锚点的偏移量 [水平, 垂直]
diff --git a/src/views/modules/visual/command/cpts/popup.vue b/src/views/modules/visual/command/cpts/popup.vue
index ab50e8e08..b10e8d182 100644
--- a/src/views/modules/visual/command/cpts/popup.vue
+++ b/src/views/modules/visual/command/cpts/popup.vue
@@ -393,7 +393,7 @@
         </div>
         <div class="item">
           联系人：
-          <span>{{ info.manageDistrict || "--" }}</span>
+          <span>{{ info.contacts || "--" }}</span>
         </div>
         <div class="item">
           联系人电话：
diff --git a/src/views/modules/visual/command/cpts/sidemenu-left.vue b/src/views/modules/visual/command/cpts/sidemenu-left.vue
index c10bf9986..4c6758188 100644
--- a/src/views/modules/visual/command/cpts/sidemenu-left.vue
+++ b/src/views/modules/visual/command/cpts/sidemenu-left.vue
@@ -131,12 +131,6 @@ export default {
 
   mounted() {
     // this.requestList();
-    this.currentKey = "event_tdnd";
-    this.currentItem = {
-      categoryKey: "event_tdnd",
-      coverageType: "csgl",
-      placeType: "event",
-    };
   },
 
   methods: {
@@ -155,6 +149,7 @@ export default {
           this.currentKey = "";
           this.currentItem = {
             categoryKey: "",
+            categoryName: "",
             coverageType: "",
             placeType: "",
           };
@@ -185,6 +180,7 @@ export default {
           });
           return item;
         });
+        this.handleClickItem(this.menuList[0]);
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/visual/command/cpts/sidemenu.vue b/src/views/modules/visual/command/cpts/sidemenu.vue
index 574c9047c..05efb55ea 100644
--- a/src/views/modules/visual/command/cpts/sidemenu.vue
+++ b/src/views/modules/visual/command/cpts/sidemenu.vue
@@ -247,6 +247,7 @@ export default {
         color: #ffffff;
         background-color: #041267;
         font-weight: bold;
+        box-shadow: 0 0 30px 5px inset #22f;
       }
 
       .info {
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index 4c1fbe043..bf861c991 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -392,6 +392,7 @@ export default {
       dotList2: [],
       categoryKeys2: [],
       coverageTypes2: [],
+      categoryNames2: [],
       dotIcoList2: {
         event_tdnd: require("@/assets/img/shuju/command/ico3/event_tdnd.png"),
         enterprise_patrol_unqualified: require("@/assets/img/shuju/command/ico3/enterprise_patrol_unqualified.png"),
@@ -548,6 +549,8 @@ export default {
       this.coverageTypes2 = [obj.coverageType];
       this.categoryKeys2 = [obj.categoryKey];
       this.placeType2 = obj.placeType;
+      this.categoryNames2 = [obj.categoryName];
+      console.log(obj)
     },
 
     handleChangeMenu(list) {
@@ -639,7 +642,12 @@ export default {
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.gridCountData = [...data];
+        this.gridCountData = [
+          ...data.map((item) => ({
+            ...item,
+            categoryName: this.categoryNames2[0],
+          })),
+        ];
       } else {
         this.$message.error(msg);
       }

From a284a1e5a6cdcbbde60e9f2e59e0538c056a34bc Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 12 Aug 2022 10:00:46 +0800
Subject: [PATCH 61/78] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worklog/icworklog-add-or-update.vue       | 175 ++++++++++++------
 1 file changed, 123 insertions(+), 52 deletions(-)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index e3b72f34d..7160f2c66 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -42,12 +42,12 @@
               </el-date-picker>
       </el-form-item>
           <el-form-item label="内容" prop="content">
-          <el-input type="textarea" v-model="dataForm.content" placeholder="内容"></el-input>
+          <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" v-model="dataForm.content" placeholder="内容"></el-input>
       </el-form-item>
           <el-form-item label="备注" prop="remark">
           <el-input type="textarea" v-model="dataForm.remark" placeholder="备注"></el-input>
       </el-form-item>
-        <el-form-item class="block"
+        <!-- <el-form-item class="block"
                       label="照片"
                       label-width="150px"
                       prop="attach">
@@ -55,7 +55,7 @@
                        :action="uploadUlr"
                        accept=".jpg,.png,.jpeg,.bmp"
                        :on-success="handleFileSuccess"
-                       :on-remove="handleFileRemove"
+                       :on-remov·e="handleFileRemove"
                        :on-preview="handleFileDownload"
                        :limit="3"
                        :before-upload="beforeUpload"
@@ -66,7 +66,26 @@
                 <div slot="tip"
                      class="el-upload__tip">支持jpg、png、bmp</div>
             </el-upload>
-        </el-form-item>
+        </el-form-item> -->
+
+        <el-form-item label="照片"
+                        label-width="150px"
+                        style="display:block">
+            <el-upload :class="['avatar-uploader', {'hide': hideUploadBtn}] "
+                       ref="uploadPic"
+                       :action="uploadUlr"
+                       list-type="picture-card"
+                       :on-exceed="exceedPic"
+                       :on-remove="removePic"
+                       :file-list="dataForm.fileList"
+                       :on-change="handleEditChange"
+                       :on-success="handleSuccess"
+                       :limit="3">
+              <span class="font-14">选择图片</span>
+              <div slot="tip"
+                   class="upload_tip">最多上传3张图片，图片支持jpg、jpeg、bmp、git或png格式</div>
+            </el-upload>
+          </el-form-item>
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -96,8 +115,10 @@ export default {
         content: '',
         remark: '',
         mobile: '',
-        fileList: []
-      }
+        fileList: [],
+        // imageList: [],//	图片集合	
+      },
+      hideUploadBtn: false
     }
   },
   created () {
@@ -184,68 +205,118 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    beforeUpload (file) {
-      const array = file.name.split('.')
-      const extension = array[array.length - 1]
+    // beforeUpload (file) {
+    //   const array = file.name.split('.')
+    //   const extension = array[array.length - 1]
 
-      const formatarray = ['jpg', 'png', 'jpeg', 'bmp']
+    //   const formatarray = ['jpg', 'png', 'jpeg', 'bmp']
 
-      if (formatarray.indexOf(extension) === -1) {
-        this.$message.error('只支持图片、word、pdf')
-        return false
-      }
+    //   if (formatarray.indexOf(extension) === -1) {
+    //     this.$message.error('只支持图片、word、pdf')
+    //     return false
+    //   }
 
-    },
+    // },
+
+    // handleFileRemove (file) {
 
-    handleFileRemove (file) {
+    //   if (file && file.status === "success") {
+    //     this.dataForm.fileList.splice(this.dataForm.fileList.findIndex(item => item.uid === file.uid), 1)
+    //   }
+    // },
+
+    // handleFileSuccess (res, file) {
+
+    //   if (res.code === 0 && res.msg === 'success') {
+    //     const array = file.name.split('.')
+    //     const fileType = array[array.length - 1]
+
+    //     const picArray = ['jpg', 'png', 'jpeg', 'bmp']
+    //     const videoarray = ['mp4', 'wma', 'm4a']
+    //     const docArray = ['doc', 'docx', 'xls', 'xlsx', 'pdf']
+    //     const mp3Array = ['mp3']
+
+    //     if (picArray.indexOf(fileType) > -1) {
+    //       file.attachmentFormat = 'image'
+    //     } else if (videoarray.indexOf(fileType) > -1) {
+    //       file.attachmentFormat = 'video'
+    //     } else if (docArray.indexOf(fileType) > -1) {
+    //       file.attachmentFormat = 'doc'
+    //     } else if (mp3Array.indexOf(fileType) > -1) {
+    //       file.attachmentFormat = 'voice'
+    //     }
+
+    //     file.url = res.data.url
+    //     file.type = fileType
+
+    //     file.fileName = file.name
+    //     file.fileType = file.type
+
+    //     this.dataForm.fileList.push(file)
+    //     console.log(this.dataForm.fileList)
+    //   } else this.$message.error(res.msg)
+    // },
+    //下载
+    // handleFileDownload (file) {
 
+    //   var a = document.createElement('a');
+    //   var event = new MouseEvent('click');
+    //   a.download = file.name;
+    //   console.log(a)
+    //   a.href = file.url;
+    //   a.dispatchEvent(event);
+
+
+    // },
+
+    exceedPic () {
+      this.$message.warning("最多上传3张预览图片")
+
+    },
+    removePic (file, fileList) {
+
+      // this.formData.imageList.splice(this.formData.imageList.findIndex(item => item === file.url), 1)
       if (file && file.status === "success") {
         this.dataForm.fileList.splice(this.dataForm.fileList.findIndex(item => item.uid === file.uid), 1)
       }
-    },
-
-    handleFileSuccess (res, file) {
+      this.hideUploadBtn = fileList.length >= 3;
 
+    },
+    handleSuccess (res, file) {
       if (res.code === 0 && res.msg === 'success') {
-        const array = file.name.split('.')
-        const fileType = array[array.length - 1]
-
-        const picArray = ['jpg', 'png', 'jpeg', 'bmp']
-        const videoarray = ['mp4', 'wma', 'm4a']
-        const docArray = ['doc', 'docx', 'xls', 'xlsx', 'pdf']
-        const mp3Array = ['mp3']
-
-        if (picArray.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'image'
-        } else if (videoarray.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'video'
-        } else if (docArray.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'doc'
-        } else if (mp3Array.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'voice'
-        }
+          const array = file.name.split('.')
+          const fileType = array[array.length - 1]
 
-        file.url = res.data.url
-        file.type = fileType
+          const picArray = ['jpg', 'png', 'jpeg', 'bmp']
+          const videoarray = ['mp4', 'wma', 'm4a']
+          const docArray = ['doc', 'docx', 'xls', 'xlsx', 'pdf']
+          const mp3Array = ['mp3']
 
-        file.fileName = file.name
-        file.fileType = file.type
+          if (picArray.indexOf(fileType) > -1) {
+            file.attachmentFormat = 'image'
+          } else if (videoarray.indexOf(fileType) > -1) {
+            file.attachmentFormat = 'video'
+          } else if (docArray.indexOf(fileType) > -1) {
+            file.attachmentFormat = 'doc'
+          } else if (mp3Array.indexOf(fileType) > -1) {
+            file.attachmentFormat = 'voice'
+          }
 
-        this.dataForm.fileList.push(file)
-        console.log(this.dataForm.fileList)
-      } else this.$message.error(res.msg)
-    },
-    //下载
-    handleFileDownload (file) {
+          file.url = res.data.url
+          file.type = fileType
+
+          file.fileName = file.name
+          file.fileType = file.type
 
-      var a = document.createElement('a');
-      var event = new MouseEvent('click');
-      a.download = file.name;
-      console.log(a)
-      a.href = file.url;
-      a.dispatchEvent(event);
+          this.dataForm.fileList.push(file)
+          console.log(this.dataForm.fileList)
+        } else this.$message.error(res.msg)
 
+    },
+    // 最多上传3张图，超过时隐藏上传按钮
+    handleEditChange (file, fileList) {
 
+      this.hideUploadBtn = fileList.length >= 3;
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {

From d9c3a5a833dea2a55b26c2b68cb7b2ddc030b615 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 12 Aug 2022 11:09:39 +0800
Subject: [PATCH 62/78] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/xiangmu/cpts/project-info.vue  | 30 +++++++++++++++++--
 .../shequzhili/xiangmu/xiangmu-ling.vue       |  4 +--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 28e4ffcfc..5784231f5 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -26,9 +26,17 @@
             </div>
 
             <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]"
-                 v-if="projectInfo.departmentNameList.length > 0">
+                 v-if="projectInfo.departmentList.length > 0">
               <span class="info-title-2">当前处理部门：</span>
-              <span>{{ projectInfo.departmentNameList.join("、") }}</span>
+              <div class="div_depart">
+                <div v-for="(item,index) in  projectInfo.departmentList"
+                     :key="index"
+                     class="div_depart">
+                  <span>{{item.departmentName+'（'+ item.staffList.join("、")+'）' }}</span>
+
+                </div>
+              </div>
+
             </div>
 
             <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]"
@@ -967,6 +975,17 @@ export default {
 
       if (code === 0) {
         this.projectInfo = data;
+        // this.projectInfo.departmentList = [
+        //   {
+        //     departmentName: "市北区",
+        //     staffList: ["薛松", "刘建军"]
+        //   }, {
+        //     departmentName: "市北区",
+        //     staffList: ["薛松", "刘建军"]
+        //   }
+        // ]
+
+
         if (data.projectStatus == "pending") {
           this.getMyDepartmentList();
           this.getAssistanceUnitList();
@@ -1254,3 +1273,10 @@ export default {
   src="@/assets/scss/modules/shequzhili/project-info.scss"
   scoped
 ></style>
+
+<style lang="scss" scoped>
+.div_depart {
+  display: flex;
+  flex-direction: column;
+}
+</style>
diff --git a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
index 00f16d600..b208eda98 100644
--- a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
+++ b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
@@ -282,7 +282,7 @@
 
           <el-table-column prop="address"
                            align="center"
-                           label="地址	"
+                           label="地址"
                            :show-overflow-tooltip="true" />
           <el-table-column prop="status"
                            align="center"
@@ -290,7 +290,7 @@
                            width="70" />
           <el-table-column prop="closedStatus"
                            align="center"
-                           label="解决状态	"
+                           label="解决状态"
                            width="90" />
           <!-- <template slot-scope="scope">
               {{ scope.row.status == 'pending' ? '处理中' : '已结案' }}

From 58349060d71c4fcc07af800650a400933d8c621b Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 12 Aug 2022 11:17:14 +0800
Subject: [PATCH 63/78] =?UTF-8?q?=E5=B0=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/command/cpts/eventInfo.vue | 5 ++---
 src/views/modules/visual/command/cpts/map.vue       | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/visual/command/cpts/eventInfo.vue b/src/views/modules/visual/command/cpts/eventInfo.vue
index fc7ddf580..f9d24d6ca 100644
--- a/src/views/modules/visual/command/cpts/eventInfo.vue
+++ b/src/views/modules/visual/command/cpts/eventInfo.vue
@@ -86,10 +86,9 @@ export default {
       this.$emit("handleClose");
       // this.eventId = ""
     },
+
     handleOk() {
-      this.pageType = "";
-      // this.eventId = ""
-      this.pageNo = 1;
+      this.handleClose();
     },
 
     handleEditSuccess() {
diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index d09c8da8f..2653ee140 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/src/views/modules/visual/command/cpts/map.vue
@@ -831,6 +831,7 @@ export default {
 
   /deep/ .l7-popup-content {
     background: rgba(#020340, 0.58);
+    box-shadow: 0 0 20px 3px inset rgba(#22f, 0.1);
   }
   /deep/ .l7-popup-close-button {
     padding: 4px;

From 184edb2d4fc79dd4a1ca82692819c017203d8a55 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 12 Aug 2022 13:52:37 +0800
Subject: [PATCH 64/78] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/event/cpts/event-info.vue | 5 -----
 src/views/modules/visual/command/cpts/eventInfo.vue    | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index b4acb9e06..a62f736d5 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -183,10 +183,8 @@
               </div>
             </div>
           </div>
-
         </el-card>
       </div>
-
     </div>
 
     <div v-if="pageTypeCopy == 'project'">
@@ -213,10 +211,7 @@ import { Loading } from "element-ui"; // 引入Loading服务
 import foldText from "@/views/components/foldText";
 import projectInfoOrigin from "../../xiangmu/cpts/project-info";
 import demandInfoOrigin from "@/views/modules/communityService/measure/info";
-
-
 import dateFormat from "dai-js/tools/dateFormat";
-
 import eventAdd from "./add";
 import eventDetail from "./event-detail";
 import processForm from "./process-form";
diff --git a/src/views/modules/visual/command/cpts/eventInfo.vue b/src/views/modules/visual/command/cpts/eventInfo.vue
index f9d24d6ca..31cbcde3d 100644
--- a/src/views/modules/visual/command/cpts/eventInfo.vue
+++ b/src/views/modules/visual/command/cpts/eventInfo.vue
@@ -30,7 +30,6 @@
 
 <script>
 import cptCard from "@/views/modules/visual/cpts/card";
-
 import { requestPost } from "@/js/dai/request";
 import eventInfo from "@/views/modules/shequzhili/event/cpts/event-info";
 

From 270a0b320562d663baa742a35bbe2b1e488c8837 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 12 Aug 2022 13:52:39 +0800
Subject: [PATCH 65/78] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shequzhili/event/eventList.vue    | 100 +++++++++++++++++-
 1 file changed, 96 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index 1790d751b..1632a2d5c 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -46,7 +46,26 @@
                         placeholder="请输入">
               </el-input>
             </el-form-item>
-
+            <el-form-item label="事件类型"
+                          prop="firstIdList">
+              <el-cascader ref="cascaderEvent" v-model="eventTypeCheck" :options="cateOptions"
+                collapse-tags 
+                :show-all-levels="false"
+                :props="{ 
+                  multiple: true,
+                  checkStrictly: false,
+                  emitPath: false,
+                  children:'subCategory',
+                  label:'name',
+                  value:'id'
+                }" clearable class="item_width_2" @change="handleEventType" />
+                <!-- <template slot-scope="{ node, data }">
+                  <div @click="cascaderClick(node, data)">
+                    <span>{{ data.name }}</span>
+                  </div>
+                </template>
+              </el-cascader> -->
+            </el-form-item>
             <el-form-item label="报事人"
                           prop="name">
               <el-input v-model="formData.name"
@@ -158,7 +177,17 @@
                            label="所属网格"
                            :show-overflow-tooltip="true">
           </el-table-column>
-
+          <el-table-column
+            prop="categoryName"
+            label="事件类型"
+            min-width="140"
+            align="center"
+            :show-overflow-tooltip="true"
+          />
+            <!-- <template slot-scope="scope">
+              {{ scope.row.firstName + '-' + scope.row.secondName }}
+            </template>
+          </el-table-column> -->
           <el-table-column prop="eventContent"
                            label="事件内容"
                            align="center"
@@ -419,8 +448,12 @@ export default {
         startTime: '',
         endTime: '',
         status: '',
+        firstIdList: [],
+        secondIdList: [],
 
       },
+      cateOptions: [],
+      eventTypeCheck: [],
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
       total: 1,
@@ -465,8 +498,29 @@ export default {
     this.agencyId = this.user.agencyId
     this.loadGrid();
     this.getTableData();
+    this.getCateOptions()
   },
   methods: {
+    handleEventType(val) {
+      // console.log('val-----eee', val)
+      console.log('nodes---', this.$refs.cascaderEvent.getCheckedNodes())
+      const nodes = this.$refs.cascaderEvent.getCheckedNodes()
+      this.formData.firstIdList = []
+      this.formData.secondIdList = []
+      let level1 = nodes.filter(item => item.level === 1)
+      let level2 = nodes.filter(item => item.level === 2)
+      console.log('level2----1', level2)
+      level1.forEach(item => {
+        console.log('level2----2', level2)
+        if (item.hasChildren) {
+          for (let i = level2.length - 1; i >= 0; i--) {
+            if (level2[i].parent.value === item.value) level2.splice(i, 1)
+          }
+        }
+      })
+      this.formData.firstIdList = level1.map(item => item.value)
+      this.formData.secondIdList = level2.map(item => item.value)
+    },
     handleSelectionChange (val) {
       this.multipleSelection = [];
       val.forEach(element => {
@@ -692,6 +746,23 @@ export default {
         this.$message.error(msg);
       }
     },
+    async getCateOptions() {
+      const url = "/gov/issue/issueprojectcategorydict/list";
+
+      const { data, code, msg } = await requestPost(url, {});
+
+      if (code === 0) {
+        // this.cateOptions = data.map((item) => {
+        //   item.subCategory.forEach((subitem) => {
+        //     delete subitem.subCategory;
+        //   });
+        //   return item;
+        // });
+        this.cateOptions = this.deepTree(data, 'subCategory')
+      } else {
+        this.$message.error(msg);
+      }
+    },
 
     handleSizeChange (val) {
 
@@ -715,12 +786,27 @@ export default {
         startTime: '',
         endTime: '',
         status: '',
+        firstIdList: [],
+        secondIdList: [],
       }
+      this.eventTypeCheck = []
+      
 
-
-      // this.pageNo = 1
+      this.pageNo = 1
+      this.getTableData();
       // this.loadTable()
     },
+    deepTree(arr, child) {
+      if (Array.isArray(arr) && arr.length > 0) {
+        return arr.map(item => {
+          // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
+          return {
+            ...item,
+            [child]: item[child] && item[child].length > 0 && this.deepTree(item[child], child) || null
+          }
+        })
+      }
+    }
   },
 };
 </script>
@@ -729,4 +815,10 @@ export default {
 @import "@/assets/scss/buttonstyle.scss";
 @import "@/assets/scss/modules/management/list-main.scss";
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
+.div_search {
+  .item_width_2 {
+    width: 200px;
+  }
+}
+
 </style>

From f822dbb3a5202be4cb944fba2da311398eda981e Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 12 Aug 2022 14:14:53 +0800
Subject: [PATCH 66/78] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/shequzhili/project-info.scss |  32 ++
 .../shequzhili/xiangmu/cpts/project-info.vue  | 310 +++++++++---------
 2 files changed, 196 insertions(+), 146 deletions(-)

diff --git a/src/assets/scss/modules/shequzhili/project-info.scss b/src/assets/scss/modules/shequzhili/project-info.scss
index fab73c410..ae6f55d5a 100644
--- a/src/assets/scss/modules/shequzhili/project-info.scss
+++ b/src/assets/scss/modules/shequzhili/project-info.scss
@@ -418,3 +418,35 @@
   box-shadow:none
   
 }
+
+.process-form{
+  margin-top:20px;
+
+  .process-title {
+    margin-bottom: 25px;
+    margin-left: -5px;
+    font-size: 16px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #333;
+    line-height: 18px;
+  }
+
+  .process-title-vis{
+    color: #fff;
+  } 
+}
+
+.form-item::v-deep .el-form-item__label {
+  color: #fff;
+}
+.form-item {
+  .el-radio {
+    color: #fff;
+  }
+
+  .el-checkbox {
+    color: #fff;
+  }
+}
+
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 28e4ffcfc..e14e171ef 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -173,64 +173,70 @@
 
           </div>
         </el-card>
-        <el-card :class="{'box-card':source==='visiual'}"
-                 v-if="projectInfo.processable && projectInfo.projectStatus == 'pending'">
-          <h3>处理</h3>
-          <div class="m-fm">
-            <el-form ref="fm"
-                     :inline="false"
-                     :model="fmData"
-                     :rules="dataRule"
-                     label-position="left"
-                     label-width="100px">
-              <el-form-item label="处理方式："
-                            prop="operateType">
-                <el-radio-group v-model="fmData.operateType">
-                  <el-radio label="dispose">处理/响应</el-radio>
-                  <el-radio label="close">结案</el-radio>
-                  <el-radio label="turn">转其他机关/科室</el-radio>
-                  <el-radio label="back"
-                            v-if="projectInfo.returnable">退回</el-radio>
-                </el-radio-group>
-              </el-form-item>
-
-              <el-form-item label="您的身份："
-                            prop="projectStaffId"
-                            v-if="myDepartmentList.length > 1">
-                <el-select v-model.trim="fmData.projectStaffId"
-                           placeholder="请选择"
-                           class="resi-cell-select">
-                  <el-option v-for="item in myDepartmentList"
-                             :key="item.projectStaffId"
-                             :label="item.departmentName"
-                             :value="item.projectStaffId">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-
-              <el-form-item v-if="fmData.operateType == 'turn'"
-                            label="处理部门："
-                            prop="staffList">
-                <el-popover placement="bottom"
-                            width="400"
-                            height="400"
-                            v-model="visibleStaffPanel">
-                  <div class="f">
-                    <select-staff @confirm="(ret) => (fmData.staffList = ret)"
-                                  @close="visibleStaffPanel = false" />
-                  </div>
-
-                  <div slot="reference">
-                    <a v-if="fmData.staffList.length == 0"
-                       style="cursor: pointer">点击选择</a>
-                    <a v-else
-                       style="cursor: pointer">已选 {{ fmData.staffList.length }} 人</a>
-                  </div>
-                </el-popover>
-              </el-form-item>
-
-              <!-- <el-form-item v-if="fmData.operateType != 'back'"
+        <div class="process-form">
+          <el-card :class="{'box-card':source==='visiual'}"
+                   v-if="projectInfo.processable && projectInfo.projectStatus == 'pending'">
+            <div :class="['process-title',{'process-title-vis':source==='visiual'}]">处理</div>
+            <div class="m-fm">
+              <div :class="{'visiual-form':source==='visiual'}">
+                <el-form ref="fm"
+                         :inline="false"
+                         :model="fmData"
+                         :rules="dataRule"
+                         label-position="left"
+                         label-width="100px">
+                  <el-form-item label="处理方式："
+                                :class="{'form-item':source==='visiual'}"
+                                prop="operateType">
+                    <el-radio-group v-model="fmData.operateType">
+                      <el-radio label="dispose">处理/响应</el-radio>
+                      <el-radio label="close">结案</el-radio>
+                      <el-radio label="turn">转其他机关/科室</el-radio>
+                      <el-radio label="back"
+                                v-if="projectInfo.returnable">退回</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+
+                  <el-form-item label="您的身份："
+                                :class="{'form-item':source==='visiual'}"
+                                prop="projectStaffId"
+                                v-if="myDepartmentList.length > 1">
+                    <el-select v-model.trim="fmData.projectStaffId"
+                               placeholder="请选择"
+                               class="resi-cell-select">
+                      <el-option v-for="item in myDepartmentList"
+                                 :key="item.projectStaffId"
+                                 :label="item.departmentName"
+                                 :value="item.projectStaffId">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item v-if="fmData.operateType == 'turn'"
+                                label="处理部门："
+                                :class="{'form-item':source==='visiual'}"
+                                prop="staffList">
+                    <el-popover placement="bottom"
+                                width="400"
+                                height="400"
+                                v-model="visibleStaffPanel">
+                      <div class="f">
+                        <select-staff @confirm="(ret) => (fmData.staffList = ret)"
+                                      @close="visibleStaffPanel = false" />
+                      </div>
+
+                      <div slot="reference">
+                        <a v-if="fmData.staffList.length == 0"
+                           style="cursor: pointer">点击选择</a>
+                        <a v-else
+                           style="cursor: pointer">已选 {{ fmData.staffList.length }} 人</a>
+                      </div>
+                    </el-popover>
+                  </el-form-item>
+
+                  <!-- <el-form-item v-if="fmData.operateType != 'back'"
                             label="协办单位："
+                  :class="{'form-item':source==='visiual'}"
                             prop="assistanceUnitIndex">
                 <el-select v-model.trim="fmData.assistanceUnitIndex"
                            placeholder="请选择"
@@ -243,79 +249,86 @@
                 </el-select>
               </el-form-item> -->
 
-              <el-form-item v-if="fmData.operateType == 'back'"
-                            label="退回到："
-                            prop="projectProcessId">
-                <el-select v-model.trim="fmData.projectProcessId"
-                           placeholder="请选择"
-                           class="resi-cell-select">
-                  <el-option v-for="item in returnableList"
-                             :key="item.projectProcessId"
-                             :label="item.processor"
-                             :value="item.projectProcessId">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-
-              <el-form-item v-if="fmData.operateType == 'close'"
-                            label="结案状态："
-                            prop="closedStatus">
-                <el-select v-model.trim="fmData.closedStatus"
-                           placeholder="请选择"
-                           class="resi-cell-select">
-                  <el-option v-for="item in resolveTypeList"
-                             :key="item.closedStatus"
-                             :label="item.name"
-                             :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-
-              <el-form-item v-if="fmData.operateType == 'close'"
-                            label="结案说明："
-                            prop="publicReply">
-                <el-input type="textarea"
-                          :rows="2"
-                          placeholder="您输入的结案说明会向居民公开展示"
-                          v-model="fmData.publicReply">
-                </el-input>
-              </el-form-item>
-
-              <el-form-item label="内部备注："
-                            prop="internalRemark">
-                <el-input type="textarea"
-                          :rows="2"
-                          placeholder="请输入内容"
-                          v-model="fmData.internalRemark">
-                </el-input>
-              </el-form-item>
-
-              <el-form-item v-if="fmData.operateType != 'close'"
-                            label="图片/附件："
-                            prop="internalFile">
-                <el-upload class="avatar-uploader"
-                           :action="uploadUrl"
-                           :data="{ customerId: customerId }"
-                           :show-file-list="true"
-                           :on-success="handleImgSuccess"
-                           :on-remove="handleImgRemove"
-                           :before-upload="beforeImgUpload">
-                  <i class="el-icon-plus avatar-uploader-icon"></i>
-                </el-upload>
-              </el-form-item>
-
-              <el-form-item v-if="fmData.operateType != 'close'"
-                            label="公开回复："
-                            prop="publicReply">
-                <el-input type="textarea"
-                          :rows="2"
-                          placeholder="请输入内容"
-                          v-model="fmData.publicReply">
-                </el-input>
-              </el-form-item>
-            </el-form>
-          </div>
-          <!-- <div class="m-btns">
+                  <el-form-item v-if="fmData.operateType == 'back'"
+                                label="退回到："
+                                :class="{'form-item':source==='visiual'}"
+                                prop="projectProcessId">
+                    <el-select v-model.trim="fmData.projectProcessId"
+                               placeholder="请选择"
+                               class="resi-cell-select">
+                      <el-option v-for="item in returnableList"
+                                 :key="item.projectProcessId"
+                                 :label="item.processor"
+                                 :value="item.projectProcessId">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item v-if="fmData.operateType == 'close'"
+                                label="结案状态："
+                                :class="{'form-item':source==='visiual'}"
+                                prop="closedStatus">
+                    <el-select v-model.trim="fmData.closedStatus"
+                               placeholder="请选择"
+                               class="resi-cell-select">
+                      <el-option v-for="item in resolveTypeList"
+                                 :key="item.closedStatus"
+                                 :label="item.name"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item v-if="fmData.operateType == 'close'"
+                                label="结案说明："
+                                :class="{'form-item':source==='visiual'}"
+                                prop="publicReply">
+                    <el-input type="textarea"
+                              :rows="2"
+                              placeholder="您输入的结案说明会向居民公开展示"
+                              v-model="fmData.publicReply">
+                    </el-input>
+                  </el-form-item>
+
+                  <el-form-item label="内部备注："
+                                :class="{'form-item':source==='visiual'}"
+                                prop="internalRemark">
+                    <el-input type="textarea"
+                              :rows="2"
+                              placeholder="请输入内容"
+                              v-model="fmData.internalRemark">
+                    </el-input>
+                  </el-form-item>
+
+                  <el-form-item v-if="fmData.operateType != 'close'"
+                                label="图片/附件："
+                                :class="{'form-item':source==='visiual'}"
+                                prop="internalFile">
+                    <el-upload class="avatar-uploader"
+                               :action="uploadUrl"
+                               :data="{ customerId: customerId }"
+                               :show-file-list="true"
+                               :on-success="handleImgSuccess"
+                               :on-remove="handleImgRemove"
+                               :before-upload="beforeImgUpload">
+                      <i class="el-icon-plus avatar-uploader-icon"></i>
+                    </el-upload>
+                  </el-form-item>
+
+                  <el-form-item v-if="fmData.operateType != 'close'"
+                                label="公开回复："
+                                :class="{'form-item':source==='visiual'}"
+                                prop="publicReply">
+                    <el-input type="textarea"
+                              :rows="2"
+                              placeholder="请输入内容"
+                              v-model="fmData.publicReply">
+                    </el-input>
+                  </el-form-item>
+                </el-form>
+              </div>
+            </div>
+            <!-- <div class="m-btns">
             <el-button size=""
                        style="margin-right: 50px"
                        @click="handleClose">关闭</el-button>
@@ -324,24 +337,25 @@
                        @click="handleSubmit">确定</el-button>
           </div> -->
 
-          <div v-if="source==='manage'"
-               class="m-btns ">
-            <el-button size="small"
-                       @click="handleClose">关闭</el-button>
-            <el-button size=""
-                       type="danger"
-                       @click="handleSubmit">确定</el-button>
-          </div>
-          <div v-else
-               class="m-btns">
-            <div class="item_btn"
-                 @click="handleClose">关闭</div>
-            <div class="item_btn mgl"
-                 @click="handleSubmit">确定</div>
+            <div v-if="source==='manage'"
+                 class="m-btns ">
+              <el-button size="small"
+                         @click="handleClose">关闭</el-button>
+              <el-button size=""
+                         type="danger"
+                         @click="handleSubmit">确定</el-button>
+            </div>
+            <div v-else
+                 class="m-btns">
+              <div class="item_btn"
+                   @click="handleClose">关闭</div>
+              <div class="item_btn mgl"
+                   @click="handleSubmit">确定</div>
 
-          </div>
+            </div>
 
-        </el-card>
+          </el-card>
+        </div>
       </div>
       <div class="g-right">
         <el-card class="m-card"
@@ -1249,6 +1263,10 @@ export default {
 };
 </script>
 
+<style lang='scss' scoped>
+@import "@/assets/scss/modules/visual/a_customize.scss";
+</style>
+
 <style
   lang="scss"
   src="@/assets/scss/modules/shequzhili/project-info.scss"

From 4b5b04dc0e4b2efed8a67da646aa2df6ec6a4658 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 12 Aug 2022 15:45:58 +0800
Subject: [PATCH 67/78] =?UTF-8?q?=E4=BB=8Etest=E6=8B=89=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/xiangmu/cpts/project-info.vue  | 79 ++++++++++++++-----
 1 file changed, 59 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index e14e171ef..bb5a32bb3 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -26,9 +26,17 @@
             </div>
 
             <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]"
-                 v-if="projectInfo.departmentNameList.length > 0">
+                 v-if="projectInfo.departmentList.length > 0">
               <span class="info-title-2">当前处理部门：</span>
-              <span>{{ projectInfo.departmentNameList.join("、") }}</span>
+              <div class="div_depart">
+                <div v-for="(item,index) in  projectInfo.departmentList"
+                     :key="index"
+                     class="div_depart">
+                  <span>{{item.departmentName+'（'+ item.staffList.join("、")+'）' }}</span>
+
+                </div>
+              </div>
+
             </div>
 
             <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]"
@@ -315,7 +323,17 @@
                     </el-upload>
                   </el-form-item>
 
-                  <el-form-item v-if="fmData.operateType != 'close'"
+                  <el-form-item v-if="fmData.operateType == 'dispose'"
+                                label="公开回复："
+                                :class="{'form-item':source==='visiual'}"
+                                prop="publicReply">
+                    <el-input type="textarea"
+                              :rows="2"
+                              placeholder="请输入内容"
+                              v-model="fmData.publicReply">
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item v-if="fmData.operateType != 'close' && fmData.operateType != 'dispose'"
                                 label="公开回复："
                                 :class="{'form-item':source==='visiual'}"
                                 prop="publicReply">
@@ -327,8 +345,7 @@
                   </el-form-item>
                 </el-form>
               </div>
-            </div>
-            <!-- <div class="m-btns">
+              <!-- <div class="m-btns">
             <el-button size=""
                        style="margin-right: 50px"
                        @click="handleClose">关闭</el-button>
@@ -337,23 +354,23 @@
                        @click="handleSubmit">确定</el-button>
           </div> -->
 
-            <div v-if="source==='manage'"
-                 class="m-btns ">
-              <el-button size="small"
-                         @click="handleClose">关闭</el-button>
-              <el-button size=""
-                         type="danger"
-                         @click="handleSubmit">确定</el-button>
-            </div>
-            <div v-else
-                 class="m-btns">
-              <div class="item_btn"
-                   @click="handleClose">关闭</div>
-              <div class="item_btn mgl"
-                   @click="handleSubmit">确定</div>
+              <div v-if="source==='manage'"
+                   class="m-btns ">
+                <el-button size="small"
+                           @click="handleClose">关闭</el-button>
+                <el-button size=""
+                           type="danger"
+                           @click="handleSubmit">确定</el-button>
+              </div>
+              <div v-else
+                   class="m-btns">
+                <div class="item_btn"
+                     @click="handleClose">关闭</div>
+                <div class="item_btn mgl"
+                     @click="handleSubmit">确定</div>
 
+              </div>
             </div>
-
           </el-card>
         </div>
       </div>
@@ -630,6 +647,10 @@ export default {
           obj.internalRemark = [
             { required: true, message: "请填写内部备注", trigger: "blur" },
           ];
+        } else if (operateType == "dispose") {
+          obj.publicReply = [
+            { required: true, message: "请填写公开回复", trigger: "blur" },
+          ]
         } else {
           obj.internalRemark = [
             { required: true, message: "请填写内部备注", trigger: "blur" },
@@ -981,6 +1002,17 @@ export default {
 
       if (code === 0) {
         this.projectInfo = data;
+        // this.projectInfo.departmentList = [
+        //   {
+        //     departmentName: "市北区",
+        //     staffList: ["薛松", "刘建军"]
+        //   }, {
+        //     departmentName: "市北区",
+        //     staffList: ["薛松", "刘建军"]
+        //   }
+        // ]
+
+
         if (data.projectStatus == "pending") {
           this.getMyDepartmentList();
           this.getAssistanceUnitList();
@@ -1272,3 +1304,10 @@ export default {
   src="@/assets/scss/modules/shequzhili/project-info.scss"
   scoped
 ></style>
+
+<style lang="scss" scoped>
+.div_depart {
+  display: flex;
+  flex-direction: column;
+}
+</style>

From da1002ea515c84bc8619c89912749bcce99f9af5 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 12 Aug 2022 15:57:06 +0800
Subject: [PATCH 68/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index bb5a32bb3..191f7df75 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -308,7 +308,7 @@
                     </el-input>
                   </el-form-item>
 
-                  <el-form-item v-if="fmData.operateType != 'close'"
+                  <el-form-item 
                                 label="图片/附件："
                                 :class="{'form-item':source==='visiual'}"
                                 prop="internalFile">

From 7797d27e410470578daccd61e17457d79a430bcd Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 12 Aug 2022 16:31:58 +0800
Subject: [PATCH 69/78] bug

---
 .../worklog/icworklog-add-or-update.vue       | 13 +++++++--
 src/views/modules/worklog/icworklog.vue       | 28 ++++++++++++-------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index 7160f2c66..0b28978eb 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -1,6 +1,6 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : formType==='detail' ? '查看' : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :disabled="formType==='detail'" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
         <el-form-item label="所属网格"
                       prop="gridId">
             <el-select
@@ -87,7 +87,7 @@
             </el-upload>
           </el-form-item>
       </el-form>
-    <template slot="footer">
+    <template slot="footer" v-if="formType != 'detail'">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
       <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
@@ -100,6 +100,7 @@ import { requestPost } from "@/js/dai/request"
 export default {
   data () {
     return {
+      formType: '',
       visible: false,
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
       logTypeArr: [],
@@ -170,6 +171,12 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+        const { id } = this.$store.state.user
+        if (this.dataForm.createdBy == id) { // 是本人可以修改
+          this.formType = 'update'
+        } else { // 不是本人只能查看
+          this.formType = 'detail'
+        }
       }).catch(() => {})
     },
     // 字典
diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue
index 3b50a8e5b..aa58fd629 100644
--- a/src/views/modules/worklog/icworklog.vue
+++ b/src/views/modules/worklog/icworklog.vue
@@ -36,7 +36,6 @@
                     placeholder="请输入网格员姓名">
           </el-input>
         </el-form-item>
-        <br/>
         <el-form-item label="联系电话"
                                      prop="createdUser">
         <el-input v-model="dataForm.mobile"
@@ -45,7 +44,7 @@
                   placeholder="请输入联系电话">
         </el-input>
       </el-form-item>
-        <el-form-item label="日志时间" prop="startTime" label-width="100px">
+        <el-form-item label="日志时间" prop="startTime">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -66,18 +65,25 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="small"  @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" size="small" class="diy-button--search" @click="getDataList()">{{ $t('query') }}</el-button>
+
+          <el-button  style="margin-left:10px"
+                      size="small"
+                      type="primary"
+                      class="diy-button--reset"
+                      @click="resetSearch">重置</el-button>
         </el-form-item>
-        <el-button style="margin-left:10px"
+        <!-- <el-button style="margin-left:10px"
                    size="small"
+                   type="primary"
                    class="diy-button--reset"
-                   @click="resetSearch">重置</el-button>
+                   @click="resetSearch">重置</el-button> -->
 <!--        <el-form-item>-->
 <!--          <el-button type="primary" size="small"  @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
 <!--        </el-form-item>-->
-<!--        <el-form-item>-->
-<!--          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
-<!--        </el-form-item>-->
+       <!-- <el-form-item>
+         <el-button size="small" style="margin-left:10px" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+       </el-form-item> -->
       </el-form>
       </el-card>
       <el-card class="resi-card-table">
@@ -91,6 +97,7 @@
           <el-button @click="exportHandle()" class="diy-button--reset" size="small"
           >导出</el-button
           >
+          <el-button size="small" type="danger" @click="deleteHandle()">批量删除</el-button>
         </div>
       <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>
@@ -101,8 +108,8 @@
         <el-table-column prop="mobile" 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">
-            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"> {{ userId == scope.row.createdBy ? $t('update') : '查看' }}</el-button>
+            <el-button type="text" v-if="userId == scope.row.createdBy" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -137,6 +144,7 @@ export default {
         deleteIsBatch: true,
         exportURL: '/gov/org/icWorkLog/export'
       },
+      userId: this.$store.state.user.id,
       agencyIdArray:[],
       orgOptions: [],
       logTypeArr: [],

From 084c1ece24e1083a6aa96bf9aac36f0c9270749a Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 15 Aug 2022 09:48:38 +0800
Subject: [PATCH 70/78] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/command.scss |  2 +-
 src/views/modules/visual/command/index.vue  | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/assets/scss/modules/visual/command.scss b/src/assets/scss/modules/visual/command.scss
index d905e5ed1..ee0138343 100644
--- a/src/assets/scss/modules/visual/command.scss
+++ b/src/assets/scss/modules/visual/command.scss
@@ -63,7 +63,7 @@
 
 .m-search {
     position: absolute;
-    z-index: 200;
+    z-index: 4;
     left: 0;
     right: 0;
     top: 30px;
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index bf861c991..ce4427adf 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -18,7 +18,7 @@
 
     <people v-if="orgLevel === 'people'" :uid="selUserId" />
 
-    <div v-show="orgLevel !== 'people'" class="g-cnt">
+    <div class="g-cnt">
       <div class="m-map" @click="handleClickMapBox">
         <grid-map
           ref="map"
@@ -207,9 +207,11 @@
       @handleClose="handleClose"
     />
 
-    <!-- <people v-if="pageType==='watch-resi'"
-          :uid="icResiUserId"
-          ref="ref_people"></people> -->
+    <people
+      v-if="pageType === 'watch-resi'"
+      :uid="icResiUserId"
+      ref="ref_people"
+    ></people>
   </div>
 </template>
 
@@ -482,8 +484,11 @@ export default {
           };
         }
       } else if (type == "watch-resi") {
-        this.toSubAgency("people", info.icResiUserId);
+        // this.toSubAgency("people", info.icResiUserId);
         this.icResiUserId = info.icResiUserId;
+        this.$router.push({
+          path: `/main-shuju/visual-basicinfo-people/${info.icResiUserId}`,
+        });
         // 查看居民详情
       } else if (type == "watch-event") {
         // 查看事件
@@ -550,7 +555,7 @@ export default {
       this.categoryKeys2 = [obj.categoryKey];
       this.placeType2 = obj.placeType;
       this.categoryNames2 = [obj.categoryName];
-      console.log(obj)
+      console.log(obj);
     },
 
     handleChangeMenu(list) {

From 1e737993aa751e41a9486df103c009edd9f10f3f Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 15 Aug 2022 09:51:41 +0800
Subject: [PATCH 71/78] 0

---
 src/views/modules/visual/command/index.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index ce4427adf..56017d830 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -16,8 +16,6 @@
       </div>
     </div>
 
-    <people v-if="orgLevel === 'people'" :uid="selUserId" />
-
     <div class="g-cnt">
       <div class="m-map" @click="handleClickMapBox">
         <grid-map
@@ -206,12 +204,6 @@
       :enterpriseId="enterpriseId"
       @handleClose="handleClose"
     />
-
-    <people
-      v-if="pageType === 'watch-resi'"
-      :uid="icResiUserId"
-      ref="ref_people"
-    ></people>
   </div>
 </template>
 

From acff3a6edda93171d1719df9826c29f53f9d0f64 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 15 Aug 2022 13:39:52 +0800
Subject: [PATCH 72/78] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8B=89=E5=8F=96?=
 =?UTF-8?q?=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worklog/icworklog-add-or-update.vue       | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index 0b28978eb..c0af91597 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -13,6 +13,7 @@
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
+                        :disabled="item.disabled"
                 >
                 </el-option>
             </el-select>
@@ -69,7 +70,6 @@
         </el-form-item> -->
 
         <el-form-item label="照片"
-                        label-width="150px"
                         style="display:block">
             <el-upload :class="['avatar-uploader', {'hide': hideUploadBtn}] "
                        ref="uploadPic"
@@ -102,6 +102,7 @@ export default {
     return {
       formType: '',
       visible: false,
+      gridState: true,
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
       logTypeArr: [],
       optionsG: [],
@@ -117,24 +118,17 @@ export default {
         remark: '',
         mobile: '',
         fileList: [],
-        // imageList: [],//	图片集合	
+        // imageList: [],//	图片集合
       },
       hideUploadBtn: false
     }
   },
   created () {
-    this.getGridList()
     this.getCategrayList()
   },
   computed: {
     dataRule () {
       return {
-        agencyId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         title: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -153,6 +147,7 @@ export default {
   methods: {
     init () {
       this.visible = true
+      this.getGridList()
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         this.dataForm.fileList = []
@@ -171,6 +166,15 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+
+        const grid = this.optionsG.filter(item => item.value === res.data.gridId)
+        if (grid.length < 1) {
+          this.gridState = false
+          this.optionsG.push({label:res.data.gridName, value:res.data.gridId, disabled: true})
+        } else {
+          this.gridState = true
+        }
+
         const { id } = this.$store.state.user
         if (this.dataForm.createdBy == id) { // 是本人可以修改
           this.formType = 'update'
@@ -197,9 +201,9 @@ export default {
       }
     },
     getGridList() {
-      const { user } = this.$store.state
+      this.optionsG = []
       this.$http
-        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
+        .post('/gov/mine/agency/getmygrids')
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -327,6 +331,11 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
+      if (!this.gridState) {
+        this.dataForm.gridId = ''
+        this.gridState = true
+        return this.$message.error("请重新选择网格")
+      }
       if (this.dataForm.content.length < 70) {
         return this.$message.error("内容不能少于70字")
       }

From 3678f109e149dd335584d1d280ac353b9cec5ab2 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 15 Aug 2022 13:53:16 +0800
Subject: [PATCH 73/78] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/worklog/icworklog-add-or-update.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index c0af91597..be6427e3f 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -10,9 +10,9 @@
             >
                 <el-option
                         v-for="item in optionsG"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
+                        :key="item.gridId"
+                        :label="item.gridName"
+                        :value="item.gridId"
                         :disabled="item.disabled"
                 >
                 </el-option>
@@ -170,7 +170,7 @@ export default {
         const grid = this.optionsG.filter(item => item.value === res.data.gridId)
         if (grid.length < 1) {
           this.gridState = false
-          this.optionsG.push({label:res.data.gridName, value:res.data.gridId, disabled: true})
+          this.optionsG.push({gridName:res.data.gridName, gridId:res.data.gridId, disabled: true})
         } else {
           this.gridState = true
         }

From e96196bd170c2163f438ee825dea8bafb9c6b9e5 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 15 Aug 2022 15:51:44 +0800
Subject: [PATCH 74/78] bug

---
 src/views/modules/worklog/icworklog-add-or-update.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index be6427e3f..bacf3a21e 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -167,8 +167,8 @@ export default {
           ...res.data
         }
 
-        const grid = this.optionsG.filter(item => item.value === res.data.gridId)
-        if (grid.length < 1) {
+        const grid = this.optionsG.filter(item => item.gridId === res.data.gridId)
+        if (grid.length < 1 && res.data.gridId !== '') {
           this.gridState = false
           this.optionsG.push({gridName:res.data.gridName, gridId:res.data.gridId, disabled: true})
         } else {
@@ -201,7 +201,6 @@ export default {
       }
     },
     getGridList() {
-      this.optionsG = []
       this.$http
         .post('/gov/mine/agency/getmygrids')
         .then(({ data: res }) => {

From 8fef272a6de4516b79a4a52d68350c536814d304 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 16 Aug 2022 11:21:00 +0800
Subject: [PATCH 75/78] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=AE=9A=E5=88=B6?=
 =?UTF-8?q?=E6=8C=87=E6=8C=A5=E8=B0=83=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/command.scss   |  11 +-
 .../visual/command/cpts/yantai-sidemenu1.vue  | 309 ++++++++++++++++++
 .../visual/command/cpts/yantai-sidemenu2.vue  | 309 ++++++++++++++++++
 src/views/modules/visual/command/index.vue    |  94 ++++--
 4 files changed, 699 insertions(+), 24 deletions(-)
 create mode 100644 src/views/modules/visual/command/cpts/yantai-sidemenu1.vue
 create mode 100644 src/views/modules/visual/command/cpts/yantai-sidemenu2.vue

diff --git a/src/assets/scss/modules/visual/command.scss b/src/assets/scss/modules/visual/command.scss
index ee0138343..d827e4cb4 100644
--- a/src/assets/scss/modules/visual/command.scss
+++ b/src/assets/scss/modules/visual/command.scss
@@ -193,6 +193,13 @@
     width: 360px;
     height: calc(825px - 15px);
 
+    .menu {
+        position: relative;
+        width: 100%;
+        margin-bottom: 20px;
+        // height: calc((825px - 15px - 20px) / 2);
+    }
+
     .title {
         margin-bottom: 10px;
         padding: 4px 0;
@@ -212,9 +219,9 @@
         }
     }
 
-    .list {
+    .wrap {
         margin-right: -8px;
-        height: calc(825px - 120px);
+        height: calc(825px - 45px);
         overflow-y: auto;
         overflow-x: hidden;
         @include scrollBar;
diff --git a/src/views/modules/visual/command/cpts/yantai-sidemenu1.vue b/src/views/modules/visual/command/cpts/yantai-sidemenu1.vue
new file mode 100644
index 000000000..84987fb13
--- /dev/null
+++ b/src/views/modules/visual/command/cpts/yantai-sidemenu1.vue
@@ -0,0 +1,309 @@
+<template>
+  <div class="m-menu">
+    <div class="list">
+      <div
+        class="item"
+        :key="'menu1' + item.coverageType"
+        v-for="item in menuList.slice(0, 2)"
+      >
+        <div
+          class="info"
+          :class="{ 'z-on': item.selected }"
+          @click="selectAll(item)"
+        >
+          <div class="name">
+            {{ item.coverageName }}
+            <i v-if="item.quantity">({{ item.quantity }})</i>
+          </div>
+
+          <div
+            class="i-arrow"
+            :class="{ 'z-unfold': !item.folded }"
+            @click.stop="item.folded = !item.folded"
+          >
+            <img src="@/assets/img/shuju/command/arrow-right.png" />
+          </div>
+        </div>
+
+        <div
+          v-show="!item.folded"
+          class="granditem"
+          :key="'menu3' + granditem.categoryKey"
+          v-for="granditem in item.categories"
+        >
+          <div
+            class="info"
+            :class="{ 'z-on': granditem.selected }"
+            @click="granditem.selected = !granditem.selected"
+          >
+            <div class="i-ico">
+              <img
+                v-if="grandIcoList[granditem.categoryKey]"
+                :src="grandIcoList[granditem.categoryKey]"
+              />
+            </div>
+
+            <div class="name">
+              {{ granditem.categoryName }}
+              <i v-if="granditem.quantity">({{ granditem.quantity }})</i>
+            </div>
+          </div>
+        </div>
+
+        <div
+          v-show="!item.folded"
+          class="subitem"
+          :key="'menu2' + subitem.placeType"
+          v-for="subitem in item.placeTypesInAnalysis"
+        >
+          <div
+            class="info"
+            :class="{ 'z-on': subitem.selected }"
+            @click="selectAll(subitem)"
+          >
+            <div class="i-ico">
+              <img
+                v-if="subitem.placeType == 'xxxxx'"
+                src="@/assets/img/shuju/command/fuwusheshi.png"
+              />
+              <img
+                v-if="subitem.placeType == 'enterprise_patrol'"
+                src="@/assets/img/shuju/command/qishiyedanweixuncha.png"
+              />
+              <img
+                v-if="subitem.placeType == 'group_rent'"
+                src="@/assets/img/shuju/command/qunzufang.png"
+              />
+              <img
+                v-if="subitem.placeType == 'community_org'"
+                src="@/assets/img/shuju/command/shequzizhuzi.png"
+              />
+              <img
+                v-if="subitem.placeType == 'superior_resource'"
+                src="@/assets/img/shuju/command/youshiziyuan.png"
+              />
+              <img
+                v-if="subitem.placeType == 'volunteer'"
+                src="@/assets/img/shuju/command/zhiyuanzhe.png"
+              />
+              <img
+                v-if="subitem.placeType == 'dangerous_chemicals'"
+                src="@/assets/img/shuju/command/zhongdianweihuapinqiye.png"
+              />
+              <img
+                v-if="subitem.placeType == 'party_unit'"
+                src="@/assets/img/shuju/command/lianjiandanwei.png"
+              />
+            </div>
+
+            <div class="name">
+              {{ subitem.placeTypeName }}
+              <i v-if="subitem.quantity">({{ subitem.quantity }})</i>
+            </div>
+
+            <div
+              class="i-arrow"
+              :class="{ 'z-unfold': !subitem.folded }"
+              @click.stop="subitem.folded = !subitem.folded"
+            >
+              <img src="@/assets/img/shuju/command/arrow-right.png" />
+            </div>
+          </div>
+
+          <div
+            v-show="!subitem.folded"
+            class="granditem"
+            :key="'menu3' + granditem.categoryKey"
+            v-for="granditem in subitem.categories"
+          >
+            <div
+              class="info"
+              :class="{ 'z-on': granditem.selected }"
+              @click="granditem.selected = !granditem.selected"
+            >
+              <div class="i-ico">
+                <img
+                  v-if="grandIcoList[granditem.categoryKey]"
+                  :src="grandIcoList[granditem.categoryKey]"
+                />
+              </div>
+
+              <div class="name">
+                {{ granditem.categoryName }}
+                <i v-if="granditem.quantity">({{ granditem.quantity }})</i>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  name: "sidemenu",
+
+  props: {
+    grandIcoList: {
+      type: Object,
+      default: () => ({}),
+    },
+    orgId: {
+      type: String,
+      default: "",
+    },
+  },
+
+  data() {
+    return {
+      menuList: [],
+    };
+  },
+
+  computed: {},
+  watch: {
+    menuList: {
+      handler(newValue, oldValue) {
+        // console.log("菜单改变拉------------------------------------", newValue);
+        if (oldValue.length != 0) {
+          this.$emit("change", newValue);
+        }
+      },
+      deep: true,
+      // immediate: true
+    },
+    orgId() {
+      this.requestList();
+    },
+  },
+
+  mounted() {
+    this.requestList();
+  },
+
+  methods: {
+    selectAll(item) {
+      item.selected = !item.selected;
+      item.categories.forEach((subitem) => {
+        subitem.selected = item.selected;
+      });
+      if (item.placeTypesInAnalysis) {
+        item.placeTypesInAnalysis.forEach((subitem) => {
+          subitem.selected = item.selected;
+          subitem.categories.forEach((subitem2) => {
+            subitem2.selected = item.selected;
+          });
+        });
+      }
+    },
+    //加载组织数据
+    async requestList() {
+      const url = "/data/aggregator/coverage/analysis/resourceCategories";
+      let params = {
+        agencyId: this.orgId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.menuList = data.map((item) => {
+          item.selected = false;
+          item.folded = true;
+          item.categories.forEach((subitem) => {
+            subitem.selected = false;
+          });
+          item.placeTypesInAnalysis.forEach((subitem) => {
+            subitem.selected = false;
+            subitem.folded = true;
+            subitem.categories.forEach((granditem) => {
+              granditem.selected = false;
+            });
+          });
+          return item;
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.m-menu {
+  padding-top: 10px;
+
+  .list {
+    .item {
+      position: relative;
+      z-index: 2;
+      line-height: 60px;
+      color: rgba(#fff, 0.8);
+
+      .z-on {
+        color: #ffffff;
+        background-color: #041267;
+        font-weight: bold;
+        box-shadow: 0 0 30px 5px inset #22f;
+      }
+
+      .info {
+        position: relative;
+        font-size: 18px;
+        width: 100%;
+        padding-left: 10px;
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+
+        .i-ico {
+          position: relative;
+          width: 35px;
+          height: 35px;
+          margin-right: 4px;
+
+          img {
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 2px;
+            margin: auto;
+          }
+        }
+
+        .i-arrow {
+          margin-left: auto;
+          margin-right: 20px;
+
+          &.z-unfold {
+            transform: rotate(90deg);
+          }
+        }
+
+        &:hover {
+          box-shadow: 0 0 30px 5px inset #22f;
+          background-color: darken(#104ba4, 12);
+        }
+      }
+
+      .subitem,
+      .granditem {
+        > .info {
+          padding-left: 20px;
+          font-size: 16px;
+        }
+
+        .granditem {
+          > .info {
+            padding-left: 40px;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/modules/visual/command/cpts/yantai-sidemenu2.vue b/src/views/modules/visual/command/cpts/yantai-sidemenu2.vue
new file mode 100644
index 000000000..ab06949f2
--- /dev/null
+++ b/src/views/modules/visual/command/cpts/yantai-sidemenu2.vue
@@ -0,0 +1,309 @@
+<template>
+  <div class="m-menu">
+    <div class="list">
+      <div
+        class="item"
+        :key="'menu1' + item.coverageType"
+        v-for="item in menuList.slice(2)"
+      >
+        <div
+          class="info"
+          :class="{ 'z-on': item.selected }"
+          @click="selectAll(item)"
+        >
+          <div class="name">
+            {{ item.coverageName }}
+            <i v-if="item.quantity">({{ item.quantity }})</i>
+          </div>
+
+          <div
+            class="i-arrow"
+            :class="{ 'z-unfold': !item.folded }"
+            @click.stop="item.folded = !item.folded"
+          >
+            <img src="@/assets/img/shuju/command/arrow-right.png" />
+          </div>
+        </div>
+
+        <div
+          v-show="!item.folded"
+          class="granditem"
+          :key="'menu3' + granditem.categoryKey"
+          v-for="granditem in item.categories"
+        >
+          <div
+            class="info"
+            :class="{ 'z-on': granditem.selected }"
+            @click="granditem.selected = !granditem.selected"
+          >
+            <div class="i-ico">
+              <img
+                v-if="grandIcoList[granditem.categoryKey]"
+                :src="grandIcoList[granditem.categoryKey]"
+              />
+            </div>
+
+            <div class="name">
+              {{ granditem.categoryName }}
+              <i v-if="granditem.quantity">({{ granditem.quantity }})</i>
+            </div>
+          </div>
+        </div>
+
+        <div
+          v-show="!item.folded"
+          class="subitem"
+          :key="'menu2' + subitem.placeType"
+          v-for="subitem in item.placeTypesInAnalysis"
+        >
+          <div
+            class="info"
+            :class="{ 'z-on': subitem.selected }"
+            @click="selectAll(subitem)"
+          >
+            <div class="i-ico">
+              <img
+                v-if="subitem.placeType == 'xxxxx'"
+                src="@/assets/img/shuju/command/fuwusheshi.png"
+              />
+              <img
+                v-if="subitem.placeType == 'enterprise_patrol'"
+                src="@/assets/img/shuju/command/qishiyedanweixuncha.png"
+              />
+              <img
+                v-if="subitem.placeType == 'group_rent'"
+                src="@/assets/img/shuju/command/qunzufang.png"
+              />
+              <img
+                v-if="subitem.placeType == 'community_org'"
+                src="@/assets/img/shuju/command/shequzizhuzi.png"
+              />
+              <img
+                v-if="subitem.placeType == 'superior_resource'"
+                src="@/assets/img/shuju/command/youshiziyuan.png"
+              />
+              <img
+                v-if="subitem.placeType == 'volunteer'"
+                src="@/assets/img/shuju/command/zhiyuanzhe.png"
+              />
+              <img
+                v-if="subitem.placeType == 'dangerous_chemicals'"
+                src="@/assets/img/shuju/command/zhongdianweihuapinqiye.png"
+              />
+              <img
+                v-if="subitem.placeType == 'party_unit'"
+                src="@/assets/img/shuju/command/lianjiandanwei.png"
+              />
+            </div>
+
+            <div class="name">
+              {{ subitem.placeTypeName }}
+              <i v-if="subitem.quantity">({{ subitem.quantity }})</i>
+            </div>
+
+            <div
+              class="i-arrow"
+              :class="{ 'z-unfold': !subitem.folded }"
+              @click.stop="subitem.folded = !subitem.folded"
+            >
+              <img src="@/assets/img/shuju/command/arrow-right.png" />
+            </div>
+          </div>
+
+          <div
+            v-show="!subitem.folded"
+            class="granditem"
+            :key="'menu3' + granditem.categoryKey"
+            v-for="granditem in subitem.categories"
+          >
+            <div
+              class="info"
+              :class="{ 'z-on': granditem.selected }"
+              @click="granditem.selected = !granditem.selected"
+            >
+              <div class="i-ico">
+                <img
+                  v-if="grandIcoList[granditem.categoryKey]"
+                  :src="grandIcoList[granditem.categoryKey]"
+                />
+              </div>
+
+              <div class="name">
+                {{ granditem.categoryName }}
+                <i v-if="granditem.quantity">({{ granditem.quantity }})</i>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  name: "sidemenu",
+
+  props: {
+    grandIcoList: {
+      type: Object,
+      default: () => ({}),
+    },
+    orgId: {
+      type: String,
+      default: "",
+    },
+  },
+
+  data() {
+    return {
+      menuList: [],
+    };
+  },
+
+  computed: {},
+  watch: {
+    menuList: {
+      handler(newValue, oldValue) {
+        // console.log("菜单改变拉------------------------------------", newValue);
+        if (oldValue.length != 0) {
+          this.$emit("change", newValue);
+        }
+      },
+      deep: true,
+      // immediate: true
+    },
+    orgId() {
+      this.requestList();
+    },
+  },
+
+  mounted() {
+    this.requestList();
+  },
+
+  methods: {
+    selectAll(item) {
+      item.selected = !item.selected;
+      item.categories.forEach((subitem) => {
+        subitem.selected = item.selected;
+      });
+      if (item.placeTypesInAnalysis) {
+        item.placeTypesInAnalysis.forEach((subitem) => {
+          subitem.selected = item.selected;
+          subitem.categories.forEach((subitem2) => {
+            subitem2.selected = item.selected;
+          });
+        });
+      }
+    },
+    //加载组织数据
+    async requestList() {
+      const url = "/data/aggregator/coverage/analysis/resourceCategories";
+      let params = {
+        agencyId: this.orgId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.menuList = data.map((item) => {
+          item.selected = false;
+          item.folded = true;
+          item.categories.forEach((subitem) => {
+            subitem.selected = false;
+          });
+          item.placeTypesInAnalysis.forEach((subitem) => {
+            subitem.selected = false;
+            subitem.folded = true;
+            subitem.categories.forEach((granditem) => {
+              granditem.selected = false;
+            });
+          });
+          return item;
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.m-menu {
+  padding-top: 10px;
+
+  .list {
+    .item {
+      position: relative;
+      z-index: 2;
+      line-height: 60px;
+      color: rgba(#fff, 0.8);
+
+      .z-on {
+        color: #ffffff;
+        background-color: #041267;
+        font-weight: bold;
+        box-shadow: 0 0 30px 5px inset #22f;
+      }
+
+      .info {
+        position: relative;
+        font-size: 18px;
+        width: 100%;
+        padding-left: 10px;
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+
+        .i-ico {
+          position: relative;
+          width: 35px;
+          height: 35px;
+          margin-right: 4px;
+
+          img {
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 2px;
+            margin: auto;
+          }
+        }
+
+        .i-arrow {
+          margin-left: auto;
+          margin-right: 20px;
+
+          &.z-unfold {
+            transform: rotate(90deg);
+          }
+        }
+
+        &:hover {
+          box-shadow: 0 0 30px 5px inset #22f;
+          background-color: darken(#104ba4, 12);
+        }
+      }
+
+      .subitem,
+      .granditem {
+        > .info {
+          padding-left: 20px;
+          font-size: 16px;
+        }
+
+        .granditem {
+          > .info {
+            padding-left: 40px;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index 56017d830..52d637a5b 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -159,20 +159,39 @@
       </div>
 
       <div class="m-sidemenu">
-        <cpt-card>
-          <div class="title">
-            <img src="@/assets/img/shuju/title-tip.png" />
-            <span>指挥调度</span>
-          </div>
+          <cpt-card>
+        <div class="wrap">
+            <div class="menu">
+              <div class="title">
+                <img src="@/assets/img/shuju/title-tip.png" />
+                <span>指挥调度</span>
+              </div>
 
-          <div class="list">
-            <sidemenu
-              :orgId="orgId"
-              @change="handleChangeMenu"
-              :grandIcoList="dotIcoList"
-            ></sidemenu>
-          </div>
-        </cpt-card>
+              <div class="list">
+                <sidemenu1
+                  :orgId="orgId"
+                  @change="handleChangeMenu1"
+                  :grandIcoList="dotIcoList"
+                ></sidemenu1>
+              </div>
+            </div>
+
+            <div class="menu">
+              <div class="title">
+                <img src="@/assets/img/shuju/title-tip.png" />
+                <span>十五分钟生活圈</span>
+              </div>
+
+              <div class="list">
+                <sidemenu2
+                  :orgId="orgId"
+                  @change="handleChangeMenu2"
+                  :grandIcoList="dotIcoList"
+                ></sidemenu2>
+              </div>
+            </div>
+        </div>
+          </cpt-card>
       </div>
     </div>
 
@@ -215,7 +234,8 @@ import { requestPost } from "@/js/dai/request";
 import People from "@/views/modules/visual/basicinfo/people";
 import cptCard from "@/views/modules/visual/cpts/card";
 import gridMap from "@/views/modules/visual/command/cpts/map";
-import sidemenu from "@/views/modules/visual/command/cpts/sidemenu";
+import sidemenu1 from "@/views/modules/visual/command/cpts/yantai-sidemenu1";
+import sidemenu2 from "@/views/modules/visual/command/cpts/yantai-sidemenu2";
 import sidemenuLeft from "@/views/modules/visual/command/cpts/sidemenu-left";
 import ScreenLoading from "@/views/modules/visual/cpts/loading";
 
@@ -267,7 +287,8 @@ export default {
     cptCard,
     ScreenLoading,
     gridMap,
-    sidemenu,
+    sidemenu1,
+    sidemenu2,
     sidemenuLeft,
     eventInfo,
     serviceInfo,
@@ -297,8 +318,8 @@ export default {
       selUserId: "",
 
       dotList: [],
-      categoryKeys: [],
-      coverageTypes: [],
+      categoryKeys: [[], []],
+      coverageTypes: [[], []],
 
       dotIcoList: {
         anzhibangjiao: require("@/assets/img/shuju/command/ico/anzhibangjiao.png"),
@@ -550,7 +571,36 @@ export default {
       console.log(obj);
     },
 
-    handleChangeMenu(list) {
+    handleChangeMenu1(list) {
+      console.log("handleChangeMenu", list);
+      let categoryKeys = [];
+      let coverageTypes = [];
+      list.forEach((item) => {
+        if (item.selected) {
+          coverageTypes.push(item.coverageType);
+        }
+        item.categories.forEach((subitem) => {
+          if (subitem.selected) {
+            coverageTypes.push(item.coverageType);
+            categoryKeys.push(subitem.categoryKey);
+          }
+        });
+
+        item.placeTypesInAnalysis.forEach((subitem) => {
+          subitem.categories.forEach((subitem2) => {
+            if (subitem2.selected) {
+              categoryKeys.push(subitem2.categoryKey);
+              coverageTypes.push(subitem2.coverageType);
+            }
+          });
+        });
+      });
+      this.categoryKeys[0] = [...new Set(categoryKeys)];
+      this.coverageTypes[0] = [...new Set(coverageTypes)];
+      this.requestMapDot();
+    },
+
+    handleChangeMenu2(list) {
       console.log("handleChangeMenu", list);
       let categoryKeys = [];
       let coverageTypes = [];
@@ -574,8 +624,8 @@ export default {
           });
         });
       });
-      this.categoryKeys = [...new Set(categoryKeys)];
-      this.coverageTypes = [...new Set(coverageTypes)];
+      this.categoryKeys[1] = [...new Set(categoryKeys)];
+      this.coverageTypes[1] = [...new Set(coverageTypes)];
       this.requestMapDot();
     },
 
@@ -585,8 +635,8 @@ export default {
       let params = {
         orgId: this.orgId,
         orgType: "agency",
-        coverageTypes: this.coverageTypes,
-        categoryKeys: this.categoryKeys,
+        coverageTypes: [...this.coverageTypes[0], ...this.coverageTypes[1]],
+        categoryKeys: [...this.categoryKeys[0], ...this.categoryKeys[1]],
         isPage: false,
       };
 

From fc45345773a510be09c48ecd09a3564a453556f9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 16 Aug 2022 13:42:09 +0800
Subject: [PATCH 76/78] 15

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

diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index 52d637a5b..d135daabf 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -159,8 +159,8 @@
       </div>
 
       <div class="m-sidemenu">
-          <cpt-card>
-        <div class="wrap">
+        <cpt-card>
+          <div class="wrap">
             <div class="menu">
               <div class="title">
                 <img src="@/assets/img/shuju/title-tip.png" />
@@ -179,7 +179,7 @@
             <div class="menu">
               <div class="title">
                 <img src="@/assets/img/shuju/title-tip.png" />
-                <span>十五分钟生活圈</span>
+                <span>15分钟生活圈</span>
               </div>
 
               <div class="list">
@@ -190,8 +190,8 @@
                 ></sidemenu2>
               </div>
             </div>
-        </div>
-          </cpt-card>
+          </div>
+        </cpt-card>
       </div>
     </div>
 

From ea614acb75af9e1680565089052b0155e6632505 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 16 Aug 2022 13:53:56 +0800
Subject: [PATCH 77/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/cpts/map/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/visual/cpts/map/index.vue b/src/views/modules/visual/cpts/map/index.vue
index 0c8bae15c..80110912b 100644
--- a/src/views/modules/visual/cpts/map/index.vue
+++ b/src/views/modules/visual/cpts/map/index.vue
@@ -29,6 +29,7 @@ let posLayer;
 let circleLayer;
 let dotLayer;
 let dotBgLayer;
+let dotLayer2;
 
 export default {
   name: "l7",

From cae9106f8ac10fef2b868567d10e9180b4bf020d Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 17 Aug 2022 09:53:10 +0800
Subject: [PATCH 78/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E9=98=B2?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=9D=90=E6=A0=87=E7=82=B9=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/cpts/map/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/visual/cpts/map/index.vue b/src/views/modules/visual/cpts/map/index.vue
index 80110912b..acd84557f 100644
--- a/src/views/modules/visual/cpts/map/index.vue
+++ b/src/views/modules/visual/cpts/map/index.vue
@@ -560,13 +560,13 @@ export default {
     },
 
     updateGrid() {
-      const { polygonData } = this;
+      const { polygonData,polygonDotData } = this;
       if (polygonLayer) {
         polygonLayer.setData(polygonData);
         lineLayer.setData(polygonData);
-        textLayer.setData(polygonData);
-        posLayer.setData(polygonData);
-        circleLayer.setData(polygonData);
+        textLayer.setData(polygonDotData);
+        posLayer.setData(polygonDotData);
+        circleLayer.setData(polygonDotData);
       }
     },