From 3e697353c6fea9cb80ec809d02594939f892e77e Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 14 Mar 2024 18:32:56 +0800
Subject: [PATCH] 更新

---
 subPackage/workbench/views/editCscj.vue |  314 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 182 insertions(+), 132 deletions(-)

diff --git a/subPackage/workbench/views/editCscj.vue b/subPackage/workbench/views/editCscj.vue
index 4896d91..1650d3e 100644
--- a/subPackage/workbench/views/editCscj.vue
+++ b/subPackage/workbench/views/editCscj.vue
@@ -119,6 +119,106 @@
 					</u-form-item>
 				</view>
 
+
+				<view class="item">
+					<view class="box-title">
+						<box-title title="房东信息"></box-title>
+					</view>
+					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+						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="请输入">
+						</u--input>
+					</u-form-item>
+					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+						label="手机号:" prop="landlordPhone">
+						<u--input border="none" type="number" v-model="form.placeExtEntity.landlordPhone"
+							placeholder="请输入">
+						</u--input>
+					</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>
+					</u-form-item>
+				</view>
+
+				<view class="item">
+					<view class="box-title">
+						<box-title title="法人信息"></box-title>
+					</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>
+					</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"
+							placeholder="请输入">
+						</u--input>
+					</u-form-item>
+					<!-- <u-form-item @click="showGenderPicker = true" class="form-item" labelWidth="100" label="性别"
+						prop="legalGender">
+						<u--input border="none" v-model="genderValue" disabled disabledColor="#ffffff"
+							placeholder="请选择性别">
+						</u--input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+
+					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+						label="年龄:" prop="legalAge">
+						<u--input border="none" type="number" v-model="form.placeExtEntity.legalAge" placeholder="请输入">
+						</u--input>
+					</u-form-item>
+					<u-form-item @click="showNationPicker = true" class="form-item" labelWidth="100" label="民族"
+						prop="ethnicity">
+						<u--input border="none" v-model="nationValue" disabled disabledColor="#ffffff"
+							placeholder="请选择民族">
+						</u--input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item> -->
+					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+						label="手机号:" prop="legalTel">
+						<u--input border="none" type="number" v-model="form.placeExtEntity.legalTel" placeholder="请输入">
+						</u--input>
+					</u-form-item>
+					<!-- <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+						label="微信号:" prop="legalWxAccount">
+						<u--input border="none" v-model="form.placeExtEntity.legalWxAccount" placeholder="请输入">
+						</u--input>
+					</u-form-item> -->
+					<!-- <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+						label="工作单位:" prop="employer">
+						<u--input border="none" v-model="form.placeExtEntity.employer" placeholder="请输入">
+						</u--input>
+					</u-form-item> -->
+					<!-- <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+						label="岗位性质:" prop="legalJobNature">
+						<u--input border="none" v-model="form.placeExtEntity.legalJobNature" placeholder="请输入">
+						</u--input>
+					</u-form-item>
+					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+						label="户籍地址:" prop="legalRegisteredAddress">
+						<u--textarea border="none" v-model="form.placeExtEntity.legalRegisteredAddress"
+							placeholder="请输入">
+						</u--textarea>
+					</u-form-item>
+					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+						label="居住地址:" prop="legalTempAddress">
+						<u--textarea border="none" type="idcard" v-model="form.placeExtEntity.legalTempAddress"
+							placeholder="请输入">
+						</u--textarea>
+					</u-form-item> -->
+				</view>
+
+
 				<view class="item pic">
 					<view class="box-title">
 						<box-title title="场所照片"></box-title>
@@ -148,6 +248,16 @@
 		<u-picker :show="isShowCatePicker" :defaultIndex="categoryIndex" ref="catePicker" keyName="categoryName"
 			:columns="categoryList" @confirm="confirmCategory" @change="changeCategory"
 			@cancel="isShowCatePicker = false"></u-picker>
+
+
+		<u-picker :defaultIndex="nationTypeListIndex" :closeOnClickOverlay="true" :show="showNationPicker"
+			:columns="[nationTypeList]" @close="showNationPicker = false" @cancel="showNationPicker = false"
+			keyName="name" @confirm="confirmNation"></u-picker>
+
+		<u-picker :defaultIndex="genderIndex" :closeOnClickOverlay="true" :show="showGenderPicker" :columns="[gender]"
+			@close="showGenderPicker = false" @cancel="showGenderPicker = false" keyName="name"
+			@confirm="confirmGender"></u-picker>
+
 		<cate-selector ref="selector" @comfirm="comfirmNineType" />
 	</view>
 </template>
@@ -163,10 +273,8 @@
 		getDoorplateAddressList
 	} from "@/api/doorplateAddress/doorplateAddress";
 	import {
+		add,
 		getPlaceDetail
-	} from '@/api/place/place.js'
-	import {
-		add
 	} from "@/api/place/place";
 	import {
 		format
@@ -217,7 +325,18 @@
 					isNine: "",
 					isFront: "",
 					frontType: "",
-					nineType: ""
+					nineType: "",
+					placeExtEntity: {
+						landlordName: "",
+						landlordIdCard: "",
+						landlordPhone: "",
+						landlordWxAccount: "",
+						legalPerson: "",
+						legalTel: "",
+						legalIdCard: "",
+						placeId: "",
+
+					}
 				},
 				rules: {
 					// 'buildingCode': {
@@ -425,13 +544,26 @@
 				showFrontTypePicker: false,
 				nineTypeValue: "",
 				frontTypeValue: "",
-				isView: false
+				isView: false,
 
+				nationTypeList: [], //民族
+				nationTypeIndex: [0],
+				nationValue: "",
+				gender: [{ //性别
+						value: 1,
+						name: '男',
+					},
+					{
+						value: 0,
+						name: '女',
+					}
+				],
+				genderIndex: [0],
+				genderValue: "",
+				showNationPicker: false,
+				showGenderPicker: false
 
 			}
-		},
-		created() {
-			this.buildColumn()
 		},
 		options: {
 			styleIsolation: 'shared', // 解除样式隔离
@@ -486,57 +618,14 @@
 		},
 
 		methods: {
-			// getBuildingDetail(params = {}) {
-			// 	getDoorplateAddressDetail(Object.assign(params, {
-			// 		stdId: this.stdId
-			// 	})).then(res => {
-			// 		let data = res.data
-			// 		this.form.buildingCode = data.buildingCode
-
-			// 		let buildingNameArr = [data.townStreetName, data.neiName, data.streetRuName, data.aoiName,
-			// 			data.buildingName
-			// 		]
-			// 		let arr = buildingNameArr.filter(e => {
-			// 			return e != null || e != ''
-			// 		})
-
-			// 		// 赋值
-			// 		// this.form.placeName = data['placeName']
-			// 		Object.keys(this.form).forEach(key => {
-			// 			if (!data[key]) {
-			// 				this.form[key] = data.place[key]
-			// 			} else {
-			// 				this.form[key] = data[key]
-			// 			}
-			// 		})
-
-			// 		this.form.building = arr.join("")
-
-			// 		Object.keys(this.comprehensiveData).forEach(key => {
-			// 			this.comprehensiveData[key].forEach(item => {
-			// 				if (!data[item.name]) {
-			// 					item.value = data.place[item.name] || '未完善'
-			// 				} else {
-			// 					item.value = data[item.name] || '未完善'
-			// 				}
-			// 			})
-			// 			this.publicData[key].forEach(item => {
-			// 				if (!data[item.name]) {
-			// 					item.value = data.place[item.name] || '未完善'
-			// 				} else {
-			// 					item.value = data[item.name] || '未完善'
-			// 				}
-			// 			})
-			// 		})
-			// 	})
-			// },
-
 
 			async getAllBizDict() {
 				// 获取九小场所类型
 				// await this.getBizDict('nineType', this.nineTypeList)
 				// 获取阵地
 				await this.getBizDict('frontType', this.frontTypeList)
+				// 获取民族
+				await this.getBizDict('nationType', this.nationTypeList);
 			},
 
 			// 获取业务字典
@@ -625,17 +714,10 @@
 
 				// 当第一列值发生变化时,变化第二列(后一列)对应的选项
 				if (columnIndex === 0) {
-					// picker为选择器this实例,变化第二列对应的选项
-					// picker.setColumnValues(1, this.categoryList[index])
+
 					this.firstId = e.value[columnIndex].categoryNo;
-					// this.secondId = this.categoryList[1][0].categoryNo;
-					// this.getCategory(2,this.firstId);
 				}
-				// else if ( columnIndex === 1){
-				// picker.setColumnValues(2, this.categoryList[index])
-				// this.secondId = e.value[columnIndex].categoryNo;
-				// this.getCategory(3,this.secondId)
-				// }
+
 			},
 
 			getBuildingDetail(params = {}) {
@@ -745,6 +827,28 @@
 								}
 							}
 						}
+
+						if (key == "legalGender" && data.legalGender) {
+							let {
+								index,
+								name
+							} = this.$getIndex(this.gender, data.legalGender, "value",
+								"name");
+							this.genderIndex = index;
+							this.genderValue = name;
+						}
+
+						if (key == "ethnicity" && data.ethnicity) {
+							let {
+								index,
+								name
+							} = this.$getIndex(this.nationTypeList, data.ethnicity, "value",
+								"name");
+							this.nationTypeIndex = index;
+							this.nationValue = name;
+						}
+
+
 					})
 					this.$set(this.form, "jwd", `${Number(data.lng).toFixed(6)},${Number(data.lat).toFixed(6)}`)
 					this.form.building = arr.join("")
@@ -816,12 +920,14 @@
 				}
 				// this.$refs.form.validate().then(valid => {
 				// 	if (valid) {
-				if (this.form?.images?.length > 0) {
+				if (this.form.images.length) {
 					let urls = []
 					this.form.images.forEach(e => {
 						urls.push(e.name)
 					})
 					this.form.imageUrls = urls.join(",")
+				} else {
+					this.form.imageUrls = ""
 				}
 
 				this.form.roleName = uni.getStorageSync("activeRole").roleName;
@@ -855,27 +961,6 @@
 			},
 
 
-			async buildColumn() {
-				//设置街道
-				const townStreet = await this.getDoorplateAddressList(null, "townStreet")
-				this.setColumn(townStreet, 0)
-				//设置社区
-				const nei = await this.getDoorplateAddressList(townStreet[0]?.code, "nei")
-				this.setColumn(nei, 1)
-				//设置路
-				const streetRu = await this.getDoorplateAddressList(nei[0]?.code, "streetRu")
-				this.setColumn(streetRu, 2)
-				//设置地区
-				const district = await this.getDoorplateAddressList(streetRu[0]?.code, "district")
-				this.setColumn(district, 3)
-				//设置楼栋
-				const building = await this.getDoorplateAddressList(district[0]?.code, "building")
-				this.setColumn(building, 4)
-			},
-
-			setColumn(data, index) {
-				this.$set(this.pickColumns, index, data)
-			},
 
 			//获取当前位置信息
 			getCurrentLocation() {
@@ -950,55 +1035,20 @@
 				this.showFrontTypePicker = false;
 			},
 
-			async changeHandler(e) {
-				const {
-					columnIndex,
-					index,
-					// 微信小程序无法将picker实例传出来,只能通过ref操作
-					picker = this.$refs.uPicker
-				} = e
-				let item = e.values[columnIndex][index]
-				//街道
-				if (columnIndex === 0) {
-					//获取社区列表
-					const nei = await this.getDoorplateAddressList(item.code, "nei")
-					picker.setColumnValues(1, nei)
+			//选择民族
+			confirmNation(e) {
+				this.nationIndex = e.indexs;
+				this.nationValue = e.value[0].name;
+				this.form.placeExtEntity.ethnicity = e.value[0].value;
+				this.showNationPicker = false;
+			},
 
-					const streetRu = await this.getDoorplateAddressList(nei[0].code, "streetRu")
-					picker.setColumnValues(2, streetRu)
-
-					const district = await this.getDoorplateAddressList(streetRu[0].code, "district")
-					picker.setColumnValues(3, district)
-
-					const building = await this.getDoorplateAddressList(district[0].code, "building")
-					picker.setColumnValues(4, building)
-				}
-
-				if (columnIndex === 1) {
-					const streetRu = await this.getDoorplateAddressList(item.code, "streetRu")
-					picker.setColumnValues(2, streetRu)
-
-					const district = await this.getDoorplateAddressList(streetRu[0].code, "district")
-					picker.setColumnValues(3, district)
-
-					const building = await this.getDoorplateAddressList(district[0].code, "building")
-					picker.setColumnValues(4, building)
-				}
-
-				if (columnIndex === 2) {
-
-					const district = await this.getDoorplateAddressList(item.code, "district")
-					picker.setColumnValues(3, district)
-
-					const building = await this.getDoorplateAddressList(district[0].code, "building")
-					picker.setColumnValues(4, building)
-				}
-
-				if (columnIndex === 3) {
-					const building = await this.getDoorplateAddressList(item.code, "building")
-					picker.setColumnValues(4, building)
-				}
-
+			//选择性别
+			confirmGender(e) {
+				this.genderIndex = e.indexs;
+				this.genderValue = e.value[0].name;
+				this.form.placeExtEntity.legalGender = e.value[0].value;
+				this.showGenderPicker = false;
 			},
 
 			//弹出层打开

--
Gitblit v1.9.3