From 476272a06e8d465d864ec37ddf34afaaa160d34d Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 15 Mar 2024 12:59:24 +0800
Subject: [PATCH] 更新

---
 /dev/null                                    |    0 
 subPackage/workbench/views/editCscj.vue      |  156 +++++++++++++++++++--
 subPackage/workbench/views/editExamine.vue   |   57 +++++--
 common/common.js                             |   13 +
 subPackage/workbench/components/formItem.vue |   62 +++++++-
 pages/home/index.vue                         |    6 
 mixin/uploadMixinPlace.js                    |    2 
 static/icon/menu-19.png                      |    0 
 subPackage/workbench/views/cscj.vue          |   85 ++++++++++-
 static/icon/menu-18.png                      |    0 
 10 files changed, 315 insertions(+), 66 deletions(-)

diff --git a/common/common.js b/common/common.js
index 0ad6457..c0447f7 100644
--- a/common/common.js
+++ b/common/common.js
@@ -69,11 +69,16 @@
 
 // 文件路径转字符串
 export const formattingUrls = (urls) => {
-	let arr = [];
-	for (let i of urls) {
-		arr.push(i.name);
+	if (!urls.length) {
+		return ""
+	} else {
+		let arr = [];
+		for (let i of urls) {
+			arr.push(i.name);
+		}
+		return arr.join(",")
 	}
-	return arr.join(",")
+
 }
 
 //转换标签颜色
diff --git a/mixin/uploadMixinPlace.js b/mixin/uploadMixinPlace.js
index d245761..6a78b6a 100644
--- a/mixin/uploadMixinPlace.js
+++ b/mixin/uploadMixinPlace.js
@@ -73,7 +73,7 @@
 			var that = this;
 			// 当设置 multiple 为 true 时, file 为数组格式,否则为对象格式
 			let lists = [].concat(event.file)
-
+			console.log("form====>", this.form);
 			let fileListLen = this.form[key].length
 			lists.map((item) => {
 				this.form[key].push({
diff --git a/pages/home/index.vue b/pages/home/index.vue
index f4b1128..fe3706b 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -332,9 +332,7 @@
 				isShowHouse: false, //显示楼盘表
 				isShowNotice: true, //显示通知公告
 				isShowContact: false,
-				bannerList: [{
-					url: "/static/img/banner.png"
-				}],
+				bannerList: [],
 				navList: [{
 						title: "物业",
 						name: "",
@@ -631,7 +629,7 @@
 			init() {
 				this.selectRole = uni.getStorageSync("activeRole")
 				this.getMenuList()
-				// this.getBanner();
+				this.getBanner();
 				this.getSiteList()
 				this.getNoticeList()
 			},
diff --git a/static/icon/menu-18.png b/static/icon/menu-18.png
new file mode 100644
index 0000000..0ed8976
--- /dev/null
+++ b/static/icon/menu-18.png
Binary files differ
diff --git a/static/icon/menu-19.png b/static/icon/menu-19.png
new file mode 100644
index 0000000..9baf483
--- /dev/null
+++ b/static/icon/menu-19.png
Binary files differ
diff --git a/static/img/banner.png b/static/img/banner.png
deleted file mode 100644
index cd32027..0000000
--- a/static/img/banner.png
+++ /dev/null
Binary files differ
diff --git a/subPackage/workbench/components/formItem.vue b/subPackage/workbench/components/formItem.vue
index fbd8ee5..b0e8286 100644
--- a/subPackage/workbench/components/formItem.vue
+++ b/subPackage/workbench/components/formItem.vue
@@ -7,18 +7,18 @@
 			<u-form-item label="电话号码" class="form-item">
 				<u--input v-model="form.telephone" border="none" placeholder="请填写电话号码"></u--input>
 			</u-form-item>
-			<u-form-item label="暂住地" class="form-item">
-				<u--input v-model="form.tempAddress" border="none" placeholder="请填写暂住地"></u--input>
+			<u-form-item label="现居住地" class="form-item">
+				<u--input v-model="form.tempAddress" border="none" placeholder="请填写现居住地"></u--input>
 			</u-form-item>
 			<u-form-item label="身份证号" class="form-item">
-				<u--input v-model="form.idCard" border="none" placeholder="请填写身份证号"></u--input>
+				<u--input v-model="form.idCard" type="idcard" border="none" placeholder="请填写身份证号"></u--input>
 			</u-form-item>
 			<u-form-item label="微信号" class="form-item">
 				<u--input v-model="form.wxAccount" border="none" placeholder="请填写微信号"></u--input>
 			</u-form-item>
-			<u-form-item label="年龄" class="form-item">
+			<!-- <u-form-item label="年龄" class="form-item">
 				<u--input v-model="form.age" border="none" placeholder="请填写年龄"></u--input>
-			</u-form-item>
+			</u-form-item> -->
 			<u-form-item @click="showGenderPicker = true" class="form-item" label="性别" prop="legalGender">
 				<u--input border="none" v-model="genderValue" disabled disabledColor="#ffffff" placeholder="请选择性别">
 				</u--input>
@@ -29,15 +29,28 @@
 				</u--input>
 				<u-icon slot="right" name="arrow-right"></u-icon>
 			</u-form-item>
-			<u-form-item label="工作单位" class="form-item">
+			<!-- <u-form-item label="工作单位" class="form-item">
 				<u--input v-model="form.employer" border="none" placeholder="请填写工作单位"></u--input>
-			</u-form-item>
+			</u-form-item> -->
 			<u-form-item label="岗位性质" class="form-item">
 				<u--input v-model="form.jobNature" border="none" placeholder="请填写岗位性质"></u--input>
 			</u-form-item>
 			<u-form-item label="户籍地址" class="form-item">
 				<u--input v-model="form.registeredAddress" border="none" placeholder="请填写户籍地址"></u--input>
 			</u-form-item>
+
+
+			<view class="item pic">
+				<view class="box-title f-28" style="padding:10rpx 0;">
+					从业人员照片
+				</view>
+				<u-upload :fileList="form.employerImg" :previewFullImage="uploadConfig.previewFullImage"
+					:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount"
+					:capture="uploadConfig.capture" uploadIcon="/static/icon/upload.png" @afterRead="afterReadImgs"
+					@delete="deleteImages">
+				</u-upload>
+			</view>
+
 		</u-form>
 		<u-picker :defaultIndex="nationTypeListIndex" :closeOnClickOverlay="true" :show="showNationPicker"
 			:columns="[nationTypeList]" @close="showNationPicker = false" @cancel="showNationPicker = false"
@@ -52,21 +65,24 @@
 	import {
 		bizDictionary
 	} from '@/api/system/dict.js'
+	import uploadMixin from "@/mixin/uploadMixinPlace";
 	export default {
+		mixins: [uploadMixin],
 		data() {
 			return {
 				form: {
 					name: '',
 					telephone: '',
 					tempAddress: '',
-					legalIdCard: '',
+					idCard: '',
 					gender: "",
 					ethnicity: "",
 					registeredAddress: "",
 					jobNature: "",
 					wxAccount: "",
 					employer: "",
-					jobNature: ""
+					jobNature: "",
+					employerImg: []
 				},
 				rules: {
 					name: {
@@ -135,6 +151,34 @@
 				this.showGenderPicker = false;
 			},
 
+
+			//上传成功后对返回数据进行处理
+			async afterReadImgs(event) {
+				this.showLoading()
+				let lists = [].concat(event.file)
+				let fileListLen = this.form.employerImg.length
+				lists.map((item) => {
+					this.form.employerImg.push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					this.form.employerImg.splice(fileListLen, 1, Object.assign({}, {
+						url: result.data.link,
+						name: result.data.name
+					}))
+					fileListLen++
+				}
+				this.loadingClose()
+			},
+
+			deleteImages(event) {
+				this.form.employerImg.splice(event.index, 1)
+			}
+
 		}
 	}
 </script>
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index 850bf3a..fdb2f77 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -149,13 +149,14 @@
 						<box-title title="房东信息"></box-title>
 					</view>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
-						label="房东姓名:" prop="landlordName">
+						label="姓名:" prop="landlordName">
 						<u--input border="none" v-model="form.placeExtEntity.landlordName" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
-						label="房东身份证号:" prop="landlordIdCard">
-						<u--input border="none" v-model="form.placeExtEntity.landlordIdCard" placeholder="请输入">
+						label="身份证号:" prop="landlordIdCard">
+						<u--input border="none" type="idcard" v-model="form.placeExtEntity.landlordIdCard"
+							placeholder="请输入">
 						</u--input>
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
@@ -166,8 +167,7 @@
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
 						label="微信号:" prop="landlordWxAccount">
-						<u--input border="none" type="idcard" v-model="form.placeExtEntity.landlordWxAccount"
-							placeholder="请输入">
+						<u--input border="none" v-model="form.placeExtEntity.landlordWxAccount" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 				</view>
@@ -178,13 +178,12 @@
 					</view>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
 						label="姓名:" prop="legalPerson">
-						<u--input border="none" type="number" v-model="form.placeExtEntity.legalPerson"
-							placeholder="请输入">
+						<u--input border="none" v-model="form.placeExtEntity.legalPerson" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
 						label="身份证号:" prop="legalIdCard">
-						<u--input border="none" type="number" v-model="form.placeExtEntity.legalIdCard"
+						<u--input border="none" type="idcard" v-model="form.placeExtEntity.legalIdCard"
 							placeholder="请输入">
 						</u--input>
 					</u-form-item>
@@ -254,6 +253,18 @@
 				</view>
 
 			</u-form>
+
+			<view class="practitioner">
+				<box-title title="从业人员信息"></box-title>
+				<view class="info" v-for="(item, index) in personNum" :key="index">
+					<view class="title">人员信息-#{{ index*1 + 1 }}</view>
+					<formItem ref="formItemRef"></formItem>
+				</view>
+
+				<view class="add-person">
+					<u-button type="success" plain @click="addPerson">再加一人</u-button>
+				</view>
+			</view>
 
 
 
@@ -377,13 +388,14 @@
 		getQrCodeDetail
 	} from "@/api/system/index"
 
-
+	import formItem from '../components/formItem.vue'
 	export default {
 		mixins: [uploadMixin],
 		components: {
 			lineItem,
 			boxTitle,
-			cateSelector
+			cateSelector,
+			formItem
 		},
 		data() {
 			return {
@@ -650,7 +662,8 @@
 				genderIndex: [0],
 				genderValue: "",
 				showNationPicker: false,
-				showGenderPicker: false
+				showGenderPicker: false,
+				personNum: 1,
 
 			}
 		},
@@ -845,6 +858,8 @@
 						})
 						return
 					}
+					const placePractitioner = data?.placePractitioner || []
+					this.personNum = placePractitioner.length
 					this.source = data.source;
 					// this.houseCode = data.houseCode;
 					const dpaEntity = data?.doorplateAddressEntity || {}
@@ -984,6 +999,30 @@
 							}
 						})
 					})
+
+					placePractitioner.forEach((item, index) => {
+						this.$nextTick(() => {
+							if (item.ethnicity) {
+								let obj = this.$getIndex(this.nationTypeList, item.ethnicity,
+									"value", "name")
+								this.$refs.formItemRef[index].nationValue = obj.name;
+								this.$refs.formItemRef[index].nationTypeIndex = obj.index;
+							}
+
+							if (item.gender) {
+								let obj = this.$getIndex(this.$refs.formItemRef[index]
+									.gender, item.gender, "value", "name")
+								this.$refs.formItemRef[index].genderValue = obj.name;
+								this.$refs.formItemRef[index].genderIndex = obj.index;
+							}
+							if (item.employerImg) {
+								this.$refs.formItemRef[index].employerImg = this.$setImageUrl(item
+									.employerImg, 2)
+							}
+
+							this.$refs.formItemRef[index].form = item
+						})
+					})
 				})
 			},
 
@@ -1049,6 +1088,19 @@
 				this.form.lng = Number(this.form.lng).toFixed(8)
 				this.form.lat = Number(this.form.lat).toFixed(8)
 				delete this.form.images;
+				if (this.personNum > 0) {
+					const placePractitioner = []
+					this.$refs.formItemRef.forEach(item => {
+						item.form.placeId = this.form.placeId
+						item.form.employerImg = this.$formattingUrls(item.form.employerImg);
+						placePractitioner.push(item.form)
+					})
+					this.form.placePractitioner = placePractitioner
+				}
+
+
+
+
 				add(this.form).then(res => {
 					uni.showToast({
 						icon: 'success',
@@ -1210,8 +1262,11 @@
 						this.getBuildingDetail()
 					}
 				})
-			}
+			},
 
+			addPerson() {
+				this.personNum++
+			},
 		}
 	}
 </script>
@@ -1352,4 +1407,10 @@
 	.top {
 		padding: 20rpx !important;
 	}
+
+	.practitioner {
+		background-color: #fff;
+		border-radius: 8rpx;
+		margin-top: 20rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/subPackage/workbench/views/editCscj.vue b/subPackage/workbench/views/editCscj.vue
index 1650d3e..afa2c4e 100644
--- a/subPackage/workbench/views/editCscj.vue
+++ b/subPackage/workbench/views/editCscj.vue
@@ -125,13 +125,14 @@
 						<box-title title="房东信息"></box-title>
 					</view>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
-						label="房东姓名:" prop="landlordName">
+						label="姓名:" prop="landlordName">
 						<u--input border="none" v-model="form.placeExtEntity.landlordName" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
-						label="房东身份证号:" prop="landlordIdCard">
-						<u--input border="none" v-model="form.placeExtEntity.landlordIdCard" placeholder="请输入">
+						label="身份证号:" prop="landlordIdCard">
+						<u--input border="none" type="idcard" v-model="form.placeExtEntity.landlordIdCard"
+							placeholder="请输入">
 						</u--input>
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
@@ -142,8 +143,7 @@
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
 						label="微信号:" prop="landlordWxAccount">
-						<u--input border="none" type="idcard" v-model="form.placeExtEntity.landlordWxAccount"
-							placeholder="请输入">
+						<u--input border="none" v-model="form.placeExtEntity.landlordWxAccount" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 				</view>
@@ -154,13 +154,12 @@
 					</view>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
 						label="姓名:" prop="legalPerson">
-						<u--input border="none" type="number" v-model="form.placeExtEntity.legalPerson"
-							placeholder="请输入">
+						<u--input border="none" v-model="form.placeExtEntity.legalPerson" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
 						label="身份证号:" prop="legalIdCard">
-						<u--input border="none" type="number" v-model="form.placeExtEntity.legalIdCard"
+						<u--input border="none" type="idcard" v-model="form.placeExtEntity.legalIdCard"
 							placeholder="请输入">
 						</u--input>
 					</u-form-item>
@@ -230,6 +229,80 @@
 					</u-upload>
 				</view>
 			</u-form>
+
+			<view class="practitioner">
+				<box-title title="从业人员信息"></box-title>
+				<view class="info" v-for="(item, index) in personNum" :key="index">
+					<view class="title">人员信息-#{{ index*1 + 1 }}</view>
+					<formItem ref="formItemRef"></formItem>
+				</view>
+
+				<view class="add-person">
+					<u-button type="success" plain @click="addPerson">再加一人</u-button>
+				</view>
+			</view>
+
+
+
+			<view class="item" v-if="currentId">
+				<view class="box-title">
+					<box-title title="综治网格">
+						<template slot="titleMore">
+							<view class="title-more">
+								<view class="red item"></view>
+								<view class="orange item"></view>
+								<view class="green item"></view>
+							</view>
+						</template>
+					</box-title>
+				</view>
+				<lineItem :dataInfo="comprehensiveData.basic">
+				</lineItem>
+				<!-- <view class="bgc-ff flex j-c-s-b a-i-c" @click="navTo(1)" style="padding:20rpx;">
+					<text>历史事件</text>
+					<u-icon name="arrow-right"></u-icon>
+				</view> -->
+
+				<lineItem :dataInfo="comprehensiveData.scene">
+					<template v-slot:pic="{scope}">
+						<view class="image" v-if="scope.value !== ''">
+							<u--image @click="imgPreview(scope.value)" width="200rpx" height="200rpx"
+								:src="scope.value"></u--image>
+						</view>
+						<view class="" v-else>
+							{{scope.value}}
+						</view>
+					</template>
+				</lineItem>
+			</view>
+
+
+
+			<view class="item" v-if="currentId">
+				<view class="box-title">
+					<box-title title="公安网格">
+						<template slot="titleMore">
+							<view class="title-more">
+								<view class="red item"></view>
+								<view class="orange item"></view>
+								<view class="green item"></view>
+							</view>
+						</template>
+					</box-title>
+				</view>
+				<lineItem :dataInfo="publicData.basic">
+				</lineItem>
+				<!-- <view class="bgc-ff flex j-c-s-b a-i-c" @click="navTo(2)" style="padding:20rpx;">
+					<text>历史事件</text>
+					<u-icon name="arrow-right"></u-icon>
+				</view> -->
+
+				<lineItem :dataInfo="publicData.scene">
+					<template v-slot:pic="{scope}">
+						{{scope.value}}
+					</template>
+				</lineItem>
+			</view>
 		</view>
 		<footer-btn @click="submit" text="保存" />
 
@@ -290,12 +363,18 @@
 
 	import cateSelector from "../components/cateSelector.vue"
 
+	import {
+		getQrCodeDetail
+	} from "@/api/system/index"
+
+	import formItem from '../components/formItem.vue'
 	export default {
 		mixins: [uploadMixin],
 		components: {
 			lineItem,
 			boxTitle,
-			cateSelector
+			cateSelector,
+			formItem
 		},
 		data() {
 			return {
@@ -561,7 +640,8 @@
 				genderIndex: [0],
 				genderValue: "",
 				showNationPicker: false,
-				showGenderPicker: false
+				showGenderPicker: false,
+				personNum: 1,
 
 			}
 		},
@@ -604,14 +684,6 @@
 				},
 				immediate: true
 			}
-
-			// secondId:{
-			//              handler(newVal,oldVal){
-			// 		this.getCategory(3,this.secondId);
-			// 	},				
-			// 	immediate:true
-			// }  
-
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules)
@@ -754,7 +826,10 @@
 						})
 						return
 					}
-					this.houseCode = data.houseCode;
+					const placePractitioner = data?.placePractitioner || []
+					this.personNum = placePractitioner.length
+					this.source = data.source;
+					// this.houseCode = data.houseCode;
 					const dpaEntity = data?.doorplateAddressEntity || {}
 					const gridEntity = data?.grid || {}
 					// this.form.buildingCode = dpaEntity?.buildingCode || ''
@@ -893,6 +968,29 @@
 						})
 					})
 
+					placePractitioner.forEach((item, index) => {
+						this.$nextTick(() => {
+							if (item.ethnicity) {
+								let obj = this.$getIndex(this.nationTypeList, item.ethnicity,
+									"value", "name")
+								this.$refs.formItemRef[index].nationValue = obj.name;
+								this.$refs.formItemRef[index].nationTypeIndex = obj.index;
+							}
+
+							if (item.gender) {
+								let obj = this.$getIndex(this.$refs.formItemRef[index]
+									.gender, item.gender, "value", "name")
+								this.$refs.formItemRef[index].genderValue = obj.name;
+								this.$refs.formItemRef[index].genderIndex = obj.index;
+							}
+							if (item.employerImg) {
+								this.$refs.formItemRef[index].employerImg = this.$setImageUrl(item
+									.employerImg, 2)
+							}
+
+							this.$refs.formItemRef[index].form = item
+						})
+					})
 				})
 			},
 
@@ -951,6 +1049,19 @@
 				this.form.lat = Number(this.form.lat).toFixed(8)
 
 				delete this.form.images;
+				if (this.personNum > 0) {
+					const placePractitioner = []
+					this.$refs.formItemRef.forEach(item => {
+						item.form.placeId = this.form.placeId
+						item.form.employerImg = this.$formattingUrls(item.form.employerImg);
+						placePractitioner.push(item.form)
+					})
+					this.form.placePractitioner = placePractitioner
+				}
+
+
+
+
 				add(this.form).then(res => {
 					this.$showTips("提交成功", "success");
 					setTimeout(() => {
@@ -1199,4 +1310,11 @@
 		background-color: #fff;
 		text-align: center;
 	}
+
+
+	.practitioner {
+		background-color: #fff;
+		border-radius: 8rpx;
+		margin-top: 20rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index d0c3dda..395da62 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -16,21 +16,19 @@
 						<u--input border="none" v-model="jwd" placeholder="请选择场所位置" disabled
 							disabledColor="#ffffff"></u--input>
 					</u-form-item>
-					<u-form-item class="form-item" label="标准地址" required prop="houseCodeBinds"
+					<!-- <u-form-item class="form-item" label="标准地址" required prop="houseCodeBinds"
 						@click="isShowPopup = true">
 						<u--input v-if="!addressNames.length" border="none" disabled disabledColor="#ffffff"
 							placeholder="请选择标准地址">
 						</u--input>
-						<!-- <u-textarea v-if="addressNames" border="none" :disabled="true" disabledColor="#ffffff"
-							v-model="addressNames" placeholder="请选择标准地址">
-						</u-textarea> -->
+						
 						<view v-if="addressNames.length">
 							<view class="f-28" v-for="i in addressNames">
 								{{i}}
 							</view>
 						</view>
 						<u-icon slot="right" name="arrow-right"></u-icon>
-					</u-form-item>
+					</u-form-item> -->
 					<u-form-item label="场所名称" required class="form-item" prop="placeName">
 						<u--input border="none" v-model="form.placeName" placeholder="请填写场所名称"></u--input>
 					</u-form-item>
@@ -103,7 +101,7 @@
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
 						label="身份证号:" prop="landlordIdCard">
-						<u--input border="none" v-model="form.landlordIdCard" placeholder="请输入">
+						<u--input border="none" type="idcard" v-model="form.landlordIdCard" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
@@ -113,7 +111,7 @@
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
 						label="微信号:" prop="landlordWxAccount">
-						<u--input border="none" type="idcard" v-model="form.landlordWxAccount" placeholder="请输入">
+						<u--input border="none" v-model="form.landlordWxAccount" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 
@@ -235,7 +233,12 @@
 					legalAge: "",
 					legalJobNature: "",
 					legalRegisteredAddress: "",
-					legalTempAddress: ""
+					legalTempAddress: "",
+					images: [],
+					landlordName: "",
+					landlordPhone: "",
+					landlordIdCard: "",
+					landlordWxAccount: ""
 				},
 				rules: {
 					"location": {
@@ -425,26 +428,35 @@
 					placePractitioner.forEach((item, index) => {
 						this.$nextTick(() => {
 							if (item.ethnicity) {
-								let obj = this.$getIndex(this.$refs.formItemRef[index]
-									.nationTypeList, item.ethnicity, "value", "name")
+								let obj = this.$getIndex(this.nationTypeList, item.ethnicity,
+									"value", "name")
 								this.$refs.formItemRef[index].nationValue = obj.name;
 								this.$refs.formItemRef[index].nationTypeIndex = obj.index;
 							}
 
 							if (item.gender) {
-								let obj = this.$getIndex(this.$refs.formItemRef[index]
-									.gender, item.gender, "value", "name")
+								let obj = this.$getIndex(this.$refs.formItemRef[index].gender, item
+									.gender, "value", "name")
 								this.$refs.formItemRef[index].genderValue = obj.name;
 								this.$refs.formItemRef[index].genderIndex = obj.index;
 							}
+							if (item.employerImg) {
+								this.$refs.formItemRef[index].employerImg = this.$setImageUrl(item
+									.employerImg, 2)
+
+
+								console.log("employerImg===>", this.$setImageUrl(item
+									.employerImg, 2))
+								// console.log(this.$refs.formItemRef[index].employerImg);
+							} else {
+								this.$refs.formItemRef[index].employerImg = []
+							}
+
+							console.log(this.$refs.formItemRef[index].form);
 
 							this.$refs.formItemRef[index].form = item
 						})
 					})
-
-					// this.$refs.formItemRef.forEach((item, index) => {
-					// 	item.form = placePractitioner[index]
-					// })
 				})
 			},
 
@@ -526,7 +538,14 @@
 				if (this.personNum > 0) {
 					const placePractitioner = []
 					this.$refs.formItemRef.forEach(item => {
+						console.log("item====>", item);
 						item.form.placeId = this.form.placeId
+						// if (item.form.employerImg == null) {
+						// 	item.form.employerImg = "";
+						// } else {
+						// 	item.form.employerImg = this.$formattingUrls(item.form.employerImg);
+						// }
+						item.form.employerImg = "";
 						placePractitioner.push(item.form)
 					})
 					this.form.placePractitioner = placePractitioner
@@ -541,7 +560,11 @@
 
 			pushPage() {
 				this.$u.func.globalNavigator(`/subPackage/workbench/views/cshw?placeId=${this.form.placeId}`)
-			}
+			},
+
+			addPerson() {
+				this.personNum++
+			},
 		}
 	}
 </script>

--
Gitblit v1.9.3