From 025c93ebcbe11d7f47e0dea71ef774599da2b69a Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 20 Feb 2023 17:01:18 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/communityYantai/community.vue        |   12 +-
 .../communityService/fuwujilu/fuwuList08.vue  |   34 +
 .../modules/plugins/change/changewelfare.vue  | 1219 +++++---
 .../modules/plugins/change/resiwelfare.vue    | 2633 +++++++++--------
 4 files changed, 2204 insertions(+), 1694 deletions(-)
 create mode 100644 src/views/modules/communityService/fuwujilu/fuwuList08.vue

diff --git a/src/views/modules/base/communityYantai/community.vue b/src/views/modules/base/communityYantai/community.vue
index aa8a2889b..591110450 100644
--- a/src/views/modules/base/communityYantai/community.vue
+++ b/src/views/modules/base/communityYantai/community.vue
@@ -3,9 +3,9 @@
 
     <div :style="{height:rowHeight}"
          class="div_tree">
-      <!-- <el-input placeholder="输入关键字进行过滤"
+      <el-input placeholder="输入关键字进行过滤"
                 v-model="filterText">
-      </el-input> -->
+      </el-input>
       <el-scrollbar :style="{height:treeHeight}"
                     class="scrollar">
         <el-tree ref="ref_tree"
@@ -222,7 +222,7 @@ export default {
       return time.getTime() > nowData
     }
     return {
-      // filterText: '',
+      filterText: '',
       treeLoading: true,
       treeData: [],
       openNodes: [],
@@ -651,9 +651,9 @@ export default {
     }
   },
   watch: {
-    // filterText (val) {
-    //   this.$refs.ref_tree.filter(val);
-    // }
+    filterText (val) {
+      this.$refs.ref_tree.filter(val);
+    }
   },
   components: {
     communityTable, buildTable, roomTable
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList08.vue b/src/views/modules/communityService/fuwujilu/fuwuList08.vue
new file mode 100644
index 000000000..e7db1167e
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList08.vue
@@ -0,0 +1,34 @@
+<template>
+	<div>
+		<fuwu-list :serviceCategoryKey="serviceCategoryKey"></fuwu-list>
+	</div>
+</template>
+
+<script>
+import fuwuList from "./fuwuList";
+
+export default {
+	components: { fuwuList },
+
+	data() {
+		return {
+			serviceCategoryKey: "08",
+		};
+	},
+	computed: {},
+	watch: {
+		// "formData.serviceTimeEnd": function (val) {
+		//   if (val && val != '') {
+		//     let arrayTemp = val.split(' ')
+		//     this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
+		//   }
+		// },
+	},
+	mounted() {},
+	methods: {},
+
+	props: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index e7f30bc90..e39316dd6 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -1,490 +1,777 @@
 <template>
-    <div class="mod-rent__rentDeath} resi-container">
-      <el-card ref="searchCard" class="search-card">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="姓名"
-                      prop="name">
-          <el-input v-model="dataForm.name"
-                    size="small"
-                    class="list_item_width_1"
-                    clearable
-                    placeholder="请输入姓名">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="证件号"
-                      prop="idCard">
-          <el-input v-model="dataForm.idCard"
-                    size="small"
-                    class="list_item_width_1"
-                    clearable
-                    placeholder="请输入证件号">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="手机"
-                      prop="mobile">
-          <el-input v-model="dataForm.mobile"
-                    size="small"
-                    class="list_item_width_1"
-                    clearable
-                    placeholder="请输入手机">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="加入时间"
-                      prop="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 type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
-        </el-form-item>
-        <!--<el-form-item>-->
-          <!--<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
-        <!--</el-form-item>-->
-      </el-form>
-      </el-card>
-      <el-card class="resi-card-table">
-<!--        <div class="resi-row-btn">-->
-<!--          <el-button type="warning" size="small" class="diy-button&#45;&#45;add" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
-<!--        </div>-->
-          <div class="exportBtn">
-        <div class="resi-row-btn">
-            <el-button style="margin-left: 10px"
-                       class="diy-button--export"
-                       size="small"
-                       @click="handleExportModule()">下载模板</el-button>
-            <el-upload :headers="$getElUploadHeaders()"
-                       style=""
-                       ref="upload"
-                       :multiple="false"
-                       :show-file-list="false"
-                       :before-upload="
-            (file) => {
-              beforeUpload(file);
-            }
-          "
-                       action=""
-                       accept=".xls,.xlsx"
-                       :http-request="
-            () => {
-              uploadFile();
-            }
-          ">
-                <el-button style="margin-left: 10px"
-                           size="small"
-                           class="diy-button--delete">导入</el-button>
-            </el-upload>
-            <el-button type="warning" size="small" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
-        </div>
+	<div class="mod-rent__rentDeath} resi-container">
+		<el-card ref="searchCard" class="search-card">
+			<el-form
+				:inline="true"
+				:model="dataForm"
+				@keyup.enter.native="getDataList()"
+			>
+				<el-form-item label="姓名" prop="name">
+					<el-input
+						v-model="dataForm.name"
+						size="small"
+						class="list_item_width_1"
+						clearable
+						placeholder="请输入姓名"
+					>
+					</el-input>
+				</el-form-item>
+				<el-form-item label="证件号" prop="idCard">
+					<el-input
+						v-model="dataForm.idCard"
+						size="small"
+						class="list_item_width_1"
+						clearable
+						placeholder="请输入证件号"
+					>
+					</el-input>
+				</el-form-item>
+				<el-form-item label="手机" prop="mobile">
+					<el-input
+						v-model="dataForm.mobile"
+						size="small"
+						class="list_item_width_1"
+						clearable
+						placeholder="请输入手机"
+					>
+					</el-input>
+				</el-form-item>
+				<el-form-item label="加入时间" prop="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>
 
-          </div>
-      <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 label="序号"
-                         type="index"
-                         fixed="left"
-                         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="userId" label="epmet用户主键" header-align="center" align="center"></el-table-column>-->
-        <!--<el-table-column prop="gridId" label="epmet网格ID" header-align="center" align="center"></el-table-column>-->
-        <el-table-column prop="name" label="姓名" header-align="center" align="center">
-          <template slot-scope="scope">
-            <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">{{scope.row.name}}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gender" label="性别" header-align="center" align="center">
-          <template slot-scope="scope">
-            {{
-            scope.row.gender == '2'
-            ? "女"
-            : scope.row.gender
-            }}
-          </template>
-        </el-table-column>
-        <!--<el-table-column prop="type" label="类型" header-align="center" align="center"></el-table-column>-->
-        <el-table-column prop="joinDate" label="加入时间" header-align="center" align="center"></el-table-column>
-        <!--<el-table-column prop="joinReason" label="加入原因" header-align="center" align="center"></el-table-column>-->
-        <!--<el-table-column prop="removeDate" label="移除时间" header-align="center" align="center" width="100"></el-table-column>-->
-        <!--<el-table-column prop="removeReason" 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 :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 @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">查看</el-button>
-            <el-button @click="removeHandleList(scope.row)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--detail">移除福利人员</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>
-      </el-card>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-      <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
-                   :userId="lookInfo.userId"
-                   :gridName="lookInfo.gridName"
-                   @close="handleCancleLook" />
-      <el-dialog
-              title="移除原因"
-              :visible.sync="removeVisible"
-              width="40%">
-        <textarea v-model="removeReason" placeholder="请输入移除福利人员的原因" class="blacklist-reason"></textarea>
-        <span slot="footer" class="dialog-footer">
-        <el-button @click="removeVisible = false">取 消</el-button>
-        <el-button type="primary" @click="removeHandle">确 定</el-button>
-      </span>
-      </el-dialog>
-    </div>
+				<el-form-item label="福利发放标识" prop="grantFlag">
+					<el-radio-group
+						size="small"
+						class="list_item_width_1"
+						v-model="dataForm.grantFlag"
+					>
+						<el-radio :label="1">已发放</el-radio>
+						<el-radio :label="0">未发放</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item label="福利类别" prop="categoryName">
+					<el-input
+						v-model="dataForm.categoryName"
+						size="small"
+						class="list_item_width_1"
+						clearable
+						placeholder="请输入福利类别"
+					>
+					</el-input>
+				</el-form-item>
+				<el-form-item>
+					<el-button
+						type="primary"
+						size="small"
+						@click="getDataList()"
+						>{{ $t("query") }}</el-button
+					>
+				</el-form-item>
+				<el-form-item>
+					<el-button
+						class="diy-button--reset"
+						size="small"
+						@click="resetForm"
+						>重置</el-button
+					>
+				</el-form-item>
+				<!--<el-form-item>-->
+				<!--<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
+				<!--</el-form-item>-->
+			</el-form>
+		</el-card>
+		<el-card class="resi-card-table">
+			<!--        <div class="resi-row-btn">-->
+			<!--          <el-button type="warning" size="small" class="diy-button&#45;&#45;add" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
+			<!--        </div>-->
+			<div class="exportBtn">
+				<div class="resi-row-btn">
+					<el-button
+						style="margin-left: 10px"
+						class="diy-button--export"
+						size="small"
+						@click="handleExportModule()"
+						>下载模板</el-button
+					>
+					<el-upload
+						:headers="$getElUploadHeaders()"
+						style=""
+						ref="upload"
+						:multiple="false"
+						:show-file-list="false"
+						:before-upload="
+							(file) => {
+								beforeUpload(file);
+							}
+						"
+						action=""
+						accept=".xls,.xlsx"
+						:http-request="
+							() => {
+								uploadFile();
+							}
+						"
+					>
+						<el-button
+							style="margin-left: 10px"
+							size="small"
+							class="diy-button--delete"
+							>导入</el-button
+						>
+					</el-upload>
+					<el-button
+						type="warning"
+						size="small"
+						class="diy-button--reset"
+						@click="exportHandle()"
+						>{{ $t("export") }}</el-button
+					>
+				</div>
+			</div>
+			<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
+					label="序号"
+					type="index"
+					fixed="left"
+					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="userId" label="epmet用户主键" header-align="center" align="center"></el-table-column>-->
+				<!--<el-table-column prop="gridId" label="epmet网格ID" header-align="center" align="center"></el-table-column>-->
+				<el-table-column
+					prop="name"
+					label="姓名"
+					header-align="center"
+					align="center"
+				>
+					<template slot-scope="scope">
+						<el-button
+							@click="handleLook(scope.row)"
+							type="text"
+							size="small"
+							class="btn-color-look"
+							>{{ scope.row.name }}</el-button
+						>
+					</template>
+				</el-table-column>
+				<el-table-column
+					prop="idCard"
+					label="证件号"
+					header-align="center"
+					align="center"
+				></el-table-column>
+				<el-table-column
+					prop="mobile"
+					label="手机号"
+					header-align="center"
+					align="center"
+				></el-table-column>
+				<el-table-column
+					prop="gender"
+					label="性别"
+					header-align="center"
+					align="center"
+				>
+					<template slot-scope="scope">
+						{{ scope.row.gender == "2" ? "女" : scope.row.gender }}
+					</template>
+				</el-table-column>
+				<!--<el-table-column prop="type" label="类型" header-align="center" align="center"></el-table-column>-->
+				<el-table-column
+					prop="joinDate"
+					label="加入时间"
+					header-align="center"
+					align="center"
+				></el-table-column>
+				<!--<el-table-column prop="joinReason" label="加入原因" header-align="center" align="center"></el-table-column>-->
+				<!--<el-table-column prop="removeDate" label="移除时间" header-align="center" align="center" width="100"></el-table-column>-->
+				<!--<el-table-column prop="removeReason" 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
+					:label="$t('handle')"
+					fixed="right"
+					header-align="center"
+					align="center"
+					width="200"
+				>
+					<template slot-scope="scope">
+						<!--<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
+						<el-button
+							@click="handleLook(scope.row)"
+							type="text"
+							size="small"
+							class="btn-color-look"
+							>查看</el-button
+						>
+						<el-button
+							type="text"
+							size="small"
+							@click="handleUpdate(scope.row)"
+							>{{ $t("update") }}</el-button
+						>
+						<el-button
+							@click="removeHandleList(scope.row)"
+							type="text"
+							size="small"
+							class="div-table-button--detail"
+							>移除福利人员</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>
+		</el-card>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getDataList"
+		></add-or-update>
+		<people-more
+			v-if="showedPeopleMoreInfo && lookInfo.userId"
+			:userId="lookInfo.userId"
+			:gridName="lookInfo.gridName"
+			@close="handleCancleLook"
+		/>
+		<el-dialog title="移除原因" :visible.sync="removeVisible" width="40%">
+			<textarea
+				v-model="removeReason"
+				placeholder="请输入移除福利人员的原因"
+				class="blacklist-reason"
+			></textarea>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="removeVisible = false">取 消</el-button>
+				<el-button type="primary" @click="removeHandle"
+					>确 定</el-button
+				>
+			</span>
+		</el-dialog>
+
+		<el-dialog
+			title="修改福利人员信息"
+			:visible.sync="joinFormVisible"
+			width="600px"
+		>
+			<el-form
+				ref="joinForm"
+				:inline="true"
+				:model="joinForm"
+				:rules="dataRule"
+				class="form"
+			>
+				<el-form-item
+					label="福利发放标识	"
+					prop="grantFlag"
+					label-width="150px"
+					style="display: block"
+				>
+					<el-radio-group v-model="joinForm.grantFlag">
+						<el-radio :label="1">已发放</el-radio>
+						<el-radio :label="0">未发放</el-radio>
+					</el-radio-group>
+				</el-form-item>
+
+				<el-form-item
+					label="福利类别	"
+					prop="categoryName"
+					label-width="150px"
+					style="display: block"
+				>
+					<el-input
+						maxlength="50"
+						style="width: 300px"
+						show-word-limit
+						placeholder="请输入福利类别	"
+						v-model="joinForm.categoryName"
+					>
+					</el-input>
+				</el-form-item>
+
+				<el-form-item
+					label="添加原因"
+					prop="joinReason"
+					label-width="150px"
+					style="display: block"
+				>
+					<el-input
+						type="textarea"
+						style="width: 300px"
+						maxlength="1000"
+						show-word-limit
+						:rows="3"
+						placeholder="请输入添加福利人员的原因"
+						v-model="joinForm.joinReason"
+					></el-input>
+				</el-form-item>
+			</el-form>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="hideJoinForm">取 消</el-button>
+				<el-button type="primary" @click="handleComfirmJoinForm"
+					>确 定</el-button
+				>
+			</span>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './changewelfare-add-or-update'
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./changewelfare-add-or-update";
 import peopleMore from "@/views/modules/shequ/cpts/people-more";
 import { requestPost } from "@/js/dai/request";
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/epmetuser/changeWelfare/page',
-        getDataListIsPage: true,
-        deleteURL: '/epmetuser/changeWelfare',
-        deleteIsBatch: true,
-        exportURL: '/epmetuser/changeWelfare/export'
-      },
-      dataForm: {
-        id: ''
-      },
-        timeRange: '',
-        // 显示人员详情
-        showedPeopleMoreInfo: false,
-        lookInfo: {
-            userId: '',
-            gridName: ''
-        },
-        removeReason: '',
-        removeVisible: false,
-        rowData: {},
-    }
-  },
-  components: {
-    AddOrUpdate,
-      peopleMore
-  },
-    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 = "";
-            }
-        }
-    },
-    methods: {
-        handleExportModule () {
-            let title = "福利人员模板";
-            let url = "/epmetuser/changeWelfare/exporttemplate";
+	mixins: [mixinViewModule],
+	components: {
+		AddOrUpdate,
+		peopleMore,
+	},
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				getDataListURL: "/epmetuser/changeWelfare/page",
+				getDataListIsPage: true,
+				deleteURL: "/epmetuser/changeWelfare",
+				deleteIsBatch: true,
+				exportURL: "/epmetuser/changeWelfare/export",
+			},
+			dataForm: {
+				id: "",
+				grantFlag: "",
+				categoryName: "",
+			},
+			timeRange: "",
+			// 显示人员详情
+			showedPeopleMoreInfo: false,
+			lookInfo: {
+				userId: "",
+				gridName: "",
+			},
+			removeReason: "",
+			removeVisible: false,
+			rowData: {},
 
-            let params = {};
+			joinFormVisible: false,
+			joinForm: {
+				grantFlag: "",
+				categoryName: "",
+				joinReason: "",
+			},
+		};
+	},
+	computed: {
+		dataRule() {
+			return {
+				grantFlag: [
+					{
+						required: true,
+						message: "请选择福利发放标识",
+						trigger: "blur",
+					},
+				],
+				categoryName: [
+					{
+						required: true,
+						message: "福利类别不能为空",
+						trigger: "blur",
+					},
+				],
+				joinReason: [
+					{
+						required: true,
+						message: "添加原因不能为空",
+						trigger: "blur",
+					},
+				],
+			};
+		},
+	},
+	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 = "";
+			}
+		},
+	},
+	methods: {
+		handleExportModule() {
+			let title = "福利人员模板";
+			let url = "/epmetuser/changeWelfare/exporttemplate";
 
-            app.ajax.exportFilePost(
-                url,
-                params,
-                (data, rspMsg) => {
-                    this.download(data, title + ".xls");
-                },
-                (rspMsg, data) => {
-                    this.$message.error(rspMsg);
-                }
-            );
-        },
-        // 下载文件
-        download (data, fileName) {
-            if (!data) {
-                return;
-            }
+			let params = {};
 
-            var csvData = new Blob([data]);
+			app.ajax.exportFilePost(
+				url,
+				params,
+				(data, rspMsg) => {
+					this.download(data, title + ".xls");
+				},
+				(rspMsg, data) => {
+					this.$message.error(rspMsg);
+				}
+			);
+		},
+		// 下载文件
+		download(data, fileName) {
+			if (!data) {
+				return;
+			}
 
-            if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-                window.navigator.msSaveOrOpenBlob(csvData, fileName);
-            }
-            // for Non-IE (chrome, firefox etc.)
-            else {
-                var a = document.createElement("a");
-                document.body.appendChild(a);
-                a.style = "display: none";
-                var url = window.URL.createObjectURL(csvData);
-                a.href = url;
-                a.download = fileName;
-                a.click();
-                a.remove();
-                window.URL.revokeObjectURL(url);
-            }
-        },
-        // 上传文件之前的钩子
-        beforeUpload (file) {
-            this.files = file;
+			var csvData = new Blob([data]);
 
-            const isText = file.type === "application/vnd.ms-excel";
-            const isTextComputer =
-                file.type ===
-                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+			if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+				window.navigator.msSaveOrOpenBlob(csvData, fileName);
+			}
+			// for Non-IE (chrome, firefox etc.)
+			else {
+				var a = document.createElement("a");
+				document.body.appendChild(a);
+				a.style = "display: none";
+				var url = window.URL.createObjectURL(csvData);
+				a.href = url;
+				a.download = fileName;
+				a.click();
+				a.remove();
+				window.URL.revokeObjectURL(url);
+			}
+		},
+		// 上传文件之前的钩子
+		beforeUpload(file) {
+			this.files = file;
 
-            if (!isText && !isTextComputer) {
-                this.$message.error("请选择正确格式的文件");
-                this.files = null;
-                this.fileName = "";
-                return false;
-            } else {
-                this.fileName = file.name;
-                return true;
-            }
-        },
-        async uploadFile () {
-            if (this.fileName == "") {
-                this.$message.warning("请选择要上传的文件！");
-                return false;
-            }
+			const isText = file.type === "application/vnd.ms-excel";
+			const isTextComputer =
+				file.type ===
+				"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
 
-            this.$message({
-                showClose: true,
-                message: "导入中，请到系统管理-导入记录中查看进度",
-                duration: 0,
-            });
+			if (!isText && !isTextComputer) {
+				this.$message.error("请选择正确格式的文件");
+				this.files = null;
+				this.fileName = "";
+				return false;
+			} else {
+				this.fileName = file.name;
+				return true;
+			}
+		},
+		async uploadFile() {
+			if (this.fileName == "") {
+				this.$message.warning("请选择要上传的文件！");
+				return false;
+			}
 
-            //清空上传列表
-            this.$refs["upload"].clearFiles();
-            let url = "";
+			this.$message({
+				showClose: true,
+				message: "导入中，请到系统管理-导入记录中查看进度",
+				duration: 0,
+			});
 
-            let fileFormData = new FormData();
-            fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+			//清空上传列表
+			this.$refs["upload"].clearFiles();
+			let url = "";
 
-            url = "/epmetuser/changeWelfare/pointImport";
+			let fileFormData = new FormData();
+			fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
 
-            window.app.ajax.post2(
-                url,
-                fileFormData,
-                (data, rspMsg) => {
-                    if (data.code === 0 && data.msg == "success") {
-                        // this.$message.success('导入成功')
-                    } else {
-                        // this.$message({
-                        //   showClose: true,
-                        //   message: rspMsg,
-                        //   duration: 0,
-                        //   type: "error"
-                        // })
-                        // this.$message.error(rspMsg)
-                    }
-                    this.loadTable();
-                },
-                (rspMsg, data) => { },
-                { headers: { "Content-Type": "multipart/form-data" } }
-            );
-        },
-      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('网络错误')
-        })
-      },
-        resetForm(formName) {
-            for(const n in this.dataForm) {
-                this.dataForm[n] = ''
-            }
-            this.timeRange = ''
-            this.getDataList()
-        },
-        async handleLook (row) {
-            if(row.gridId !== ''){
-                const url = '/gov/org/grid/griddetail'
-                let params = {
-                    gridId : row.gridId,
-                }
-                const { data, code, msg } = await requestPost(url, params)
-                if(code === 0){
-                    this.lookInfo.gridName = data.gridName
-                } else {
-                    this.$message.error(msg)
-                }
-            }else{
-                this.lookInfo.gridName = ''
-            }
-            if(row.userId === '' || row.userId === null){
-                this.$message.error('未查询到该用户的相关信息')
-                return false
-            }
-            this.lookInfo.userId = row.userId
-            this.showedPeopleMoreInfo = true
-        },
-        handleCancleLook() {
-            this.lookInfo.userId = ''
-            this.lookInfo.gridName = ''
-            this.showedPeopleMoreInfo = false
-        },
-        removeHandleList (row) {
-            this.removeVisible = true
-            this.removeReason = ''
-            this.rowData = { ...row }
-        },
-        removeHandle () {
-            const params = {
-                id: this.rowData.id,
-                removeReason: this.removeReason
-            }
-            this.$http.post('/epmetuser/changeWelfare/removeWelfare', 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.removeVisible = false
-                        this.getDataList()
-                    }
-                })
-            }).catch(err => {
-                this.$message.error(err.message)
-            })
-        },
-    }
-}
+			url = "/epmetuser/changeWelfare/pointImport";
+
+			window.app.ajax.post2(
+				url,
+				fileFormData,
+				(data, rspMsg) => {
+					if (data.code === 0 && data.msg == "success") {
+						// this.$message.success('导入成功')
+					} else {
+						// this.$message({
+						//   showClose: true,
+						//   message: rspMsg,
+						//   duration: 0,
+						//   type: "error"
+						// })
+						// this.$message.error(rspMsg)
+					}
+					this.loadTable();
+				},
+				(rspMsg, data) => {},
+				{ headers: { "Content-Type": "multipart/form-data" } }
+			);
+		},
+		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("网络错误");
+				});
+		},
+		resetForm(formName) {
+			for (const n in this.dataForm) {
+				this.dataForm[n] = "";
+			}
+			this.timeRange = "";
+			this.getDataList();
+		},
+		async handleLook(row) {
+			if (row.gridId !== "") {
+				const url = "/gov/org/grid/griddetail";
+				let params = {
+					gridId: row.gridId,
+				};
+				const { data, code, msg } = await requestPost(url, params);
+				if (code === 0) {
+					this.lookInfo.gridName = data.gridName;
+				} else {
+					this.$message.error(msg);
+				}
+			} else {
+				this.lookInfo.gridName = "";
+			}
+			if (row.userId === "" || row.userId === null) {
+				this.$message.error("未查询到该用户的相关信息");
+				return false;
+			}
+			this.lookInfo.userId = row.userId;
+			this.showedPeopleMoreInfo = true;
+		},
+		handleCancleLook() {
+			this.lookInfo.userId = "";
+			this.lookInfo.gridName = "";
+			this.showedPeopleMoreInfo = false;
+		},
+
+		// 更新福利信息
+		handleUpdate(row) {
+			this.rowData = { ...row };
+			// 重置表单
+			const { joinForm } = this;
+			Object.keys(joinForm).forEach((k) => {
+				this.joinForm[k] = row[k];
+			});
+			this.joinFormVisible = true;
+		},
+
+		hideJoinForm() {
+			this.joinFormVisible = false;
+			// 重置表单
+			const { joinForm } = this;
+			Object.keys(joinForm).forEach((k) => {
+				this.joinForm[k] = "";
+			});
+		},
+
+		// 修改-验证表单后提交
+		async handleComfirmJoinForm() {
+			this.$refs["joinForm"].validate((valid, messageObj) => {
+				if (!valid) {
+					app.util.validateRule(messageObj);
+				} else {
+					this.submitJoinForm();
+				}
+			});
+		},
+
+		// 修改-提交
+		submitJoinForm() {
+			const { joinForm } = this;
+			const params = {
+				id: this.rowData.id,
+				...joinForm,
+			};
+			this.$http
+				.post("/epmetuser/changeWelfare/update", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					this.hideJoinForm();
+					this.getDataList();
+
+					this.$message({
+						message: this.$t("prompt.success"),
+						type: "success",
+						duration: 500,
+					});
+				})
+				.catch((err) => {
+					this.$message.error(err.message);
+				});
+		},
+
+		removeHandleList(row) {
+			this.removeVisible = true;
+			this.removeReason = "";
+			this.rowData = { ...row };
+		},
+		removeHandle() {
+			const params = {
+				id: this.rowData.id,
+				removeReason: this.removeReason,
+			};
+			this.$http
+				.post("/epmetuser/changeWelfare/removeWelfare", 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.removeVisible = false;
+							this.getDataList();
+						},
+					});
+				})
+				.catch((err) => {
+					this.$message.error(err.message);
+				});
+		},
+	},
+};
 </script>
 <style lang="scss" scoped>
-  @import "@/assets/scss/buttonstyle.scss";
-
-  .exportBtn {
-      display: flex;
-      align-items: center;
-  }
+@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;
+.exportBtn {
+	display: flex;
+	align-items: center;
+}
 
-    }
-    .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;
-  }
-  .blacklist-reason {
-    width: 100%;
-    height: 80px;
-    border: 1px solid #e4e4e4;
-    border-radius: 4px;
-    resize: none;
-    padding: 8px;
-    box-sizing: border-box;
-  }
-  .resi-row-btn {
-    display: flex;
-    margin-bottom: 13px;
-    .el-button {
-      margin-left: 10px;
-      border: 0;
-    }
-    // .el-button--success {
-    //   background: rgba(34, 193, 195, 1);
-    // }
-    // .el-button--warning {
-    //   background: rgba(254, 179, 73, 1);
-    // }
-    // .el-button--danger {
-    //   background: rgba(254, 98, 82, 1);
-    // }
-  }
+.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;
+}
+.blacklist-reason {
+	width: 100%;
+	height: 80px;
+	border: 1px solid #e4e4e4;
+	border-radius: 4px;
+	resize: none;
+	padding: 8px;
+	box-sizing: border-box;
+}
+.resi-row-btn {
+	display: flex;
+	margin-bottom: 13px;
+	.el-button {
+		margin-left: 10px;
+		border: 0;
+	}
+	// .el-button--success {
+	//   background: rgba(34, 193, 195, 1);
+	// }
+	// .el-button--warning {
+	//   background: rgba(254, 179, 73, 1);
+	// }
+	// .el-button--danger {
+	//   background: rgba(254, 98, 82, 1);
+	// }
+}
 </style>
diff --git a/src/views/modules/plugins/change/resiwelfare.vue b/src/views/modules/plugins/change/resiwelfare.vue
index 4e323498f..6c798cd6b 100644
--- a/src/views/modules/plugins/change/resiwelfare.vue
+++ b/src/views/modules/plugins/change/resiwelfare.vue
@@ -1,12 +1,14 @@
 <template>
-  <div class="resi-container">
-    <death-search v-if="searchList.length > 0"
-                 ref="deathSearch"
-                 :form-list="searchList"
-                 :column-name="defaultCategotyKey"
-                 @search="handleSearch" />
-    <el-card class="resi-card-table">
-      <!-- <div class="resi-row-btn">
+	<div class="resi-container">
+		<death-search
+			v-if="searchList.length > 0"
+			ref="deathSearch"
+			:form-list="searchList"
+			:column-name="defaultCategotyKey"
+			@search="handleSearch"
+		/>
+		<el-card class="resi-card-table">
+			<!-- <div class="resi-row-btn">
         <el-button size="small"
                    class="diy-button--add"
                    @click="handleAdd">新增</el-button>
@@ -40,58 +42,70 @@
                      @click="deleteBatch">批量删除</el-button>
 
       </div> -->
-      <el-table ref="ref_table"
-                :data="tableData"
-                v-loading="tableLoading"
-                border
-                style="width: 100%"
-                class="resi-table"
-                :height="tableHeight"
-                @select-all="selectAll"
-                @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         fixed="left"
-                         align="center"
-                         :selectable="checkSelect"
-                         width="55" />
-        <el-table-column label="序号"
-                         type="index"
-                         fixed="left"
-                         align="center"
-                         width="50">
-        </el-table-column>
-        <el-table-column v-for="item in tableHeader"
-                         :key="item.columnName"
-                         :prop="item.columnName"
-                         :label="item.label"
-                         align="center"
-                         :fixed="item.columnName == 'NAME' ? 'left' : false"
-                         :show-overflow-tooltip="true"
-                         >
-                         <!-- :width="item.width || computedWidth(item.label, item.itemType)" -->
-                         <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
-          <template slot-scope="scope">
-            <a v-if="item.columnName == 'NAME'"
-               class="name-a"
-               @click="handleLook(scope.row)">
-              {{ handleFilterSpan(scope.row, item) }}
-            </a>
-            <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作"
-                         align="center"
-                         width="150">
-          <template slot-scope="scope">
-              <el-button @click="joinBlacklist(scope.row)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--detail">添加福利人员</el-button>
-            <!-- <el-button @click="handleLook(scope.row)"
+			<el-table
+				ref="ref_table"
+				:data="tableData"
+				v-loading="tableLoading"
+				border
+				style="width: 100%"
+				class="resi-table"
+				:height="tableHeight"
+				@select-all="selectAll"
+				@selection-change="selectionChange"
+			>
+				<el-table-column
+					type="selection"
+					fixed="left"
+					align="center"
+					:selectable="checkSelect"
+					width="55"
+				/>
+				<el-table-column
+					label="序号"
+					type="index"
+					fixed="left"
+					align="center"
+					width="50"
+				>
+				</el-table-column>
+				<el-table-column
+					v-for="item in tableHeader"
+					:key="item.columnName"
+					:prop="item.columnName"
+					:label="item.label"
+					align="center"
+					:fixed="item.columnName == 'NAME' ? 'left' : false"
+					:show-overflow-tooltip="true"
+				>
+					<!-- :width="item.width || computedWidth(item.label, item.itemType)" -->
+					<!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
+					<template slot-scope="scope">
+						<a
+							v-if="item.columnName == 'NAME'"
+							class="name-a"
+							@click="handleLook(scope.row)"
+						>
+							{{ handleFilterSpan(scope.row, item) }}
+						</a>
+						<span v-else>{{
+							handleFilterSpan(scope.row, item)
+						}}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button
+							@click="joinBlacklist(scope.row)"
+							type="text"
+							size="small"
+							class="div-table-button--detail"
+							>添加福利人员</el-button
+						>
+						<!-- <el-button @click="handleLook(scope.row)"
                        type="text"
                        size="small"
                        class="btn-color-look">查看</el-button> -->
-            <!-- <el-button @click="handleTransfer(scope.row)"
+						<!-- <el-button @click="handleTransfer(scope.row)"
                        type="text"
                        size="small"
                        class="div-table-button--detail">变动</el-button>
@@ -108,12 +122,12 @@
                              @onConfirm="handleDel(scope.row)">
               </el-popconfirm>
             </template> -->
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="div-flex">
-        <div class="div_del">
-          <!-- <el-checkbox :indeterminate="isIndeterminate"
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="div-flex">
+				<div class="div_del">
+					<!-- <el-checkbox :indeterminate="isIndeterminate"
                        v-model="selAllFlag"
                        :disabled="selAllFlagDisabled"
                        @change="handleSelectAll">全选</el-checkbox>
@@ -122,1229 +136,1404 @@
                      type="danger"
                      size="small"
                      @click="deleteBatch">删除</el-button> -->
-        </div>
-        <div>
-          <el-pagination @size-change="handleSizeChange"
-                         @current-change="handleCurrentChange"
-                         :current-page.sync="currentPage"
-                         :page-sizes="[20, 50, 100, 200]"
-                         :page-size="pageSize"
-                         layout="sizes, prev, pager, next, total"
-                         :total="total">
-          </el-pagination>
-        </div>
+				</div>
+				<div>
+					<el-pagination
+						@size-change="handleSizeChange"
+						@current-change="handleCurrentChange"
+						:current-page.sync="currentPage"
+						:page-sizes="[20, 50, 100, 200]"
+						:page-size="pageSize"
+						layout="sizes, prev, pager, next, total"
+						:total="total"
+					>
+					</el-pagination>
+				</div>
+			</div>
+		</el-card>
 
-      </div>
-    </el-card>
+		<el-dialog
+			:title="formName"
+			:visible.sync="dialogVisible"
+			width="80%"
+			top="5vh"
+			append-to-body
+			class="dialog-h"
+			:close-on-click-modal="false"
+			:before-close="handlerCancle"
+		>
+			<div class="dialog-h-content scroll-h">
+				<resi-form
+					v-if="dialogVisible"
+					ref="baseForm"
+					:fixed="true"
+					:form-list="formList"
+					@changegroup="handleChangeGroup"
+				/>
+				<div v-if="dialogVisible" class="resi-other">
+					<div class="resi-other-title">其他</div>
+					<div class="tabs-other-info">
+						<el-tabs v-model="activeName" @tab-click="handleClick">
+							<el-tab-pane
+								v-for="item in tabsList"
+								:key="item.columnName"
+								:label="item.label"
+								:name="'group' + item.groupId"
+							>
+								<resi-form
+									:ref="'group' + item.groupId"
+									:columns="3"
+									:support-add="item.supportAdd"
+									:form-id="item.columnName"
+									:form-list="item.itemList"
+								/>
+							</el-tab-pane>
+						</el-tabs>
+					</div>
+				</div>
+			</div>
 
-    <el-dialog :title="formName"
-               :visible.sync="dialogVisible"
-               width="80%"
-               top="5vh"
-               append-to-body
-               class="dialog-h"
-               :close-on-click-modal="false"
-               :before-close="handlerCancle">
-      <div class="dialog-h-content scroll-h">
-        <resi-form v-if="dialogVisible"
-                   ref="baseForm"
-                   :fixed="true"
-                   :form-list="formList"
-                   @changegroup="handleChangeGroup" />
-        <div v-if="dialogVisible"
-             class="resi-other">
-          <div class="resi-other-title">其他</div>
-          <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
-                     @tab-click="handleClick">
-              <el-tab-pane v-for="item in tabsList"
-                           :key="item.columnName"
-                           :label="item.label"
-                           :name="'group' + item.groupId">
-                <resi-form :ref="'group' + item.groupId"
-                           :columns="3"
-                           :support-add="item.supportAdd"
-                           :form-id="item.columnName"
-                           :form-list="item.itemList" />
-              </el-tab-pane>
-            </el-tabs>
-          </div>
-        </div>
-      </div>
+			<div class="resi-btns">
+				<el-button size="small" @click="handlerCancle">取消</el-button>
+				<el-button
+					type="primary"
+					size="small"
+					:loading="btnLoading"
+					@click="handleSUbmit"
+					>提交</el-button
+				>
+			</div>
+		</el-dialog>
 
-      <div class="resi-btns">
-        <el-button size="small"
-                   @click="handlerCancle">取消</el-button>
-        <el-button type="primary"
-                   size="small"
-                   :loading="btnLoading"
-                   @click="handleSUbmit">提交</el-button>
-      </div>
-    </el-dialog>
+		<el-dialog
+			:title="formName"
+			:visible.sync="dialogEditVisible"
+			width="80%"
+			append-to-body
+			class="dialog-h"
+			top="5vh"
+			:close-on-click-modal="false"
+			:before-close="handlerEditCancle"
+		>
+			<div class="dialog-h-content scroll-h">
+				<edit-resi
+					v-if="dialogEditVisible"
+					ref="baseForm"
+					:disabled="disabled"
+					:form-info="editForm"
+					:fixed="true"
+					:form-list="formList"
+					:agency-id="editAgencyId"
+					@changegroup="handleChangeGroup"
+				/>
+				<div v-if="dialogEditVisible" class="resi-other">
+					<div class="resi-other-title">其他</div>
+					<div class="tabs-other-info">
+						<el-tabs v-model="activeName" @tab-click="handleClick">
+							<el-tab-pane
+								v-for="item in tabsList"
+								:key="item.columnName"
+								:label="item.label"
+								:name="'group' + item.groupId"
+							>
+								<edit-resi
+									:ref="'group' + item.groupId"
+									:columns="3"
+									:support-add="item.supportAdd"
+									:form-id="item.columnName"
+									:muti-list="item.mutiList"
+									:form-list="item.itemList"
+									:disabled="disabled"
+									:label-width="'140px'"
+									:agency-id="editAgencyId"
+								/>
+							</el-tab-pane>
+						</el-tabs>
+					</div>
+				</div>
+			</div>
+			<div class="resi-btns">
+				<el-button size="small" @click="handlerEditCancle"
+					>取消</el-button
+				>
+				<el-button
+					v-if="!disabled"
+					type="primary"
+					size="small"
+					:loading="btnLoading"
+					@click="handleEditSUbmit"
+					>提交</el-button
+				>
+			</div>
+		</el-dialog>
 
-    <el-dialog :title="formName"
-               :visible.sync="dialogEditVisible"
-               width="80%"
-               append-to-body
-               class="dialog-h"
-               top="5vh"
-               :close-on-click-modal="false"
-               :before-close="handlerEditCancle">
-      <div class="dialog-h-content scroll-h">
-        <edit-resi v-if="dialogEditVisible"
-                   ref="baseForm"
-                   :disabled="disabled"
-                   :form-info="editForm"
-                   :fixed="true"
-                   :form-list="formList"
-                   :agency-id="editAgencyId"
-                   @changegroup="handleChangeGroup" />
-        <div v-if="dialogEditVisible"
-             class="resi-other">
-          <div class="resi-other-title">其他</div>
-          <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
-                     @tab-click="handleClick">
-              <el-tab-pane v-for="item in tabsList"
-                           :key="item.columnName"
-                           :label="item.label"
-                           :name="'group' + item.groupId">
-                <edit-resi :ref="'group' + item.groupId"
-                           :columns="3"
-                           :support-add="item.supportAdd"
-                           :form-id="item.columnName"
-                           :muti-list="item.mutiList"
-                           :form-list="item.itemList"
-                           :disabled="disabled"
-                           :label-width="'140px'"
-                           :agency-id="editAgencyId" />
-              </el-tab-pane>
-            </el-tabs>
-          </div>
-        </div>
-      </div>
-      <div class="resi-btns">
-        <el-button size="small"
-                   @click="handlerEditCancle">取消</el-button>
-        <el-button v-if="!disabled"
-                   type="primary"
-                   size="small"
-                   :loading="btnLoading"
-                   @click="handleEditSUbmit">提交</el-button>
-      </div>
-    </el-dialog>
+		<!-- 调动 -->
+		<el-dialog
+			:visible.sync="tranferShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="'人员变动'"
+			width="950px"
+			top="5vh"
+			class="dialog-h"
+			@closed="diaClose"
+		>
+			<resi-transfer
+				ref="ref_transfer"
+				@dialogCancle="transferClose"
+			></resi-transfer>
+		</el-dialog>
 
-    <!-- 调动 -->
-    <el-dialog :visible.sync="tranferShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'人员变动'"
-               width="950px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <resi-transfer ref="ref_transfer"
-                     @dialogCancle="transferClose"></resi-transfer>
-    </el-dialog>
+		<!-- 变更记录 -->
+		<el-dialog
+			:visible.sync="changeRecordShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="'变更记录'"
+			width="1150px"
+			top="5vh"
+			@closed="diaClose"
+		>
+			<resi-change-record ref="ref_changerecord"></resi-change-record>
+		</el-dialog>
+		<people-more
+			v-if="showedPeopleMoreInfo && lookInfo.userId"
+			:userId="lookInfo.userId"
+			:gridName="lookInfo.gridName"
+			@close="handleCancleLook"
+		/>
+		<el-dialog
+			title="添加福利人员"
+			:visible.sync="blacklistVisible"
+			width="600px"
+		>
+			<el-form
+				ref="joinForm"
+				:inline="true"
+				:model="joinForm"
+				:rules="dataRule"
+				class="form"
+			>
+				<el-form-item
+					label="福利发放标识	"
+					prop="grantFlag"
+					label-width="150px"
+					style="display: block"
+				>
+					<el-radio-group v-model="joinForm.grantFlag">
+						<el-radio :label="1">已发放</el-radio>
+						<el-radio :label="0">未发放</el-radio>
+					</el-radio-group>
+				</el-form-item>
 
-    <!-- 变更记录 -->
-    <el-dialog :visible.sync="changeRecordShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'变更记录'"
-               width="1150px"
-               top="5vh"
-               @closed="diaClose">
-      <resi-change-record ref="ref_changerecord"></resi-change-record>
-    </el-dialog>
-    <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
-                 :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>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="blacklistVisible = false">取 消</el-button>
-        <el-button type="primary" @click="confirmJoinDeathlist">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
+				<el-form-item
+					label="福利类别	"
+					prop="categoryName"
+					label-width="150px"
+					style="display: block"
+				>
+					<el-input
+						maxlength="50"
+						style="width: 300px"
+						show-word-limit
+						placeholder="请输入福利类别	"
+						v-model="joinForm.categoryName"
+					>
+					</el-input>
+				</el-form-item>
+
+				<el-form-item
+					label="添加原因"
+					prop="joinReason"
+					label-width="150px"
+					style="display: block"
+				>
+					<el-input
+						type="textarea"
+						style="width: 300px"
+						maxlength="1000"
+						show-word-limit
+						:rows="3"
+						placeholder="请输入添加福利人员的原因"
+						v-model="joinForm.joinReason"
+					></el-input>
+				</el-form-item>
+			</el-form>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="blacklistVisible = false">取 消</el-button>
+				<el-button type="primary" @click="handleComfirmJoinForm"
+					>确 定</el-button
+				>
+			</span>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import nextTick from 'dai-js/tools/nextTick'
-import deathSearch from '../../../components/deathSearch.vue'
-import resiForm from '../../../components/resiForm.vue'
-import editResi from '../../../components/editResi.vue'
-import axios from 'axios'
-import { mapGetters } from 'vuex'
-import resiTransfer from '../../../components/resiTransfer.vue'
-import resiChangeRecord from '../../../components/resiChangeRecord.vue'
+import nextTick from "dai-js/tools/nextTick";
+import deathSearch from "../../../components/deathSearch.vue";
+import resiForm from "../../../components/resiForm.vue";
+import editResi from "../../../components/editResi.vue";
+import axios from "axios";
+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";
 
 export default {
-  components: {
-      deathSearch,
-    resiForm,
-    editResi,
-    resiTransfer,
-    resiChangeRecord,
-    peopleMore
-  },
-  data () {
-    return {
-      exportBtn: false,
-      exportBtnTitle: '导出',
-      importBtnTitle: '导入',
-      importLoading: false,
-      rowVisible: false,
-      tableLoading: false,
-      btnLoading: false,
-      disabled: false,
-      pageLoading: false,
-      selAllFlag: false,
-      selAllFlagDisabled: false,
-      isIndeterminate: false,
-      dialogEditVisible: false,
-      dialogVisible: false,
-      // 显示人员详情
-      showedPeopleMoreInfo: false,
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
-      currentPage: 1,
-      pageSize: 20,
-      total: null,
-      searchH: 0,
-      conditions: [],
-      activeName: '',
-      tableData: [],
-      searchList: [],
-      editAgencyId: '',
-      editForm: {
-        GRID_ID: '',
-        VILLAGE_ID: '',
-        BUILD_ID: '',
-        HOME_ID: ''
-      },
-      editTableName: {},
-      formName: '',
-      formList: [],
-      tableHeader: [],
-      tabsList: [],
-      selection: [],
-
-      defaultCategotyKey: '',
+	components: {
+		deathSearch,
+		resiForm,
+		editResi,
+		resiTransfer,
+		resiChangeRecord,
+		peopleMore,
+	},
+	data() {
+		return {
+			exportBtn: false,
+			exportBtnTitle: "导出",
+			importBtnTitle: "导入",
+			importLoading: false,
+			rowVisible: false,
+			tableLoading: false,
+			btnLoading: false,
+			disabled: false,
+			pageLoading: false,
+			selAllFlag: false,
+			selAllFlagDisabled: false,
+			isIndeterminate: false,
+			dialogEditVisible: false,
+			dialogVisible: false,
+			// 显示人员详情
+			showedPeopleMoreInfo: false,
+			uploadUlr:
+				window.SITE_CONFIG["apiURL"] +
+				"/epmetuser/icresiuser/importExcel",
+			currentPage: 1,
+			pageSize: 20,
+			total: null,
+			searchH: 0,
+			conditions: [],
+			activeName: "",
+			tableData: [],
+			searchList: [],
+			editAgencyId: "",
+			editForm: {
+				GRID_ID: "",
+				VILLAGE_ID: "",
+				BUILD_ID: "",
+				HOME_ID: "",
+			},
+			editTableName: {},
+			formName: "",
+			formList: [],
+			tableHeader: [],
+			tabsList: [],
+			selection: [],
 
-      tranferShow: false,
-      changeRecordShow: false,
-      lookInfo: {
-        userId: '',
-        gridName: ''
-      },
-      blacklistVisible: false, // 加入黑名单
-      blacklistReason: '', // 加入黑名单原因
-      rowData: {}, // 加入黑名单的人员信息
-    }
-  },
-  props: {
+			defaultCategotyKey: "",
 
-  },
-  async activated () {
-    if (this.$route.query) {
-      this.searchList = []
-      let query = this.$route.query
-      this.defaultCategotyKey = query.columnName
-      console.log(this.defaultCategotyKey)
-      await this.getSearchList()
-      this.$refs.deathSearch.handleSearch()
-    }
+			tranferShow: false,
+			changeRecordShow: false,
+			lookInfo: {
+				userId: "",
+				gridName: "",
+			},
+			blacklistVisible: false, // 加入黑名单
+			blacklistReason: "", // 加入黑名单原因
+			rowData: {}, // 加入黑名单的人员信息
 
-  },
-  computed: {
-    ...mapGetters(['clientHeight', 'iframeHeight']),
-    tableHeight() {
-      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
-      const _h = this.clientHeight - 280 - this.searchH
-      return this.$store.state.inIframe ? h : _h
-    }
-  },
-  async created () {
-    if (this.$route.query) {
-      let query = this.$route.query
-      this.defaultCategotyKey = query.columnName
-    }
+			joinForm: {
+				grantFlag: "",
+				categoryName: "",
+				joinReason: "",
+			},
+		};
+	},
+	props: {},
+	async activated() {
+		if (this.$route.query) {
+			this.searchList = [];
+			let query = this.$route.query;
+			this.defaultCategotyKey = query.columnName;
+			console.log(this.defaultCategotyKey);
+			await this.getSearchList();
+			this.$refs.deathSearch.handleSearch();
+		}
+	},
+	computed: {
+		...mapGetters(["clientHeight", "iframeHeight"]),
+		tableHeight() {
+			const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh;
+			const _h = this.clientHeight - 280 - this.searchH;
+			return this.$store.state.inIframe ? h : _h;
+		},
 
+		dataRule() {
+			return {
+				grantFlag: [
+					{
+						required: true,
+						message: "请选择福利发放标识",
+						trigger: "blur",
+					},
+				],
+				categoryName: [
+					{
+						required: true,
+						message: "福利类别不能为空",
+						trigger: "blur",
+					},
+				],
+				joinReason: [
+					{
+						required: true,
+						message: "添加原因不能为空",
+						trigger: "blur",
+					},
+				],
+			};
+		},
+	},
+	async created() {
+		if (this.$route.query) {
+			let query = this.$route.query;
+			this.defaultCategotyKey = query.columnName;
+		}
 
-    await this.getSearchList()
-    // await this.getFormList()
-    await this.getTableHeader()
-    // console.log('this.$refs.deathSearch', this)
-    this.$refs.deathSearch.handleSearch()
+		await this.getSearchList();
+		// await this.getFormList()
+		await this.getTableHeader();
+		// console.log('this.$refs.deathSearch', this)
+		this.$refs.deathSearch.handleSearch();
 
-    // this.handleSearch()
-    // this.getTableData()
-    this.pageLoading = true
-    this.searchH = this.$refs.deathSearch.$el.offsetHeight
-    console.log('storeoooo----0000', this.$store)
-    // console.log('deathSearch', this.$refs.deathSearch.$el.offsetHeight)
+		// this.handleSearch()
+		// this.getTableData()
+		this.pageLoading = true;
+		this.searchH = this.$refs.deathSearch.$el.offsetHeight;
+		console.log("storeoooo----0000", this.$store);
+		// console.log('deathSearch', this.$refs.deathSearch.$el.offsetHeight)
+	},
+	mounted() {
+		// this.$nextTick(() => {
+		//   this.tableHeight = document.documentElement.clientHeight - this.$refs.deathSearch.$el.offsetHeight - 280 + 'px'
+		// })
+		console.log(
+			"document.documentElement.clientWidth",
+			document.documentElement.clientHeight
+		);
+	},
+	methods: {
+		searchFilter(columnName) {
+			const filterName = ["NAME", "MOBILE", "ID_CARD", "IS_BDHJ"];
+			return filterName.some((item) => {
+				return item == columnName;
+			});
+		},
+		tableHeaderFilter(columnName) {
+			const filterName = [
+				"NAME",
+				"GRID_ID",
+				"HOME_ID",
+				"MOBILE",
+				"ID_CARD",
+				"GENDER",
+			];
+			return filterName.some((item) => {
+				return item == columnName;
+			});
+		},
+		joinBlacklist(row) {
+			this.blacklistVisible = true;
+			this.blacklistReason = "";
+			this.rowData = { ...row };
+		},
 
-  },
-  mounted () {
+    // 新增-验证表单后提交
+		async handleComfirmJoinForm() {
+			this.$refs["joinForm"].validate((valid, messageObj) => {
+				if (!valid) {
+					app.util.validateRule(messageObj);
+				} else {
+					this.submitJoinForm();
+				}
+			});
+		},
 
-    // this.$nextTick(() => {
-    //   this.tableHeight = document.documentElement.clientHeight - this.$refs.deathSearch.$el.offsetHeight - 280 + 'px'
-    // })
-    console.log('document.documentElement.clientWidth', document.documentElement.clientHeight)
-  },
-  methods: {
-    searchFilter (columnName) {
-      const filterName = [ 'NAME', 'MOBILE', 'ID_CARD', 'IS_BDHJ' ]
-      return filterName.some(item => {
-        return item == columnName
-      })
-    },
-    tableHeaderFilter (columnName) {
-      const filterName = [ 'NAME', 'GRID_ID', 'HOME_ID', 'MOBILE', 'ID_CARD', 'GENDER' ]
-      return filterName.some(item => {
-        return item == columnName
-      })
-    },
-    joinBlacklist (row) {
-      this.blacklistVisible = true
-      this.blacklistReason = ''
-      this.rowData = { ...row }
-    },
-    confirmJoinDeathlist () {
-      const params = {
-        idCard: this.rowData.ID_CARD,
-        name: this.rowData.NAME,
-        mobile: this.rowData.MOBILE,
-        gender: this.rowData.GENDER == '女' ? '0' : this.rowData.GENDER == '男' ? '1' : '',
-        type: '1',
-        userId: this.rowData.icResiUserId,
-        joinReason: this.blacklistReason
-      }
-      this.$http.post('/epmetuser/changeWelfare/save', 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.blacklistVisible = false
-            this.getTableData()
-          }
-        })
-      }).catch(err => {
-        this.$message.error(err.message)
-      })
-    },
-    checkSelect (row, index) {
+    // 新增-提交
+		submitJoinForm() {
+			const { joinForm } = this;
+			const params = {
+				idCard: this.rowData.ID_CARD,
+				name: this.rowData.NAME,
+				mobile: this.rowData.MOBILE,
+				gender:
+					this.rowData.GENDER == "女"
+						? "0"
+						: this.rowData.GENDER == "男"
+						? "1"
+						: "",
+				type: "1",
+				userId: this.rowData.icResiUserId,
+				...joinForm,
+			};
+			this.$http
+				.post("/epmetuser/changeWelfare/save", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					// 重置表单
+					Object.keys(joinForm).forEach((k) => {
+						this.joinForm[k] = "";
+					});
 
-      return row.isChecked
-    },
-    //调动
-    async handleTransfer (row) {
-      this.tranferShow = true
+					this.$message({
+						message: this.$t("prompt.success"),
+						type: "success",
+						duration: 500,
+						onClose: () => {
+							this.blacklistVisible = false;
+							this.getTableData();
+						},
+					});
+				})
+				.catch((err) => {
+					this.$message.error(err.message);
+				});
+		},
 
-      await nextTick(200)
+		checkSelect(row, index) {
+			return row.isChecked;
+		},
+		//调动
+		async handleTransfer(row) {
+			this.tranferShow = true;
 
-      this.$refs.ref_transfer.initForm(row)
-    },
-    //变更记录
-    async handleChangeRecord (row) {
-      this.changeRecordShow = true
+			await nextTick(200);
 
-      await nextTick(200)
+			this.$refs.ref_transfer.initForm(row);
+		},
+		//变更记录
+		async handleChangeRecord(row) {
+			this.changeRecordShow = true;
 
-      this.$refs.ref_changerecord.initForm(row)
-    },
+			await nextTick(200);
 
-    diaClose () {
-      this.tranferShow = false
-      this.changeRecordShow = false
-    },
+			this.$refs.ref_changerecord.initForm(row);
+		},
 
-    transferClose () {
-      this.tranferShow = false
-      this.getTableData()
-    },
-    computedWidth (label, type) {
+		diaClose() {
+			this.tranferShow = false;
+			this.changeRecordShow = false;
+		},
 
-      let wd = ''
-      if (type == 'input' || type == 'select') wd = 40 * label.length
-      else if(type == 'radio') wd = 20 * label.length
-      console.log('type-----wd', wd)
-      return wd > 80 ? wd : 80
-    },
-    filterEdit (id) {
-      const { user } = this.$store.state
-      return id === user.agencyId
-    },
-    selectionChange (selection) {
-      this.selection = selection
+		transferClose() {
+			this.tranferShow = false;
+			this.getTableData();
+		},
+		computedWidth(label, type) {
+			let wd = "";
+			if (type == "input" || type == "select") wd = 40 * label.length;
+			else if (type == "radio") wd = 20 * label.length;
+			console.log("type-----wd", wd);
+			return wd > 80 ? wd : 80;
+		},
+		filterEdit(id) {
+			const { user } = this.$store.state;
+			return id === user.agencyId;
+		},
+		selectionChange(selection) {
+			this.selection = selection;
 
-      if (selection.length === this.tableData.length) {
-        this.selAllFlag = true
-        this.isIndeterminate = false
-      } else if (selection.length > 0) {
-        this.selAllFlag = false
-        this.isIndeterminate = true
-      } else {
-        this.selAllFlag = false
-        this.isIndeterminate = false
-      }
-    },
-    handleSelectAll (selectAllFlag) {
-      // if (this.tableData.length == 0) {
-      //   this.selAllFlag = false
-      //   return
-      // }
-      this.$refs.ref_table.clearSelection();
-      if (selectAllFlag) {
-        this.tableData.forEach(row => {
-          // this.$refs.ref_table.toggleRowSelection(row);
-          if (row.isChecked) {
-            this.$refs.ref_table.toggleRowSelection(row);
-          }
-        });
-      }
-    },
-    selectAll (selection) {
-      this.selection = selection
+			if (selection.length === this.tableData.length) {
+				this.selAllFlag = true;
+				this.isIndeterminate = false;
+			} else if (selection.length > 0) {
+				this.selAllFlag = false;
+				this.isIndeterminate = true;
+			} else {
+				this.selAllFlag = false;
+				this.isIndeterminate = false;
+			}
+		},
+		handleSelectAll(selectAllFlag) {
+			// if (this.tableData.length == 0) {
+			//   this.selAllFlag = false
+			//   return
+			// }
+			this.$refs.ref_table.clearSelection();
+			if (selectAllFlag) {
+				this.tableData.forEach((row) => {
+					// this.$refs.ref_table.toggleRowSelection(row);
+					if (row.isChecked) {
+						this.$refs.ref_table.toggleRowSelection(row);
+					}
+				});
+			}
+		},
+		selectAll(selection) {
+			this.selection = selection;
 
-      if (selection.length > 0) {
-        this.selAllFlag = true
-      } else {
-        this.selAllFlag = false
-      }
+			if (selection.length > 0) {
+				this.selAllFlag = true;
+			} else {
+				this.selAllFlag = false;
+			}
+		},
+		deleteBatch() {
+			if (this.selection.length > 0) {
+				this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+					confirmButtonText: "确定",
+					cancelButtonText: "取消",
+					type: "warning",
+				})
+					.then(() => {
+						this.deleteresiBatch();
+					})
+					.catch((err) => {
+						if (err == "cancel") {
+							// this.$message({
+							//   type: "info",
+							//   message: "已取消删除"
+							// });
+						}
+					});
+			} else {
+				this.$message.warning("请先选择要删除的居民");
+			}
+		},
+		handleSizeChange(val) {
+			console.log(`每页 ${val} 条`);
+			this.pageSize = val;
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			console.log(`当前页: ${val}`);
+			this.currentPage = val;
+			this.getTableData();
+		},
+		handleFilterSpan(row, item) {
+			let _val = "";
+			if (item.itemType === "radio" && item.options.length > 0) {
+				item.options.forEach((n) => {
+					if (n.value === row[item.columnName]) _val = n.label;
+				});
+				if (row[item.columnName] == "0") return (_val = "");
+			}
 
-    },
-    deleteBatch () {
-      if (this.selection.length > 0) {
-        this.$confirm("删除之后无法恢复，确认删除？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            this.deleteresiBatch()
-          })
-          .catch(err => {
-            if (err == "cancel") {
-              // this.$message({
-              //   type: "info",
-              //   message: "已取消删除"
-              // });
-            }
+			return _val || row[item.columnName];
+		},
+		handleSearch(val) {
+			this.currentPage = 1;
+			this.conditions = val;
+			this.getTableData();
+		},
+		async handleExportModule() {
+			let url = "/epmetuser/icresiuser/import/download-template";
 
-          });
-      } else {
-        this.$message.warning('请先选择要删除的居民')
-      }
-    },
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getTableData()
-    },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
-      this.currentPage = val
-      this.getTableData()
-    },
-    handleFilterSpan (row, item) {
-      let _val = ''
-      if (item.itemType === 'radio' && item.options.length > 0) {
-        item.options.forEach((n) => {
-          if (n.value === row[item.columnName]) _val = n.label
-        })
-        if (row[item.columnName] == '0') return _val = ''
-      }
+			let params = {};
+			await this.$http({
+				method: "POST",
+				url,
+				responseType: "blob",
+				data: params,
+			})
+				.then((res) => {
+					console.log("res----dddd", 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("网络错误");
+				});
+		},
+		// 下载文件
+		download(data, fileName) {
+			console.log("data", data);
+			if (!data) {
+				return;
+			}
 
-      return _val || row[item.columnName]
-    },
-    handleSearch (val) {
-      this.currentPage = 1
-      this.conditions = val
-      this.getTableData()
-    },
-    async handleExportModule () {
-      let url = "/epmetuser/icresiuser/import/download-template"
+			var csvData = new Blob([data]);
 
+			if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+				window.navigator.msSaveOrOpenBlob(csvData, fileName);
+			}
+			// for Non-IE (chrome, firefox etc.)
+			else {
+				var a = document.createElement("a");
+				document.body.appendChild(a);
+				a.style = "display: none";
+				var url = window.URL.createObjectURL(csvData);
+				a.href = url;
+				a.download = fileName;
+				a.click();
+				a.remove();
+				window.URL.revokeObjectURL(url);
+			}
+		},
+		async handleExport() {
+			this.exportBtn = true;
+			this.exportBtnTitle = "正在导出...";
+			let params = {
+				formCode: "resi_base_info",
+				conditions: this.conditions,
+			};
 
-      let params = {}
-      await this.$http({
-        method: 'POST',
-        url,
-        responseType: 'blob',
-        data: params
-      })
-        .then(res => {
-          console.log('res----dddd', 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('网络错误')
-        })
-    },
-    // 下载文件
-    download (data, fileName) {
-      console.log('data', data)
-      if (!data) {
-        return
-      }
+			// .post('epmetuser/icresiuser/exportExcel', params)
+			await axios({
+				url:
+					window.SITE_CONFIG["apiURL"] +
+					"/epmetuser/icresiuser/exportExcel",
+				// url: 'epmetuser/icresiuser/exportExcel',
+				method: "post",
+				data: params,
+				responseType: "blob",
+			})
+				.then((res) => {
+					console.log("resllll", res);
+					let fileName = window.decodeURI(
+						res.headers["content-disposition"]
+							.split(";")[1]
+							.split("=")[1]
+					);
+					console.log("filename", fileName);
+					let blob = new Blob([res.data], {
+						type: "application/vnd.ms-excel",
+					});
+					var url = window.URL.createObjectURL(blob);
+					var aLink = document.createElement("a");
+					aLink.style.display = "none";
+					aLink.href = url;
+					aLink.setAttribute("download", fileName);
+					document.body.appendChild(aLink);
+					aLink.click();
+					document.body.removeChild(aLink); //下载完成移除元素
+					window.URL.revokeObjectURL(url); //释放掉blob对象
+				})
+				.catch((err) => {
+					console.log("获取导出情失败", err);
+					this.$message.error("获取导出失败");
+				});
+			this.exportBtnTitle = "导出";
+			this.exportBtn = false;
+		},
+		// 上传大图标成功
+		handleExcelSuccess(res, file) {
+			if (res.code === 0 && res.msg === "success") {
+				console.log("resss---ppp", res);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+		handleProgress(event, file, fileList) {
+			console.log("percentage", file.percentage);
+		},
 
-      var csvData = new Blob([data])
+		beforeExcelUpload(file) {
+			console.log("file", file);
+			const isType = file.type === "application/vnd.ms-excel";
+			const isTypeComputer =
+				file.type ===
+				"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+			const fileType = isType || isTypeComputer;
+			const isLt1M = file.size / 1024 / 1024 < 100;
+			if (!fileType) {
+				this.$message.error("上传文件只能是xls/xlsx格式！");
+			}
 
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, fileName)
-      }
-      // for Non-IE (chrome, firefox etc.)
-      else {
-        var a = document.createElement('a')
-        document.body.appendChild(a)
-        a.style = 'display: none'
-        var url = window.URL.createObjectURL(csvData)
-        a.href = url
-        a.download = fileName
-        a.click()
-        a.remove()
-        window.URL.revokeObjectURL(url)
-      }
-    },
-    async handleExport () {
-      this.exportBtn = true
-      this.exportBtnTitle = '正在导出...'
-      let params = {
-        formCode: 'resi_base_info',
-        conditions: this.conditions
-      }
+			if (!isLt1M) {
+				this.$message.error("上传文件大小不能超过 100MB!");
+			}
+			return fileType && isLt1M;
+		},
+		async uploadHttpRequest(file) {
+			this.importLoading = true;
+			this.importBtnTitle = "正在上传中...";
+			this.$message({
+				showClose: true,
+				message: "导入中，请到系统管理-导入记录中查看进度",
+				duration: 0,
+			});
+			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			formData.append("file", file.file); //添加文件对象
+			await this.$http
+				.post("/epmetuser/icresiuser/importExcel", formData)
+				.then((res) => {
+					console.log("res-up", res);
+					if (res.data.code == 0 && res.data.msg == "success") {
+						// this.$message.success('导入成功')
+						this.getTableData();
+					} else this.$message.error(res.data.msg);
+				})
+				.catch((err) => {
+					console.log("失败", err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			// await axios({
+			//   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
+			//   method: 'post',
+			//   data: formData,
+			//   timeout: '300000',
+			//   responseType: 'blob'
+			// })
+			//   .then((res) => {
+			//     console.log('res-up', res)
+			//     // 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对象
+			//     // }
 
-      // .post('epmetuser/icresiuser/exportExcel', params)
-      await axios({
-        url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/exportExcel',
-        // url: 'epmetuser/icresiuser/exportExcel',
-        method: 'post',
-        data: params,
-        responseType: 'blob'
-      })
-        .then(res => {
+			//     this.getTableData()
+			//   })
+			//   .catch(err => {
+			//     console.log('失败', err)
+			//     file.onError() //上传失败的文件会从文件列表中删除
+			//     this.$message.error('导入失败')
+			//   })
+			this.importLoading = false;
+			this.importBtnTitle = "导入";
+			this.$refs.upload.clearFiles();
+		},
+		handleClick(tab, event) {
+			console.log(tab, event);
+		},
+		async handleLook(row) {
+			this.lookInfo.userId = row.icResiUserId;
+			this.lookInfo.gridName = row.GRID_ID;
+			this.showedPeopleMoreInfo = true;
+			// this.disabled = true
+			// this.editAgencyId = row.ORG_ID
+			// await this.getFormList('edit')
+			// this.getrowInfo(row.icResiUserId)
+		},
+		handleCancleLook() {
+			this.lookInfo.userId = "";
+			this.lookInfo.gridName = "";
+			this.showedPeopleMoreInfo = false;
+		},
+		async handleEdit(row) {
+			this.disabled = false;
+			this.editAgencyId = row.ORG_ID;
+			await this.getFormList("edit");
+			await this.getrowInfo(row.icResiUserId);
+		},
+		async handleAdd() {
+			await this.getFormList();
+			this.dialogVisible = true;
+		},
+		async handleChangeGroup(val) {
+			console.log("changeguoprrrrr----", val);
+			let { childGroup, value } = val;
+			let hasT = false;
+			let i = 0;
+			// const list = { ...this.tabsList }
+			this.tabsList.forEach((item, index) => {
+				if (item.tableName === childGroup.tableName) {
+					hasT = true;
+					i = index;
+				}
+			});
+			if (value === 1 || value === "1") {
+				// console.log('changegroup----999', value)
+				if (!hasT) {
+					childGroup.itemList.forEach(async (item) => {
+						if (item.optionSourceType === "remote") {
+							await this.getOptionsList(
+								item.optionSourceValue
+							).then((res) => {
+								item.options = res;
+							});
+							// console.log('')
+						}
+					});
+					this.tabsList.push(childGroup);
+				}
+			} else {
+				// console.log('changegroup----000', value)
+				if (hasT) this.tabsList.splice(i, 1);
+			}
+		},
+		formetForm() {
+			const _baseForm = this.$refs.baseForm.handleForm();
+			let arr = [];
+			if (_baseForm.length === 0) return false;
+			arr.push([..._baseForm]);
+			this.tabsList.forEach((item) => {
+				arr.push([
+					...this.$refs["group" + item.groupId][0].handleForm(),
+				]);
+			});
+			let arr2 = arr.reduce(function (a, b) {
+				return a.concat(b);
+			});
+			let noChange = true;
+			arr2.forEach((item) => {
+				if (item.list.length !== 0) noChange = false;
+			});
+			console.log("arr2", arr2);
+			if (noChange) {
+				this.$message.warning("您还没有做任何修改");
+				return false;
+			}
+			// 合并相同tableName的多个数组
+			let hash = {};
+			let i = 0;
+			let res = [];
+			let finalArr = [];
+			arr2.forEach(function (item) {
+				let name = item.tableName;
+				if (hash[name]) {
+					res[hash[name] - 1].list.push(...item.list);
+				} else {
+					hash[name] = ++i;
+					res.push({
+						list: [...item.list],
+						supportAdd: item.supportAdd,
+						tableName: name,
+					});
+				}
+			});
+			console.log("res", res);
+			// 多个list合并成一个list子集
+			res.forEach((item) => {
+				let _form = {};
+				item.list.length > 0 &&
+					item.list.forEach((n) => {
+						_form = { ..._form, ...n };
+					});
+				if (item.list.length > 0) {
+					finalArr.push({
+						tableName: item.tableName,
+						list: item.supportAdd ? [...item.list] : [{ ..._form }],
+					});
+				}
+			});
+			console.log("finalArr", finalArr);
+			return finalArr;
+		},
+		async handleEditSUbmit() {
+			const arr = await this.formetForm();
+			if (arr) this.submitEdit(arr);
+		},
+		async handleSUbmit() {
+			const arr = await this.formetForm();
+			if (arr) this.submitAdd(arr);
+		},
+		handleDel(row) {
+			let params = {
+				formCode: "resi_base_info",
+				userIds: [row.icResiUserId],
+			};
+			console.log("row1", row);
+			this.$http
+				.post("/epmetuser/icresiuser/delete", params)
+				.then(({ data: res }) => {
+					console.log("row2", row);
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("row3", row);
+						this.$message.success("删除成功");
+						this.getTableData();
+					}
+				})
+				.catch((err) => {
+					console.log("row4", err);
+					return this.$message.error("网络错误");
+				});
+		},
+		handleFormatUrl(url) {
+			return url.includes("?");
+		},
+		handlerEditCancle() {
+			this.$refs.baseForm.resetForm();
+			this.tabsList.forEach((item) => {
+				this.$refs["group" + item.groupId][0].resetForm();
+			});
+			this.dialogEditVisible = false;
+		},
+		handlerCancle() {
+			this.$refs.baseForm.resetForm();
+			this.tabsList.forEach((item) => {
+				this.$refs["group" + item.groupId][0].resetForm();
+			});
+			this.dialogVisible = false;
+		},
+		async submitAdd(arr) {
+			this.btnLoading = true;
+			await this.$http
+				.post("/epmetuser/icresiuser/add", arr)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message.success("提交成功");
+						// this.$refs[formName].resetFields();
+						this.$refs.baseForm.resetForm();
+						this.tabsList.forEach((item) => {
+							this.$refs["group" + item.groupId][0].resetForm();
+						});
+						this.getTableData();
+						this.dialogVisible = false;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+			this.btnLoading = false;
+		},
+		async submitEdit(arr) {
+			this.btnLoading = true;
+			await this.$http
+				.post("/epmetuser/icresiuser/edit", arr)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message.success("提交成功");
+						// this.$refs[formName].resetFields();
+						this.$refs.baseForm.resetForm();
+						this.tabsList.forEach((item) => {
+							this.$refs["group" + item.groupId][0].resetForm();
+						});
+						this.getTableData();
+						this.dialogEditVisible = false;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+			this.btnLoading = false;
+		},
+		async getTableHeader() {
+			await this.$http
+				.post("/oper/customize/icform/tableheaders", {
+					formCode: "resi_base_info",
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.tableHeader = [];
+						res.data.forEach((item) => {
+							if (this.tableHeaderFilter(item.columnName)) {
+								this.tableHeader.push(item);
+							}
+						});
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		async getTableData() {
+			this.tableLoading = true;
+			let params = {
+				formCode: "resi_base_info",
+				pageNo: this.currentPage,
+				pageSize: this.pageSize,
+				conditions: this.conditions,
+			};
+			await this.$http
+				.post("/epmetuser/icresiuser/listresi", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.tableData = res.data.list.map((item) => {
+							return {
+								...item,
+								isChecked: this.filterEdit(item.ORG_ID),
+							};
+						});
+						let _selAllFlagDisabled = true;
+						this.tableData.forEach((item) => {
+							if (item.isChecked) _selAllFlagDisabled = false;
+						});
+						this.selAllFlagDisabled = _selAllFlagDisabled;
+						this.total = res.data.total;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+			this.tableLoading = false;
+		},
+		getrowInfo(id) {
+			let params = {
+				formCode: "resi_base_info",
+				icResiUserId: id,
+			};
+			this.$http
+				.post("/epmetuser/icresiuser/detail", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						// console.log('getrowInfo----', res.data)
+						let info = res.data;
+						this.editTableName = { ...info };
+						let list = info[this.formList[0].tableName][0];
+						for (let n in list) {
+							this.editForm[n] = list[n];
+						}
+						this.formList.forEach((item) => {
+							item.columnValue = list[item.columnName];
+							item.ID = list.ID;
 
-          console.log('resllll', res)
-          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-          console.log('filename', fileName)
-          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-          var url = window.URL.createObjectURL(blob)
-          var aLink = document.createElement('a')
-          aLink.style.display = 'none'
-          aLink.href = url
-          aLink.setAttribute('download', fileName)
-          document.body.appendChild(aLink)
-          aLink.click()
-          document.body.removeChild(aLink) //下载完成移除元素
-          window.URL.revokeObjectURL(url) //释放掉blob对象
-        })
-        .catch((err) => {
-          console.log('获取导出情失败', err)
-          this.$message.error('获取导出失败')
-        })
-      this.exportBtnTitle = '导出'
-      this.exportBtn = false
-    },
-    // 上传大图标成功
-    handleExcelSuccess (res, file) {
-      if (res.code === 0 && res.msg === 'success') {
+							if (
+								item.columnValue == "1" &&
+								item.itemType === "radio" &&
+								item.childGroup
+							) {
+								this.tabsList.push(item.childGroup);
+							}
 
-        console.log('resss---ppp', res)
+							// if (item.childGroup && info[item.childGroup.tableName]) {
 
-      } else {
-        this.$message.error(res.msg)
-      }
-    },
-    handleProgress (event, file, fileList) {
-      console.log('percentage', file.percentage)
-    },
-
-    beforeExcelUpload (file) {
-      console.log('file', file)
-      const isType = file.type === 'application/vnd.ms-excel'
-      const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-      const fileType = isType || isTypeComputer
-      const isLt1M = (file.size / 1024 / 1024) < 100
-      if (!fileType) {
-        this.$message.error('上传文件只能是xls/xlsx格式！')
-      }
-
-      if (!isLt1M) {
-        this.$message.error('上传文件大小不能超过 100MB!')
-      }
-      return fileType && isLt1M
-    },
-    async uploadHttpRequest (file) {
-      this.importLoading = true
-      this.importBtnTitle = '正在上传中...'
-      this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
-      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append('file', file.file) //添加文件对象
-      await this.$http
-        .post('/epmetuser/icresiuser/importExcel', formData).then(res => {
-          console.log('res-up', res)
-          if (res.data.code == 0 && res.data.msg == 'success') {
-            // this.$message.success('导入成功')
-            this.getTableData()
-          } else this.$message.error(res.data.msg)
-        }).catch(err => {
-          console.log('失败', err)
-          file.onError() //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
-        })
-      // await axios({
-      //   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
-      //   method: 'post',
-      //   data: formData,
-      //   timeout: '300000',
-      //   responseType: 'blob'
-      // })
-      //   .then((res) => {
-      //     console.log('res-up', res)
-      //     // 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.getTableData()
-      //   })
-      //   .catch(err => {
-      //     console.log('失败', err)
-      //     file.onError() //上传失败的文件会从文件列表中删除
-      //     this.$message.error('导入失败')
-      //   })
-      this.importLoading = false
-      this.importBtnTitle = '导入'
-      this.$refs.upload.clearFiles()
-    },
-    handleClick (tab, event) {
-      console.log(tab, event)
-    },
-    async handleLook (row) {
-      this.lookInfo.userId = row.icResiUserId
-      this.lookInfo.gridName = row.GRID_ID
-      this.showedPeopleMoreInfo = true;
-      // this.disabled = true
-      // this.editAgencyId = row.ORG_ID
-      // await this.getFormList('edit')
-      // this.getrowInfo(row.icResiUserId)
-    },
-    handleCancleLook() {
-      this.lookInfo.userId = ''
-      this.lookInfo.gridName = ''
-      this.showedPeopleMoreInfo = false;
-    },
-    async handleEdit (row) {
-      this.disabled = false
-      this.editAgencyId = row.ORG_ID
-      await this.getFormList('edit')
-      await this.getrowInfo(row.icResiUserId)
-    },
-    async handleAdd () {
-      await this.getFormList()
-      this.dialogVisible = true
-    },
-    async handleChangeGroup (val) {
-      console.log('changeguoprrrrr----', val)
-      let { childGroup, value } = val
-      let hasT = false
-      let i = 0
-      // const list = { ...this.tabsList }
-      this.tabsList.forEach((item, index) => {
-        if (item.tableName === childGroup.tableName) {
-          hasT = true
-          i = index
-        }
-      })
-      if (value === 1 || value === '1') {
-        // console.log('changegroup----999', value)
-        if (!hasT) {
-          childGroup.itemList.forEach(async (item) => {
-            if (item.optionSourceType === 'remote') {
-              await this.getOptionsList(item.optionSourceValue).then((res) => {
-                item.options = res
-              })
-              // console.log('')
-            }
-          })
-          this.tabsList.push(childGroup)
-        }
-      } else {
-        // console.log('changegroup----000', value)
-        if (hasT) this.tabsList.splice(i, 1)
-      }
-    },
-    formetForm () {
-      const _baseForm = this.$refs.baseForm.handleForm()
-      let arr = []
-      if (_baseForm.length === 0) return false
-      arr.push([..._baseForm])
-      this.tabsList.forEach((item) => {
-        arr.push([...this.$refs['group' + item.groupId][0].handleForm()])
-      })
-      let arr2 = arr.reduce(function (a, b) {
-        return a.concat(b)
-      })
-      let noChange = true
-      arr2.forEach((item) => {
-        if (item.list.length !== 0) noChange = false
-      })
-      console.log('arr2', arr2)
-      if (noChange) {
-        this.$message.warning('您还没有做任何修改')
-        return false
-      }
-      // 合并相同tableName的多个数组
-      let hash = {}
-      let i = 0
-      let res = []
-      let finalArr = []
-      arr2.forEach(function (item) {
-        let name = item.tableName
-        if (hash[name]) {
-          res[hash[name] - 1].list.push(...item.list)
-        } else {
-          hash[name] = ++i
-          res.push({
-            list: [...item.list],
-            supportAdd: item.supportAdd,
-            tableName: name
-          })
-        }
-      })
-      console.log('res', res)
-      // 多个list合并成一个list子集
-      res.forEach((item) => {
-        let _form = {}
-        item.list.length > 0 &&
-          item.list.forEach((n) => {
-            _form = { ..._form, ...n }
-          })
-        if (item.list.length > 0) {
-          finalArr.push({
-            tableName: item.tableName,
-            list: item.supportAdd ? [...item.list] : [{ ..._form }]
-          })
-        }
-      })
-      console.log('finalArr', finalArr)
-      return finalArr
-    },
-    async handleEditSUbmit () {
-      const arr = await this.formetForm()
-      if (arr) this.submitEdit(arr)
-    },
-    async handleSUbmit () {
-      const arr = await this.formetForm()
-      if (arr) this.submitAdd(arr)
-    },
-    handleDel (row) {
-      let params = {
-        formCode: 'resi_base_info',
-        userIds: [row.icResiUserId]
-      }
-      console.log('row1', row)
-      this.$http
-        .post('/epmetuser/icresiuser/delete', params)
-        .then(({ data: res }) => {
-          console.log('row2', row)
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('row3', row)
-            this.$message.success('删除成功')
-            this.getTableData()
-          }
-        })
-        .catch((err) => {
-          console.log('row4', err)
-          return this.$message.error('网络错误')
-        })
-    },
-    handleFormatUrl (url) {
-      return url.includes('?')
-    },
-    handlerEditCancle () {
-      this.$refs.baseForm.resetForm()
-      this.tabsList.forEach((item) => {
-        this.$refs['group' + item.groupId][0].resetForm()
-      })
-      this.dialogEditVisible = false
-    },
-    handlerCancle () {
-      this.$refs.baseForm.resetForm()
-      this.tabsList.forEach((item) => {
-        this.$refs['group' + item.groupId][0].resetForm()
-      })
-      this.dialogVisible = false
-    },
-    async submitAdd (arr) {
-      this.btnLoading = true
-      await this.$http
-        .post('/epmetuser/icresiuser/add', arr)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.$message.success('提交成功')
-            // this.$refs[formName].resetFields();
-            this.$refs.baseForm.resetForm()
-            this.tabsList.forEach((item) => {
-              this.$refs['group' + item.groupId][0].resetForm()
-            })
-            this.getTableData()
-            this.dialogVisible = false
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.btnLoading = false
-    },
-    async submitEdit (arr) {
-      this.btnLoading = true
-      await this.$http
-        .post('/epmetuser/icresiuser/edit', arr)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-
-            return this.$message.error(res.msg)
-          } else {
-            this.$message.success('提交成功')
-            // this.$refs[formName].resetFields();
-            this.$refs.baseForm.resetForm()
-            this.tabsList.forEach((item) => {
-              this.$refs['group' + item.groupId][0].resetForm()
-            })
-            this.getTableData()
-            this.dialogEditVisible = false
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.btnLoading = false
-    },
-    async getTableHeader () {
-      await this.$http
-        .post('/oper/customize/icform/tableheaders', {
-          formCode: 'resi_base_info'
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.tableHeader = []
-            res.data.forEach(item => {
-              if (this.tableHeaderFilter(item.columnName)) {
-                this.tableHeader.push(item)
-              }
-            })
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    async getTableData () {
-      this.tableLoading = true
-      let params = {
-        formCode: 'resi_base_info',
-        pageNo: this.currentPage,
-        pageSize: this.pageSize,
-        conditions: this.conditions
-      }
-      await this.$http
-        .post('/epmetuser/icresiuser/listresi', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.tableData = res.data.list.map(item => {
-              return {
-                ...item,
-                isChecked: this.filterEdit(item.ORG_ID)
-              }
-            })
-            let _selAllFlagDisabled = true
-            this.tableData.forEach(item => {
-              if (item.isChecked) _selAllFlagDisabled = false
-            })
-            this.selAllFlagDisabled = _selAllFlagDisabled
-            this.total = res.data.total
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.tableLoading = false
-    },
-    getrowInfo (id) {
-      let params = {
-        formCode: 'resi_base_info',
-        icResiUserId: id
-      }
-      this.$http
-        .post('/epmetuser/icresiuser/detail', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            // console.log('getrowInfo----', res.data)
-            let info = res.data
-            this.editTableName = { ...info }
-            let list = info[this.formList[0].tableName][0]
-            for (let n in list) {
-              this.editForm[n] = list[n]
-            }
-            this.formList.forEach((item) => {
-              item.columnValue = list[item.columnName]
-              item.ID = list.ID
-
-              if (
-                item.columnValue == '1' &&
-                item.itemType === 'radio' &&
-                item.childGroup
-              ) {
-                this.tabsList.push(item.childGroup)
-              }
-
-              // if (item.childGroup && info[item.childGroup.tableName]) {
-
-              // }
-            })
-            this.tabsList.forEach((item) => {
-              let _info = info[item.tableName]
-              if (item.supportAdd) {
-                // console.log('tabsList---333', item.label)
-                const _list = [...item.itemList]
-                let mutiList = []
-                if (_info) {
-                  _info.forEach((fo, index) => {
-                    // console.log('mutiList----555' + index, mutiList, _list)
-                    mutiList.splice(index, 0, {
-                      row: index,
-                      itemList: _list.map((m) => {
-                        // console.log('itemList---item' + index, m)
-                        return {
-                          ...m,
-                          ID: fo.ID,
-                          columnValue: fo[m.columnName]
-                        }
-                      })
-                    })
-                    // console.log('mutiList----666' + index, mutiList)
-                  })
-                }
-                item.mutiList = mutiList
-              } else {
-                if (_info) {
-                  item.itemList.forEach((n) => {
-                    n.ID = _info[0].ID
-                    n.columnValue = _info[0][n.columnName]
-                  })
-                }
-              }
-            })
-            // console.log('getrowInfo---formname', this.tabsList)
-            this.dialogEditVisible = true
-          }
-        })
-        .catch((err) => {
-          console.log('getrowInfo---formnameerr', err)
-          return this.$message.error('网络错误')
-        })
-    },
-    async getOptionsList (url) {
-      let options = []
-      // console.log('getOptionsList----', url)
-      await this.$http
-        .post(url, { formCode: 'resi_base_info' })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            options = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      return options
-    },
-    async getSearchList () {
-      await this.$http
-        .post('/oper/customize/icform/conditionlist', {
-          formCode: 'resi_base_info',
-          dynamic: true
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功--sss', res)
-            this.searchList = []
-            res.data.forEach(item => {
-              if (this.searchFilter(item.columnName)) {
-                this.searchList.push(item)
-              }
-            })
-            res.data.forEach((item) => {
-              if (item.optionSourceType === 'remote') {
-                this.getOptionsList(item.optionSourceValue).then((res) => {
-                  item.options = res
-                })
-                // console.log('')
-              }
-            })
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    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 }
-        }
-        return _item
-      })
-      return arr
-    },
-    async getFormList (type) {
-      await this.$http
-        .post('/oper/customize/icform/getcustomerform', {
-          formCode: 'resi_base_info',
-          dynamic: true
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取详情成功getFormList')
-            let { itemList, groupList, formName } = res.data
-            this.formName = formName
-            this.activeName = 'group' + res.data.groupList[0].groupId
-            if (type !== 'edit') {
-              itemList.forEach(async (item) => {
-                if (item.optionSourceType === 'remote') {
-                  await this.getOptionsList(item.optionSourceValue).then(
-                    (res) => {
-                      item.options = this.getTreeData(res)
-                    }
-                  )
-                }
-              })
-            }
-            groupList.forEach((item) => {
-              item.itemList.forEach(async (n) => {
-                n.tableName = item.tableName
-                if (n.optionSourceType === 'remote' && type !== 'edit') {
-                  await this.getOptionsList(n.optionSourceValue).then((res) => {
-                    n.options = this.getTreeData(res)
-                  })
-                }
-              })
-            })
-            // }
-            this.formList = itemList
-            this.tabsList = groupList
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    async deleteresiBatch () {
-      if (this.selection.length === 0) return this.$message.error('请选择之后进行操作')
-      let userIds = this.selection.map(item => item.icResiUserId)
-      let params = {
-        formCode: 'resi_base_info',
-        userIds
-      }
-      this.$http
-        .post('/epmetuser/icresiuser/delete', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.$message.success('删除成功')
-            this.getTableData()
-          }
-        })
-        .catch((err) => {
-          console.log('row4', err)
-          return this.$message.error('网络错误')
-        })
-    },
-  }
-}
+							// }
+						});
+						this.tabsList.forEach((item) => {
+							let _info = info[item.tableName];
+							if (item.supportAdd) {
+								// console.log('tabsList---333', item.label)
+								const _list = [...item.itemList];
+								let mutiList = [];
+								if (_info) {
+									_info.forEach((fo, index) => {
+										// console.log('mutiList----555' + index, mutiList, _list)
+										mutiList.splice(index, 0, {
+											row: index,
+											itemList: _list.map((m) => {
+												// console.log('itemList---item' + index, m)
+												return {
+													...m,
+													ID: fo.ID,
+													columnValue:
+														fo[m.columnName],
+												};
+											}),
+										});
+										// console.log('mutiList----666' + index, mutiList)
+									});
+								}
+								item.mutiList = mutiList;
+							} else {
+								if (_info) {
+									item.itemList.forEach((n) => {
+										n.ID = _info[0].ID;
+										n.columnValue = _info[0][n.columnName];
+									});
+								}
+							}
+						});
+						// console.log('getrowInfo---formname', this.tabsList)
+						this.dialogEditVisible = true;
+					}
+				})
+				.catch((err) => {
+					console.log("getrowInfo---formnameerr", err);
+					return this.$message.error("网络错误");
+				});
+		},
+		async getOptionsList(url) {
+			let options = [];
+			// console.log('getOptionsList----', url)
+			await this.$http
+				.post(url, { formCode: "resi_base_info" })
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						options = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+			return options;
+		},
+		async getSearchList() {
+			await this.$http
+				.post("/oper/customize/icform/conditionlist", {
+					formCode: "resi_base_info",
+					dynamic: true,
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取查询详情成功--sss", res);
+						this.searchList = [];
+						res.data.forEach((item) => {
+							if (this.searchFilter(item.columnName)) {
+								this.searchList.push(item);
+							}
+						});
+						res.data.forEach((item) => {
+							if (item.optionSourceType === "remote") {
+								this.getOptionsList(
+									item.optionSourceValue
+								).then((res) => {
+									item.options = res;
+								});
+								// console.log('')
+							}
+						});
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		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 };
+				}
+				return _item;
+			});
+			return arr;
+		},
+		async getFormList(type) {
+			await this.$http
+				.post("/oper/customize/icform/getcustomerform", {
+					formCode: "resi_base_info",
+					dynamic: true,
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取详情成功getFormList");
+						let { itemList, groupList, formName } = res.data;
+						this.formName = formName;
+						this.activeName =
+							"group" + res.data.groupList[0].groupId;
+						if (type !== "edit") {
+							itemList.forEach(async (item) => {
+								if (item.optionSourceType === "remote") {
+									await this.getOptionsList(
+										item.optionSourceValue
+									).then((res) => {
+										item.options = this.getTreeData(res);
+									});
+								}
+							});
+						}
+						groupList.forEach((item) => {
+							item.itemList.forEach(async (n) => {
+								n.tableName = item.tableName;
+								if (
+									n.optionSourceType === "remote" &&
+									type !== "edit"
+								) {
+									await this.getOptionsList(
+										n.optionSourceValue
+									).then((res) => {
+										n.options = this.getTreeData(res);
+									});
+								}
+							});
+						});
+						// }
+						this.formList = itemList;
+						this.tabsList = groupList;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		async deleteresiBatch() {
+			if (this.selection.length === 0)
+				return this.$message.error("请选择之后进行操作");
+			let userIds = this.selection.map((item) => item.icResiUserId);
+			let params = {
+				formCode: "resi_base_info",
+				userIds,
+			};
+			this.$http
+				.post("/epmetuser/icresiuser/delete", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message.success("删除成功");
+						this.getTableData();
+					}
+				})
+				.catch((err) => {
+					console.log("row4", err);
+					return this.$message.error("网络错误");
+				});
+		},
+	},
+};
 </script>
 
 <style lang="scss" scoped>
 .tabs-other-info {
-  ::v-deep .el-tabs__item {
-    // width: 50px;
-    height: 24px;
-    box-sizing: border-box;
-    margin-right: 7px;
-    padding: 0 10px !important;
-    font-size: 16px;
-    font-weight: 400;
-    color: #666666;
-    line-height: 24px;
-    background: #ebecf1;
-    border-radius: 2px;
-  }
-  ::v-deep .el-tabs__nav-wrap::after,
-  ::v-deep .el-tabs__active-bar {
-    display: none;
-  }
-  ::v-deep .el-tabs__nav-next,
-  ::v-deep .el-tabs__nav-prev {
-    // width: 12px;
-    // height: 12px;
-    color: rgba(30, 122, 254, 1);
-    line-height: 20px;
-    background: rgba(30, 122, 254, 0.2);
-    // border-radius: 50%;
-  }
-  ::v-deep .el-tabs__item.is-active {
-    color: #fff;
-    background: linear-gradient(90deg, #1a5afd, #26c4ff);
-  }
+	::v-deep .el-tabs__item {
+		// width: 50px;
+		height: 24px;
+		box-sizing: border-box;
+		margin-right: 7px;
+		padding: 0 10px !important;
+		font-size: 16px;
+		font-weight: 400;
+		color: #666666;
+		line-height: 24px;
+		background: #ebecf1;
+		border-radius: 2px;
+	}
+	::v-deep .el-tabs__nav-wrap::after,
+	::v-deep .el-tabs__active-bar {
+		display: none;
+	}
+	::v-deep .el-tabs__nav-next,
+	::v-deep .el-tabs__nav-prev {
+		// width: 12px;
+		// height: 12px;
+		color: rgba(30, 122, 254, 1);
+		line-height: 20px;
+		background: rgba(30, 122, 254, 0.2);
+		// border-radius: 50%;
+	}
+	::v-deep .el-tabs__item.is-active {
+		color: #fff;
+		background: linear-gradient(90deg, #1a5afd, #26c4ff);
+	}
 }
 .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);
-  }
+	::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);
-  }
+	::v-deep .el-button--text {
+		text-decoration: underline;
+	}
+	::v-deep .btn-color-del {
+		margin-left: 10px;
+		color: rgba(213, 16, 16, 1);
+	}
+	::v-deep .btn-color-edit {
+		color: rgba(0, 167, 169, 1);
+	}
 }
 </style>
 
 <style lang="scss" scoped>
 .resi-card-table {
-  margin-top: 20px;
+	margin-top: 20px;
 }
 .resi-row-btn {
-  display: flex;
-  margin-bottom: 13px;
-  .el-button {
-    margin-left: 10px;
-    border: 0;
-  }
-  // .el-button--success {
-  //   background: rgba(34, 193, 195, 1);
-  // }
-  // .el-button--warning {
-  //   background: rgba(254, 179, 73, 1);
-  // }
-  // .el-button--danger {
-  //   background: rgba(254, 98, 82, 1);
-  // }
+	display: flex;
+	margin-bottom: 13px;
+	.el-button {
+		margin-left: 10px;
+		border: 0;
+	}
+	// .el-button--success {
+	//   background: rgba(34, 193, 195, 1);
+	// }
+	// .el-button--warning {
+	//   background: rgba(254, 179, 73, 1);
+	// }
+	// .el-button--danger {
+	//   background: rgba(254, 98, 82, 1);
+	// }
 }
 .resi-other {
-  width: 100%;
-  display: flex;
-  .resi-other-title {
-    flex-shrink: 0;
-    // display: inline-block;
-    width: 100px;
-    box-sizing: border-box;
-    margin-bottom: 10px;
-    // padding: 6px 12px 0 0;
-    font-size: 16px;
-    font-weight: 500;
-    color: #333;
-    text-align: center;
-  }
-  .tabs-other-info {
-    // display: inline-block;
-    // flex: 1;
-    // padding-left: 60px;
-    width: calc(100% - 100px);
-  }
+	width: 100%;
+	display: flex;
+	.resi-other-title {
+		flex-shrink: 0;
+		// display: inline-block;
+		width: 100px;
+		box-sizing: border-box;
+		margin-bottom: 10px;
+		// padding: 6px 12px 0 0;
+		font-size: 16px;
+		font-weight: 500;
+		color: #333;
+		text-align: center;
+	}
+	.tabs-other-info {
+		// display: inline-block;
+		// flex: 1;
+		// padding-left: 60px;
+		width: calc(100% - 100px);
+	}
 }
 
 .resi-btns {
-  margin-top: 20px;
-  text-align: center;
+	margin-top: 20px;
+	text-align: center;
 }
 .div-flex {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 100%;
-  .div_del {
-    margin-top: 15px;
-  }
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	.div_del {
+		margin-top: 15px;
+	}
 }
 .blacklist-reason {
-  width: 100%;
-  height: 80px;
-  border: 1px solid #e4e4e4;
-  border-radius: 4px;
-  resize: none;
-  padding: 8px;
-  box-sizing: border-box;
+	width: 100%;
+	height: 80px;
+	border: 1px solid #e4e4e4;
+	border-radius: 4px;
+	resize: none;
+	padding: 8px;
+	box-sizing: border-box;
 }
 </style>

From d8ff6276a86ddeb619e4b00de931f2ae6f6cc0e7 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 20 Feb 2023 17:13:30 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index e39316dd6..957c3f6d6 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -51,14 +51,15 @@
 				</el-form-item>
 
 				<el-form-item label="福利发放标识" prop="grantFlag">
-					<el-radio-group
+					<el-select
 						size="small"
-						class="list_item_width_1"
 						v-model="dataForm.grantFlag"
+						filterable
+						placeholder="请选择"
 					>
-						<el-radio :label="1">已发放</el-radio>
-						<el-radio :label="0">未发放</el-radio>
-					</el-radio-group>
+						<el-option label="未发放" :value="0"> </el-option>
+						<el-option label="已发放" :value="1"> </el-option>
+					</el-select>
 				</el-form-item>
 				<el-form-item label="福利类别" prop="categoryName">
 					<el-input

From 107fae45f9ccd0e5ff40e3dc03adb76c1615780f Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 20 Feb 2023 17:24:32 +0800
Subject: [PATCH 3/7] 1

---
 .../modules/base/communityYantai/community.vue      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/communityYantai/community.vue b/src/views/modules/base/communityYantai/community.vue
index 13f261b4b..b829cb5f8 100644
--- a/src/views/modules/base/communityYantai/community.vue
+++ b/src/views/modules/base/communityYantai/community.vue
@@ -1,9 +1,8 @@
 <template>
 	<div class="div_main">
 		<div :style="{ height: rowHeight }" class="div_tree">
-			<el-input placeholder="输入关键字进行过滤"
-                v-model="filterText">
-      </el-input>
+			<el-input placeholder="输入关键字进行过滤" v-model="filterText">
+			</el-input>
 			<el-scrollbar
 				ref="leftScrollBar"
 				:style="{ height: treeHeight }"
@@ -285,7 +284,7 @@ export default {
 			return time.getTime() > nowData;
 		};
 		return {
-			filterText: '',
+			filterText: "",
 			treeLoading: true,
 			treeData: [],
 			openNodes: [],
@@ -381,6 +380,12 @@ export default {
 		...mapGetters(["clientHeight", "iframeHeight"]),
 	},
 
+	watch: {
+		filterText(val) {
+			this.$refs.ref_tree.filter(val);
+		},
+	},
+
 	async mounted() {
 		this.treeLoading = true;
 

From 9212d4f5310b458f0fc3255132603ece84ff4524 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 21 Feb 2023 10:38:02 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B0=B9=E4=BD=9C?=
 =?UTF-8?q?=E6=A2=85=E5=A5=B3=E5=A3=AB=E7=9A=84=E6=84=8F=E8=A7=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/change/changewelfare.vue     | 11 +++++++++--
 src/views/modules/plugins/change/resiwelfare.vue | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index 957c3f6d6..e82a7b9c7 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -289,6 +289,13 @@
 				:rules="dataRule"
 				class="form"
 			>
+				<el-form-item
+					label="姓名	"
+					label-width="150px"
+					style="display: block"
+				>
+					<div>{{ rowData.name }}</div>
+				</el-form-item>
 				<el-form-item
 					label="福利发放标识	"
 					prop="grantFlag"
@@ -308,7 +315,7 @@
 					style="display: block"
 				>
 					<el-input
-						maxlength="50"
+						maxlength="100"
 						style="width: 300px"
 						show-word-limit
 						placeholder="请输入福利类别	"
@@ -326,7 +333,7 @@
 					<el-input
 						type="textarea"
 						style="width: 300px"
-						maxlength="1000"
+						maxlength="200"
 						show-word-limit
 						:rows="3"
 						placeholder="请输入添加福利人员的原因"
diff --git a/src/views/modules/plugins/change/resiwelfare.vue b/src/views/modules/plugins/change/resiwelfare.vue
index 6c798cd6b..8253eee1d 100644
--- a/src/views/modules/plugins/change/resiwelfare.vue
+++ b/src/views/modules/plugins/change/resiwelfare.vue
@@ -314,6 +314,14 @@
 				:rules="dataRule"
 				class="form"
 			>
+				<el-form-item
+					label="姓名	"
+					label-width="150px"
+					style="display: block"
+				>
+					<div>{{ rowData.NAME }}</div>
+				</el-form-item>
+
 				<el-form-item
 					label="福利发放标识	"
 					prop="grantFlag"
@@ -333,7 +341,7 @@
 					style="display: block"
 				>
 					<el-input
-						maxlength="50"
+						maxlength="100"
 						style="width: 300px"
 						show-word-limit
 						placeholder="请输入福利类别	"
@@ -351,7 +359,7 @@
 					<el-input
 						type="textarea"
 						style="width: 300px"
-						maxlength="1000"
+						maxlength="200"
 						show-word-limit
 						:rows="3"
 						placeholder="请输入添加福利人员的原因"
@@ -550,7 +558,7 @@ export default {
 			this.rowData = { ...row };
 		},
 
-    // 新增-验证表单后提交
+		// 新增-验证表单后提交
 		async handleComfirmJoinForm() {
 			this.$refs["joinForm"].validate((valid, messageObj) => {
 				if (!valid) {
@@ -561,7 +569,7 @@ export default {
 			});
 		},
 
-    // 新增-提交
+		// 新增-提交
 		submitJoinForm() {
 			const { joinForm } = this;
 			const params = {

From d6f443ba435215fac2b2483a1c46d5d0613d56aa Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 21 Feb 2023 13:50:33 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regionalParty/activitys.vue               | 1539 +++++++------
 .../communityParty/regionalParty/units.vue    | 1907 +++++++++--------
 2 files changed, 1840 insertions(+), 1606 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 2559274b9..556e4bd47 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -1,742 +1,853 @@
 <template>
-  <div class="div_main">
-    <div class="div_search">
-      <el-form :inline="true"
-               :model="formData"
-               ref="ref_searchform"
-               :label-width="'100px'">
-        <div>
-
-          <el-form-item label="单位名称"
-                        prop="unitId">
-            <el-select class="item_width_1"
-                       v-model="formData.unitId"
-                       size="small"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in unitList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-
-          <el-form-item label="服务事项"
-                        prop="serviceMatter">
-            <el-select class="item_width_2"
-                       v-model="formData.serviceMatter"
-                       size="small"
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in serviceList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-
-          <el-form-item label="所属网格"
-                        prop="gridId">
-            <el-select class="item_width_1"
-                       v-model="formData.gridId"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in gridList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-
-        </div>
-        <div>
-          <el-form-item label="活动标题"
-                        prop="title">
-            <el-input v-model="formData.title"
-                      size="small"
-                      class="item_width_1"
-                      clearable
-                      placeholder="请输入内容">
-            </el-input>
-
-          </el-form-item>
-
-          <el-form-item label="活动时间"
-                        prop="startTime">
-            <el-date-picker v-model="timeRange"
-                            size="small"
-                            type="daterange"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            @change="handleTimeChange"
-                            range-separator="至"
-                            start-placeholder="开始时间"
-                            end-placeholder="结束时间">
-            </el-date-picker>
-
-          </el-form-item>
-          <el-button style="margin-left:10px"
-                     class="diy-button--search"
-                     size="small"
-                     @click="handleSearch">查询</el-button>
-          <el-button style="margin-left:10px"
-                     class="diy-button--reset"
-                     size="small"
-                     @click="resetSearch">重置</el-button>
-        </div>
-      </el-form>
-    </div>
-    <div class="div_table">
-      <div class="div_btn">
-        <el-button style=""
-                   class="diy-button--add"
-                   size="small"
-                   @click="handleAdd">新增</el-button>
-        <!-- 
-        <el-upload :headers="$getElUploadHeaders()"  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> 
-        <el-button style="float:left"
-                   class="diy-button--reset"
-                   size="small"
-                   @click="handleExport">导出</el-button>-->
-
-      </div>
-
-      <el-table class="table"
-                :data="tableData"
-                border
-                :height="tableHeight"
-                v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                style="width: 100%">
-
-        <el-table-column label="序号"
-                         header-align="center"
-                         align="center"
-                         type="index"
-                         width="50"></el-table-column>
-        <el-table-column prop="unitName"
-                         header-align="center"
-                         align="center"
-                         label="单位名称"
-                         width="180">
-        </el-table-column>
-        <el-table-column prop="gridName"
-                         header-align="center"
-                         align="center"
-                         label="所属网格"
-                         width="180">
-        </el-table-column>
-        <el-table-column prop="title"
-                         header-align="center"
-                         align="center"
-                         label="活动标题"
-                         min-width="180">
-        </el-table-column>
-        <el-table-column prop="address"
-                         header-align="center"
-                         align="center"
-                         label="活动地址"
-                         min-width="230">
-        </el-table-column>
-
-        <el-table-column prop="peopleCount"
-                         header-align="center"
-                         align="center"
-                         label="服务人数"
-                         width="100">
-        </el-table-column>
-        <el-table-column prop="activityTime"
-                         header-align="center"
-                         align="center"
-                         label="活动时间"
-                         width="230">
-        </el-table-column>
-        <el-table-column prop="activityTime"
-                         header-align="center"
-                         align="center"
-                         label="来源"
-                         width="100">
-          <template slot-scope="scope">
-            <span v-if="scope.row.actId">小程序</span>
-            <span v-else>管理平台</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="140"
-                         header-align="center"
-                         align="center"
-                         class="operate">
-          <template slot-scope="scope">
-
-            <el-button type="text"
-                       style="color:#1C6AFD;text-decoration: underline;"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="agencyId===scope.row.agencyId&&!scope.row.actId"
-                       type="text"
-                       style="color:#00A7A9;text-decoration: underline;"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-button v-if="agencyId===scope.row.agencyId"
-                       type="text"
-                       style="color:#D51010;text-decoration: underline;"
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[10, 20, 50]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
-      </div>
-    </div>
-
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="950px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <activitys-form ref="ref_form"
-                      :unitList="unitList"
-                      :gridList="gridList"
-                      @dialogCancle="addFormCancle"
-                      @dialogOk="addFormOk"></activitys-form>
-    </el-dialog>
-
-    <el-dialog :visible.sync="detailShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'活动详情'"
-               width="950px"
-               top="5vh"
-               class="dialog-h"
-               @closed="detailClosed">
-      <activitys-detail ref="ref_detail"
-                        :serviceList="serviceList"
-                        :gridList="gridList"
-                        @diaDetailClose="detailClosed"></activitys-detail>
-    </el-dialog>
-
-  </div>
+	<div class="div_main">
+		<div class="div_search">
+			<el-form
+				:inline="true"
+				:model="formData"
+				ref="ref_searchform"
+				:label-width="'100px'"
+			>
+				<div>
+					<el-form-item label="单位名称" prop="unitId">
+						<el-select
+							class="item_width_1"
+							v-model="formData.unitId"
+							size="small"
+							placeholder="全部"
+							clearable
+						>
+							<el-option
+								v-for="item in unitList"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+
+					<el-form-item label="服务事项" prop="serviceMatter">
+						<el-select
+							class="item_width_2"
+							v-model="formData.serviceMatter"
+							size="small"
+							placeholder="请选择"
+							clearable
+						>
+							<el-option
+								v-for="item in serviceList"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+
+					<el-form-item label="所属网格" prop="gridId">
+						<el-select
+							class="item_width_1"
+							v-model="formData.gridId"
+							placeholder="全部"
+							clearable
+						>
+							<el-option
+								v-for="item in gridList"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</div>
+				<div>
+					<el-form-item label="活动标题" prop="title">
+						<el-input
+							v-model="formData.title"
+							size="small"
+							class="item_width_1"
+							clearable
+							placeholder="请输入内容"
+						>
+						</el-input>
+					</el-form-item>
+
+					<el-form-item label="活动时间" prop="startTime">
+						<el-date-picker
+							v-model="timeRange"
+							size="small"
+							type="daterange"
+							value-format="yyyy-MM-dd HH:mm:ss"
+							@change="handleTimeChange"
+							range-separator="至"
+							start-placeholder="开始时间"
+							end-placeholder="结束时间"
+						>
+						</el-date-picker>
+					</el-form-item>
+					<el-button
+						style="margin-left: 10px"
+						class="diy-button--search"
+						size="small"
+						@click="handleSearch"
+						>查询</el-button
+					>
+					<el-button
+						style="margin-left: 10px"
+						class="diy-button--reset"
+						size="small"
+						@click="resetSearch"
+						>重置</el-button
+					>
+				</div>
+			</el-form>
+		</div>
+		<div class="div_table">
+			<div class="resi-row-btn">
+				<el-button
+					class="diy-button--add"
+					size="small"
+					@click="handleAdd"
+					>新增</el-button
+				>
+
+				<el-button
+					class="diy-button--export"
+					size="small"
+					@click="handleExportModule"
+					>下载模板</el-button
+				>
+
+				<el-upload
+					:headers="$getElUploadHeaders()"
+					ref="upload"
+					class="upload-demo"
+					: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>
+
+				<el-button
+					class="diy-button--reset"
+					size="small"
+					@click="handleExport"
+					>导出</el-button
+				>
+			</div>
+
+			<el-table
+				class="table"
+				:data="tableData"
+				border
+				:height="tableHeight"
+				v-loading="tableLoading"
+				:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+				style="width: 100%"
+			>
+				<el-table-column
+					label="序号"
+					header-align="center"
+					align="center"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column
+					prop="unitName"
+					header-align="center"
+					align="center"
+					label="单位名称"
+					width="180"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="gridName"
+					header-align="center"
+					align="center"
+					label="所属网格"
+					width="180"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="title"
+					header-align="center"
+					align="center"
+					label="活动标题"
+					min-width="180"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="address"
+					header-align="center"
+					align="center"
+					label="活动地址"
+					min-width="230"
+				>
+				</el-table-column>
+
+				<el-table-column
+					prop="peopleCount"
+					header-align="center"
+					align="center"
+					label="服务人数"
+					width="100"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="activityTime"
+					header-align="center"
+					align="center"
+					label="活动时间"
+					width="230"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="activityTime"
+					header-align="center"
+					align="center"
+					label="来源"
+					width="100"
+				>
+					<template slot-scope="scope">
+						<span v-if="scope.row.actId">小程序</span>
+						<span v-else>管理平台</span>
+					</template>
+				</el-table-column>
+
+				<el-table-column
+					label="操作"
+					fixed="right"
+					width="140"
+					header-align="center"
+					align="center"
+					class="operate"
+				>
+					<template slot-scope="scope">
+						<el-button
+							type="text"
+							style="color: #1c6afd; text-decoration: underline"
+							size="small"
+							@click="handleDetail(scope.row)"
+							>查看</el-button
+						>
+						<el-button
+							v-if="
+								agencyId === scope.row.agencyId &&
+								!scope.row.actId
+							"
+							type="text"
+							style="color: #00a7a9; text-decoration: underline"
+							size="small"
+							@click="handleEdit(scope.row)"
+							>修改</el-button
+						>
+
+						<el-button
+							v-if="agencyId === scope.row.agencyId"
+							type="text"
+							style="color: #d51010; text-decoration: underline"
+							size="small"
+							@click="handleDelete(scope.row)"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div>
+				<el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page.sync="pageNo"
+					:page-sizes="[10, 20, 50]"
+					:page-size="pageSize"
+					layout="sizes, prev, pager, next, total"
+					:total="total"
+				>
+				</el-pagination>
+			</div>
+		</div>
+
+		<!-- 修改弹出框 -->
+		<el-dialog
+			:visible.sync="formShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="formTitle"
+			width="950px"
+			top="5vh"
+			class="dialog-h"
+			@closed="diaClose"
+		>
+			<activitys-form
+				ref="ref_form"
+				:unitList="unitList"
+				:gridList="gridList"
+				@dialogCancle="addFormCancle"
+				@dialogOk="addFormOk"
+			></activitys-form>
+		</el-dialog>
+
+		<el-dialog
+			:visible.sync="detailShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="'活动详情'"
+			width="950px"
+			top="5vh"
+			class="dialog-h"
+			@closed="detailClosed"
+		>
+			<activitys-detail
+				ref="ref_detail"
+				:serviceList="serviceList"
+				:gridList="gridList"
+				@diaDetailClose="detailClosed"
+			></activitys-detail>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-
-import activitysForm from './activitysForm'
-import activitysDetail from './activitysDetail'
-import util from '@js/util.js';
+import activitysForm from "./activitysForm";
+import activitysDetail from "./activitysDetail";
+import util from "@js/util.js";
 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服务
 
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
-    return {
-      loading: false,
-      total: 0,
-      pageSize: 10,
-      pageNo: 0,
-      tableLoading: false,
-      agencyId: '',
-      gridList: [],//所属网格
-      unitList: [],//单位list
-      serviceList: [
-        {
-          id: "1",
-          name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。'
-        },
-        {
-          id: "2",
-          name: '积极配合'
-        },
-        {
-          id: "3",
-          name: '积极配合社区安全巡查员进行'
-        },
-        {
-          id: "4",
-          name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施'
-        },
-      ],//服务list
-      pickerOptions: { //控制时间范围
-        disabledDate (time) {
-          return time.getTime() > (Date.now() - (24 * 60 * 60 * 1000))
-        }
-      },
-
-      timeRange: [],
-      unitId: '',
-      formData: {
-        unitId: '',
-        title: '',
-        serviceMatter: '',
-        startTime: '',
-        endTime: '',
-        gridId: ''
-      },
-
-
-      tableData: [],
-
-      //form相关
-      formShow: false,
-      formTitle: '新增活动',
-      detailShow: false,
-
-      files: "",
-      fileName: "",
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import'
-
-    }
-  },
-  components: {
-    activitysForm, activitysDetail
-  },
-  async created () {
-
-  },
-  async mounted () {
-    //获取服务事项
-    await this.loadService()
-
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
-
-    //获取建联单位
-    this.loadUnit()
-    this.loadGrid()
-    //获取网格下拉框数据
-    this.loadTable()
-  },
-
-  methods: {
-    handleSearch () {
-      this.loadTable()
-    },
-    async loadGrid () {
-      const url = "/gov/org/customergrid/gridoption"
-
-      let params = {
-        agencyId: this.agencyId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.gridList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    async loadUnit () {
-      const url = "/heart/icpartyunit/option"
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
-
-      let params = {
-        agencyId: this.agencyId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.unitList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    //获取服务事项下拉框
-    async loadService () {
-      const url = "/heart/serviceitem/dict-list"
-
-
-      let params = {
-        // parentCategoryCode: '1010'
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.serviceList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    async loadTable () {
-      this.tableLoading = true
-
-      const url = "/heart/icpartyactivity/search"
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
-      let params = {
-        agencyId: this.agencyId,
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-        ...this.formData
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.total = data.total
-        this.tableData = data.list
-      } else {
-        this.$message.error(msg)
-      }
-      this.tableLoading = false
-    },
-
-
-
-    diaClose () {
-
-      this.$refs.ref_form.resetData()
-      this.formShow = false
-    },
-
-    detailClosed () {
-      console.log(this.$refs.ref_detail)
-      this.$refs.ref_detail.diaDestroy()
-      this.detailShow = false
-    },
-
-
-    handleDetail (row) {
-      this.detailShow = true
-      this.formTitle = '详情'
-
-      this.$nextTick(() => {
-        this.$refs.ref_detail.initForm(row)
-        // this.$refs.ref_form.initForm('detail', row.id)
-      })
-    },
-
-    handleAdd () {
-      this.formTitle = '新增'
-
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null)
-      })
-    },
-
-    handleEdit (row) {
-      this.formTitle = '修改'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.id)
-      })
-    },
-
-    addFormCancle () {
-      this.formShow = false
-    },
-    addFormOk () {
-      this.formShow = false
-      this.loadTable()
-
-    },
-
-    async handleDelete (row) {
-
-      this.$confirm("确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.deleteActivity(row)
-        })
-        .catch(err => {
-          if (err == "cancel") {
-
-          }
-
-        });
-    },
-
-    async deleteActivity (row) {
-      const url = "/heart/icpartyactivity/delete"
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
-
-      let params = {
-        id: row.id
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    //重置搜索条件
-    resetSearch () {
-      this.timeRange = []
-      this.formData = {
-        gridId: '',
-        unitName: '',
-        serviceMatter: '',
-        type: '',
-        contact: '',
-        contactMobile: ''
-      }
-      this.pageSize = 10
-      this.pageNo = 0
-      this.loadTable()
-    },
-
-    //导出表格
-    async handleExport () {
-      let title = '联建活动列表'
-
-      const url = "/heart/icpartyactivity/export"
-      let params = {
-        agencyId: this.agencyId,
-
-        ...this.formData
-
-      }
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-
-    },
-
-    // 下载文件
-    download (data, fileName) {
-      if (!data) {
-        return
-      }
-
-      var csvData = new Blob([data])
-
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, fileName);
-      }
-      // for Non-IE (chrome, firefox etc.)
-      else {
-        var a = document.createElement('a');
-        document.body.appendChild(a);
-        a.style = 'display: none';
-        var url = window.URL.createObjectURL(csvData);
-        a.href = url;
-        a.download = fileName;
-        a.click();
-        a.remove();
-        window.URL.revokeObjectURL(url);
-      }
-
-    },
-
-    // 上传文件之前的钩子
-    beforeUpload (file) {
-      this.files = file;
-
-      const isText = file.type === 'application/vnd.ms-excel'
-      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-
-      if (!isText && !isTextComputer) {
-        this.$message.error('请选择正确格式的文件')
-        return false
-      } else {
-        this.fileName = file.name;
-        return true
-      }
-
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
-    },
-
-    async uploadFile () {
-      this.loading = true
-
-      if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
-      }
-
-      //清空上传列表
-      this.$refs['upload'].clearFiles()
-
-      var url = '/heart/icpartyactivity/import'
-      let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
-      const { data, code, msg } = await requestPost(url, fileFormData)
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "导入成功"
-        });
-
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-
-
-    },
-
-    handleTimeChange (time) {
-      if (time) {
-        const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
-        const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
-
-        this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
-        this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
-
-        // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
-        // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
-      } else {
-        this.formData.startTime = ''
-        this.formData.endTime = ''
-        // this.startTimeShow = ''
-        // this.endTimeShow = ''
-      }
-
-    },
-
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
-    },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
-    },
-
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  computed: {
-    tableHeight () {
-
-      return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
-
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  watch: {
-
-  },
-  props: {
-
-  }
-}
+	data() {
+		return {
+			loading: false,
+			total: 0,
+			pageSize: 10,
+			pageNo: 0,
+			tableLoading: false,
+			agencyId: "",
+			gridList: [], //所属网格
+			unitList: [], //单位list
+			serviceList: [
+				{
+					id: "1",
+					name: "积极配合社区安全巡查员进行场所消防、安全等方面的检查。",
+				},
+				{
+					id: "2",
+					name: "积极配合",
+				},
+				{
+					id: "3",
+					name: "积极配合社区安全巡查员进行",
+				},
+				{
+					id: "4",
+					name: "积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施",
+				},
+			], //服务list
+			pickerOptions: {
+				//控制时间范围
+				disabledDate(time) {
+					return time.getTime() > Date.now() - 24 * 60 * 60 * 1000;
+				},
+			},
+
+			timeRange: [],
+			unitId: "",
+			formData: {
+				unitId: "",
+				title: "",
+				serviceMatter: "",
+				startTime: "",
+				endTime: "",
+				gridId: "",
+			},
+
+			tableData: [],
+
+			//form相关
+			formShow: false,
+			formTitle: "新增活动",
+			detailShow: false,
+
+			files: "",
+			fileName: "",
+			uploadUlr:
+				window.SITE_CONFIG["apiURL"] + "/gov/org/neighborhood/import",
+		};
+	},
+	components: {
+		activitysForm,
+		activitysDetail,
+	},
+	async created() {},
+	async mounted() {
+		//获取服务事项
+		await this.loadService();
+
+		const { user } = this.$store.state;
+		this.agencyId = user.agencyId;
+
+		//获取建联单位
+		this.loadUnit();
+		this.loadGrid();
+		//获取网格下拉框数据
+		this.loadTable();
+	},
+
+	methods: {
+		handleSearch() {
+			this.loadTable();
+		},
+		async loadGrid() {
+			const url = "/gov/org/customergrid/gridoption";
+
+			let params = {
+				agencyId: this.agencyId,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.gridList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async loadUnit() {
+			const url = "/heart/icpartyunit/option";
+			// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
+
+			let params = {
+				agencyId: this.agencyId,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.unitList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		//获取服务事项下拉框
+		async loadService() {
+			const url = "/heart/serviceitem/dict-list";
+
+			let params = {
+				// parentCategoryCode: '1010'
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.serviceList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async loadTable() {
+			this.tableLoading = true;
+
+			const url = "/heart/icpartyactivity/search";
+			// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
+			let params = {
+				agencyId: this.agencyId,
+				pageSize: this.pageSize,
+				pageNo: this.pageNo,
+				...this.formData,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.total = data.total;
+				this.tableData = data.list;
+			} else {
+				this.$message.error(msg);
+			}
+			this.tableLoading = false;
+		},
+
+		diaClose() {
+			this.$refs.ref_form.resetData();
+			this.formShow = false;
+		},
+
+		detailClosed() {
+			console.log(this.$refs.ref_detail);
+			this.$refs.ref_detail.diaDestroy();
+			this.detailShow = false;
+		},
+
+		handleDetail(row) {
+			this.detailShow = true;
+			this.formTitle = "详情";
+
+			this.$nextTick(() => {
+				this.$refs.ref_detail.initForm(row);
+				// this.$refs.ref_form.initForm('detail', row.id)
+			});
+		},
+
+		handleAdd() {
+			this.formTitle = "新增";
+
+			this.formShow = true;
+			this.$nextTick(() => {
+				this.$refs.ref_form.initForm("add", null);
+			});
+		},
+
+		handleEdit(row) {
+			this.formTitle = "修改";
+			this.formShow = true;
+			this.$nextTick(() => {
+				this.$refs.ref_form.initForm("edit", row.id);
+			});
+		},
+
+		addFormCancle() {
+			this.formShow = false;
+		},
+		addFormOk() {
+			this.formShow = false;
+			this.loadTable();
+		},
+
+		async handleDelete(row) {
+			this.$confirm("确认删除?", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			})
+				.then(() => {
+					this.deleteActivity(row);
+				})
+				.catch((err) => {
+					if (err == "cancel") {
+					}
+				});
+		},
+
+		async handleExportModule() {
+			let url = "/heart/icpartyactivity/import-template-download";
+
+			let params = {};
+			await this.$http({
+				method: "POST",
+				url,
+				responseType: "blob",
+				data: params,
+			})
+				.then((res) => {
+					console.log("res-------dd", res);
+					if (res.headers["content-disposition"]) {
+						let fileName = window.decodeURI(
+							res.headers["content-disposition"]
+								.split(";")[1]
+								.split("=")[1]
+						);
+						this.download(res.data, fileName);
+					} else this.$message.error("下载失败");
+				})
+				.catch((err) => {
+					console.log("err", err);
+					return this.$message.error("网络错误");
+				});
+		},
+
+		async deleteActivity(row) {
+			const url = "/heart/icpartyactivity/delete";
+			// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
+
+			let params = {
+				id: row.id,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "删除成功",
+				});
+
+				this.loadTable();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		//重置搜索条件
+		resetSearch() {
+			this.timeRange = [];
+			this.formData = {
+				gridId: "",
+				unitName: "",
+				serviceMatter: "",
+				type: "",
+				contact: "",
+				contactMobile: "",
+			};
+			this.pageSize = 10;
+			this.pageNo = 0;
+			this.loadTable();
+		},
+
+		//导出表格
+		async handleExport() {
+			let title = "联建活动列表";
+
+			const url = "/heart/icpartyactivity/export";
+			let params = {
+				agencyId: this.agencyId,
+
+				...this.formData,
+			};
+
+			app.ajax.exportFilePost(
+				url,
+				params,
+				(data, rspMsg) => {
+					this.download(data, title + ".xls");
+				},
+				(rspMsg, data) => {
+					this.$message.error(rspMsg);
+				}
+			);
+		},
+
+		// 下载文件
+		download(data, fileName) {
+			if (!data) {
+				return;
+			}
+
+			var csvData = new Blob([data]);
+
+			if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+				window.navigator.msSaveOrOpenBlob(csvData, fileName);
+			}
+			// for Non-IE (chrome, firefox etc.)
+			else {
+				var a = document.createElement("a");
+				document.body.appendChild(a);
+				a.style = "display: none";
+				var url = window.URL.createObjectURL(csvData);
+				a.href = url;
+				a.download = fileName;
+				a.click();
+				a.remove();
+				window.URL.revokeObjectURL(url);
+			}
+		},
+
+		// 上传文件之前的钩子
+		beforeUpload(file) {
+			this.files = file;
+
+			const isText = file.type === "application/vnd.ms-excel";
+			const isTextComputer =
+				file.type ===
+				"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+
+			if (!isText && !isTextComputer) {
+				this.$message.error("请选择正确格式的文件");
+				return false;
+			} else {
+				this.fileName = file.name;
+				return true;
+			}
+		},
+		// 上传文件个数超过定义的数量
+		handleExceed(files, fileList) {
+			this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
+		},
+
+		async uploadFile() {
+			this.loading = true;
+
+			if (this.fileName == "") {
+				this.$message.warning("请选择要上传的文件！");
+				return false;
+			}
+
+			//清空上传列表
+			this.$refs["upload"].clearFiles();
+
+			var url = "/heart/icpartyactivity/import";
+			let fileFormData = new FormData();
+			fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+			const { data, code, msg } = await requestPost(url, fileFormData);
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "导入成功",
+				});
+
+				this.loadTable();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		handleTimeChange(time) {
+			if (time) {
+				const startTimeArray = util
+					.dateFormatter(time[0], "date")
+					.split("-");
+				const endTimeArray = util
+					.dateFormatter(time[1], "date")
+					.split("-");
+
+				this.formData.startTime =
+					startTimeArray[0] +
+					"-" +
+					startTimeArray[1] +
+					"-" +
+					startTimeArray[2] +
+					" 00:00:00";
+				this.formData.endTime =
+					endTimeArray[0] +
+					"-" +
+					endTimeArray[1] +
+					"-" +
+					endTimeArray[2] +
+					" 23:59:59";
+
+				// this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+				// this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+			} else {
+				this.formData.startTime = "";
+				this.formData.endTime = "";
+				// this.startTimeShow = ''
+				// this.endTimeShow = ''
+			}
+		},
+
+		handleSizeChange(val) {
+			this.pageSize = val;
+			this.pageNo = 1;
+			this.loadTable();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.loadTable();
+		},
+
+		// 开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: "正在加载……", // 加载中需要显示的文字
+				background: "rgba(0,0,0,.7)", // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		},
+	},
+	computed: {
+		tableHeight() {
+			return this.$store.state.inIframe
+				? this.clientHeight - 430 + this.iframeHeight
+				: this.clientHeight - 430;
+		},
+
+		...mapGetters(["clientHeight", "iframeHeight"]),
+	},
+	watch: {},
+	props: {},
+};
 </script>
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 .div_main {
-  width: 100%;
+	width: 100%;
 }
 
 .div_search {
-  background: #ffffff;
-  border-radius: 4px;
-  padding: 30px 20px 5px;
-  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+	background: #ffffff;
+	border-radius: 4px;
+	padding: 30px 20px 5px;
+	box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
 }
 
 .item_width_1 {
-  width: 260px;
+	width: 260px;
 }
 .item_width_2 {
-  width: 495px;
+	width: 495px;
 }
 
 .div_table {
-  background: #ffffff;
-  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-  border-radius: 4px;
-  margin-top: 15px;
-  padding: 23px 30px 10px;
-
-  .table {
-    margin-top: 20px;
-  }
+	background: #ffffff;
+	box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+	border-radius: 4px;
+	margin-top: 15px;
+	padding: 23px 30px 10px;
+
+	.table {
+		margin-top: 20px;
+	}
 }
 
 .div_btn {
 }
 
 .el-row {
-  /* margin-bottom: 20px; */
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 10px;
-  margin-right: 50px;
+	/* margin-bottom: 20px; */
+	display: flex;
+	flex-wrap: wrap;
+	margin-top: 10px;
+	margin-right: 50px;
+}
+
+.resi-row-btn {
+	display: flex;
+	margin-bottom: 13px;
+	::v-deep .el-button {
+		// margin-left: 10px;
+		border: 0;
+	}
+	::v-deep .el-select {
+		margin-right: 10px;
+	}
+	.el-button--success {
+		background: rgba(34, 193, 195, 1);
+	}
+	.el-button {
+		margin-left: 10px;
+		border: 0;
+	}
+	.el-button--success {
+		background: rgba(34, 193, 195, 1);
+	}
+	.el-button--warning {
+		background: rgba(254, 179, 73, 1);
+	}
+	.el-button--danger {
+		background: rgba(254, 98, 82, 1);
+	}
 }
 </style>
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 265bf8d71..762492d25 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -1,933 +1,1056 @@
 <template>
-  <div class="div_main">
-    <div class="div_search">
-      <el-form :inline="true"
-               :model="formData"
-               ref="ref_searchform"
-               :label-width="'100px'">
-        <div>
-
-          <el-form-item label="所属组织"
-                        prop="agencyId">
-            <el-cascader class="item_width_1"
-                         ref="myCascader"
-                         v-model="agencyIdArray"
-                         :options="orgOptions"
-                         :props="orgOptionProps"
-                         :show-all-levels="false"
-                         @change="handleChangeAgency"></el-cascader>
-
-          </el-form-item>
-          <el-form-item label="单位名称"
-                        prop="unitName">
-            <el-input v-model="formData.unitName"
-                      class="item_width_1"
-                      clearable
-                      size="small"
-                      placeholder="请输入内容">
-            </el-input>
-
-          </el-form-item>
-          <el-form-item label="服务事项"
-                        prop="serviceMatter">
-            <el-select class="item_width_2"
-                       v-model="formData.serviceMatter"
-                       placeholder="请选择"
-                       size="small"
-                       clearable>
-              <el-option v-for="item in serviceList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-        </div>
-        <div>
-          <el-form-item label="分类"
-                        prop="type">
-            <el-select class="item_width_1"
-                       v-model="formData.type"
-                       placeholder="请选择"
-                       size="small"
-                       clearable>
-              <el-option v-for="item in typeList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-          <el-form-item label="联系人"
-                        prop="contact">
-            <el-input v-model="formData.contact"
-                      class="item_width_1"
-                      size="small"
-                      clearable
-                      placeholder="请输入内容">
-            </el-input>
-
-          </el-form-item>
-
-          <el-form-item label="联系电话"
-                        prop="contactMobile">
-            <el-input v-model="formData.contactMobile"
-                      class="item_width_1"
-                      size="small"
-                      clearable
-                      placeholder="请输入内容">
-            </el-input>
-
-          </el-form-item>
-
-          <el-button style="margin-left:10px"
-                     class="diy-button--search"
-                     size="small"
-                     @click="handleSearch">查询</el-button>
-          <el-button style="margin-left:10px"
-                     class="diy-button--reset"
-                     size="small"
-                     @click="resetSearch">重置</el-button>
-        </div>
-      </el-form>
-    </div>
-    <div class="div_table">
-      <div class="div_btn">
-        <el-button class="diy-button--add"
-                   size="small"
-                   @click="handleAdd">新增</el-button>
-        <!-- 
-        <el-upload :headers="$getElUploadHeaders()"  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>
-        <el-button style="float:left"
-                  class="diy-button--reset"
-                   size="small"
-                   @click="handleExport">导出</el-button>-->
-
-      </div>
-
-      <el-table class="table"
-                :data="tableData"
-                border
-                :height="tableHeight"
-                v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                style="width: 100%">
-        <el-table-column label="序号"
-                         header-align="center"
-                         align="center"
-                         type="index"
-                         width="50"></el-table-column>
-
-        <el-table-column prop="unitName"
-                         header-align="center"
-                         align="center"
-                         label="单位名称"
-                         min-width="100">
-        </el-table-column>
-        <el-table-column prop="agencyName"
-                         header-align="center"
-                         align="center"
-                         label="所属组织"
-                         min-width="100">
-        </el-table-column>
-        <el-table-column prop="type"
-                         header-align="center"
-                         align="center"
-                         label="分类"
-                         min-width="80">
-        </el-table-column>
-        <el-table-column prop="serviceMatterListShow"
-                         header-align="center"
-                         align="center"
-                         label="服务事项"
-                         show-overflow-tooltip
-                         min-width="250">
-
-          <!-- <template slot-scope="scope">
+	<div class="div_main">
+		<div class="div_search">
+			<el-form
+				:inline="true"
+				:model="formData"
+				ref="ref_searchform"
+				:label-width="'100px'"
+			>
+				<div>
+					<el-form-item label="所属组织" prop="agencyId">
+						<el-cascader
+							class="item_width_1"
+							ref="myCascader"
+							v-model="agencyIdArray"
+							:options="orgOptions"
+							:props="orgOptionProps"
+							:show-all-levels="false"
+							@change="handleChangeAgency"
+						></el-cascader>
+					</el-form-item>
+					<el-form-item label="单位名称" prop="unitName">
+						<el-input
+							v-model="formData.unitName"
+							class="item_width_1"
+							clearable
+							size="small"
+							placeholder="请输入内容"
+						>
+						</el-input>
+					</el-form-item>
+					<el-form-item label="服务事项" prop="serviceMatter">
+						<el-select
+							class="item_width_2"
+							v-model="formData.serviceMatter"
+							placeholder="请选择"
+							size="small"
+							clearable
+						>
+							<el-option
+								v-for="item in serviceList"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</div>
+				<div>
+					<el-form-item label="分类" prop="type">
+						<el-select
+							class="item_width_1"
+							v-model="formData.type"
+							placeholder="请选择"
+							size="small"
+							clearable
+						>
+							<el-option
+								v-for="item in typeList"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item label="联系人" prop="contact">
+						<el-input
+							v-model="formData.contact"
+							class="item_width_1"
+							size="small"
+							clearable
+							placeholder="请输入内容"
+						>
+						</el-input>
+					</el-form-item>
+
+					<el-form-item label="联系电话" prop="contactMobile">
+						<el-input
+							v-model="formData.contactMobile"
+							class="item_width_1"
+							size="small"
+							clearable
+							placeholder="请输入内容"
+						>
+						</el-input>
+					</el-form-item>
+
+					<el-button
+						style="margin-left: 10px"
+						class="diy-button--search"
+						size="small"
+						@click="handleSearch"
+						>查询</el-button
+					>
+					<el-button
+						style="margin-left: 10px"
+						class="diy-button--reset"
+						size="small"
+						@click="resetSearch"
+						>重置</el-button
+					>
+				</div>
+			</el-form>
+		</div>
+		<div class="div_table">
+			<div class="resi-row-btn">
+				<el-button
+					class="diy-button--add"
+					size="small"
+					@click="handleAdd"
+					>新增</el-button
+				>
+
+				<el-button
+					class="diy-button--export"
+					size="small"
+					@click="handleExportModule"
+					>下载模板</el-button
+				>
+
+				<el-upload
+					:headers="$getElUploadHeaders()"
+					ref="upload"
+					class="upload-demo"
+					: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>
+
+				<el-button
+					class="diy-button--reset"
+					size="small"
+					@click="handleExport"
+					>导出</el-button
+				>
+			</div>
+
+			<el-table
+				class="table"
+				:data="tableData"
+				border
+				:height="tableHeight"
+				v-loading="tableLoading"
+				:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+				style="width: 100%"
+			>
+				<el-table-column
+					label="序号"
+					header-align="center"
+					align="center"
+					type="index"
+					width="50"
+				></el-table-column>
+
+				<el-table-column
+					prop="unitName"
+					header-align="center"
+					align="center"
+					label="单位名称"
+					min-width="100"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="agencyName"
+					header-align="center"
+					align="center"
+					label="所属组织"
+					min-width="100"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="type"
+					header-align="center"
+					align="center"
+					label="分类"
+					min-width="80"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="serviceMatterListShow"
+					header-align="center"
+					align="center"
+					label="服务事项"
+					show-overflow-tooltip
+					min-width="250"
+				>
+					<!-- <template slot-scope="scope">
             <p style="text-align:center;margin:2px 0;"
                v-for="(item,index) in scope.row.serviceMatterList"
                :key="index">{{item}}</p>
 
           </template> -->
-        </el-table-column>
-        <el-table-column prop="contact"
-                         header-align="center"
-                         align="center"
-                         label="联系人"
-                         width="80">
-        </el-table-column>
-        <el-table-column prop="contactMobile"
-                         header-align="center"
-                         align="center"
-                         label="联系电话"
-                         width="120">
-        </el-table-column>
-        <el-table-column prop="memberCount"
-                         header-align="center"
-                         align="center"
-                         label="在职党员数"
-                         width="100">
-        </el-table-column>
-        <!-- <el-table-column prop="satisfaction"
+				</el-table-column>
+				<el-table-column
+					prop="contact"
+					header-align="center"
+					align="center"
+					label="联系人"
+					width="80"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="contactMobile"
+					header-align="center"
+					align="center"
+					label="联系电话"
+					width="120"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="memberCount"
+					header-align="center"
+					align="center"
+					label="在职党员数"
+					width="100"
+				>
+				</el-table-column>
+				<!-- <el-table-column prop="satisfaction"
                          header-align="center"
                          align="center"
                          label="群众满意度"
                          width="100">
         </el-table-column> -->
-        <!-- <el-table-column prop="score"
+				<!-- <el-table-column prop="score"
                          header-align="center"
                          align="center"
                          label="积分"
                          width="80">
         </el-table-column> -->
-        <el-table-column prop="remark"
-                         header-align="center"
-                         align="center"
-                         label="备注"
-                         show-overflow-tooltip
-                         width="150">
-        </el-table-column>
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="150"
-                         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="agencyId===scope.row.agencyId"
-                       type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-popover v-if="agencyId===scope.row.agencyId"
-                        popper-class="btn-popper"
-                        placement="bottom"
-                        style="margin-left:10px"
-                        width="20"
-                        trigger="click">
-              <div v-if="scope.row.syncType==='not_sync'"
-                   class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail"
-                           size="small"
-                           @click="handleSync(scope.row)">同步</el-button>
-              </div>
-              <div v-if="scope.row.syncType==='sync'"
-                   class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail"
-                           size="small"
-                           @click="handleNoSync(scope.row)">取消同步</el-button>
-              </div>
-              <div class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail"
-                           size="small"
-                           @click="handleFinish(scope.row)">完成情况</el-button>
-              </div>
-
-              <div class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail"
-                           size="small"
-                           @click="handleScore(scope.row)">积分记录</el-button>
-              </div>
-              <div class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--delete"
-                           size="small"
-                           @click="handleDelete(scope.row)">删除</el-button>
-              </div>
-
-              <el-button type="text"
-                         size="small"
-                         class="div-table-button--more"
-                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
-            </el-popover>
-
-            <el-button v-else
-                       type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleScore(scope.row)">积分记录</el-button>
-
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[10, 20, 50]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
-      </div>
-    </div>
-
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               :destroy-on-close="true"
-               width="950px"
-               top="5vh"
-               class="dialog-h"
-               @closed="editDiaClose">
-      <units-form ref="ref_form"
-                  :typeList="typeList"
-                  @dialogCancle="addFormCancle"
-                  @dialogOk="addFormOk"></units-form>
-    </el-dialog>
-
-    <el-dialog :visible.sync="detailShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'单位详情'"
-               width="950px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaDetailClose">
-      <units-detail ref="ref_detail"
-                    @diaDetailClose="diaDetailClose"></units-detail>
-    </el-dialog>
-
-    <!-- 完成情况 -->
-    <el-dialog :visible.sync="finishDiaShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="finishDiaTitle"
-               width="950px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <finish-list ref="ref_finish"></finish-list>
-    </el-dialog>
-
-    <!-- 积分记录 -->
-    <el-dialog :visible.sync="scoreDiaShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="scoreDiaTitle"
-               width="1050px"
-               top="5vh"
-               @closed="diaClose">
-      <score-record ref="ref_score"
-                    :serviceType="'party_unit'"></score-record>
-    </el-dialog>
-
-  </div>
+				<el-table-column
+					prop="remark"
+					header-align="center"
+					align="center"
+					label="备注"
+					show-overflow-tooltip
+					width="150"
+				>
+				</el-table-column>
+				<el-table-column
+					label="操作"
+					fixed="right"
+					width="150"
+					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="agencyId === scope.row.agencyId"
+							type="text"
+							class="div-table-button--edit"
+							size="small"
+							@click="handleEdit(scope.row)"
+							>修改</el-button
+						>
+
+						<el-popover
+							v-if="agencyId === scope.row.agencyId"
+							popper-class="btn-popper"
+							placement="bottom"
+							style="margin-left: 10px"
+							width="20"
+							trigger="click"
+						>
+							<div
+								v-if="scope.row.syncType === 'not_sync'"
+								class="table-more-btn"
+							>
+								<el-button
+									type="text"
+									class="div-table-button--detail"
+									size="small"
+									@click="handleSync(scope.row)"
+									>同步</el-button
+								>
+							</div>
+							<div
+								v-if="scope.row.syncType === 'sync'"
+								class="table-more-btn"
+							>
+								<el-button
+									type="text"
+									class="div-table-button--detail"
+									size="small"
+									@click="handleNoSync(scope.row)"
+									>取消同步</el-button
+								>
+							</div>
+							<div class="table-more-btn">
+								<el-button
+									type="text"
+									class="div-table-button--detail"
+									size="small"
+									@click="handleFinish(scope.row)"
+									>完成情况</el-button
+								>
+							</div>
+
+							<div class="table-more-btn">
+								<el-button
+									type="text"
+									class="div-table-button--detail"
+									size="small"
+									@click="handleScore(scope.row)"
+									>积分记录</el-button
+								>
+							</div>
+							<div class="table-more-btn">
+								<el-button
+									type="text"
+									class="div-table-button--delete"
+									size="small"
+									@click="handleDelete(scope.row)"
+									>删除</el-button
+								>
+							</div>
+
+							<el-button
+								type="text"
+								size="small"
+								class="div-table-button--more"
+								slot="reference"
+								>更多<i class="el-icon-caret-bottom"></i
+							></el-button>
+						</el-popover>
+
+						<el-button
+							v-else
+							type="text"
+							class="div-table-button--detail"
+							size="small"
+							@click="handleScore(scope.row)"
+							>积分记录</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div>
+				<el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page.sync="pageNo"
+					:page-sizes="[10, 20, 50]"
+					:page-size="pageSize"
+					layout="sizes, prev, pager, next, total"
+					:total="total"
+				>
+				</el-pagination>
+			</div>
+		</div>
+
+		<!-- 修改弹出框 -->
+		<el-dialog
+			:visible.sync="formShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="formTitle"
+			:destroy-on-close="true"
+			width="950px"
+			top="5vh"
+			class="dialog-h"
+			@closed="editDiaClose"
+		>
+			<units-form
+				ref="ref_form"
+				:typeList="typeList"
+				@dialogCancle="addFormCancle"
+				@dialogOk="addFormOk"
+			></units-form>
+		</el-dialog>
+
+		<el-dialog
+			:visible.sync="detailShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="'单位详情'"
+			width="950px"
+			top="5vh"
+			class="dialog-h"
+			@closed="diaDetailClose"
+		>
+			<units-detail
+				ref="ref_detail"
+				@diaDetailClose="diaDetailClose"
+			></units-detail>
+		</el-dialog>
+
+		<!-- 完成情况 -->
+		<el-dialog
+			:visible.sync="finishDiaShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="finishDiaTitle"
+			width="950px"
+			top="5vh"
+			class="dialog-h"
+			@closed="diaClose"
+		>
+			<finish-list ref="ref_finish"></finish-list>
+		</el-dialog>
+
+		<!-- 积分记录 -->
+		<el-dialog
+			:visible.sync="scoreDiaShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="scoreDiaTitle"
+			width="1050px"
+			top="5vh"
+			@closed="diaClose"
+		>
+			<score-record
+				ref="ref_score"
+				:serviceType="'party_unit'"
+			></score-record>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-
-import unitsForm from './unitsForm'
-import unitsDetail from './unitsDetail'
-import finishList from './finishList'
-import scoreRecord from '../../../components/scoreRecord.vue'
+import unitsForm from "./unitsForm";
+import unitsDetail from "./unitsDetail";
+import finishList from "./finishList";
+import scoreRecord from "../../../components/scoreRecord.vue";
 
 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服务
 
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
-    return {
-      loading: false,
-      total: 0,
-      pageSize: 10,
-      pageNo: 0,
-      tableLoading: false,
-      agencyId: '',
-
-      unitList: [],//单位list
-      serviceList: [],//服务list
-      typeList: [],//分类list
-      agencyIdArray: [],
-      orgOptions: [],
-      orgOptionProps: {
-        multiple: false,
-        value: 'agencyId',
-        label: 'agencyName',
-        children: 'subAgencyList',
-        checkStrictly: true
-      },
-
-      unitId: '',
-      formData: {
-        agencyId: '',
-        unitName: '',
-        serviceMatter: '',
-        type: '',
-        contact: '',
-        contactMobile: ''
-      },
-
-      tableData: [],
-
-      //form相关
-      formShow: false,
-      formTitle: '新增单位',
-      detailShow: false,
-
-      //完成情况
-      finishDiaTitle: '区域化党建单位完成情况',
-      finishDiaShow: false,
-      //积分记录
-      scoreDiaTitle: '积分记录',
-      scoreDiaShow: false,
-
-      files: "",
-      fileName: "",
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import'
-
-    }
-  },
-  components: {
-    unitsForm, unitsDetail, finishList, scoreRecord
-  },
-  async created () {
-
-  },
-  async mounted () {
-    //获取服务事项
-    await this.loadService()
-    this.getOrgTreeList()
-
-    //获取分类
-    await this.loadType()
-
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
-
-    await this.loadTable()
-  },
-
-  methods: {
-
-    handleChangeAgency (val) {
-      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
-      if (obj) {
-
-        this.formData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-
-      } else {
-        this.formData.agencyId = ''
-
-      }
-
-    },
-
-    getOrgTreeList () {
-      const { user } = this.$store.state
-      this.$http
-        .post('/gov/org/customeragency/my-subagency-list', {})
-        .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('网络错误')
-        })
-    },
-
-
-    handleSearch () {
-      this.loadTable()
-    },
-
-    //获取服务事项下拉框
-    async loadService () {
-      const url = "/heart/serviceitem/dict-list"
-
-
-      let params = {
-        // parentCategoryCode: '1010'
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.serviceList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    //获取分类
-    async loadType () {
-      const url = "/sys/dict/data/dictlist"
-
-      let params = {
-        dictType: 'party_unit_type'
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.typeList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    async loadTable () {
-      this.tableLoading = true
-
-      const url = "/heart/icpartyunit/list"
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
-      let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-        agencyId: this.agencyId,
-        ...this.formData
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.total = data.total
-        data.list.forEach(element => {
-          if (element.serviceMatterList.length > 0) {
-            element.serviceMatterListShow = element.serviceMatterList.join(',')
-          } else {
-            element.serviceMatterListShow = ''
-          }
-
-        });
-        this.tableData = data.list
-
-      } else {
-        this.$message.error(msg)
-      }
-      this.tableLoading = false
-    },
-
-    editDiaClose () {
-      this.$refs.ref_form.resetData()
-      this.formShow = false
-    },
-    diaClose () {
-      this.detailShow = false
-      this.finishDiaShow = false
-      this.scoreDiaShow = false
-    },
-    diaDetailClose () {
-      console.log(this.$refs.ref_detail)
-      this.$refs.ref_detail.diaDestroy()
-      this.detailShow = false
-    },
-
-    handleDetail (row) {
-      // this.formTitle = '详情'
-      this.detailShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_detail.initForm(row)
-      })
-    },
-
-    //完成情况
-    handleFinish (row) {
-      this.finishDiaTitle = row.unitName + '完成情况'
-      this.finishDiaShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_finish.initTable(row)
-      })
-    },
-    //积分记录
-    handleScore (row) {
-      this.scoreDiaShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_score.initForm(row.id)
-      })
-    },
-
-    handleAdd () {
-      this.formTitle = '新增'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null)
-      })
-    },
-
-    handleEdit (row) {
-      this.formTitle = '修改'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.id)
-      })
-    },
-
-    addFormCancle () {
-      this.formShow = false
-    },
-    addFormOk () {
-      this.formShow = false
-      this.loadTable()
-
-    },
-
-    async handleSync (row) {
-
-      this.$confirm("确认同步到通讯录？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.syncUnit(row)
-        })
-        .catch(err => {
-          if (err == "cancel") {
-
-          }
-
-        });
-    },
-    async handleNoSync (row) {
-
-      this.$confirm("确认取消同步?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.noSyncUnit(row)
-        })
-        .catch(err => {
-          if (err == "cancel") {
-
-          }
-
-        });
-    },
-
-    async syncUnit (row) {
-      const url = "/gov/org/department/syncdept"
-
-      let params = {
-        id: row.id,
-        deptName: row.unitName,
-        mobile: row.contactMobile,
-        personName: row.contact,
-        deptType: 'party_unit',
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        if (data.type) {
-          this.$message({
-            type: "success",
-            message: data.msg || "同步成功"
-          });
-
-          this.loadTable()
-        } else {
-          this.$message.error(data.msg)
-        }
-
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    async noSyncUnit (row) {
-      const url = "/gov/org/department/notsyncdept"
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
-
-      let params = {
-        id: row.id,
-        deptId: row.deptId,
-        deptStaffId: row.deptStaffId,
-        deptType: 'party_unit',
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        if (data.type) {
-          this.$message({
-            type: "success",
-            message: "取消同步成功"
-          });
-          this.loadTable()
-        } else {
-          this.$message.error(data.msg)
-        }
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    async handleDelete (row) {
-
-      this.$confirm("确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.deleteUnit(row)
-        })
-        .catch(err => {
-          if (err == "cancel") {
-
-          }
-
-        });
-    },
-
-    async deleteUnit (row) {
-      const url = "/heart/icpartyunit/delete"
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
-
-      let params = {
-        id: row.id
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    //重置搜索条件
-    resetSearch () {
-      this.agencyIdArray = []
-      this.formData = {
-        agencyId: '',
-        unitName: '',
-        serviceMatter: '',
-        type: '',
-        contact: '',
-        contactMobile: ''
-      }
-      this.pageSize = 10
-      this.pageNo = 0
-      // this.loadTable()
-    },
-
-    //导出表格
-    async handleExport () {
-      let title = '联建单位列表'
-
-      const url = "/heart/icpartyunit/export"
-      let params = {
-        agencyId: this.agencyId,
-        ...this.formData
-      }
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-
-    },
-
-    // 下载文件
-    download (data, fileName) {
-      if (!data) {
-        return
-      }
-
-      var csvData = new Blob([data])
-
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, fileName);
-      }
-      // for Non-IE (chrome, firefox etc.)
-      else {
-        var a = document.createElement('a');
-        document.body.appendChild(a);
-        a.style = 'display: none';
-        var url = window.URL.createObjectURL(csvData);
-        a.href = url;
-        a.download = fileName;
-        a.click();
-        a.remove();
-        window.URL.revokeObjectURL(url);
-      }
-
-    },
-
-    // 上传文件之前的钩子
-    beforeUpload (file) {
-      this.files = file;
-
-      const isText = file.type === 'application/vnd.ms-excel'
-      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-
-      if (!isText && !isTextComputer) {
-        this.$message.error('请选择正确格式的文件')
-        return false
-      } else {
-        this.fileName = file.name;
-        return true
-      }
-
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
-    },
-
-    async uploadFile () {
-      this.loading = true
-
-      if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
-      }
-
-      //清空上传列表
-      this.$refs['upload'].clearFiles()
-
-      var url = '/heart/icpartyunit/import'
-      let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
-      const { data, code, msg } = await requestPost(url, fileFormData)
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "导入成功"
-        });
-
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-
-
-    },
-
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
-    },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
-    },
-
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  computed: {
-    tableHeight () {
-
-      return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
-
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  watch: {
-
-  },
-  props: {
-
-  }
-}
+	data() {
+		return {
+			loading: false,
+			total: 0,
+			pageSize: 10,
+			pageNo: 0,
+			tableLoading: false,
+			agencyId: "",
+
+			unitList: [], //单位list
+			serviceList: [], //服务list
+			typeList: [], //分类list
+			agencyIdArray: [],
+			orgOptions: [],
+			orgOptionProps: {
+				multiple: false,
+				value: "agencyId",
+				label: "agencyName",
+				children: "subAgencyList",
+				checkStrictly: true,
+			},
+
+			unitId: "",
+			formData: {
+				agencyId: "",
+				unitName: "",
+				serviceMatter: "",
+				type: "",
+				contact: "",
+				contactMobile: "",
+			},
+
+			tableData: [],
+
+			//form相关
+			formShow: false,
+			formTitle: "新增单位",
+			detailShow: false,
+
+			//完成情况
+			finishDiaTitle: "区域化党建单位完成情况",
+			finishDiaShow: false,
+			//积分记录
+			scoreDiaTitle: "积分记录",
+			scoreDiaShow: false,
+
+			files: "",
+			fileName: "",
+			uploadUlr:
+				window.SITE_CONFIG["apiURL"] + "/gov/org/neighborhood/import",
+		};
+	},
+	components: {
+		unitsForm,
+		unitsDetail,
+		finishList,
+		scoreRecord,
+	},
+	async created() {},
+	async mounted() {
+		//获取服务事项
+		await this.loadService();
+		this.getOrgTreeList();
+
+		//获取分类
+		await this.loadType();
+
+		const { user } = this.$store.state;
+		this.agencyId = user.agencyId;
+
+		await this.loadTable();
+	},
+
+	methods: {
+		handleChangeAgency(val) {
+			let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
+			if (obj) {
+				this.formData.agencyId =
+					this.agencyIdArray.length > 0
+						? this.agencyIdArray[this.agencyIdArray.length - 1]
+						: "";
+			} else {
+				this.formData.agencyId = "";
+			}
+		},
+
+		getOrgTreeList() {
+			const { user } = this.$store.state;
+			this.$http
+				.post("/gov/org/customeragency/my-subagency-list", {})
+				.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("网络错误");
+				});
+		},
+
+		handleSearch() {
+			this.loadTable();
+		},
+
+		//获取服务事项下拉框
+		async loadService() {
+			const url = "/heart/serviceitem/dict-list";
+
+			let params = {
+				// parentCategoryCode: '1010'
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.serviceList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		//获取分类
+		async loadType() {
+			const url = "/sys/dict/data/dictlist";
+
+			let params = {
+				dictType: "party_unit_type",
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.typeList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async loadTable() {
+			this.tableLoading = true;
+
+			const url = "/heart/icpartyunit/list";
+			// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
+			let params = {
+				pageSize: this.pageSize,
+				pageNo: this.pageNo,
+				agencyId: this.agencyId,
+				...this.formData,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.total = data.total;
+				data.list.forEach((element) => {
+					if (element.serviceMatterList.length > 0) {
+						element.serviceMatterListShow =
+							element.serviceMatterList.join(",");
+					} else {
+						element.serviceMatterListShow = "";
+					}
+				});
+				this.tableData = data.list;
+			} else {
+				this.$message.error(msg);
+			}
+			this.tableLoading = false;
+		},
+
+		editDiaClose() {
+			this.$refs.ref_form.resetData();
+			this.formShow = false;
+		},
+		diaClose() {
+			this.detailShow = false;
+			this.finishDiaShow = false;
+			this.scoreDiaShow = false;
+		},
+		diaDetailClose() {
+			console.log(this.$refs.ref_detail);
+			this.$refs.ref_detail.diaDestroy();
+			this.detailShow = false;
+		},
+
+		handleDetail(row) {
+			// this.formTitle = '详情'
+			this.detailShow = true;
+			this.$nextTick(() => {
+				this.$refs.ref_detail.initForm(row);
+			});
+		},
+
+		//完成情况
+		handleFinish(row) {
+			this.finishDiaTitle = row.unitName + "完成情况";
+			this.finishDiaShow = true;
+			this.$nextTick(() => {
+				this.$refs.ref_finish.initTable(row);
+			});
+		},
+		//积分记录
+		handleScore(row) {
+			this.scoreDiaShow = true;
+			this.$nextTick(() => {
+				this.$refs.ref_score.initForm(row.id);
+			});
+		},
+
+		handleAdd() {
+			this.formTitle = "新增";
+			this.formShow = true;
+			this.$nextTick(() => {
+				this.$refs.ref_form.initForm("add", null);
+			});
+		},
+
+		handleEdit(row) {
+			this.formTitle = "修改";
+			this.formShow = true;
+			this.$nextTick(() => {
+				this.$refs.ref_form.initForm("edit", row.id);
+			});
+		},
+
+		addFormCancle() {
+			this.formShow = false;
+		},
+		addFormOk() {
+			this.formShow = false;
+			this.loadTable();
+		},
+
+		async handleSync(row) {
+			this.$confirm("确认同步到通讯录？", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			})
+				.then(() => {
+					this.syncUnit(row);
+				})
+				.catch((err) => {
+					if (err == "cancel") {
+					}
+				});
+		},
+		async handleNoSync(row) {
+			this.$confirm("确认取消同步?", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			})
+				.then(() => {
+					this.noSyncUnit(row);
+				})
+				.catch((err) => {
+					if (err == "cancel") {
+					}
+				});
+		},
+
+		async syncUnit(row) {
+			const url = "/gov/org/department/syncdept";
+
+			let params = {
+				id: row.id,
+				deptName: row.unitName,
+				mobile: row.contactMobile,
+				personName: row.contact,
+				deptType: "party_unit",
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				if (data.type) {
+					this.$message({
+						type: "success",
+						message: data.msg || "同步成功",
+					});
+
+					this.loadTable();
+				} else {
+					this.$message.error(data.msg);
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async noSyncUnit(row) {
+			const url = "/gov/org/department/notsyncdept";
+			// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
+
+			let params = {
+				id: row.id,
+				deptId: row.deptId,
+				deptStaffId: row.deptStaffId,
+				deptType: "party_unit",
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				if (data.type) {
+					this.$message({
+						type: "success",
+						message: "取消同步成功",
+					});
+					this.loadTable();
+				} else {
+					this.$message.error(data.msg);
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async handleDelete(row) {
+			this.$confirm("确认删除?", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			})
+				.then(() => {
+					this.deleteUnit(row);
+				})
+				.catch((err) => {
+					if (err == "cancel") {
+					}
+				});
+		},
+
+		async deleteUnit(row) {
+			const url = "/heart/icpartyunit/delete";
+			// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
+
+			let params = {
+				id: row.id,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "删除成功",
+				});
+
+				this.loadTable();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		//重置搜索条件
+		resetSearch() {
+			this.agencyIdArray = [];
+			this.formData = {
+				agencyId: "",
+				unitName: "",
+				serviceMatter: "",
+				type: "",
+				contact: "",
+				contactMobile: "",
+			};
+			this.pageSize = 10;
+			this.pageNo = 0;
+			// this.loadTable()
+		},
+
+		//导出表格
+		async handleExport() {
+			let title = "联建单位列表";
+
+			const url = "/heart/icpartyunit/export";
+			let params = {
+				agencyId: this.agencyId,
+				...this.formData,
+			};
+
+			app.ajax.exportFilePost(
+				url,
+				params,
+				(data, rspMsg) => {
+					this.download(data, title + ".xls");
+				},
+				(rspMsg, data) => {
+					this.$message.error(rspMsg);
+				}
+			);
+		},
+
+		// 下载文件
+		download(data, fileName) {
+			if (!data) {
+				return;
+			}
+
+			var csvData = new Blob([data]);
+
+			if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+				window.navigator.msSaveOrOpenBlob(csvData, fileName);
+			}
+			// for Non-IE (chrome, firefox etc.)
+			else {
+				var a = document.createElement("a");
+				document.body.appendChild(a);
+				a.style = "display: none";
+				var url = window.URL.createObjectURL(csvData);
+				a.href = url;
+				a.download = fileName;
+				a.click();
+				a.remove();
+				window.URL.revokeObjectURL(url);
+			}
+		},
+
+		async handleExportModule() {
+			let url = "/heart/icpartyunit/import-template-download";
+
+			let params = {};
+			await this.$http({
+				method: "POST",
+				url,
+				responseType: "blob",
+				data: params,
+			})
+				.then((res) => {
+					console.log("res-------dd", res);
+					if (res.headers["content-disposition"]) {
+						let fileName = window.decodeURI(
+							res.headers["content-disposition"]
+								.split(";")[1]
+								.split("=")[1]
+						);
+						this.download(res.data, fileName);
+					} else this.$message.error("下载失败");
+				})
+				.catch((err) => {
+					console.log("err", err);
+					return this.$message.error("网络错误");
+				});
+		},
+
+		// 上传文件之前的钩子
+		beforeUpload(file) {
+			this.files = file;
+
+			const isText = file.type === "application/vnd.ms-excel";
+			const isTextComputer =
+				file.type ===
+				"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+
+			if (!isText && !isTextComputer) {
+				this.$message.error("请选择正确格式的文件");
+				return false;
+			} else {
+				this.fileName = file.name;
+				return true;
+			}
+		},
+		// 上传文件个数超过定义的数量
+		handleExceed(files, fileList) {
+			this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
+		},
+
+		async uploadFile() {
+			this.loading = true;
+
+			if (this.fileName == "") {
+				this.$message.warning("请选择要上传的文件！");
+				return false;
+			}
+
+			//清空上传列表
+			this.$refs["upload"].clearFiles();
+
+			var url = "/heart/icpartyunit/import";
+			let fileFormData = new FormData();
+			fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+			const { data, code, msg } = await requestPost(url, fileFormData);
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "导入成功",
+				});
+
+				this.loadTable();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		handleSizeChange(val) {
+			this.pageSize = val;
+			this.pageNo = 1;
+			this.loadTable();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.loadTable();
+		},
+
+		// 开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: "正在加载……", // 加载中需要显示的文字
+				background: "rgba(0,0,0,.7)", // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		},
+	},
+	computed: {
+		tableHeight() {
+			return this.$store.state.inIframe
+				? this.clientHeight - 430 + this.iframeHeight
+				: this.clientHeight - 430;
+		},
+
+		...mapGetters(["clientHeight", "iframeHeight"]),
+	},
+	watch: {},
+	props: {},
+};
 </script>
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 .div_main {
-  width: 100%;
+	width: 100%;
 }
 
 .div_search {
-  background: #ffffff;
-  border-radius: 4px;
-  padding: 30px 20px 5px;
-  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+	background: #ffffff;
+	border-radius: 4px;
+	padding: 30px 20px 5px;
+	box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
 }
 
 .item_width_1 {
-  width: 260px;
+	width: 260px;
 }
 .item_width_2 {
-  width: 620px;
+	width: 620px;
 }
 
 .div_table {
-  background: #ffffff;
-  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-  border-radius: 4px;
-  margin-top: 15px;
-  padding: 23px 30px 10px;
-
-  .table {
-    margin-top: 20px;
-  }
+	background: #ffffff;
+	box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+	border-radius: 4px;
+	margin-top: 15px;
+	padding: 23px 30px 10px;
+
+	.table {
+		margin-top: 20px;
+	}
 }
 
 .el-row {
-  /* margin-bottom: 20px; */
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 10px;
-  margin-right: 50px;
+	/* margin-bottom: 20px; */
+	display: flex;
+	flex-wrap: wrap;
+	margin-top: 10px;
+	margin-right: 50px;
+}
+
+.resi-row-btn {
+	display: flex;
+	margin-bottom: 13px;
+	::v-deep .el-button {
+		// margin-left: 10px;
+		border: 0;
+	}
+	::v-deep .el-select {
+		margin-right: 10px;
+	}
+	.el-button--success {
+		background: rgba(34, 193, 195, 1);
+	}
+	.el-button {
+		margin-left: 10px;
+		border: 0;
+	}
+	.el-button--success {
+		background: rgba(34, 193, 195, 1);
+	}
+	.el-button--warning {
+		background: rgba(254, 179, 73, 1);
+	}
+	.el-button--danger {
+		background: rgba(254, 98, 82, 1);
+	}
 }
 </style>

From 318433514910b735e6fcbe4e9c2ac7bfe4b96104 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 21 Feb 2023 16:06:57 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 5705 +++++++++--------
 1 file changed, 3051 insertions(+), 2654 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index ba413d9eb..ae8dc9fef 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,895 +1,1203 @@
 <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="departmentTypeShow"
-                       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)">进入</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">
-        <template slot-scope="scope">
-          <span>{{scope.row.name}}</span>
-          <el-tag v-if="scope.row.enableFlag==='disabled'"
-                  type="danger"
-                  style="margin-left:10px"
-                  size="mini"
-                  disable-transitions>{{ '已禁用' }}</el-tag>
-        </template>
-      </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 v-if="scope.row.enableFlag==='enable'"
-                     size="mini"
-                     type="danger"
-                     icon="el-icon-circle-close"
-                     @click="DisablePeo(scope.row)">禁用</el-button>
-          <el-button v-if="scope.row.enableFlag==='disabled'"
-                     size="mini"
-                     type="danger"
-                     icon="el-icon-circle-close"
-                     @click="enablestaff(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 v-if="selDeptType === 'duty'"
-                     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 v-if="selDeptType === 'duty'"
-                     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="850"
-               :before-close="handleClose">
-      <el-form label-width="120px"
-               :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="850"
-                 :before-close="handleClose">
-        <el-form label-width="120px"
-                 :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 label="坐标">
-            <div id="con"></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>
-
-    <!-- 新增人员 -->
-    <div v-if="dialogVisiblePeo">
-      <el-dialog title="新增人员"
-                 :visible.sync="dialogVisiblePeo"
-                 width="850"
-                 :before-close="handleClose">
-        <el-form :model="peoForm"
-                 label-width="120px"
-                 ref="addPeoForm"
-                 :rules="rulesPeo">
-          <el-form-item label="姓名"
-                        prop="name">
-            <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>
-      </el-dialog>
-    </div>
-
-    <!-- 人员修改 -->
-    <el-dialog v-if="modifyPeo"
-               title="人员修改"
-               :visible.sync="modifyPeo"
-               width="850"
-               :before-close="handleClose">
-      <el-form :model="peoForm"
-               label-width="120px"
-               ref="editPeoForm"
-               :rules="rulesPeo">
-        <el-form-item label="姓名"
-                      prop="name">
-          <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 v-if="Disable"
-               title="确认禁用"
-               :visible.sync="Disable"
-               width="850"
-               :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 v-if="details"
-               title="人员详情"
-               :visible.sync="details"
-               width="850"
-               :before-close="handleClosePeoView">
-      <el-form label-width="120px">
-        <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 v-if="transferPeo"
-               title="人员调动"
-               :visible.sync="transferPeo"
-               width="850"
-               :before-close="handleClose">
-      <el-form label-width="120px"
-               :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, multiple: false }"
-                       v-model="selectValue"
-                       :options="options"
-                       style="width: 100%"
-                       @change="handleChangeTransferCascader">
-            <template slot-scope="{ data }">
-              <span>{{ data.label }}</span>
-              <span v-if="data.type != 'agency'"
-                    style="color: #aaa; font-size: 12px">（{{ data.typeName }}）
-              </span>
-            </template>
-          </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 v-if="createAgencyDialogFlag"
-               title="新增组织"
-               :visible.sync="createAgencyDialogFlag"
-               width="850"
-               :before-close="handleClose">
-      <el-form label-width="120px">
-        <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 label="组织简介">
-          <el-input v-model="agencyForm.remark"
-          type="textarea" rows=3  maxlength="500" show-word-limit placeholder="请输入组织简介"></el-input>
-        </el-form-item>
-        <el-form-item label="坐标">
-          <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 v-if="modifyCityOrgPop"
-               title="修改组织"
-               :visible.sync="modifyCityOrgPop"
-               width="850"
-               :before-close="handleClose">
-      <el-form label-width="120px">
-        <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 label="组织简介">
-          <el-input
-          type="textarea"
-          v-model="OrgDetailsForm.remark"
-          placeholder="请输入内容"
-          resize="none"
-          rows=3
-      maxlength="500"
-          show-word-limit
-        >
-        </el-input>
-        </el-form-item>
-        <el-form-item label="坐标">
-          <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 v-if="streetOrCommunity"
-               title="修改组织"
-               :visible.sync="streetOrCommunity"
-               width="850"
-               :before-close="handleClose">
-      <el-form label-width="120px">
-        <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
-          type="textarea"
-          v-model="OrgDetailsForm.remark"
-          placeholder="请输入内容"
-          show-word-limit  
-          maxlength="500"
-          resize="none"
-          rows=3
-        >
-        </el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model="OrgDetailsForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-        <el-form-item label="坐标">
-          <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 v-if="OrgUnitPop"
-               title="修改部门"
-               :visible.sync="OrgUnitPop"
-               width="850"
-               :before-close="handleClose">
-      <el-form label-width="120px">
-        <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="联系电话1">
-          <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 v-if="modifyGridPop"
-               title="修改网格"
-               :visible.sync="modifyGridPop"
-               width="850"
-               :before-close="handleClose">
-      <el-form label-width="120px">
-        <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-number v-model="modifyGridFrom.gridSort"
-                           :min="1"
-                           label="排序"></el-input-number>
-        </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 label="坐标">
-          <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>
+	<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="departmentTypeShow"
+				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)"
+						>进入</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="cleanAgencyStaffTableListData"
+			style="width: 100%"
+			height="350"
+		>
+			<el-table-column prop="name" label="本级工作人员名字" width="260">
+				<template slot-scope="scope">
+					<span>{{ scope.row.name }}</span>
+					<el-tag
+						v-if="scope.row.enableFlag === 'disabled'"
+						type="danger"
+						style="margin-left: 10px"
+						size="mini"
+						disable-transitions
+						>{{ "已禁用" }}</el-tag
+					>
+				</template>
+			</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-input
+						placeholder="请输入内容"
+						v-model="searchStaffKeyword"
+						style="width: 400px; margin-right: 10px"
+						@input="handleSearchStaff"
+						class="input-with-select"
+					>
+						<el-button
+							@click.stop="handleSearchStaff"
+							slot="append"
+							icon="el-icon-search"
+						></el-button>
+					</el-input>
+
+					<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
+						v-if="scope.row.enableFlag === 'enable'"
+						size="mini"
+						type="danger"
+						icon="el-icon-circle-close"
+						@click="DisablePeo(scope.row)"
+						>禁用/删除</el-button
+					>
+					<el-button
+						v-if="scope.row.enableFlag === 'disabled'"
+						size="mini"
+						type="danger"
+						icon="el-icon-circle-close"
+						@click="enablestaff(scope.row)"
+						>解禁</el-button
+					>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<!-- 下级机关单位/基层科室工作人员 -->
+		<el-table
+			height="350"
+			v-show="departmentStaffTableFlag"
+			:data="cleanDepartmentStaffTableListData"
+			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-input
+						placeholder="请输入内容"
+						v-model="searchDeptStaffKeyword"
+						style="width: 400px; margin-right: 10px"
+						@input="handleSearchDeptStaff"
+						class="input-with-select"
+					>
+						<el-button
+							@click.stop="handleSearchDeptStaff"
+							slot="append"
+							icon="el-icon-search"
+						></el-button>
+					</el-input>
+
+					<el-button
+						v-if="selDeptType === 'duty'"
+						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
+						v-if="selDeptType === 'duty'"
+						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="cleanGridStaffTableListData"
+			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-input
+						placeholder="请输入内容"
+						v-model="searchGridStaffKeyword"
+						style="width: 400px; margin-right: 10px"
+						@input="handleSearchGridStaff"
+						class="input-with-select"
+					>
+						<el-button
+							@click.stop="handleSearchGridStaff"
+							slot="append"
+							icon="el-icon-search"
+						></el-button>
+					</el-input>
+
+					<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="850"
+			:before-close="handleClose"
+		>
+			<el-form label-width="120px" :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="850"
+				:before-close="handleClose"
+			>
+				<el-form label-width="120px" :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 label="坐标">
+						<div id="con"></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>
+
+		<!-- 新增人员 -->
+		<div v-if="dialogVisiblePeo">
+			<el-dialog
+				title="新增人员"
+				:visible.sync="dialogVisiblePeo"
+				width="850"
+				:before-close="handleClose"
+			>
+				<el-form
+					:model="peoForm"
+					label-width="120px"
+					ref="addPeoForm"
+					:rules="rulesPeo"
+				>
+					<el-form-item label="姓名" prop="name">
+						<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>
+			</el-dialog>
+		</div>
+
+		<!-- 人员修改 -->
+		<el-dialog
+			v-if="modifyPeo"
+			title="人员修改"
+			:visible.sync="modifyPeo"
+			width="850"
+			:before-close="handleClose"
+		>
+			<el-form
+				:model="peoForm"
+				label-width="120px"
+				ref="editPeoForm"
+				:rules="rulesPeo"
+			>
+				<el-form-item label="姓名" prop="name">
+					<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
+			v-if="Disable"
+			title="确认禁用"
+			:visible.sync="Disable"
+			width="850"
+			: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
+			v-if="details"
+			title="人员详情"
+			:visible.sync="details"
+			width="850"
+			:before-close="handleClosePeoView"
+		>
+			<el-form label-width="120px">
+				<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
+			v-if="transferPeo"
+			title="人员调动"
+			:visible.sync="transferPeo"
+			width="850"
+			:before-close="handleClose"
+		>
+			<el-form label-width="120px" :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, multiple: false }"
+						v-model="selectValue"
+						:options="options"
+						style="width: 100%"
+						@change="handleChangeTransferCascader"
+					>
+						<template slot-scope="{ data }">
+							<span>{{ data.label }}</span>
+							<span
+								v-if="data.type != 'agency'"
+								style="color: #aaa; font-size: 12px"
+								>（{{ data.typeName }}）
+							</span>
+						</template>
+					</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
+			v-if="createAgencyDialogFlag"
+			title="新增组织"
+			:visible.sync="createAgencyDialogFlag"
+			width="850"
+			:before-close="handleClose"
+		>
+			<el-form label-width="120px">
+				<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 label="组织简介">
+					<el-input
+						v-model="agencyForm.remark"
+						type="textarea"
+						rows="3"
+						maxlength="500"
+						show-word-limit
+						placeholder="请输入组织简介"
+					></el-input>
+				</el-form-item>
+				<el-form-item label="坐标">
+					<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
+			v-if="modifyCityOrgPop"
+			title="修改组织"
+			:visible.sync="modifyCityOrgPop"
+			width="850"
+			:before-close="handleClose"
+		>
+			<el-form label-width="120px">
+				<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 label="组织简介">
+					<el-input
+						type="textarea"
+						v-model="OrgDetailsForm.remark"
+						placeholder="请输入内容"
+						resize="none"
+						rows="3"
+						maxlength="500"
+						show-word-limit
+					>
+					</el-input>
+				</el-form-item>
+				<el-form-item label="坐标">
+					<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
+			v-if="streetOrCommunity"
+			title="修改组织"
+			:visible.sync="streetOrCommunity"
+			width="850"
+			:before-close="handleClose"
+		>
+			<el-form label-width="120px">
+				<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
+						type="textarea"
+						v-model="OrgDetailsForm.remark"
+						placeholder="请输入内容"
+						show-word-limit
+						maxlength="500"
+						resize="none"
+						rows="3"
+					>
+					</el-input>
+				</el-form-item>
+				<el-form-item label="联系电话">
+					<el-input
+						v-model="OrgDetailsForm.mobile"
+						placeholder="请输入联系电话"
+					></el-input>
+				</el-form-item>
+				<el-form-item label="坐标">
+					<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
+			v-if="OrgUnitPop"
+			title="修改部门"
+			:visible.sync="OrgUnitPop"
+			width="850"
+			:before-close="handleClose"
+		>
+			<el-form label-width="120px">
+				<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="联系电话1">
+					<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
+			v-if="modifyGridPop"
+			title="修改网格"
+			:visible.sync="modifyGridPop"
+			width="850"
+			:before-close="handleClose"
+		>
+			<el-form label-width="120px">
+				<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-number
+						v-model="modifyGridFrom.gridSort"
+						:min="1"
+						label="排序"
+					></el-input-number>
+				</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 label="坐标">
+					<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>
@@ -897,1380 +1205,1468 @@ import { requestPost, requestGet } from "@/js/dai/request";
 import daiMap from "@/utils/dai-map";
 
 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: "",
-      currentAreaCodeSwitch: "",
-      parentAreaCode: "",
-      parentAgencyId: localStorage.getItem("agencyId"),
-      parentAgencyLevel: localStorage.getItem("level"),
-
-      // 经纬度坐标
-      lat: "",
-      lng: "",
-      latitude: "",
-      longitude: "",
-      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: "", //经度
-        latitude: "", //纬度
-        centerAddress: "",
-      },
-      // 新增组织
-      agencyForm: {
-        parentAgencyId: "",
-        agencyName: "",
-        level: "",
-        areaCodeSwitch: "",
-        areaCode: "",
-        areaName: "",
-        contacts: "",
-        mobile: "",
-        remark:"",
-        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: "",
-        remark:""
-      },
-      // 下级机关单位
-      OrgUnitDetailsForm: {
-        code: "",
-        contacts: "",
-        departmentId: "",
-        departmentName: "",
-        mobile: "",
-      },
-      // 网格修改表单
-      modifyGridFrom: {
-        gridName: "",
-        code: "",
-        gridTypeName: "",
-        contacts: "",
-        mobile: "",
-        latitude: "",
-        longitude: "",
-        agencyId: "",
-        gridType: "",
-        manageDistrict: "",
-        griId: "",
-        // 排序
-        gridSort: 0,
-      },
-      judgeOrgInfoLevel: [],
-      keyWords: "",
-      typeList: [],
-      // 性别字典
-      genderList: [
-        { value: 1, label: "男" },
-        { value: 2, label: "女" },
-        { value: 0, label: "未知" },
-      ],
-      // 专兼职字典
-      postList: [
-        { value: "fulltime", label: "专职" },
-        { value: "parttime", label: "兼职" },
-      ],
-      // 职责字典
-      dutyList: [],
-      // 修改操作是否展示
-      modifyPeo: false,
-
-      roleList: [],
-
-      // 级联数据
-      options: [],
-      selectValue: [],
-      // 顶部 面包屑
-      breadcrumbArr: [],
-      // 面包屑 当前所属机构ID
-      currentBreadcrumbKey: "",
-      // 组织区划数据
-      zonings: [],
-      // 校验
-      rules: {
-        departmentName: [
-          { required: true, message: "社区名称必填", trigger: "blur" },
-        ],
-        gridName: [
-          { required: true, message: "网格名称必填", trigger: "blur" },
-        ],
-        addDepartmentName: [
-          { required: true, message: "部门名称必填", trigger: "blur" },
-        ],
-      },
-
-      rulesPeo: {
-        name: [{ required: true, message: "姓名必填", trigger: "blur" }],
-        mobile: [{ required: true, message: "手机号必填", trigger: "blur" }],
-        gender: [{ required: true, message: "性别必填", trigger: "blur" }],
-        post: [{ required: true, message: "专兼职必填", trigger: "blur" }],
-        duty: [{ required: true, message: "职责必填", trigger: "blur" }],
-        newRoles: [{ required: true, message: "角色必填", trigger: "blur" }],
-      },
-
-      selDeptType: "",
-    };
-  },
-  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(() => {
-          this.createMap();
-        }, 1000);
-      }
-    },
-    createAgencyDialogFlag (val) {
-      if (val) {
-        setTimeout(() => {
-          this.createMap();
-        }, 1000);
-      }
-    },
-    modifyCityOrgPop (val) {
-      if (val) {
-        setTimeout(() => {
-          this.createMap();
-        }, 1000);
-      }
-    },
-    streetOrCommunity (val) {
-      if (val) {
-        setTimeout(() => {
-          this.createMap();
-        }, 1000);
-      }
-    },
-    modifyGridPop (val) {
-      if (val) {
-        setTimeout(() => {
-          this.createMap();
-        }, 1000);
-      }
-    },
-  },
-  mounted () {
-    // this.initMap()
-  },
-  methods: {
-    // 点击后获取id
-    handleChangeTransferCascader (e) {
-      console.log("*********************");
-      function findItem (valueArr, coll) {
-        console.log("--------------------");
-        console.log(valueArr);
-        let copyArr = [...valueArr];
-        let firstValue = copyArr.shift();
-        let item = coll.find((a) => a.value == firstValue);
-        console.log(item);
-        if (copyArr.length > 0) {
-          return findItem(copyArr, item.children);
-        } else {
-          return item;
-        }
-      }
-      let item = findItem(e, this.options);
-      this.transferForm.orgId = item.value;
-      this.transferForm.orgType = item.type;
-    },
-    /** 查询系统工作人员角色（职责） */
-    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;
-
-      const url = "/gov/access/govrole/list";
-
-      let params = {};
-
-      const { data, code, msg } = await requestGet(url, params);
-
-      if (code === 0) {
-        this.roleList = data;
-      } 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";
-
-      let params = {
-        agencyId: this.currentAgencyId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.departmentTableListData = data;
-
-        this.departmentTableListData.forEach((element) => {
-          if (element.deptType === "duty") {
-            element.departmentTypeShow = "职能部门";
-          } else if (element.deptType === "party_unit") {
-            element.departmentTypeShow = "联建单位";
-          } else if (element.deptType === "community_org") {
-            element.departmentTypeShow = "社会自组织";
-          } else {
-            element.departmentTypeShow = "";
-          }
-        });
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    /** 查询网格列表 */
-    async getGridList () {
-      const url = "/gov/org/grid/allgrids";
-
-      let params = {
-        agencyId: this.currentAgencyId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.gridTableListData = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    // 查询网格人员列表
-    async getGridStaffListData () {
-      const url = "/data/aggregator/org/stafflist";
-
-      let params = {
-        orgId: this.currentGridOrgId,
-        orgType: "grid",
-        pageNo: 1,
-        pageSize: 100,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      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);
-      }
-    },
-
-    // 查询部门人员
-    async getDepartmentStaffListData () {
-      const url = "/data/aggregator/org/stafflist";
-
-      let params = {
-        orgId: this.currentDepartmentId,
-        orgType: "dept",
-        pageNo: 1,
-        pageSize: 100,
-      };
-
-      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();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    async submitPeo () {
-      this.$refs["addPeoForm"].validate((valid, err) => {
-        if (valid) {
-          this.submitPeoDo();
-        } else {
-          app.util.validateRule(err);
-          return console.log("error submit!!", valid, err);
-        }
-      });
-    },
-
-    // 添加人员
-    async submitPeoDo () {
-      const url = "/gov/org/staff/addstaffv2";
-      const {
-        peoForm: { orgType },
-      } = this;
-      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:
-          orgType == "agency"
-            ? this.currentAgencyId
-            : orgType == "dept"
-              ? this.currentDepartmentId
-              : this.currentGridOrgId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message.success("添加成功");
-        this.dialogVisiblePeo = false;
-        this.peoForm = [];
-        this.getAgencyList();
-        this.getDepartmentList();
-        this.getGridList();
-        this.getAgencyStaffListData();
-        this.insertFormRest();
-        if (orgType == "dept") {
-          this.getDepartmentStaffListData();
-        } else if (orgType == "grid") {
-          this.getGridStaffListData();
-        } else {
-          this.getAgencyStaffListData();
-        }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    async updatePeo () {
-      this.$refs["editPeoForm"].validate((valid, err) => {
-        if (valid) {
-          this.updatePeoDo();
-        } else {
-          app.util.validateRule(err);
-          return console.log("error updatePeo!!", valid, err);
-        }
-      });
-    },
-    // 人员修改
-    async updatePeoDo () {
-      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,
-        gender: this.peoForm.gender,
-        workType: this.peoForm.post,
-        roles: this.peoForm.duty,
-        newRoles: this.peoForm.newRoles,
-        agencyId: this.currentAgencyId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message.success("修改成功");
-        this.modifyPeo = false;
-
-        this.getAgencyList();
-        this.getDepartmentList();
-        this.getGridList();
-        this.getAgencyStaffListData();
-        this.getDepartmentStaffListData();
-        this.getGridStaffListData();
-        this.insertFormRest();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    // 字典
-    async getDictionaries () {
-      const url = "/sys/dict/data/dictlist";
-
-      let params = {
-        dictType: "grid_type",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.typeList = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    /** 搜索按钮操作 */
-    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 = [];
-    },
-    // 人员调动
-    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.agencyForm.remark = ""),
-        (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) {
-      console.log(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 (row) {
-      console.log(row);
-      this.gridStaffTableListData = [];
-      this.departmentStaffTableListData = [];
-      this.agencyStaffTableListData = [];
-      this.currentDepartmentId = row.departmentId;
-      this.departmentStaffTableFlag = true;
-      this.currentAgencyStaffTableFlag = false;
-      this.gridStaffTableFlag = false;
-      this.gridTableFlag = false;
-      this.agencyTableFlag = false;
-      this.departmentTableFlag = false;
-
-      this.selDeptType = row.deptType;
-      this.getDepartmentStaffListData();
-      this.assembleBreadcrumbArr(row.departmentId, "department");
-    },
-
-    // 进入组织，重新渲染
-    entryAgency (agencyId) {
-      this.currentAgencyId = agencyId;
-
-      this.agencyTableListData = [];
-      this.departmentTableListData = [];
-      this.gridTableListData = [];
-      this.gridStaffTableListData = [];
-      this.agencyStaffTableListData = [];
-      this.departmentStaffTableListData = [];
-
-      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;
-    },
-
-    // 新增人员
-    addPeo (row) {
-      this.dialogVisiblePeo = true;
-      this.peoForm.orgType = "agency";
-    },
-
-    // 新增社区人员
-    addCommunityPeo () {
-      this.dialogVisiblePeo = true;
-      this.peoForm.orgType = "dept";
-    },
-
-    // 新增网格人员
-    addGridPeo () {
-      this.dialogVisiblePeo = true;
-      this.peoForm.orgType = "grid";
-    },
-    // 修改网格人员
-    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.gender = data.gender;
-        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 ? '男' : '女'
-        this.peoForm.gender = data.gender;
-        // 已有的权限（职责）
-        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 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.gender = data.gender;
-        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);
-      }
-    },
-    // 取消禁用按钮
-    cancelDisable () {
-      this.Disable = false;
-    },
-    // 人员禁用
-    DisablePeo (row) {
-      this.DisableForm.staffId = row.staffId;
-      this.Disable = true;
-    },
-    enablestaff (row) {
-      this.$confirm("确认解禁该员工?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.submitEnable(row)
-        })
-        .catch(err => {
-          if (err == "cancel") {
-            // this.$message({
-            //   type: "info",
-            //   message: "已取消删除"
-            // });
-          }
-
-        });
-    },
-    // 确定解禁
-    async submitEnable (row) {
-      const url = "/epmetuser/customerstaff/enablestaff";
-
-      let params = {
-        staffId: row.staffId,
-
-      };
-
-      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 submitDisable () {
-      const url = "/epmetuser/customerstaff/disabledstaff";
-
-      let params = {
-        staffId: this.DisableForm.staffId,
-        agencyId: this.DisableForm.agencyId,
-        customerId: this.DisableForm.customerId,
-      };
-
-      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;
-    },
-
-    // 人员调动
-    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) {
-        function computeOption (opt) {
-          return {
-            label: opt.agencyName,
-            value: opt.agencyId,
-            type: "agency",
-            children: [
-              ...(opt.departmentList || []).map((item) => ({
-                label: item.deptName,
-                value: item.deptId,
-                type: "dept",
-                typeName: "部门",
-              })),
-              ...(opt.gridList || []).map((item) => ({
-                label: item.gridName,
-                value: item.gridId,
-                type: "grid",
-                typeName: "网格",
-              })),
-              ...(opt.subAgencyList || []).map((item) => computeOption(item)),
-            ],
-          };
-        }
-        if (data) {
-          this.options = [computeOption(data)];
-          console.log("树树树树树树树树树树", this.options[0]);
-        }
-      } else {
-        this.$message.error("树查询失败", msg);
-      }
-    },
-    // 人员调动确定
-    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();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    // 获取导航
-    // 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) {
-          // 社区级为最低级组织，不展示下级组织列表
-          this.currentAgencyLevel = data.level;
-          this.currentAreaCode = data.areaCode;
-          this.currentAreaCodeSwitch = data.areaCodeSwitch;
-          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 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);
-        }
-      }
-    },
-
-    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') {
+	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: "",
+			currentAreaCodeSwitch: "",
+			parentAreaCode: "",
+			parentAgencyId: localStorage.getItem("agencyId"),
+			parentAgencyLevel: localStorage.getItem("level"),
+
+			// 经纬度坐标
+			lat: "",
+			lng: "",
+			latitude: "",
+			longitude: "",
+			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: "", //经度
+				latitude: "", //纬度
+				centerAddress: "",
+			},
+			// 新增组织
+			agencyForm: {
+				parentAgencyId: "",
+				agencyName: "",
+				level: "",
+				areaCodeSwitch: "",
+				areaCode: "",
+				areaName: "",
+				contacts: "",
+				mobile: "",
+				remark: "",
+				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: "",
+				remark: "",
+			},
+			// 下级机关单位
+			OrgUnitDetailsForm: {
+				code: "",
+				contacts: "",
+				departmentId: "",
+				departmentName: "",
+				mobile: "",
+			},
+			// 网格修改表单
+			modifyGridFrom: {
+				gridName: "",
+				code: "",
+				gridTypeName: "",
+				contacts: "",
+				mobile: "",
+				latitude: "",
+				longitude: "",
+				agencyId: "",
+				gridType: "",
+				manageDistrict: "",
+				griId: "",
+				// 排序
+				gridSort: 0,
+			},
+			judgeOrgInfoLevel: [],
+			keyWords: "",
+			typeList: [],
+			// 性别字典
+			genderList: [
+				{ value: 1, label: "男" },
+				{ value: 2, label: "女" },
+				{ value: 0, label: "未知" },
+			],
+			// 专兼职字典
+			postList: [
+				{ value: "fulltime", label: "专职" },
+				{ value: "parttime", label: "兼职" },
+			],
+			// 职责字典
+			dutyList: [],
+			// 修改操作是否展示
+			modifyPeo: false,
+
+			roleList: [],
+
+			// 级联数据
+			options: [],
+			selectValue: [],
+			// 顶部 面包屑
+			breadcrumbArr: [],
+			// 面包屑 当前所属机构ID
+			currentBreadcrumbKey: "",
+			// 组织区划数据
+			zonings: [],
+			// 校验
+			rules: {
+				departmentName: [
+					{
+						required: true,
+						message: "社区名称必填",
+						trigger: "blur",
+					},
+				],
+				gridName: [
+					{
+						required: true,
+						message: "网格名称必填",
+						trigger: "blur",
+					},
+				],
+				addDepartmentName: [
+					{
+						required: true,
+						message: "部门名称必填",
+						trigger: "blur",
+					},
+				],
+			},
+
+			rulesPeo: {
+				name: [
+					{ required: true, message: "姓名必填", trigger: "blur" },
+				],
+				mobile: [
+					{ required: true, message: "手机号必填", trigger: "blur" },
+				],
+				gender: [
+					{ required: true, message: "性别必填", trigger: "blur" },
+				],
+				post: [
+					{ required: true, message: "专兼职必填", trigger: "blur" },
+				],
+				duty: [
+					{ required: true, message: "职责必填", trigger: "blur" },
+				],
+				newRoles: [
+					{ required: true, message: "角色必填", trigger: "blur" },
+				],
+			},
+
+			selDeptType: "",
+
+			searchStaffKeyword: "",
+			searchGridStaffKeyword: "",
+			searchDeptStaffKeyword: "",
+		};
+	},
+	watch: {
+		dialogVisibleGrid(val) {
+			if (val) {
+				setTimeout(() => {
+					this.createMap();
+				}, 1000);
+			}
+		},
+		createAgencyDialogFlag(val) {
+			if (val) {
+				setTimeout(() => {
+					this.createMap();
+				}, 1000);
+			}
+		},
+		modifyCityOrgPop(val) {
+			if (val) {
+				setTimeout(() => {
+					this.createMap();
+				}, 1000);
+			}
+		},
+		streetOrCommunity(val) {
+			if (val) {
+				setTimeout(() => {
+					this.createMap();
+				}, 1000);
+			}
+		},
+		modifyGridPop(val) {
+			if (val) {
+				setTimeout(() => {
+					this.createMap();
+				}, 1000);
+			}
+		},
+	},
+	computed: {
+		cleanAgencyStaffTableListData() {
+			return this.agencyStaffTableListData.filter((item) => !item.hidden);
+		},
+		cleanGridStaffTableListData() {
+			return this.gridStaffTableListData.filter((item) => !item.hidden);
+		},
+		cleanDepartmentStaffTableListData() {
+			return this.departmentStaffTableListData.filter(
+				(item) => !item.hidden
+			);
+		},
+	},
+	mounted() {
+		this.getAgencyList();
+		this.getDepartmentList();
+		this.getGridList();
+		this.getAgencyStaffListData();
+		this.getDutyList();
+		this.getRoleList();
+		// this.getNavigation()
+		// 更新顶部面包屑
+		this.assembleBreadcrumbArr(localStorage.getItem("agencyId"), "agency");
+		// this.initMap()
+	},
+	methods: {
+		handleSearchStaff() {
+			const { searchStaffKeyword, agencyStaffTableListData } = this;
+			this.agencyStaffTableListData = agencyStaffTableListData.map(
+				(item) => {
+					return {
+						...item,
+						hidden: !(
+							item.name.indexOf(searchStaffKeyword) != -1 ||
+							item.mobile.indexOf(searchStaffKeyword) != -1
+						),
+					};
+				}
+			);
+		},
+		handleSearchGridStaff() {
+			const { searchGridStaffKeyword, gridStaffTableListData } = this;
+			this.gridStaffTableListData = gridStaffTableListData.map((item) => {
+				return {
+					...item,
+					hidden: !(
+						item.name.indexOf(searchGridStaffKeyword) != -1 ||
+						item.mobile.indexOf(searchGridStaffKeyword) != -1
+					),
+				};
+			});
+		},
+		handleSearchDeptStaff() {
+			const { searchDeptStaffKeyword, departmentStaffTableListData } =
+				this;
+			this.departmentStaffTableListData =
+				departmentStaffTableListData.map((item) => {
+					return {
+						...item,
+						hidden: !(
+							item.name.indexOf(searchDeptStaffKeyword) != -1 ||
+							item.mobile.indexOf(searchDeptStaffKeyword) != -1
+						),
+					};
+				});
+		},
+
+		// 点击后获取id
+		handleChangeTransferCascader(e) {
+			console.log("*********************");
+			function findItem(valueArr, coll) {
+				console.log("--------------------");
+				console.log(valueArr);
+				let copyArr = [...valueArr];
+				let firstValue = copyArr.shift();
+				let item = coll.find((a) => a.value == firstValue);
+				console.log(item);
+				if (copyArr.length > 0) {
+					return findItem(copyArr, item.children);
+				} else {
+					return item;
+				}
+			}
+			let item = findItem(e, this.options);
+			this.transferForm.orgId = item.value;
+			this.transferForm.orgType = item.type;
+		},
+		/** 查询系统工作人员角色（职责） */
+		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;
+
+			const url = "/gov/access/govrole/list";
+
+			let params = {};
+
+			const { data, code, msg } = await requestGet(url, params);
+
+			if (code === 0) {
+				this.roleList = data;
+			} 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";
+
+			let params = {
+				agencyId: this.currentAgencyId,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.departmentTableListData = data;
+
+				this.departmentTableListData.forEach((element) => {
+					if (element.deptType === "duty") {
+						element.departmentTypeShow = "职能部门";
+					} else if (element.deptType === "party_unit") {
+						element.departmentTypeShow = "联建单位";
+					} else if (element.deptType === "community_org") {
+						element.departmentTypeShow = "社会自组织";
+					} else {
+						element.departmentTypeShow = "";
+					}
+				});
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		/** 查询网格列表 */
+		async getGridList() {
+			const url = "/gov/org/grid/allgrids";
+
+			let params = {
+				agencyId: this.currentAgencyId,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.gridTableListData = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		// 查询网格人员列表
+		async getGridStaffListData() {
+			const url = "/data/aggregator/org/stafflist";
+
+			let params = {
+				orgId: this.currentGridOrgId,
+				orgType: "grid",
+				pageNo: 1,
+				pageSize: 10000,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			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: 10000,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.agencyStaffTableListData = data.staffList;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		// 查询部门人员
+		async getDepartmentStaffListData() {
+			const url = "/data/aggregator/org/stafflist";
+
+			let params = {
+				orgId: this.currentDepartmentId,
+				orgType: "dept",
+				pageNo: 1,
+				pageSize: 10000,
+			};
+
+			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();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async submitPeo() {
+			this.$refs["addPeoForm"].validate((valid, err) => {
+				if (valid) {
+					this.submitPeoDo();
+				} else {
+					app.util.validateRule(err);
+					return console.log("error submit!!", valid, err);
+				}
+			});
+		},
+
+		// 添加人员
+		async submitPeoDo() {
+			const url = "/gov/org/staff/addstaffv2";
+			const {
+				peoForm: { orgType },
+			} = this;
+			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:
+					orgType == "agency"
+						? this.currentAgencyId
+						: orgType == "dept"
+						? this.currentDepartmentId
+						: this.currentGridOrgId,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message.success("添加成功");
+				this.dialogVisiblePeo = false;
+				this.peoForm = [];
+				this.getAgencyList();
+				this.getDepartmentList();
+				this.getGridList();
+				this.getAgencyStaffListData();
+				this.insertFormRest();
+				if (orgType == "dept") {
+					this.getDepartmentStaffListData();
+				} else if (orgType == "grid") {
+					this.getGridStaffListData();
+				} else {
+					this.getAgencyStaffListData();
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async updatePeo() {
+			this.$refs["editPeoForm"].validate((valid, err) => {
+				if (valid) {
+					this.updatePeoDo();
+				} else {
+					app.util.validateRule(err);
+					return console.log("error updatePeo!!", valid, err);
+				}
+			});
+		},
+		// 人员修改
+		async updatePeoDo() {
+			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,
+				gender: this.peoForm.gender,
+				workType: this.peoForm.post,
+				roles: this.peoForm.duty,
+				newRoles: this.peoForm.newRoles,
+				agencyId: this.currentAgencyId,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message.success("修改成功");
+				this.modifyPeo = false;
+
+				this.getAgencyList();
+				this.getDepartmentList();
+				this.getGridList();
+				this.getAgencyStaffListData();
+				this.getDepartmentStaffListData();
+				this.getGridStaffListData();
+				this.insertFormRest();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		// 字典
+		async getDictionaries() {
+			const url = "/sys/dict/data/dictlist";
+
+			let params = {
+				dictType: "grid_type",
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.typeList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		/** 搜索按钮操作 */
+		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 = [];
+		},
+		// 人员调动
+		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.agencyForm.remark = ""),
+				(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) {
+			console.log(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(row) {
+			console.log(row);
+			this.gridStaffTableListData = [];
+			this.departmentStaffTableListData = [];
+			this.agencyStaffTableListData = [];
+			this.currentDepartmentId = row.departmentId;
+			this.departmentStaffTableFlag = true;
+			this.currentAgencyStaffTableFlag = false;
+			this.gridStaffTableFlag = false;
+			this.gridTableFlag = false;
+			this.agencyTableFlag = false;
+			this.departmentTableFlag = false;
+
+			this.selDeptType = row.deptType;
+			this.getDepartmentStaffListData();
+			this.assembleBreadcrumbArr(row.departmentId, "department");
+		},
+
+		// 进入组织，重新渲染
+		entryAgency(agencyId) {
+			this.currentAgencyId = agencyId;
+
+			this.agencyTableListData = [];
+			this.departmentTableListData = [];
+			this.gridTableListData = [];
+			this.gridStaffTableListData = [];
+			this.agencyStaffTableListData = [];
+			this.departmentStaffTableListData = [];
+
+			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;
+		},
+
+		// 新增人员
+		addPeo(row) {
+			this.dialogVisiblePeo = true;
+			this.peoForm.orgType = "agency";
+		},
+
+		// 新增社区人员
+		addCommunityPeo() {
+			this.dialogVisiblePeo = true;
+			this.peoForm.orgType = "dept";
+		},
+
+		// 新增网格人员
+		addGridPeo() {
+			this.dialogVisiblePeo = true;
+			this.peoForm.orgType = "grid";
+		},
+		// 修改网格人员
+		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.gender = data.gender;
+				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 ? '男' : '女'
+				this.peoForm.gender = data.gender;
+				// 已有的权限（职责）
+				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 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.gender = data.gender;
+				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);
+			}
+		},
+		// 取消禁用按钮
+		cancelDisable() {
+			this.Disable = false;
+		},
+		// 人员禁用
+		DisablePeo(row) {
+			this.DisableForm.staffId = row.staffId;
+			this.Disable = true;
+		},
+		enablestaff(row) {
+			this.$confirm("确认解禁该员工?", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			})
+				.then(() => {
+					this.submitEnable(row);
+				})
+				.catch((err) => {
+					if (err == "cancel") {
+						// this.$message({
+						//   type: "info",
+						//   message: "已取消删除"
+						// });
+					}
+				});
+		},
+		// 确定解禁
+		async submitEnable(row) {
+			const url = "/epmetuser/customerstaff/enablestaff";
+
+			let params = {
+				staffId: row.staffId,
+			};
+
+			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 submitDisable() {
+			const url = "/epmetuser/customerstaff/disabledstaff";
+
+			let params = {
+				staffId: this.DisableForm.staffId,
+				agencyId: this.DisableForm.agencyId,
+				customerId: this.DisableForm.customerId,
+			};
+
+			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;
+		},
+
+		// 人员调动
+		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) {
+				function computeOption(opt) {
+					return {
+						label: opt.agencyName,
+						value: opt.agencyId,
+						type: "agency",
+						children: [
+							...(opt.departmentList || []).map((item) => ({
+								label: item.deptName,
+								value: item.deptId,
+								type: "dept",
+								typeName: "部门",
+							})),
+							...(opt.gridList || []).map((item) => ({
+								label: item.gridName,
+								value: item.gridId,
+								type: "grid",
+								typeName: "网格",
+							})),
+							...(opt.subAgencyList || []).map((item) =>
+								computeOption(item)
+							),
+						],
+					};
+				}
+				if (data) {
+					this.options = [computeOption(data)];
+					console.log("树树树树树树树树树树", this.options[0]);
+				}
+			} else {
+				this.$message.error("树查询失败", msg);
+			}
+		},
+		// 人员调动确定
+		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();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		// 获取导航
+		// 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) {
+					// 社区级为最低级组织，不展示下级组织列表
+					this.currentAgencyLevel = data.level;
+					this.currentAreaCode = data.areaCode;
+					this.currentAreaCodeSwitch = data.areaCodeSwitch;
+					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 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);
+				}
+			}
+		},
+
+		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 = []
@@ -2302,405 +2698,406 @@ export default {
           this.getGridStaffListData()
           this.assembleBreadcrumbArr(orgId, 'grid')
       } */
-    },
-    // 获取组织区划信息
-    async getZoning (areaCode, parentAgencyId, parentAgencyLevel) {
-      const url = "/data/aggregator/org/nextlevelareacodelist";
-
-      let params = {
-        areaCode: areaCode,
-        level: parentAgencyLevel,
-        parentAgencyId: 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;
-        }
-      });
-    },
-    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 () {
-      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.currentAgencyId,
-        agencyName: this.agencyForm.agencyName,
-        level: this.agencyForm.level,
-        areaCodeSwitch: this.currentAreaCodeSwitch,
-        areaCode: this.agencyForm.areaCode,
-        areaName: this.agencyForm.areaName,
-        contacts: this.agencyForm.contacts,
-        mobile: this.agencyForm.mobile,
-        code: this.agencyForm.code,
-        remark: this.agencyForm.remark,
-        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);
-      }
-    },
-
-    // 修改面包屑
-    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 getOrgDetailsById () {
-      const url = "/gov/org/agency/agencydetail";
-
-      let params = {
-        agencyId: this.judgeOrgInfoLevel.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;
-        }
-
-        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.OrgDetailsForm.remark = data.remark;
-        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.grid;
-        this.modifyGridFrom.gridSort = data.gridSort;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    // 市级/街道/社区级组织修改确定按钮
-    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,
-        remark:this.OrgDetailsForm.remark,
-        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,
-        sort: this.modifyGridFrom.gridSort,
-      };
-
-      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);
-      }
-    },
-
-    /** 地图初始化 */
-    createMap () {
-      let { latitude, longitude } = this;
-      if (
-        latitude === null ||
-        latitude === "" ||
-        longitude === null ||
-        longitude === ""
-      ) {
-        let { latitude: latitude2, longitude: longitude2 } =
-          this.$store.state.user;
-        if (!latitude2 || latitude2 == "" || latitude2 == "0") {
-          latitude = 39.9088810666821;
-          longitude = 116.39743841556731;
-        } else {
-          latitude = latitude2;
-          longitude = longitude2;
-        }
-      }
-      // var center = new window.TMap.LatLng(latitude, longitude); //设置中心点坐标
-      var map = new daiMap(
-        document.getElementById("con"),
-        { latitude, longitude },
-        {
-          zoom: 16.2, // 设置地图缩放级别
-          pitch: 43.5, // 设置俯仰角
-          rotation: 45, // 设置地图旋转角度
-        }
-      );
-      // //初始化地图
-      // var map = new window.TMap.Map("con", {
-      //   center: center,
-      //   zoom: 13, // 设置地图缩放级别
-      //   pitch: 43.5, // 设置俯仰角
-      //   rotation: 45, // 设置地图旋转角度
-      // });
-
-      // // 新建一个地点搜索类
-      // let markers = new window.TMap.MultiMarker({
-      //   map: map,
-      //   geometries: [],
-      // });
-
-      // map.on("panend", (e) => {
-      //   handleMoveCenter(e);
-      // });
-
-      // 监听地图平移结束
-      map.on("dragend", (e) => {
-        handleMoveCenter(e);
-      });
-
-      // map.setCenter(latitude, longitude);
-      map.setMarker(latitude, longitude);
-
-      // setMarker(latitude, longitude);
-
-      // function setMarker(lat, lng) {
-      //   console.log("setMarker", lat, lng);
-      //   markers.setGeometries([]);
-
-      //   markers.add([
-      //     {
-      //       id: "4",
-      //       styleId: "marker",
-      //       position: new window.TMap.LatLng(lat, lng),
-      //       properties: {
-      //         title: "marker4",
-      //       },
-      //     },
-      //   ]);
-      // }
-
-      function handleMoveCenter (e) {
-        //修改地图中心点
-        const { lat, lng } = map.getCenter();
-        // const lat = lat;
-        // const lng = lng;
-        map.setMarker(lat, lng);
-
-        // let { msg, data } = await map.getAddress(lat, lng);
-        // if (msg == "success") {
-        //   this.formData.address = data.address
-        //   this.searchValue = data.address
-        //   this.searchOptions = []
-
-        // }
-
-        //修改地图中心点
-        // const center = map.getCenter();
-        // const lat = center.getLat();
-        // const lng = center.getLng();
-
-        // setMarker(lat, lng);
-      }
-    },
-  },
+		},
+		// 获取组织区划信息
+		async getZoning(areaCode, parentAgencyId, parentAgencyLevel) {
+			const url = "/data/aggregator/org/nextlevelareacodelist";
+
+			let params = {
+				areaCode: areaCode,
+				level: parentAgencyLevel,
+				parentAgencyId: 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;
+				}
+			});
+		},
+		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() {
+			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.currentAgencyId,
+				agencyName: this.agencyForm.agencyName,
+				level: this.agencyForm.level,
+				areaCodeSwitch: this.currentAreaCodeSwitch,
+				areaCode: this.agencyForm.areaCode,
+				areaName: this.agencyForm.areaName,
+				contacts: this.agencyForm.contacts,
+				mobile: this.agencyForm.mobile,
+				code: this.agencyForm.code,
+				remark: this.agencyForm.remark,
+				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);
+			}
+		},
+
+		// 修改面包屑
+		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 getOrgDetailsById() {
+			const url = "/gov/org/agency/agencydetail";
+
+			let params = {
+				agencyId: this.judgeOrgInfoLevel.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;
+				}
+
+				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.OrgDetailsForm.remark = data.remark;
+				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.grid;
+				this.modifyGridFrom.gridSort = data.gridSort;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		// 市级/街道/社区级组织修改确定按钮
+		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,
+				remark: this.OrgDetailsForm.remark,
+				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,
+				sort: this.modifyGridFrom.gridSort,
+			};
+
+			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);
+			}
+		},
+
+		/** 地图初始化 */
+		createMap() {
+			let { latitude, longitude } = this;
+			if (
+				latitude === null ||
+				latitude === "" ||
+				longitude === null ||
+				longitude === ""
+			) {
+				let { latitude: latitude2, longitude: longitude2 } =
+					this.$store.state.user;
+				if (!latitude2 || latitude2 == "" || latitude2 == "0") {
+					latitude = 39.9088810666821;
+					longitude = 116.39743841556731;
+				} else {
+					latitude = latitude2;
+					longitude = longitude2;
+				}
+			}
+			// var center = new window.TMap.LatLng(latitude, longitude); //设置中心点坐标
+			var map = new daiMap(
+				document.getElementById("con"),
+				{ latitude, longitude },
+				{
+					zoom: 16.2, // 设置地图缩放级别
+					pitch: 43.5, // 设置俯仰角
+					rotation: 45, // 设置地图旋转角度
+				}
+			);
+			// //初始化地图
+			// var map = new window.TMap.Map("con", {
+			//   center: center,
+			//   zoom: 13, // 设置地图缩放级别
+			//   pitch: 43.5, // 设置俯仰角
+			//   rotation: 45, // 设置地图旋转角度
+			// });
+
+			// // 新建一个地点搜索类
+			// let markers = new window.TMap.MultiMarker({
+			//   map: map,
+			//   geometries: [],
+			// });
+
+			// map.on("panend", (e) => {
+			//   handleMoveCenter(e);
+			// });
+
+			// 监听地图平移结束
+			map.on("dragend", (e) => {
+				handleMoveCenter(e);
+			});
+
+			// map.setCenter(latitude, longitude);
+			map.setMarker(latitude, longitude);
+
+			// setMarker(latitude, longitude);
+
+			// function setMarker(lat, lng) {
+			//   console.log("setMarker", lat, lng);
+			//   markers.setGeometries([]);
+
+			//   markers.add([
+			//     {
+			//       id: "4",
+			//       styleId: "marker",
+			//       position: new window.TMap.LatLng(lat, lng),
+			//       properties: {
+			//         title: "marker4",
+			//       },
+			//     },
+			//   ]);
+			// }
+
+			function handleMoveCenter(e) {
+				//修改地图中心点
+				const { lat, lng } = map.getCenter();
+				// const lat = lat;
+				// const lng = lng;
+				map.setMarker(lat, lng);
+
+				// let { msg, data } = await map.getAddress(lat, lng);
+				// if (msg == "success") {
+				//   this.formData.address = data.address
+				//   this.searchValue = data.address
+				//   this.searchOptions = []
+
+				// }
+
+				//修改地图中心点
+				// const center = map.getCenter();
+				// const lat = center.getLat();
+				// const lng = center.getLng();
+
+				// setMarker(lat, lng);
+			}
+		},
+	},
 };
 </script>
 
 <style scoped>
 #container {
-  width: 100%;
-  height: 100%;
+	width: 100%;
+	height: 100%;
 }
 #info {
-  left: 20px;
-  top: 20px;
-  font-size: 14px;
-  background: #fff;
-  width: 270px;
-  padding: 10px;
-  border-radius: 3px;
+	left: 20px;
+	top: 20px;
+	font-size: 14px;
+	background: #fff;
+	width: 270px;
+	padding: 10px;
+	border-radius: 3px;
 }
 #con {
-  width: 100%;
-  height: 100%;
+	width: 100%;
+	height: 100%;
 }
 .el-tag + .el-tag {
-  margin-left: 10px;
+	margin-left: 10px;
 }
 </style>

From 0df854d7c9aa4b230535b5d200650a575d8e4661 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 21 Feb 2023 16:35:15 +0800
Subject: [PATCH 7/7] 1

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

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index ae8dc9fef..87c6e1cf5 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -200,7 +200,7 @@
 			>
 				<template slot="header" slot-scope="scope">
 					<el-input
-						placeholder="请输入内容"
+						placeholder="请输入姓名或手机号"
 						v-model="searchStaffKeyword"
 						style="width: 400px; margin-right: 10px"
 						@input="handleSearchStaff"
@@ -299,7 +299,7 @@
 			>
 				<template slot="header" slot-scope="scope">
 					<el-input
-						placeholder="请输入内容"
+						placeholder="请输入姓名或手机号"
 						v-model="searchDeptStaffKeyword"
 						style="width: 400px; margin-right: 10px"
 						@input="handleSearchDeptStaff"
@@ -386,7 +386,7 @@
 			>
 				<template slot="header" slot-scope="scope">
 					<el-input
-						placeholder="请输入内容"
+						placeholder="请输入姓名或手机号"
 						v-model="searchGridStaffKeyword"
 						style="width: 400px; margin-right: 10px"
 						@input="handleSearchGridStaff"