From 53a59ee16607e0a3f061f22cf8f66266fe720c6e Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sun, 12 Nov 2023 19:44:49 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

---
 subPackage/workbench/views/editExamine.vue |  170 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 95 insertions(+), 75 deletions(-)

diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index 92dcecc..4dd9dfb 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -1,53 +1,65 @@
 <template>
-	<div class="container">
-		<view class="">
-			<box-title title="基本信息"></box-title>
-			<u-form labelWidth="70" :model="form" :rules="rules" ref="form" class="form">
-				<u-form-item label="场所位置" required class="form-item" prop="localtion">
-					<u--input border="none" v-model="form.localtion"></u--input>
-				</u-form-item>
-				<u-form-item label="场所名称" required class="form-item" prop="placeName">
-					<u--input border="none" v-model="form.placeName"></u--input>
-				</u-form-item>
-				<u-form-item label="法人信息" required class="form-item" prop="legalPerson">
-					<u--input border="none" v-model="form.legalPerson"></u--input>
-				</u-form-item>
-				<u-form-item label="法人电话" class="form-item">
-					<u--input border="none" v-model="form.legalTel"></u--input>
-				</u-form-item>
-			</u-form>
-		</view>
-		<view class="">
-			<box-title title="营业执照"></box-title>
-			<view class="upload-img">
-				<u-upload :fileList="form.imageUrls" :previewFullImage="uploadConfig.previewFullImage"
-					:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount"
-					:capture="uploadConfig.capture" @afterRead="afterReadImg" @delete="deletePic">
-				</u-upload>
+	<view class="container">
+		<view class="main-content">
+			<view class="mt-20 b-c-w">
+				<box-title :title="'基本信息'"></box-title>
+				<u-form labelWidth="70" :model="form" :rules="rules" ref="form" class="form">
+					<u-form-item label="场所位置" required class="form-item" prop="localtion">
+						<u--input border="none" v-model="form.localtion"></u--input>
+					</u-form-item>
+					<u-form-item label="场所名称" required class="form-item" prop="placeName">
+						<u--input border="none" v-model="form.placeName"></u--input>
+					</u-form-item>
+					<u-form-item label="法人信息" required class="form-item" prop="legalPerson">
+						<u--input border="none" v-model="form.legalPerson"></u--input>
+					</u-form-item>
+					<u-form-item label="法人电话" class="form-item">
+						<u--input border="none" v-model="form.legalTel"></u--input>
+					</u-form-item>
+				</u-form>
+			</view>
+			<view class="mt-20 b-c-w">
+				<box-title title="营业执照"></box-title>
+				<view class="upload-img">
+					<u-upload :fileList="form.imageUrls" :previewFullImage="uploadConfig.previewFullImage"
+						:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
+						:maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImg"
+						@delete="deletePic">
+					</u-upload>
+				</view>
+			</view>
+			<view class="mt-20 b-c-w">
+				<box-title title="场所平面图"></box-title>
+				<view class="upload-img">
+					<u-upload :fileList="form.planImageUrls" :previewFullImage="uploadConfig.previewFullImage"
+						:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
+						:maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImg"
+						@delete="deletePic">
+					</u-upload>
+				</view>
+			</view>
+			<view class="practitioner">
+				<box-title title="从业人员信息"></box-title>
+				<view class="info" v-for="i in personNum" :key="i">
+					<view class="title">人员信息-#{{ i }}</view>
+					<formItem ref="formItemRef"></formItem>
+				</view>
+
+				<view class="add-person">
+					<u-button type="success" plain @click="addPerson">在加一人</u-button>
+				</view>
 			</view>
 		</view>
-		<view class="">
-			<box-title title="场所平面图"></box-title>
-			<view class="upload-img">
-				<u-upload :fileList="form.planImageUrls" :previewFullImage="uploadConfig.previewFullImage"
-					:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount"
-					:capture="uploadConfig.capture" @afterRead="afterReadImg" @delete="deletePic">
-				</u-upload>
-			</view>
-		</view>
-		<view class="practitioner">
-			<box-title title="从业人员信息"></box-title>
-			<view class="info" v-for="i in personNum" :key="i">
-				<view class="title">人员信息-#{{ i }}</view>
-				<formItem ref="formItemRef"></formItem>
-			</view>
-		</view>
-		<u-button type="success" plain class="add-person" @click="addPerson">在加一人</u-button>
+
 		<view class="btn-group">
-			<u-button class="btn-item" type="primary" @click="submit">提交</u-button>
-			<u-button class="btn-item" @click="pushPage">我上报的事件</u-button>
+			<view>
+				<u-button type="primary" @click="submit">提交</u-button>
+			</view>
+			<view class="mt-20">
+				<u-button @click="pushPage">我上报的事件</u-button>
+			</view>
 		</view>
-	</div>
+	</view>
 </template>
 
 <script>
@@ -61,7 +73,8 @@
 	export default {
 		mixins: [uploadMixin],
 		components: {
-			formItem
+			formItem,
+			boxTitle
 		},
 		data() {
 			return {
@@ -109,7 +122,8 @@
 			// 		}
 			// 	})
 			// },
-			getCsDetails() {
+			getCsDetails() {
+				const that = this
 				getPlaceDetail({
 					placeId: this.curSelectSite.id
 				}).then(detailRes => {
@@ -125,29 +139,33 @@
 						return
 					}
 					const placePractitioner = data?.placePractitioner || []
+					console.log(data);
 					Object.keys(this.form).forEach(key => {
 						this.form[key] = data[key]
 						if (key === 'imageUrls' || key === 'planImageUrls') {
+							data[key] = data[key] || ''
 							this.form[key] = []
 							if (!!data[key]) {
 								data[key] = JSON.parse(data[key])
 								if (Array.isArray(data[key])) {
 									this.form[key] = data[key]
+								} else {
+									this.form[key].push(data[key])
 								}
-							} else {
-								this.form[key].push(data[key])
 							}
 						}
 					})
 
-					console.log(this.form);
-					this.personNum = placePractitioner.length
-					this.$nextTick(() => {
+					that.personNum = placePractitioner.length
+					// that.$nextTick(() => {
 						console.log(placePractitioner);
-						this.$refs.formItemRef.forEach((item, index) => {
-							item.form = placePractitioner[index]
-						})
-					})
+						setTimeout(() => {
+							const componetns = that.$refs.formItemRef || []
+							that.$refs.formItemRef.forEach((item, index) => {
+								item.form = placePractitioner[index]
+							})
+						}, 0)
+					// })
 				})
 			},
 			updatePlaceExt(data) {
@@ -197,12 +215,28 @@
 </script>
 
 <style lang="scss" scoped>
-	page {
-		background-color: #f6f6f6;
-	}
-
 	.container {
-		padding-bottom: 300rpx;
+		width: 100%;
+		height: 100vh;
+
+		display: flex;
+		flex-direction: column;
+		background: #F9F9FA;
+		color: #fff;
+		font-size: 32rpx;
+
+		.main-content {
+			height: 0;
+			flex: 1;
+			overflow-y: auto;
+		}
+
+		.btn-group {
+			padding: 20rpx;
+			z-index: 999;
+			background-color: #fff;
+		}
+
 
 		.form {
 			margin-top: 20rpx;
@@ -239,19 +273,5 @@
 			}
 		}
 
-		.btn-group {
-			background-color: #fff;
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			width: calc(100% - 40rpx);
-			padding: 20rpx;
-			border-top: 1rpx solid #f6f6f6;
-			z-index: 999;
-
-			.btn-item {
-				margin-top: 20rpx;
-			}
-		}
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3