Merge branch 'dev-烟台0220需求' into yantai_master

# Conflicts:
#	src/views/modules/base/organization/organization.vue

src/views/modules/base/communityYantai/community.vue

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

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>

src/views/modules/plugins/change/changewelfare.vue

@@ -1,51 +1,91 @@
 <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
-        <el-form-item label="姓名"
+				:inline="true"
-                      prop="name">
+				:model="dataForm"
-          <el-input v-model="dataForm.name"
+				@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="请输入姓名">
+						placeholder="请输入姓名"
+					>
 					</el-input>
 				</el-form-item>
-        <el-form-item label="证件号"
+				<el-form-item label="证件号" prop="idCard">
-                      prop="idCard">
+					<el-input
-          <el-input v-model="dataForm.idCard"
+						v-model="dataForm.idCard"
 						size="small"
 						class="list_item_width_1"
 						clearable
-                    placeholder="请输入证件号">
+						placeholder="请输入证件号"
+					>
 					</el-input>
 				</el-form-item>
-        <el-form-item label="手机"
+				<el-form-item label="手机" prop="mobile">
-                      prop="mobile">
+					<el-input
-          <el-input v-model="dataForm.mobile"
+						v-model="dataForm.mobile"
 						size="small"
 						class="list_item_width_1"
 						clearable
-                    placeholder="请输入手机">
+						placeholder="请输入手机"
+					>
 					</el-input>
 				</el-form-item>
-        <el-form-item label="加入时间"
+				<el-form-item label="加入时间" prop="startTime">
-                      prop="startTime">
+					<el-date-picker
-          <el-date-picker v-model="timeRange"
+						v-model="timeRange"
 						type="daterange"
 						clearable
 						size="small"
 						range-separator="至"
 						start-placeholder="选择日期"
 						end-placeholder="选择日期"
-                          value-format="yyyy-MM-dd">
+						value-format="yyyy-MM-dd"
+					>
 					</el-date-picker>
 				</el-form-item>
+
+				<el-form-item label="福利发放标识" prop="grantFlag">
+					<el-select
+						size="small"
+						v-model="dataForm.grantFlag"
+						filterable
+						placeholder="请选择"
+					>
+						<el-option label="未发放" :value="0"> </el-option>
+						<el-option label="已发放" :value="1"> </el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="福利类别" prop="categoryName">
+					<el-input
+						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-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-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>-->
@@ -53,16 +93,20 @@
 			</el-form>
 		</el-card>
 		<el-card class="resi-card-table">
-<!--        <div class="resi-row-btn">-->
+			<!--        <div class="resi-row-btn">-->
-<!--          <el-button type="warning" size="small" class="diy-button&#45;&#45;add" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
+			<!--          <el-button type="warning" size="small" class="diy-button&#45;&#45;add" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
-<!--        </div>-->
+			<!--        </div>-->
 			<div class="exportBtn">
 				<div class="resi-row-btn">
-            <el-button style="margin-left: 10px"
+					<el-button
+						style="margin-left: 10px"
 						class="diy-button--export"
 						size="small"
-                       @click="handleExportModule()">下载模板</el-button>
+						@click="handleExportModule()"
-            <el-upload :headers="$getElUploadHeaders()"
+						>下载模板</el-button
+					>
+					<el-upload
+						:headers="$getElUploadHeaders()"
 						style=""
 						ref="upload"
 						:multiple="false"
@@ -78,57 +122,121 @@
 							() => {
 								uploadFile();
 							}
-          ">
+						"
-                <el-button style="margin-left: 10px"
+					>
+						<el-button
+							style="margin-left: 10px"
 							size="small"
-                           class="diy-button--delete">导入</el-button>
+							class="diy-button--delete"
+							>导入</el-button
+						>
 					</el-upload>
-            <el-button type="warning" size="small" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
+					<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
+				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="序号"
+				<el-table-column
+					label="序号"
 					type="index"
 					fixed="left"
 					align="center"
-                         width="50">
+					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">
+				<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>
+						<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
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
+					prop="idCard"
-        <el-table-column prop="gender" label="性别" header-align="center" align="center">
+					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 }}
-            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="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">
+				<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="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
-            <el-button @click="removeHandleList(scope.row)"
+							@click="handleLook(scope.row)"
 							type="text"
 							size="small"
-                       class="div-table-button--detail">移除福利人员</el-button>
+							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>
@@ -139,65 +247,183 @@
 				:total="total"
 				layout="total, sizes, prev, pager, next, jumper"
 				@size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+				@current-change="pageCurrentChangeHandle"
+			>
 			</el-pagination>
 		</el-card>
 		<!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+		<add-or-update
-      <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
+			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" />
+			@close="handleCancleLook"
-      <el-dialog
+		/>
-              title="移除原因"
+		<el-dialog title="移除原因" :visible.sync="removeVisible" width="40%">
-              :visible.sync="removeVisible"
+			<textarea
-              width="40%">
+				v-model="removeReason"
-        <textarea v-model="removeReason" placeholder="请输入移除福利人员的原因" class="blacklist-reason"></textarea>
+				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>
+				<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="姓名	"
+					label-width="150px"
+					style="display: block"
+				>
+					<div>{{ rowData.name }}</div>
+				</el-form-item>
+				<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="100"
+						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="200"
+						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 mixinViewModule from "@/mixins/view-module";
-import AddOrUpdate from './changewelfare-add-or-update'
+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 () {
+	components: {
+		AddOrUpdate,
+		peopleMore,
+	},
+	data() {
 		return {
 			mixinViewModuleOptions: {
-        getDataListURL: '/epmetuser/changeWelfare/page',
+				getDataListURL: "/epmetuser/changeWelfare/page",
 				getDataListIsPage: true,
-        deleteURL: '/epmetuser/changeWelfare',
+				deleteURL: "/epmetuser/changeWelfare",
 				deleteIsBatch: true,
-        exportURL: '/epmetuser/changeWelfare/export'
+				exportURL: "/epmetuser/changeWelfare/export",
 			},
 			dataForm: {
-        id: ''
+				id: "",
+				grantFlag: "",
+				categoryName: "",
 			},
-        timeRange: '',
+			timeRange: "",
 			// 显示人员详情
 			showedPeopleMoreInfo: false,
 			lookInfo: {
-            userId: '',
+				userId: "",
-            gridName: ''
+				gridName: "",
 			},
-        removeReason: '',
+			removeReason: "",
 			removeVisible: false,
 			rowData: {},
-    }
+
+			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",
+					},
+				],
+			};
 		},
-  components: {
-    AddOrUpdate,
-      peopleMore
 	},
 	watch: {
-        timeRange (val) {
+		timeRange(val) {
 			if (Array.isArray(val) && val.length == 2) {
 				this.dataForm.startTime = val[0];
 				this.dataForm.endTime = val[1];
@@ -205,10 +431,10 @@ export default {
 				this.dataForm.startTime = "";
 				this.dataForm.endTime = "";
 			}
-        }
+		},
 	},
 	methods: {
-        handleExportModule () {
+		handleExportModule() {
 			let title = "福利人员模板";
 			let url = "/epmetuser/changeWelfare/exporttemplate";
 
@@ -226,7 +452,7 @@ export default {
 			);
 		},
 		// 下载文件
-        download (data, fileName) {
+		download(data, fileName) {
 			if (!data) {
 				return;
 			}
@@ -250,7 +476,7 @@ export default {
 			}
 		},
 		// 上传文件之前的钩子
-        beforeUpload (file) {
+		beforeUpload(file) {
 			this.files = file;
 
 			const isText = file.type === "application/vnd.ms-excel";
@@ -268,7 +494,7 @@ export default {
 				return true;
 			}
 		},
-        async uploadFile () {
+		async uploadFile() {
 			if (this.fileName == "") {
 				this.$message.warning("请选择要上传的文件！");
 				return false;
@@ -306,118 +532,188 @@ export default {
 					}
 					this.loadTable();
 				},
-                (rspMsg, data) => { },
+				(rspMsg, data) => {},
 				{ headers: { "Content-Type": "multipart/form-data" } }
 			);
 		},
-      exportHandle () {
+		exportHandle() {
-        const url = this.mixinViewModuleOptions.exportURL
+			const url = this.mixinViewModuleOptions.exportURL;
 			this.$http({
-          method: 'GET',
+				method: "GET",
 				url,
-          responseType: 'blob',
+				responseType: "blob",
-          params: this.dataForm
+				params: this.dataForm,
-        }).then(res => {
+			})
+				.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])
+						let fileName = window.decodeURI(
-            console.log('filename', fileName)
+							res.headers["content-disposition"]
-            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+								.split(";")[1]
-            var url = window.URL.createObjectURL(blob)
+								.split("=")[1]
-            var aLink = document.createElement('a')
+						);
-            aLink.style.display = 'none'
+						console.log("filename", fileName);
-            aLink.href = url
+						let blob = new Blob([res.data], {
-            aLink.setAttribute('download', fileName)
+							type: "application/vnd.ms-excel",
-            document.body.appendChild(aLink)
+						});
-            aLink.click()
+						var url = window.URL.createObjectURL(blob);
-            document.body.removeChild(aLink) //下载完成移除元素
+						var aLink = document.createElement("a");
-            window.URL.revokeObjectURL(url) //释放掉blob对象
+						aLink.style.display = "none";
-          } else this.$message.error('下载失败')
+						aLink.href = url;
-        }).catch(err => {
+						aLink.setAttribute("download", fileName);
-          console.log('err', err)
+						document.body.appendChild(aLink);
-          return this.$message.error('网络错误')
+						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) {
+			for (const n in this.dataForm) {
-                this.dataForm[n] = ''
+				this.dataForm[n] = "";
 			}
-            this.timeRange = ''
+			this.timeRange = "";
-            this.getDataList()
+			this.getDataList();
 		},
-        async handleLook (row) {
+		async handleLook(row) {
-            if(row.gridId !== ''){
+			if (row.gridId !== "") {
-                const url = '/gov/org/grid/griddetail'
+				const url = "/gov/org/grid/griddetail";
 				let params = {
-                    gridId : row.gridId,
+					gridId: row.gridId,
-                }
+				};
-                const { data, code, msg } = await requestPost(url, params)
+				const { data, code, msg } = await requestPost(url, params);
-                if(code === 0){
+				if (code === 0) {
-                    this.lookInfo.gridName = data.gridName
+					this.lookInfo.gridName = data.gridName;
 				} else {
-                    this.$message.error(msg)
+					this.$message.error(msg);
 				}
-            }else{
+			} else {
-                this.lookInfo.gridName = ''
+				this.lookInfo.gridName = "";
 			}
-            if(row.userId === '' || row.userId === null){
+			if (row.userId === "" || row.userId === null) {
-                this.$message.error('未查询到该用户的相关信息')
+				this.$message.error("未查询到该用户的相关信息");
-                return false
+				return false;
 			}
-            this.lookInfo.userId = row.userId
+			this.lookInfo.userId = row.userId;
-            this.showedPeopleMoreInfo = true
+			this.showedPeopleMoreInfo = true;
 		},
 		handleCancleLook() {
-            this.lookInfo.userId = ''
+			this.lookInfo.userId = "";
-            this.lookInfo.gridName = ''
+			this.lookInfo.gridName = "";
-            this.showedPeopleMoreInfo = false
+			this.showedPeopleMoreInfo = false;
 		},
-        removeHandleList (row) {
+
-            this.removeVisible = true
+		// 更新福利信息
-            this.removeReason = ''
+		handleUpdate(row) {
-            this.rowData = { ...row }
+			this.rowData = { ...row };
+			// 重置表单
+			const { joinForm } = this;
+			Object.keys(joinForm).forEach((k) => {
+				this.joinForm[k] = row[k];
+			});
+			this.joinFormVisible = true;
 		},
-        removeHandle () {
+
+		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,
-                removeReason: this.removeReason
+				...joinForm,
+			};
+			this.$http
+				.post("/epmetuser/changeWelfare/update", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
 					}
-            this.$http.post('/epmetuser/changeWelfare/removeWelfare', params).then(({ data: res }) => {
+					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)
+						return this.$message.error(res.msg);
 					}
 					this.$message({
-                    message: this.$t('prompt.success'),
+						message: this.$t("prompt.success"),
-                    type: 'success',
+						type: "success",
 						duration: 500,
 						onClose: () => {
-                        this.removeVisible = false
+							this.removeVisible = false;
-                        this.getDataList()
+							this.getDataList();
-                    }
+						},
-                })
+					});
-            }).catch(err => {
-                this.$message.error(err.message)
 				})
+				.catch((err) => {
+					this.$message.error(err.message);
+				});
 		},
-    }
+	},
-}
+};
 </script>
 <style lang="scss" scoped>
-  @import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/buttonstyle.scss";
 
-  .exportBtn {
+.exportBtn {
 	display: flex;
 	align-items: center;
-  }
+}
 
-  .resi-container .resi-card-table {
+.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 {
+.resi-table {
 	::v-deep .el-button--text {
 		text-decoration: underline;
 	}
@@ -428,11 +724,10 @@ export default {
 	::v-deep .btn-color-edit {
 		color: rgba(0, 167, 169, 1);
 	}
-  }
+}
-  .form-wr {
+.form-wr {
 	.input-width {
 		width: 260px;
-
 	}
 	.input-width-textarea {
 		width: 500px;
@@ -454,14 +749,14 @@ export default {
 			}
 		}
 	}
-  }
+}
-  .div-content {
+.div-content {
 	width: 100%;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
-  }
+}
-  .blacklist-reason {
+.blacklist-reason {
 	width: 100%;
 	height: 80px;
 	border: 1px solid #e4e4e4;
@@ -469,8 +764,8 @@ export default {
 	resize: none;
 	padding: 8px;
 	box-sizing: border-box;
-  }
+}
-  .resi-row-btn {
+.resi-row-btn {
 	display: flex;
 	margin-bottom: 13px;
 	.el-button {
@@ -486,5 +781,5 @@ export default {
 	// .el-button--danger {
 	//   background: rgba(254, 98, 82, 1);
 	// }
-  }
+}
 </style>