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>