测试修改

user_ui/health/pages/health/add.vue

@@ -175,6 +175,7 @@
 				cardf:require('@/health/static/health/cardf.png'),
 				aphoto: require('@/work/static/service/photo.png'),
 				rdelimg: require('@/work/static/service/rdel.png'),
+				rimg: require('@/mine/static/house/rimg.png'),
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				nvaHeight:44,
@@ -393,6 +394,10 @@
 				var val=e.detail.value;
 				this.datainfo.isHouseholder=this.sfList[val].dictValue;
 				this.sfhz=this.sfList[val].dictLabel;
+				if(this.datainfo.isHouseholder=='Y'){
+					this.datainfo.isTenant='N';
+					this.sfzh='否'
+				}
 			},
 			bindDateChangea(e){
 				var val=e.detail.value;
@@ -403,6 +408,10 @@
 				var val=e.detail.value;
 				this.datainfo.isTenant=this.sfList[val].dictValue;
 				this.sfzh=this.sfList[val].dictLabel;
+				if(this.datainfo.isTenant=='Y'){
+					this.datainfo.isHouseholder='N';
+					this.sfhz='否'
+				}
 			},
 			bindDateChangec(e){
 				var val=e.detail.value;

user_ui/mine/pages/house/addhouse.vue

@@ -24,6 +24,15 @@
 					  	<uni-easyinput :disabled="isdisabled" v-model="datainfo.location" :inputBorder='false' placeholder="自动识别" />
 					  	<view class="rimg"></view>
 					  </view>
+				  </uni-forms-item>
+				  <uni-forms-item label="房屋类型" required name="houseType">
+				  	<picker range-key='dictLabel' :disabled="isdisabled" :value="fwlxidx" :range="fwlxList"   @change='bindDateChangee'>
+				  	<view class="flexc mh35">
+				  		<view class="flex1 txr f13 co27" v-if="datainfo.houseType&&!fwlx">{{statusFormats(datainfo.houseType,fwlxList,'fwlx')}}</view>
+				  		<view class="flex1 txr f13" v-else :class="fwlx?'co27':'coa'">{{fwlx||"请选择房屋类型"}}</view>
+				  		<view class="rimg"><image :src="rimg"></image></view>
+				  	</view>
+				  	</picker>
 				  </uni-forms-item>
 					<uni-forms-item label="权利人姓名" name="ownerName">
 						<view class="flexc">
@@ -61,11 +70,11 @@
 					</uni-forms-item>
 					<uni-forms-item label="小区名称" name="communityName">
 						<view class="flexc">
-							<uni-easyinput :disabled="isdisabled" v-model="datainfo.communityName" :inputBorder='false' placeholder="请输入小区名称" />
+							<uni-easyinput disabled v-model="datainfo.communityName" :inputBorder='false' placeholder="请输入小区名称" />
 							<view class="rimg"></view>
 						</view>
 					</uni-forms-item>
-					<uni-forms-item label="楼栋" required name="loudong">
+					<!-- <uni-forms-item label="楼栋" required name="loudong">
 						<view class="flexcc">
 							<view class="flexc ml10">
 								<uni-easyinput :disabled="isdisabled" v-model="datainfo.loudong" :inputBorder='false' placeholder="请输入" />
@@ -77,19 +86,19 @@
 							</view>
 							<view class="rimg"></view>
 						</view>
-					</uni-forms-item>
-					<uni-forms-item label="门牌号" required name="xxaddress">
+					</uni-forms-item> -->
+					<!-- <uni-forms-item label="门牌号" required name="xxaddress">
 						<view class="flexc">
 							<uni-easyinput :disabled="isdisabled" v-model="datainfo.xxaddress" :inputBorder='false' placeholder="请输入门牌号" />
 							<view class="rimg"></view>
 						</view>
-					</uni-forms-item>
-					<!-- <uni-forms-item label="门牌号" required name="detailedAddress">
+					</uni-forms-item> -->
+					<uni-forms-item label="门牌号" required name="detailedAddress">
 						<view class="flexc">
-							<uni-easyinput :disabled="isdisabled" v-model="datainfo.detailedAddress" :inputBorder='false' placeholder="请输入门牌号" />
+							<uni-easyinput disabled v-model="datainfo.detailedAddress" :inputBorder='false' placeholder="请输入门牌号" />
 							<view class="rimg"></view>
 						</view>
-					</uni-forms-item> -->
+					</uni-forms-item>
 					<uni-forms-item label="使用期限" name="usagePeriod">
 						<view class="flexc">
 							<uni-easyinput :disabled="isdisabled" v-model="datainfo.usagePeriod" :inputBorder='false' placeholder="请输入使用期限" />
@@ -231,6 +240,7 @@
 					 "location":"",//房屋坐落位置
 					 "rightType":"",//权利类型，如所有权、使用权等
 					 "area":"",//房屋面积，单位为平方米
+					 "houseType":null,//房屋类型 1:普通住宅,2:洋房
 					 "documentNumber":"",//房屋相关的字第号
 					 "propertyUnitNumber":"",//不动产单元号
 					 "coOwnership":"",//房屋的共有情况，如共有比例等
@@ -247,6 +257,7 @@
 				},
 				rules: {
 				  location: {rules: [{required: true,errorMessage: '请输入房屋坐落位置' }]},
+				  houseType: {rules: [{required: true,errorMessage: '请选择房屋类型' }]},
 				  // detailedAddress: {rules: [{required: true,errorMessage: '请输入门牌号' }]},
 				  area: {rules: [{required: true,errorMessage: '请输入面积' }]},
 				},
@@ -256,13 +267,16 @@
 				qllx:'',
 				fwyt:'',
 				ywcw:'',
+				fwlx:'',
 				fwztidx:'',
 				qllxidx:'',
 				fwytidx:'',
 				ywcwidx:'',
+				fwlxidx:'',
 				fwztList:[],
 				qllxList:[],
 				fwytList:[],
+				fwlxList:[],
 				ywcwList:[{dictLabel:'有',dictValue:'Y'},{dictLabel:'无',dictValue:'N'},],
 				isdisabled:false,
 				latitude:'',
@@ -310,6 +324,8 @@
 					this.fwytidx=aite.key;
 				}else if(type=='ywcw'){
 					this.ywcwidx=aite.key;
+				}else if(type=='fwlx'){
+					this.fwlxidx=aite.key;
 				}
 				return aite.actions;
 			},
@@ -325,6 +341,17 @@
 						})
 					}
 				})
+				// 房屋类型
+				getDictionaryFn('house_type').then(res=>{
+					if(res.code==200){
+						this.fwlxList = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
 				//权利类型
 				getDictionaryFn('types_rights').then(res=>{
 					if(res.code==200){
@@ -372,35 +399,40 @@
 				this.datainfo.hasParkingSpace=this.ywcwList[val].dictValue;
 				this.ywcw=this.ywcwList[val].dictLabel;
 			},
+			bindDateChangee(e){
+				var val=e.detail.value;
+				this.datainfo.houseType=this.fwlxList[val].dictValue;
+				this.fwlx=this.fwlxList[val].dictLabel;
+			},
 			getDetail(){
 				houseInfoDet(this.id).then(res=>{
 					if(res.code==200){
 						this.datainfo=res.data;
-						if(res.data&&res.data.detailedAddress){
-							this.datainfo.xxaddress=res.data.detailedAddress
-							var address=res.data.detailedAddress;
-							var indxa=address.indexOf('栋')
-							var indxb=address.indexOf('单元')
-							var a = address.split(/[栋单元]/).filter(Boolean);
-							this.datainfo.loudong=a[0];
-							this.datainfo.danyuan=a[1];
-							this.datainfo.xxaddress=a[2];
-						}
+						// if(res.data&&res.data.detailedAddress){
+						// 	this.datainfo.xxaddress=res.data.detailedAddress
+						// 	var address=res.data.detailedAddress;
+						// 	var indxa=address.indexOf('栋')
+						// 	var indxb=address.indexOf('单元')
+						// 	var a = address.split(/[栋单元]/).filter(Boolean);
+						// 	this.datainfo.loudong=a[0];
+						// 	this.datainfo.danyuan=a[1];
+						// 	this.datainfo.xxaddress=a[2];
+						// }
 					}
 				})
 			},
 			getSubmit(){
 				this.$refs.form.validate().then(res => {
 					var params=JSON.parse(JSON.stringify(this.datainfo))
-					if(!params.loudong||!params.danyuan){
-						this.$toast("请输入楼栋")
-						return
-					}
-					if(!params.xxaddress){
-						this.$toast("请输入门牌号")
-						return
-					}
-					params.detailedAddress=`${params.loudong?params.loudong+'栋':''}` + `${params.danyuan?params.danyuan+'单元':''}` + params.xxaddress;
+					// if(!params.loudong||!params.danyuan){
+					// 	this.$toast("请输入楼栋")
+					// 	return
+					// }
+					// if(!params.xxaddress){
+					// 	this.$toast("请输入门牌号")
+					// 	return
+					// }
+					// params.detailedAddress=`${params.loudong?params.loudong+'栋':''}` + `${params.danyuan?params.danyuan+'单元':''}` + params.xxaddress;
 					if(this.ptype=='add'){
 						houseInfoAdd(params).then(res=>{
 							if(res.code==200){

user_ui/mine/pages/house/index.vue

@@ -150,7 +150,8 @@
 		methods:{
 			checkPermi, checkRole,
 			getAddFn(){
-				this.$tab.navigateTo("/mine/pages/house/addhouse")
+				// this.$tab.navigateTo("/mine/pages/house/addhouse")
+				this.$tab.navigateTo("/mine/pages/info/authenadd?type=rzad")
 			},
 			getChargeFn(){
 				this.$tab.navigateTo("/mine/pages/house/house")

user_ui/mine/pages/info/authenadd.vue

@@ -200,7 +200,7 @@
 										</uni-forms-item>
 										<uni-forms-item label="小区名称" name="communityName">
 											<view class="flexc">
-												<uni-easyinput :disabled="isdisabled" v-model="houserinfo.communityName" :inputBorder='false' placeholder="请输入小区名称" />
+												<uni-easyinput disabled v-model="houserinfo.communityName" :inputBorder='false' placeholder="请输入小区名称" />
 												<view class="rimg"></view>
 											</view>
 										</uni-forms-item>
@@ -210,6 +210,15 @@
 												<view class="rimg"></view>
 											</view>
 										</uni-forms-item>
+										<uni-forms-item label="房屋类型" required name="houseType">
+											<picker range-key='dictLabel' :disabled="isdisabled" :value="fwlxidx" :range="fwlxList"   @change='bindDateChangeh'>
+											<view class="flexc mh35">
+												<view class="flex1 txr f13 co27" v-if="houserinfo.houseType&&!fwlx">{{statusFormats(houserinfo.houseType,fwlxList,'fwlx')}}</view>
+												<view class="flex1 txr f13" v-else :class="fwlx?'co27':'coa'">{{fwlx||"请选择房屋类型"}}</view>
+												<view class="rimg"><image :src="rimg"></image></view>
+											</view>
+											</picker>
+										</uni-forms-item>
 										<uni-forms-item label="使用期限" name="usagePeriod">
 											<view class="flexc">
 												<uni-easyinput :disabled="isdisabled" v-model="houserinfo.usagePeriod" :inputBorder='false' placeholder="请输入使用期限" />
@@ -318,12 +327,13 @@
 				datainfo: {
 					"tenantId":'',//租户id
 					"residentType":null,//人员类型：1:业主 2:租户 3:其他
-					"residentName":null,//居住人员姓名
-					"residentPhone":null,//人员手机号
+					"residentName":this.$store.state.user.nickName,//居住人员姓名
+					"residentPhone":this.$store.state.user.phonenumber,//人员手机号
 					"houseInfoRedidentList":[],//用户房屋信息集合
 					"houseId":'',//关联房屋信息表的house_id
 					"residentRelationship":null,//居住人员与户主的关系，如父子、夫妻等
 					"isHouseholder":null,//是否是户主 N不是 Y是
+					"houseType":null,//房屋类型 1:普通住宅,2:洋房
 					
 					"residentIdCard":null,//居住人员身份证号码，18位
 					// "residentBirthday":null,//居住人员出生日期
@@ -400,6 +410,9 @@
 				qllxList:[],
 				fwytList:[],
 				sfList:[],
+				fwlxList:[],
+				fwlxidx:'',
+				fwlx:'',
 				rzflag:false,
 				choseidx:'',
 				houserinfo:{
@@ -408,6 +421,7 @@
 					"houseImage":null,//房本照片
 					"ownerName":null,//权利人姓名
 					"location":null,//房屋坐落位置
+					 "houseType":null,//房屋类型 1:普通住宅,2:洋房
 					"rightType":null,//权利类型，如所有权、使用权等
 					"area":null,//房屋面积，单位为平方米
 					"documentNumber":null,//房屋相关的字第号
@@ -510,6 +524,8 @@
 					this.rymmidx=aite.key;
 				}else if(type=='dslx'){
 					this.dslxidx=aite.key;
+				}else if(type=='fwlx'){
+					this.fwlxidx=aite.key;
 				}
 				return aite.actions;
 			},
@@ -583,6 +599,17 @@
 						})
 					}
 				})
+				// 房屋类型
+				getDictionaryFn('house_type').then(res=>{
+					if(res.code==200){
+						this.fwlxList = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
 				// 是否
 				getDictionaryFn('sys_yes_no').then(res=>{
 					if(res.code==200){
@@ -718,6 +745,11 @@
 				this.datainfo.specialType=this.dslxList[val].dictValue;
 				this.dslx=this.dslxList[val].dictLabel;
 			},
+			bindDateChangeh(e){
+				var val=e.detail.value;
+				this.houserinfo.houseType=this.fwlxList[val].dictValue;
+				this.fwlx=this.fwlxList[val].dictLabel;
+			},
 			getDetail(){
 				authentication(this.id).then(res=>{
 					if(res.code==200){
@@ -782,14 +814,14 @@
 					// 	this.$toast('请选择居住门户')
 					// 	return
 					// }
-					// let _IDRe18 =
-					// 	/^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
-					// let _IDre15 = /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/
-					// // 校验身份证：
-					// if (params.residentIdCard&&!_IDRe18.test(params.residentIdCard) && !_IDre15.test(params.residentIdCard)) {
-					// 	this.$toast("请输入正确身份证号")
-					// 	return
-					// }
+					let _IDRe18 =
+						/^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+					let _IDre15 = /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/
+					// 校验身份证：
+					if (params.residentIdCard&&!_IDRe18.test(params.residentIdCard) && !_IDre15.test(params.residentIdCard)) {
+						this.$toast("请输入正确身份证号")
+						return
+					}
 					if(this.ptype=='add'){
 						if(this.rzflag){
 							residentInfoAdd(params).then(res=>{

user_ui/work/pages/manage/index.vue

@@ -19,11 +19,11 @@
 		</view>
 		<view class="mdetail">
 			<view class="mdtop flexc">
-				<view class="flexc flex0" @click.stop="choseflag=!choseflag">
+				<!-- <view class="flexc flex0" @click.stop="choseflag=!choseflag">
 					<image :src="chose" class="chose" v-if="choseflag"></image>
 					<image :src="nchose" class="chose" v-else></image>
 						全选
-				</view>
+				</view> -->
 				<view class="mdtnum">357.20 元</view>
 			</view>
 			<view>
@@ -62,6 +62,88 @@
 							</view>
 						</view>
 					</uni-collapse-item>
+					<uni-collapse-item title-border="none">
+						<template v-slot:title>
+							<view class="coltit flexcj">
+								<view class="flexc flex0" @click.stop="choseflag=!choseflag">
+									<image :src="chose" v-if="choseflag" class="chose"></image>
+									<image :src="nchose" v-else class="chose"></image>
+										能耗费
+								</view>
+								<view class="colnum flexc">
+									<view class="num">277.20元</view>
+									<view class="btn bga">待缴</view>
+									<view class="btn bgb">已缴</view>
+								</view>
+							</view>	
+						</template>
+						<view class="content">
+							<view class="cuntlist flexc">
+								<view class="cltit">计费区间</view>
+								<view class="cltxt">2024-11-01 至224-11-30</view>
+							</view>
+							<view class="cuntlist flexc">
+								<view class="cltit">优惠金额</view>
+								<view class="cltxt">0.00元</view>
+							</view>
+							<view class="cuntlist flexc">
+								<view class="cltit">违约金额</view>
+								<view class="cltxt">0.00元</view>
+							</view>
+							<view class="cuntlist flexc">
+								<view class="cltit">应缴金额</view>
+								<view class="cltxt co025">80.00元</view>
+							</view>
+						</view>
+					</uni-collapse-item>
+				</uni-collapse>
+			</view>
+		</view>
+		<view class="mdetail">
+			<view class="mdtop flexc">
+				<!-- <view class="flexc flex0" @click.stop="choseflag=!choseflag">
+					<image :src="chose" class="chose" v-if="choseflag"></image>
+					<image :src="nchose" class="chose" v-else></image>
+						全选
+				</view> -->
+				<view class="mdtnum">357.20 元</view>
+			</view>
+			<view>
+				<uni-collapse ref="collapse" @change="change">
+					<uni-collapse-item title-border="none">
+						<template v-slot:title>
+							<view class="coltit flexcj">
+								<view class="flexc flex0" @click.stop="choseflag=!choseflag">
+									<image :src="chose" v-if="choseflag" class="chose"></image>
+									<image :src="nchose" v-else class="chose"></image>
+										车位费
+								</view>
+								<view class="colnum flexc">
+									<view class="num">277.20元</view>
+									<view class="btn bga">待缴</view>
+									<view class="btn bgb">已缴</view>
+								</view>
+							</view>	
+						</template>
+						<view class="content">
+							<view class="cuntlist flexc">
+								<view class="cltit">计费区间</view>
+								<view class="cltxt">2024-11-01 至224-11-30</view>
+							</view>
+							<view class="cuntlist flexc">
+								<view class="cltit">优惠金额</view>
+								<view class="cltxt">0.00元</view>
+							</view>
+							<view class="cuntlist flexc">
+								<view class="cltit">违约金额</view>
+								<view class="cltxt">0.00元</view>
+							</view>
+							<view class="cuntlist flexc">
+								<view class="cltit">应缴金额</view>
+								<view class="cltxt co025">80.00元</view>
+							</view>
+						</view>
+					</uni-collapse-item>
 				</uni-collapse>
 			</view>
 		</view>
@@ -188,7 +270,7 @@ border-radius: 10rpx;min-height: 92rpx;padding:12rpx 0 12rpx 24rpx;box-sizing: b
 		}
 		
 	}
-	.mdetail{width: 714rpx;background: #FFFFFF;border-radius: 20rpx;margin: 0 auto;padding: 24rpx;box-sizing: border-box;
+	.mdetail{width: 714rpx;background: #FFFFFF;border-radius: 20rpx;margin: 0 auto;padding: 24rpx;box-sizing: border-box;margin-bottom: 24rpx;
 		.mdtop{padding-bottom: 20rpx;
 			.mdttit{font-size: 30rpx;color: #272727;flex: 0 0 auto;}
 			.mdtnum{font-size: 30rpx;color: #0256FD;font-weight: bold;flex: 1;text-align: right;margin-left: 20rpx;}