From 13a22d8309624a58780da087c62173b72c53e9f3 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 13 Apr 2023 14:36:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/census/addFormEnterprise.vue      | 76 +++++++++++++----
 src/views/modules/census/addFormHouse.vue     | 77 +++++++++++++----
 src/views/modules/census/addFormResident.vue  | 83 +++++++++++++++----
 .../modules/census/census-residentList.vue    | 45 +++++++++-
 src/views/modules/census/record.vue           | 12 ++-
 5 files changed, 238 insertions(+), 55 deletions(-)

diff --git a/src/views/modules/census/addFormEnterprise.vue b/src/views/modules/census/addFormEnterprise.vue
index 293eb3649..f9f34d765 100644
--- a/src/views/modules/census/addFormEnterprise.vue
+++ b/src/views/modules/census/addFormEnterprise.vue
@@ -1,13 +1,13 @@
 <template>
-	<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+	<el-dialog :visible.sync="dialogVisible" width="1100px" :before-close="handleCancle" top="5vh">
 		<span slot="title">
 			<span v-if="pageType == 'add'">新增</span>
 			<span v-if="pageType == 'edit'">修改</span>
 			<span v-if="pageType == 'view'">查看</span>
 		</span>
 		<div>
-			<div class="dialog-h-content scroll-h">
-				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+			<div class="dialog-h-content2 scroll-h">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" v-if="pageType != 'view'">
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="场所名称" prop="placeOrgName">
@@ -89,7 +89,7 @@
 					</el-row>
 					<div id="app_event" class="div_map"></div>
 				</el-form>
-				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+				<el-form :inline="false" :model="formData" ref="form" label-width="140px" v-if="pageType == 'view'">
 					<el-row>
 						<el-col :span="12">
 							<el-form-item label="场所类别" prop="placeCategory">{{ formData.placeCategoryName }}</el-form-item>
@@ -117,23 +117,27 @@
 						<el-col :span="12">
 							<el-form-item label="联系电话" prop="mobile">{{ formData.mobile }}</el-form-item>
 						</el-col>
-						<el-col :span="24">
-							<el-form-item label="场所地址" prop="address" style="display: block">{{ formData.address }}</el-form-item>
+						<el-col :span="12">
+							<el-form-item label="场所地址" prop="address">
+								<div id="app_event" class="div_map"></div>
+								{{ formData.address }}
+							</el-form-item>
 						</el-col>
 					</el-row>
-					<div id="app_event" class="div_map"></div>
 				</el-form>
+
+				<div class="div_btn" style="text-align: center;"><el-button size="small" @click="handleCancle">取消</el-button></div>
+				<div class="div_btn" v-if="pageType != 'view'">
+					<el-button size="small" @click="handleCancle">取 消</el-button>
+					<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
+					<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">保 存</el-button>
+				</div>
+				<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 			</div>
-			<div class="div_btn" v-if="pageType != 'view'">
-				<el-button size="small" @click="handleCancle">取 消</el-button>
-				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
-				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">保 存</el-button>
-			</div>
-			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 
 		<span slot="footer" class="dialog-footer">
-			<el-button @click="handleCancle">关 闭</el-button>
+			<!-- <el-button @click="handleCancle">关 闭</el-button> -->
 			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
 		</span>
 	</el-dialog>
@@ -459,4 +463,48 @@ export default {
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
 // @import '@/assets/scss/modules/visual/a_customize.scss';
+/deep/.el-dialog__header {
+	padding: 25px 20px 10px 25px;
+	font-size: 18px;
+	font-family: PingFang SC;
+	font-weight: normal;
+	color: #333;
+}
+/deep/.el-dialog__body {
+	padding: 30px 0px 30px 40px;
+}
+/deep/.el-dialog__footer {
+	text-align: center;
+}
+/deep/.el-form {
+	.el-form-item {
+		position: relative;
+		margin-bottom: 22px;
+		.el-form-item__label {
+			font-size: 14px;
+			padding-left: 15px;
+			text-align: left;
+			&::before {
+				position: absolute;
+				left: 0;
+				top: 12px;
+				content: '';
+				display: block;
+				width: 7px;
+				height: 7px;
+				background: #0c81fe;
+				border-radius: 3px;
+			}
+		}
+		.el-form-item__content {
+			font-size: 14px;
+		}
+	}
+}
+/deep/.dialog-h-content2 {
+	max-height: calc(83vh - 130px);
+	box-sizing: border-box;
+	padding: 0 10px;
+	overflow: auto;
+}
 </style>
diff --git a/src/views/modules/census/addFormHouse.vue b/src/views/modules/census/addFormHouse.vue
index 7a84e7156..43f8bc68c 100644
--- a/src/views/modules/census/addFormHouse.vue
+++ b/src/views/modules/census/addFormHouse.vue
@@ -1,16 +1,16 @@
 <template>
-	<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+	<el-dialog :visible.sync="dialogVisible" width="900px" :before-close="handleCancle" top="5vh">
 		<span slot="title">
 			<span v-if="pageType == 'add'">新增</span>
 			<span v-if="pageType == 'edit'">修改</span>
-			<span v-if="pageType == 'view'">查看</span>
+			<span v-if="pageType == 'view'">查看房屋</span>
 		</span>
 		<div>
-			<div class="dialog-h-content scroll-h">
+			<div class="dialog-h-content2 scroll-h">
 				<div v-if="view_real_data" class="div_tuomin" style="margin-top: 20px;">
 					<el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button>
 				</div>
-				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule"  v-if="pageType != 'view'">
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="场所名称" prop="placeOrgName">
@@ -93,43 +93,43 @@
 					<div id="app_event" class="div_map"></div>
 				</el-form>
 
-				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+				<el-form :inline="false" :model="formData" ref="form"  v-if="pageType == 'view'">
 					<el-row>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房屋名称" prop="fullName">{{ formData.fullName }}</el-form-item>
 						</el-col>
-						<!-- <el-col :span="12">
+						<!-- <el-col :span="24">
 							<el-form-item label="" prop="placeCategory"></el-form-item>
 							<el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button>
 						</el-col> -->
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="单元号" prop="unitName">{{ formData.unitName ? formData.unitName : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="门牌号" prop="doorName">{{ formData.doorName }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房屋编码" prop="coding">{{ formData.coding ? formData.coding : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房屋类型" prop="houseTypeName">{{ formData.houseTypeName ? formData.houseTypeName : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房屋用途" prop="purposeName">{{ formData.purposeName ? formData.purposeName : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房屋状态" prop="rentName">{{ formData.rentName ? formData.rentName : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房主姓名" prop="ownerName">{{ formData.ownerName ? formData.ownerName : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="联系方式" prop="showOwnerPhone">{{ formData.showOwnerPhone ? formData.showOwnerPhone : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房主身份证" prop="showOwnerIdCard">{{ formData.showOwnerIdCard ? formData.showOwnerIdCard : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="备注" prop="remark">{{ formData.remark ? formData.remark : '--' }}</el-form-item>
 						</el-col>
 					</el-row>
@@ -217,7 +217,7 @@ export default {
 		};
 		return {
 			agencyObj: {},
-			view_real_data: true,
+			view_real_data: false,
 			btnDisable: false,
 			user: '',
 			agencyId: '',
@@ -497,4 +497,45 @@ export default {
 	top: 25px;
 	right: 40px;
 }
+/deep/.el-dialog__header {
+	padding: 30px 20px 10px 30px;
+	font-size: 18px;
+	font-family: PingFang SC;
+	font-weight: normal;
+	color: #333;
+}
+/deep/.el-dialog__body {
+	padding:30px 0px 30px 90px;
+}
+/deep/.el-dialog__footer{text-align: center;}
+/deep/.el-form {
+	.el-form-item {
+		position: relative;
+		margin-bottom: 12px;
+		.el-form-item__label {
+			font-size: 15px;
+			padding-left: 15px;
+			&::before {
+				position: absolute;
+				left: 0;
+				top: 12px;
+				content: '';
+				display: block;
+				width: 7px;
+				height: 7px;
+				background: #0c81fe;
+				border-radius: 3px;
+			}
+		}
+		.el-form-item__content {
+			font-size: 15px;
+		}
+	}
+}
+/deep/.dialog-h-content2 {
+	max-height: calc(83vh - 130px);
+	box-sizing: border-box;
+	padding: 0 10px;
+	overflow: auto;
+}
 </style>
diff --git a/src/views/modules/census/addFormResident.vue b/src/views/modules/census/addFormResident.vue
index bec9b8ce3..d30c3a45f 100644
--- a/src/views/modules/census/addFormResident.vue
+++ b/src/views/modules/census/addFormResident.vue
@@ -1,40 +1,42 @@
 <template>
-	<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+	<el-dialog :visible.sync="dialogVisible" width="1180px" :before-close="handleCancle" top="5vh">
 		<span slot="title">
 			<span v-if="pageType == 'add'">新增</span>
 			<span v-if="pageType == 'edit'">修改</span>
-			<span v-if="pageType == 'view'">查看</span>
+			<span v-if="pageType == 'view'">更多信息</span>
 		</span>
 		<div>
-			<div class="dialog-h-content scroll-h">
-				<div v-if="view_real_data" class="div_tuomin" style="margin-top: 20px;"><el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button></div>
-				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+			<div class="dialog-h-content2 scroll-h">
+				<div v-if="view_real_data" class="div_tuomin" style="margin-top: 20px;">
+					<el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button>
+				</div>
+				<el-form :inline="false" :model="formData" ref="form" v-if="pageType == 'view'">
 					<template v-for="(fieldSubList, index) in fieldList">
 						<el-row>
 							<!-- :key="'fieldSubList' + index" -->
-							<el-col :span="6">
+							<el-col :span="8">
 								<div v-if="index == 0">
-									<el-form-item label="所属网格">{{ gridName }}</el-form-item>
+									<el-form-item label="所属网格">{{ detailData.gridName }}</el-form-item>
 								</div>
 							</el-col>
-							<el-col :span="6">
+							<el-col :span="8">
 								<div v-if="index == 0">
-									<el-form-item label="所属小区">{{ xiaoquName }}</el-form-item>
+									<el-form-item label="所属小区">{{ detailData.villageName }}</el-form-item>
 								</div>
 							</el-col>
-							<el-col :span="6">
+							<el-col :span="8">
 								<div v-if="index == 0">
-									<el-form-item label="所属楼栋">{{ louName }}-{{ danyuanName }}</el-form-item>
+									<el-form-item label="所属楼栋">{{ detailData.buildName }}</el-form-item>
 								</div>
 							</el-col>
-							<el-col :span="6">
+							<el-col :span="8">
 								<div v-if="index == 0">
-									<el-form-item label="所属家庭">{{ homeName }}</el-form-item>
+									<el-form-item label="所属家庭">{{ detailData.doorName }}</el-form-item>
 								</div>
 							</el-col>
 
 							<template v-for="field in fieldSubList">
-								<el-col :span="6">
+								<el-col :span="8">
 									<el-form-item :label="field.label">
 										<span v-if="field.columnName === 'MOBILE' || field.columnName === 'ID_CARD'">{{ info[field.columnName] || '--' }}</span>
 										<span v-else-if="field.itemType == 'select' || field.itemType == 'radio' || field.itemType == 'checkbox' || field.itemType == 'cascader'">
@@ -45,7 +47,7 @@
 								</el-col>
 							</template>
 						</el-row>
-						<div style="border-bottom:dashed 1px #ccc"></div>
+						<div class="line"></div>
 					</template>
 				</el-form>
 
@@ -159,8 +161,8 @@ export default {
 			type: String,
 			default: ''
 		},
-		gridName: {
-			type: String,
+		detailData: {
+			type: Object,
 			default: ''
 		}
 	},
@@ -171,7 +173,7 @@ export default {
 
 	data() {
 		return {
-			view_real_data: true,
+			view_real_data: false,
 			formData: {},
 			customerId: '',
 			isXiaozhaizi: false,
@@ -576,4 +578,49 @@ export default {
 <style lang="scss" scoped>
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
+/deep/.el-dialog__header {
+	padding: 30px 20px 10px 30px;
+	font-size: 22px;
+	font-family: PingFang SC;
+	font-weight: 800;
+	color: #333;
+}
+/deep/.el-dialog__body {
+	padding:30px 0px 30px 50px;
+}
+/deep/.el-form {
+	.el-form-item {
+		position: relative;
+		.el-form-item__label {
+			font-size: 18px;
+			padding-left: 15px;
+			&::before {
+				position: absolute;
+				left: 0;
+				top: 12px;
+				content: '';
+				display: block;
+				width: 7px;
+				height: 7px;
+				background: #ddd;
+				border-radius: 3px;
+			}
+		}
+		.el-form-item__content {
+			font-size: 18px;
+		}
+	}
+}
+.line {
+	margin: 20px auto;
+	width: 900px;
+	height: 1px;
+	border: 1px dashed #ddd;
+}
+/deep/.dialog-h-content2 {
+	max-height: calc(83vh - 130px);
+	box-sizing: border-box;
+	padding: 0 10px;
+	overflow: auto;
+}
 </style>
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index cb3d500da..84e6cd183 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -126,7 +126,7 @@
 		<div>
 			<!-- :pageType="pageType" -->
 			<!-- :disabled="disabled" -->
-			<addForm v-if="dialogVisible" :dialogVisible="dialogVisible" :userId="detailId" :pageType="pageType" :gridName="detailData" @handleClose="handleClose" />
+			<addForm v-if="dialogVisible" :dialogVisible="dialogVisible" :userId="detailId" :pageType="pageType" :detailData="detailData" @handleClose="handleClose" />
 		</div>
 	</div>
 </template>
@@ -243,7 +243,14 @@ export default {
 			this.dialogVisible = true;
 			this.pageType = 'view';
 			this.detailId = row.icResiUserId;
-			this.detailData = row.gridName;
+			this.detailData = {
+				gridName: row.gridName,
+				homeName: row.homeName,
+				villageName: row.villageName,
+				buildName: row.buildName,
+				unitName: row.unitName,
+				doorName: row.doorName
+			};
 		},
 		handleClose() {
 			this.dialogVisible = false;
@@ -863,4 +870,38 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
+/deep/.el-dialog__header {
+	padding: 30px 20px 10px 30px;
+	font-size: 22px;
+	font-family: PingFang SC;
+	font-weight: 800;
+	color: #333;
+}
+/deep/.el-dialog__body {
+	padding: 30px 50px;
+}
+/deep/.el-dialog__footer{text-align: center;}
+/deep/.el-form {
+	.el-form-item {
+		position: relative;
+		.el-form-item__label {
+			font-size: 18px;
+			padding-left: 15px;
+			&::before {
+				position: absolute;
+				left: 0;
+				top: 12px;
+				content: '';
+				display: block;
+				width: 7px;
+				height: 7px;
+				background: #0c81fe;
+				border-radius: 3px;
+			}
+		}
+		.el-form-item__content {
+			font-size: 18px;
+		}
+	}
+}
 </style>
diff --git a/src/views/modules/census/record.vue b/src/views/modules/census/record.vue
index 07cde7c06..ba5d8ef36 100644
--- a/src/views/modules/census/record.vue
+++ b/src/views/modules/census/record.vue
@@ -1,12 +1,12 @@
 <template>
 	<div class="m-record">
-		<h3>检查记录</h3>
+		<h3>巡查记录</h3>
 		<div>
 			<div class="u-table-btn1 mt10" v-if="formType == 'edit'">
 				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
 			</div>
 			<div class="m-table-item">
-				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
+				<el-table :data="tableData" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="resi-table" row-key="id" border style="width: 100%">
 					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
 					<el-table-column prop="patrolTime" label="检查时间" align="center" width="200px">
 						<template slot-scope="scope">
@@ -406,7 +406,13 @@ export default {
 <style lang="scss" scoped>
 @import '@/assets/scss/buttonstyle.scss';
 @import '@/assets/scss/modules/management/list-main.scss';
-
+.m-record h3{
+	font-size: 1.17em;
+	&::before {
+		display: none;
+	}
+	
+}
 .mt10 {
 	margin-bottom: 10px;
 }