From f57e022fbf07dccbd447eee7030971c51d10a6ed Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 12 Mar 2024 18:10:16 +0800
Subject: [PATCH] 更新

---
 subPackage/workbench/views/editExamine.vue |  203 ++++++++++++++++++++--
 pages.json                                 |   12 
 subPackage/workbench/views/cscj.vue        |  294 +++++++++++++++-----------------
 common/setting.js                          |    4 
 4 files changed, 327 insertions(+), 186 deletions(-)

diff --git a/common/setting.js b/common/setting.js
index 3833aec..97a0c9e 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -10,8 +10,8 @@
 	version: '2.0.0',
 	// 开发环境接口Url
 	// devUrl: 'http://z4042833u6.wicp.vip',
-	// devUrl: 'http://192.168.2.140:9528',
-	devUrl: 'https://srgdjczzxtpt.com:2080/api',
+	devUrl: 'http://192.168.2.140:9528',
+	// devUrl: 'https://srgdjczzxtpt.com:2080/api',
 	// devUrl: 'https://kt39592615.goho.co',
 	minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
 	// minioBaseUrl: "http://192.168.0.101:9528/",
diff --git a/pages.json b/pages.json
index a024c59..62ab20a 100644
--- a/pages.json
+++ b/pages.json
@@ -924,12 +924,12 @@
 				"iconPath": "static/img/tabbar-01.png",
 				"text": "首页"
 			},
-			{
-				"pagePath": "pages/circle/index",
-				"iconPath": "static/img/tabbar-02.png",
-				"selectedIconPath": "static/img/tabbar-02-selected.png",
-				"text": "圈子"
-			},
+			// {
+			// 	"pagePath": "pages/circle/index",
+			// 	"iconPath": "static/img/tabbar-02.png",
+			// 	"selectedIconPath": "static/img/tabbar-02-selected.png",
+			// 	"text": "圈子"
+			// },
 			{
 				"pagePath": "pages/user/center",
 				"iconPath": "static/img/tabbar-03.png",
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index 9019e49..a345c4e 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -144,49 +144,98 @@
 				</view>
 
 
-				<!-- <view class="item">
+				<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="principal">
-						<u--input border="none" v-model="form.principal" placeholder="请输入">
+						label="房东姓名:" prop="landlordName">
+						<u--input border="none" v-model="form.landlordName" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
-						label="手机号:" prop="principalPhone">
-						<u--input border="none" type="number" v-model="form.principalPhone" placeholder="请输入">
+						label="房东身份证号:" prop="landlordIdCard">
+						<u--input border="none" v-model="form.landlordIdCard" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
-						label="微信号:" prop="principalIdCard">
-						<u--input border="none" type="idcard" v-model="form.principalIdCard" placeholder="请输入">
+						label="手机号:" prop="landlordPhone">
+						<u--input border="none" type="number" v-model="form.landlordPhone" placeholder="请输入">
 						</u--input>
 					</u-form-item>
-				</view> -->
+					<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>
+					</u-form-item>
+				</view>
 
-
-
-				<!-- <view class="item">
+				<view class="item">
 					<view class="box-title">
-						<box-title title="实际使用人信息"></box-title>
+						<box-title title="法人信息"></box-title>
 					</view>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
-						label="场所负责人:" prop="principal">
-						<u--input border="none" v-model="form.principal" placeholder="请输入">
+						label="姓名:" prop="legalPerson">
+						<u--input border="none" type="number" v-model="form.legalPerson" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
-						label="手机号:" prop="principalPhone">
-						<u--input border="none" type="number" v-model="form.principalPhone" placeholder="请输入">
+						label="身份证号:" prop="legalIdCard">
+						<u--input border="none" type="number" v-model="form.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.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="ntaionValue" 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.legalTel" placeholder="请输入">
 						</u--input>
 					</u-form-item>
 					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
-						label="微信号:" prop="principalIdCard">
-						<u--input border="none" type="idcard" v-model="form.principalIdCard" placeholder="请输入">
+						label="微信号:" prop="legalWxAccount">
+						<u--input border="none" type="idcard" v-model="form.legalWxAccount" placeholder="请输入">
 						</u--input>
 					</u-form-item>
-				</view> -->
+					<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+						label="工作单位:" prop="employer">
+						<u--input border="none" type="idcard" v-model="form.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" type="idcard" v-model="form.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" type="idcard" v-model="form.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.legalTempAddress" placeholder="请输入">
+						</u--textarea>
+					</u-form-item>
+				</view>
 
 
 				<view class="item pic" v-if="(currentId && form.images.length) || !currentId ">
@@ -279,6 +328,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>
@@ -316,6 +375,7 @@
 	import {
 		getQrCodeDetail
 	} from "@/api/system/index"
+
 
 	export default {
 		mixins: [uploadMixin],
@@ -561,12 +621,28 @@
 				nineTypeValue: "",
 				frontTypeValue: "",
 				isView: false,
-				source: ""
+				source: "",
+
+				nationTypeList: [], //民族
+				nationTypeIndex: [0],
+				nationValue: "",
+				gender: [{ //性别
+						value: 1,
+						name: '男',
+					},
+					{
+						value: 0,
+						name: '女',
+					}
+				],
+				genderIndex: [0],
+				genderValue: "",
+				showNationPicker: false,
+				showGenderPicker: false
+
 			}
 		},
-		// created() {
-		// 	this.buildColumn()
-		// },
+
 		options: {
 			styleIsolation: 'shared', // 解除样式隔离
 		},
@@ -614,71 +690,20 @@
 				},
 				immediate: true
 			}
-
-			// secondId:{
-			//              handler(newVal,oldVal){
-			// 		this.getCategory(3,this.secondId);
-			// 	},				
-			// 	immediate:true
-			// }  
-
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules)
 		},
 
 		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);
 			},
 
 			// 获取业务字典
@@ -770,18 +795,11 @@
 					// 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 = {}) {
-
 				let idorCodeParams = {}
 				if (this.houseCode) {
 					idorCodeParams = {
@@ -889,6 +907,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("")
@@ -1015,28 +1055,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() {
@@ -1109,57 +1127,23 @@
 				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)
-
-					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)
-				}
-
+			//选择民族
+			confirmNation(e) {
+				this.nationIndex = e.indexs;
+				this.nationValue = e.value[0].name;
+				this.form.ethnicity = e.value[0].value;
+				this.showNationPicker = false;
 			},
 
+			//选择性别
+			confirmGender(e) {
+				this.genderIndex = e.indexs;
+				this.genderValue = e.value[0].name;
+				this.form.legalGender = e.value[0].value;
+				this.showGenderPicker = false;
+			},
+
+
 			//弹出层打开
 			popup() {
 				// this.$refs.uniPopup.open()
diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index 28e2047..e31de9c 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -1,25 +1,20 @@
 <template>
 	<view class="container">
 		<view class="main-content">
-			<view class="base">
-				<box-title :title="'基本信息'"></box-title>
-				<u-form labelWidth="70" :model="form" :rules="rules" ref="form" class="form">
+
+			<u-form labelWidth="80" :model="form" :rules="rules" ref="form" class="form">
+
+				<view class="base">
+					<box-title :title="'基本信息'"></box-title>
+
 					<u-form-item label="场所位置" required class="form-item" prop="location" @click="getLocation">
 						<u--textarea border="none" v-model="form.location" placeholder="请选择场所位置"></u--textarea>
 						<u-icon slot="right" name="arrow-right"></u-icon>
 					</u-form-item>
+
 					<u-form-item label="经纬度" required class="form-item">
 						<u--input border="none" v-model="jwd" placeholder="请选择场所位置" disabled
 							disabledColor="#ffffff"></u--input>
-					</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>
-					<u-form-item label="法人信息" required class="form-item" prop="legalPerson">
-						<u--input border="none" v-model="form.legalPerson" placeholder="请填写法人信息"></u--input>
-					</u-form-item>
-					<u-form-item label="法人电话" class="form-item" prop="legalTel" required>
-						<u--input border="none" type="number" v-model="form.legalTel" placeholder="请填写法人电话"></u--input>
 					</u-form-item>
 					<u-form-item class="form-item" label="标准地址" required prop="houseCodeBinds"
 						@click="isShowPopup = true">
@@ -36,8 +31,94 @@
 						</view>
 						<u-icon slot="right" name="arrow-right"></u-icon>
 					</u-form-item>
-				</u-form>
-			</view>
+					<u-form-item label="场所名称" required class="form-item" prop="placeName">
+						<u--input border="none" v-model="form.placeName" placeholder="请填写场所名称"></u--input>
+					</u-form-item>
+					<u-form-item label="法人信息" required class="form-item" prop="legalPerson">
+						<u--input border="none" v-model="form.legalPerson" placeholder="请填写法人信息"></u--input>
+					</u-form-item>
+					<u-form-item label="法人身份证" :required="isRequired" class="form-item" prop="legalIdCard">
+						<u--input border="none" v-model="form.legalIdCard" placeholder="请填写法人身份证"></u--input>
+					</u-form-item>
+					<u-form-item label="法人电话" class="form-item" prop="legalTel" :required="isRequired">
+						<u--input border="none" type="number" v-model="form.legalTel" placeholder="请填写法人电话"></u--input>
+					</u-form-item>
+					<u-form-item class="form-item" :required="isRequired" :disabled="isDisabled" label="微信号:"
+						prop="legalWxAccount">
+						<u--input border="none" type="idcard" v-model="form.legalWxAccount" placeholder="请输入">
+						</u--input>
+					</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>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+					<u-form-item class="form-item" :required="isRequired" :disabled="isDisabled" label="年龄:"
+						prop="legalAge">
+						<u--input border="none" type="number" v-model="form.legalAge" placeholder="请输入">
+						</u--input>
+					</u-form-item>
+					<u-form-item @click="showNationPicker = true" class="form-item" 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" :required="isRequired" :disabled="isDisabled" label="工作单位:"
+						prop="employer">
+						<u--input border="none" type="idcard" v-model="form.employer" placeholder="请输入">
+						</u--input>
+					</u-form-item>
+					<u-form-item class="form-item" :required="isRequired" :disabled="isDisabled" label="岗位性质:"
+						prop="legalJobNature">
+						<u--input border="none" type="idcard" v-model="form.legalJobNature" placeholder="请输入">
+						</u--input>
+					</u-form-item>
+					<u-form-item class="form-item" :required="isRequired" :disabled="isDisabled" label="户籍地址:"
+						prop="legalRegisteredAddress">
+						<u--textarea border="none" type="idcard" v-model="form.legalRegisteredAddress"
+							placeholder="请输入">
+						</u--textarea>
+					</u-form-item>
+					<u-form-item class="form-item" :required="isRequired" :disabled="isDisabled" label="居住地址:"
+						prop="legalTempAddress">
+						<u--textarea border="none" type="idcard" v-model="form.legalTempAddress" placeholder="请输入">
+						</u--textarea>
+					</u-form-item>
+
+				</view>
+
+
+				<view class="item bgc-ff mt-20">
+
+					<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.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.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.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.landlordWxAccount" placeholder="请输入">
+						</u--input>
+					</u-form-item>
+
+				</view>
+			</u-form>
 			<view class="license">
 				<box-title title="营业执照"></box-title>
 				<view class="upload-img">
@@ -92,6 +173,14 @@
 
 		</u-popup>
 
+		<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>
+
 
 		<footer-btn @click="submit"></footer-btn>
 
@@ -123,7 +212,9 @@
 	import {
 		getPlaceList
 	} from '@/api/place/place.js'
-
+	import {
+		bizDictionary
+	} from '@/api/system/dict.js'
 	export default {
 		mixins: [uploadMixin],
 		components: {
@@ -141,7 +232,13 @@
 					legalTel: '',
 					imageUrls: [],
 					planImageUrls: [],
-					houseCodeBinds: ""
+					houseCodeBinds: "",
+					legalWxAccount: "",
+					employer: "",
+					legalAge: "",
+					legalJobNature: "",
+					legalRegisteredAddress: "",
+					legalTempAddress: ""
 				},
 				rules: {
 					"location": {
@@ -179,7 +276,23 @@
 				placeList: [],
 				isShowPopup: false,
 				checkedPlace: [],
-				addressNames: []
+				addressNames: [],
+				nationTypeList: [], //民族
+				nationTypeIndex: [0],
+				nationValue: "",
+				gender: [{ //性别
+						value: 1,
+						name: '男',
+					},
+					{
+						value: 0,
+						name: '女',
+					}
+				],
+				genderIndex: [0],
+				genderValue: "",
+				showNationPicker: false,
+				showGenderPicker: false
 			}
 		},
 		onShow() {
@@ -189,16 +302,37 @@
 		onReady() {
 			//onReady 为uni-app支持的生命周期之一
 			this.$refs.form.setRules(this.rules)
+
 		},
 
-		mounted() {
-
-			this.$nextTick(() => {
-				this.getCsDetails();
-
-			})
+		async mounted() {
+			await this.getBizDict();
+			this.getCsDetails();
 		},
+
 		methods: {
+
+
+			// 获取民族
+			getBizDict() {
+				const param = {
+					code: "nationType"
+				}
+				bizDictionary(param).then(res => {
+					if (res.code == 200) {
+						res.data.forEach(e => {
+							this.nationTypeList.push({
+								name: e.dictValue,
+								value: Number(e.dictKey)
+							})
+						})
+					}
+				})
+
+
+
+			},
+
 
 			checkboxChange(n) {
 				console.log('change', n);
@@ -312,6 +446,24 @@
 					// 	item.form = placePractitioner[index]
 					// })
 				})
+			},
+
+
+
+			//选择民族
+			confirmNation(e) {
+				this.nationIndex = e.indexs;
+				this.nationValue = e.value[0].name;
+				this.form.ethnicity = e.value[0].value;
+				this.showNationPicker = false;
+			},
+
+			//选择性别
+			confirmGender(e) {
+				this.genderIndex = e.indexs;
+				this.genderValue = e.value[0].name;
+				this.form.legalGender = e.value[0].value;
+				this.showGenderPicker = false;
 			},
 
 
@@ -505,4 +657,9 @@
 			top: 20rpx;
 		}
 	}
+
+	.item {
+		padding: 0 30rpx;
+		border-radius: 8rpx;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3