zouling 2 місяців тому
батько
коміт
535b87e171

+ 8 - 0
user_ui/api/work/people.js

@@ -117,6 +117,14 @@ export function residentInfoDel(data) {
   })
 }
 
+// 居住人员-新增(只有户主能使用)wuYe:residentInfo:addResidentInfoByHouseholder
+export function familyInfoAdd(data) {
+  return request({
+    url: '/wuYe/residentInfo/addResidentInfoByHouseholder',
+    method: 'post',
+    data: data
+  })
+}
 
 // 居住人员-详情过滤租户
 export function authentication(data) {

+ 22 - 22
user_ui/health/pages/health/add.vue

@@ -43,7 +43,7 @@
 					</uni-forms-item>
 					<uni-forms-item label="姓名" required name="residentName">
 						<view class="flexc">
-							<uni-easyinput  disabled v-model="datainfo.residentName"  :inputBorder='false' placeholder="自动识别" />
+							<uni-easyinput  :disabled="isdisabled" v-model="datainfo.residentName"  :inputBorder='false' placeholder="自动识别" />
 						</view>
 					</uni-forms-item>
 					<uni-forms-item label="性别" required name="residentGender">
@@ -162,7 +162,7 @@
 	import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
 	import {uploadIdentify,uploadmore} from '@/utils/common.js'
 	import {houseInfolistNoPage} from "@/api/work/work.js"
-	import {residentInfoAdd,residentInfoPut,residentInfoDet} from "@/api/work/people.js"
+	import {familyInfoAdd,residentInfoPut,residentInfoDet} from "@/api/work/people.js"
 	import {getDictionaryFn} from "@/api/system/user.js"
 	import {selectValueKey} from "@/utils/common.js"
 	import {getOcrIdCard} from "@/api/system/card.js"
@@ -181,30 +181,30 @@
 				backgroundColor: "transparent",
 				datainfo: {
 					// "residentId":"",//居住人员主键
-					"houseId":"",//关联房屋信息表的house_id
+					"houseId":null,//关联房屋信息表的house_id
 					"residentType":1,//人员类型
 					// "userId":"",//关联sys_user表中user_id
-					"detailedAddress":"",//居住人员的门牌号
-					"residentName":"",//居住人员姓名
-					"residentIdCard":"",//居住人员身份证号码,18位
-					"residentBirthday":"",//居住人员出生日期
+					"detailedAddress":null,//居住人员的门牌号
+					"residentName":null,//居住人员姓名
+					"residentIdCard":null,//居住人员身份证号码,18位
+					"residentBirthday":null,//居住人员出生日期
 					// "yearsOld":"",//年龄
-					"residentPhone":"",//居住人员手机号
+					"residentPhone":null,//居住人员手机号
 					"residentGender":'',//居住人员性别:1-男,2-女
-					"residentRelationship":"",//居住人员与户主的关系,如父子、夫妻等
-					"isHouseholder":"",//是否是户主 N不是 Y是
-					"isTenant":"",//是否是租户:Y-是,N-否
-					"residentEmployer":"",//居住人员工作单位
-					"residentAppearance":"",//居住人员面貌,如党员、群众等
-					"residentHobby":"",//爱好
-					"facePhoto":"",//人脸地址
-					"idCardAddress":"",//身份证住址
-					"specialType":"",//特殊类型
-					"idCardFront":"",//身份证正面
-					"idCardBack":"",//身份证反面
+					"residentRelationship":null,//居住人员与户主的关系,如父子、夫妻等
+					"isHouseholder":null,//是否是户主 N不是 Y是
+					"isTenant":null,//是否是租户:Y-是,N-否
+					"residentEmployer":null,//居住人员工作单位
+					"residentAppearance":null,//居住人员面貌,如党员、群众等
+					"residentHobby":null,//爱好
+					"facePhoto":null,//人脸地址
+					"idCardAddress":null,//身份证住址
+					"specialType":null,//特殊类型
+					"idCardFront":null,//身份证正面
+					"idCardBack":null,//身份证反面
 				},
 				rules:{
-					residentIdCard: {rules: [{required: true,errorMessage: '请输入身份证号码' }]},
+					// residentIdCard: {rules: [{required: true,errorMessage: '请输入身份证号码' }]},
 					residentName: {rules: [{required: true,errorMessage: '请输入姓名' }]},
 					residentGender: {rules: [{required: true,errorMessage: '请选择性别' }]},
 					houseId: {rules: [{required: true,errorMessage: '请选择居住门户' }]},
@@ -213,7 +213,7 @@
 					// residentRelationship: {rules: [{required: true,errorMessage: '请选择与户主关系' }]},
 					// isTenant: {rules: [{required: true,errorMessage: '请选择是否租户' }]},
 					// residentAppearance: {rules: [{required: true,errorMessage: '请选择人员面貌' }]},
-					residentPhone: {rules: [{required: true,errorMessage: '请输入手机号'}, {pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,errorMessage:'请输入正确的手机号码'}]},
+					// residentPhone: {rules: [{required: true,errorMessage: '请输入手机号'}, {pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,errorMessage:'请输入正确的手机号码'}]},
 				  },
 				sfhz:"",
 				hzgx:"",
@@ -453,7 +453,7 @@
 						return
 					}
 					if(this.ptype=='add'){
-						residentInfoAdd(params).then(res=>{
+						familyInfoAdd(params).then(res=>{
 							if(res.code==200){
 								this.$toast("新增成功")
 								setTimeout(function(){

+ 7 - 5
user_ui/mine/components/box/list.vue

@@ -166,7 +166,8 @@
 					<image :src="housea" class="imgs" v-if="ite.houseStatus==4"></image>
 					<image :src="houseb" class="imgs" v-if="ite.houseStatus==2"></image>
 					<image :src="housec" class="imgs" v-if="ite.houseStatus==3"></image>
-					<view class="tit">{{ite.detailedAddress}}</view>
+					<!-- <view class="tit">{{ite.detailedAddress}}</view> -->
+					<view class="tit">{{ite.communityName}}</view>
 					<view class="flex1"></view>
 					<view class="txt ca" v-if="ite.houseStatus==1">自住</view>
 					<view class="txt cb" v-if="ite.houseStatus==4">出租</view>
@@ -175,7 +176,8 @@
 				</view>
 				<view class="plists">
 					<block v-for="(aite,aidx) in ite.residentInfoList">
-						<view class="flexc pr mb12"   :key="`peo${aidx}`" v-if="aidx==0" @click="getDetail(aite.residentId)"
+						<!-- v-if="aidx==0" -->
+						<view class="flexc pr mb12"   :key="`peo${aidx}`"  @click="getDetail(aite.residentId)"
 							:data-idx="idx" :data-aidx="aidx" data-type="peo"
 							@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+aite.right+'px'"
 						>
@@ -198,7 +200,7 @@
 							</view>
 							<view class="spdel" v-if="aite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(aite.residentId)">删除</view>
 						</view>
-						<view class="flexc pr mb12"   :key="`peo${aidx}`" v-if="aidx>0&&ite.zhanflag" @click="getDetail(aite.residentId)"
+						<!-- <view class="flexc pr mb12"   :key="`peo${aidx}`" v-if="aidx>0&&ite.zhanflag" @click="getDetail(aite.residentId)"
 							:data-idx="idx"
 							:data-aidx="aidx" data-type="peo"
 							@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+aite.right+'px'"
@@ -221,9 +223,9 @@
 								</view>
 							</view>
 							<view class="spdel" v-if="aite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(aite.residentId)">删除</view>
-						</view>
+						</view> -->
 					</block>
-					<image :src="upimg" v-if="ite.residentInfoList.length>1" :class="ite.zhanflag?'act':''" class="upimg" @click="getZhan(idx)"></image>
+					<!-- <image :src="upimg" v-if="ite.residentInfoList.length>1" :class="ite.zhanflag?'act':''" class="upimg" @click="getZhan(idx)"></image> -->
 				</view>
 			</view>
 		</block>

+ 1 - 1
user_ui/mine/pages/house/index.vue

@@ -10,7 +10,7 @@
 				<view class="tit">嗨,{{nickName}}!</view>
 				<view class="tita flexcc" v-if="list[0].isHouseholder=='Y'">户主</view>
 				<view class="flex1"></view>
-				<view class="tbtns flex0 flexc" @click="getListFn">家庭成员
+				<view class="tbtns flex0 flexc" @click="getListFn" v-if="checkPermi(['wuYe:residentInfo:familylist'])">家庭成员
 					<image :src="more"></image>
 				</view>
 			</view>

+ 41 - 9
user_ui/mine/pages/house/people.vue

@@ -16,6 +16,9 @@
 					<view class="btn" @click="getConfirm">搜索</view>
 				</view>
 			</view>
+			<view class="tabtop flexc">
+				<view class="tabt" :class="tabval==ite.val?'act':''" v-for="(ite,idx) in tablist" :key="idx" @click="getTabFn(ite.val)">{{ite.tit}}</view>
+			</view>
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
@@ -35,7 +38,7 @@
 	import boxList from "@/mine/components/box/list.vue"
 	import {getDictionaryFn} from "@/api/system/user.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
-	import {houseInfoList} from "@/api/work/work.js"
+	import {houseInfoList,houseInfolistNoPage} from "@/api/work/work.js"
 	import {residentInfoList,residentInfoDel} from "@/api/work/people.js"
 	export default{
 		components:{boxList},
@@ -55,6 +58,8 @@
 				reachflag: true,
 				wtdt:'',
 				houseId:'',
+				tabval:"",
+				tablist:[],
 				userId:this.$store.state.user.userId,
 				phonenumber:this.$store.state.user.phonenumber,
 			}
@@ -70,7 +75,6 @@
 				this.houseId=e.id;
 			}
 			this.init()
-			this.getDataFn()
 		},
 		// 上拉触底加载更多触发事件
 		onReachBottom() {
@@ -93,6 +97,27 @@
 						})
 					}
 				})
+				var params={
+					userId:this.userId,
+					pageSize: 100,
+					pageNum: 1,
+				}
+				houseInfolistNoPage(params).then(res=>{
+					if(res.code==200){
+						if(res.rows&&res.rows.length){
+							var data=res.rows[0];
+							this.tabval=data.houseId;
+							this.getDataFn()
+						}
+						
+						this.tablist= res.rows.map(v => {
+							return {
+								tit: v.detailedAddress,
+								val: v.houseId,
+							}
+						})
+					}
+				})
 			},
 			getAddFn(){
 				this.$tab.navigateTo("/health/pages/health/add")
@@ -139,11 +164,11 @@
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
 					// residentPhone:this.phonenumber,
-					userId:this.userId
-				}
-				if(this.houseId){
-					params.houseId=this.houseId
+					houseId:this.tabval
 				}
+				// if(this.houseId){
+				// 	params.houseId=this.houseId
+				// }
 				if(this.text){
 					params.residentName=this.text
 				}
@@ -193,9 +218,9 @@
 	page{background: #F3F3F0;}
 </style>
 <style lang="scss" scoped>
-.car{padding-top: 140rpx;}
+.car{padding-top: 210rpx;}
 .cartop{position: fixed;left: 0;right: 0;top: 0;background-color: #ffffff;z-index: 2;
-	.topa{padding: 20rpx 20rpx 32rpx;
+	.topa{padding: 20rpx;
 		.resetimg{width: 36rpx;height: 36rpx;margin-right: 24rpx;flex: 0 0 auto;}
 		.chekt{width: 150rpx;overflow: hidden;
 			view{font-weight: 500;font-size: 26rpx;color: #272727;flex: 1;}
@@ -209,7 +234,14 @@ font-size: 26rpx;
 color: #FFFFFF;}
 		}
 	}
-
+	// padding-bottom: 40rpx;padding-top: 26rpx;
+	.tabtop{padding-bottom: 20rpx;padding-top:6rpx;overflow: auto;
+		.tabt{font-weight: 500;font-size: 32rpx;color: #666666;position: relative;line-height: 56rpx;flex: 0 0 auto;text-align: center;margin: 0 10rpx;padding: 0 20rpx;
+			&.act{font-weight: bold;font-size: 32rpx;color: #272727;
+			&::after{content: '';width: 40rpx;height: 10rpx;background: #0156FE;border-radius: 6rpx;position: absolute;left: 50%;margin-left: -20rpx;bottom: -10rpx;}
+			}
+		}
+	}
 }
 .carlists{padding: 0 18rpx;}
 </style>

+ 2 - 0
user_ui/mine/pages/info/authen.vue

@@ -73,6 +73,8 @@
 					residentId:info.residentId,
 					userId:info.userId,
 					tenantId:info.tenantId,
+					examine:info.examine,
+					houseId:info.houseId,
 				}
 				deleteResident(params).then(res=>{
 					if(res.code==200){

+ 3 - 3
user_ui/news/pages/complaint/index.vue

@@ -32,8 +32,8 @@
 				pageNum: 1,
 				reachflag: true,
 				wtdt:'',
-				tabval:'',
-				tablist:[],
+				tabval:'-1',
+				tablist:[{tit:'全部',val:-1}],
 				tsjyList:[],
 				userId:this.$store.state.user.userId,
 			}
@@ -67,7 +67,7 @@
 								val: v.dictValue
 							}
 							this.tablist.push(obj)
-							this.tabval=res.data[0].dictValue
+							// this.tabval=res.data[0].dictValue
 							return {
 								dictLabel: v.dictLabel,
 								dictValue: v.dictValue