1

property_ui/car/pages/illegalcheck.vue

@@ -61,7 +61,7 @@
 				phofile:[],//图片合集
 				datainfo:{
 					"plateNumber": "",
-					"portalId": "",
+					"houseId": "",
 					"visitPortal": "",
 					"mobileNumber": "",
 					"carType": "2",
@@ -157,7 +157,7 @@
 							this.datainfo.carType='1';
 							this.datainfo.mobileNumber=data.residentPhone;
 							this.datainfo.visitPortal=data.detailedAddress;
-							this.datainfo.portalId=data.houseId;
+							this.datainfo.houseId=data.houseId;
 						}
 						
 					}

property_ui/components/box/popup.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<!-- 信息弹窗 -->
-		<view class="bgbox" style="z-index: 100;" v-if="initFace=='Y'"></view>
-		<view class="fixedbox" style="z-index: 101;" v-if="initFace=='Y'">
+		<view class="bgbox" style="z-index: 100;" v-if="initFace=='1'||initFace=='2'"></view>
+		<view class="fixedbox" style="z-index: 101;" v-if="initFace=='1'||initFace=='2'">
 			<image :src="tiptit" class="imga"></image>
 			<view  class="boxs">
 				<view class="ztit">您的信息暂未完善，请前去完善</view>
@@ -33,7 +33,7 @@
 			initFace:{
 				type: [String,Number],
 				default () {
-					return 'N'
+					return ''
 				}
 			},
 			phoneList:{

property_ui/config.js

@@ -3,7 +3,7 @@ module.exports = {
   // baseUrl: 'https://zhsq.qs163.cn/prod-api',
   // baseUrl: 'http://47.99.82.249:5011/prod-api',
   baseUrl: 'http://192.168.101.245:8077',
-  // baseUrl: 'http://192.168.101.86:8074',
+  // baseUrl: 'http://192.168.101.86:8077',
   // baseUrl: 'http://10.90.90.52:8065',
   // baseUrl: 'http://10.90.90.53:8065',
   // baseUrlimg: 'http://114.99.127.243:2001',

property_ui/pages/index/index.vue

@@ -167,11 +167,11 @@
 					<view>物业服务</view>
 				</view>
 				<view class="lists">
-					<view class="list bimga" @click="getPatrolFn" v-if="checkPermi(['wuYe:checkPointRecord:list'])">
+					<view class="list bimga" @click="getPatrolFn" v-if="checkPermi(['wuYe:checkPointRecord:applist'])">
 						<view class="imgs"><image :src="htabi" class="imgg"></image></view>
 						<view class="txt">今日巡更</view>
 					</view>
-					<view class="list bimga" @click="getWarrantyFn" v-if="checkPermi(['wuYe:repair:list'])">
+					<view class="list bimga" @click="getWarrantyFn" v-if="checkPermi(['wuYe:repair:applist'])">
 						<view class="imgs"><image :src="htabj" class="imgb"></image><view class="tips">
 							<block v-if="countTips.propertyRepair>98">99+</block>
 							<block v-else>{{countTips.propertyRepair||0}}</block>
@@ -189,7 +189,7 @@
 						</view>
 						<view class="txt">员工管理</view>
 					</view>
-					<view class="list bimga" @click="getComplaintFn" v-if="checkPermi(['wuYe:suggestion:list'])">
+					<view class="list bimga" @click="getComplaintFn" v-if="checkPermi(['wuYe:suggestion:applist'])">
 						<view class="imgs"><image :src="htabl" class="imga"></image><view class="tips">
 							<block v-if="countTips.complaintSuggestion>98">99+</block>
 							<block v-else>{{countTips.complaintSuggestion||0}}</block>
@@ -283,7 +283,7 @@ const Clientid = config.Clientid
 			upimg:require("@/static/images/home/up.png"),
 			aupimg: require('@/static/images/aup.png'),
 			city:'合肥市',
-			initFace:'N',//initFace Y需要,N不需要人脸认证
+			initFace:'',//initFace 1:双端都未认证 2：只认证了业主端 3：只认证了物业端 4:双端都认证过
 			deptName:this.$store.state.user.deptName,
 			nickName:this.$store.state.user.nickName,
 			postGroup:'',//岗位
@@ -398,7 +398,7 @@ const Clientid = config.Clientid
 			this.$tab.navigateTo(`/people/pages/people/staffadd?type=${type}`) 
 		},
 		getClose(){
-			this.initFace='N';
+			this.initFace='';
 		},
 		getNoticeDet(data){
 			this.$tab.navigateTo(`/service/pages/service/warrantydetail?id=`+data) 

property_ui/pages/tlogin.vue

@@ -211,13 +211,11 @@
 			 // 	this.$toast("请同意用户协议")
 			 // 	return
 			 // }
-			 console.log(this.loginForm)
 			 this.pwdLogin()
 		 },
 		 // 密码登录
 		 async pwdLogin() {
 		 	var that=this;
-			console.log(this.loginForm)
 			// return
 		   this.$store.dispatch('Login', this.loginForm).then((res) => {
 			   // 判断是否记住密码

property_ui/people/components/car/list.vue

@@ -139,7 +139,7 @@
 					<view class="imgs"><image :src="sfz" class="sfz"></image></view>{{ite.hideflag?ite.idCarda:ite.idCard}}
 				</view>
 				<view style="height: 20rpx;"></view>
-				<view class="pshbox flexc" v-if="ite.examine==1&&checkPermi(['wuYe:staffManage:examine'])">
+				<view class="pshbox flexc" v-if="ite.examine==1&&checkPermi(['wuYe:residentInfo:examineStaff'])">
 					<view class="btna" @click.stop="getShFn(ite,'3')">拒绝</view>
 					<view class="btnb" @click.stop="getShFn(ite,'2')">同意</view>
 				</view>
@@ -169,7 +169,7 @@
 							<view class="clist"><view class="tit">来访人数</view>{{ite.num}}人</view>
 						</view>
 						<view class="w50 flexc">
-							<view class="clist"><view class="tit">来访事由</view>{{ite.reason}}</view>
+							<view class="clist"><view class="tit">来访事由</view>{{kaType(ite.reason,syList)}}</view>
 							<view class="clist"><view class="tit">车牌号码</view>{{ite.plateNumber}}</view>
 						</view>
 						<view class="clist"><view class="tit">手机号码</view>{{ite.mobileNumber}}</view>
@@ -244,6 +244,12 @@
 				default () {
 					return []
 				}
+			},
+			syList:{//来访事由
+				type:Array,
+				default () {
+					return []
+				}
 			}
 		},
 		data(){

property_ui/people/pages/people/comeadd.vue

@@ -42,7 +42,7 @@
 							</picker> -->
 						</view>
 					</uni-forms-item>
-					<uni-forms-item label="来访门户" name="portalId">
+					<uni-forms-item label="来访门户" name="houseId">
 						<!-- <view class="flexc">
 							<uni-easyinput v-model="datainfo.houseAddress" :inputBorder='false' placeholder="请输入门户号" />
 							<view class="rimg"></view>
@@ -132,7 +132,7 @@
 				checkflag:true,
 				datainfo: {
 					// "visitorManageId":"",//来访主键
-					 "portalId":"",//门户id
+					 "houseId":"",//门户id
 					 "houseAddress":"",//详细门牌号
 					 "name":"",//访客姓名
 					 "num":"",//来访人数
@@ -147,7 +147,7 @@
 				},
 				syqxidx:'',
 				rules:{name: {rules: [{required: true,errorMessage: '请输入访客姓名' }]},
-				  portalId: {rules: [{required: true,errorMessage: '请选择来访门户' }]},
+				  houseId: {rules: [{required: true,errorMessage: '请选择来访门户' }]},
 				  mobileNumber: {rules: [{required: true,errorMessage: '请输入手机号'}, {pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,errorMessage:'请输入正确的手机号码'}]},},
 				phofile:[],
 				filterable:true,
@@ -225,14 +225,14 @@
 					reservDet(this.id).then(res=>{
 						if(res.code==200){
 							this.datainfo=res.data;
-							this.chooseValue=res.data.portalId
+							this.chooseValue=res.data.houseId
 						}
 					})
 				}else{
 					visitorDet(this.id).then(res=>{
 						if(res.code==200){
 							this.datainfo=res.data;
-							this.chooseValue=res.data.portalId
+							this.chooseValue=res.data.houseId
 						}
 					})
 				}
@@ -246,7 +246,7 @@
 					// 	this.$toast("请输入正确的手机号")
 					// 	return
 					// }
-					if(!params.portalId){
+					if(!params.houseId){
 						this.$toast("请选择来访门户")
 						return
 					}
@@ -320,7 +320,7 @@
 				})
 			},
 			getchange(e){
-				this.datainfo.portalId=e.value;
+				this.datainfo.houseId=e.value;
 				this.datainfo.houseAddress=e.label;
 				if(this.tabval=='1'){
 					this.datainfo.detailAddress=e.location;

property_ui/people/pages/people/comegl.vue

@@ -22,7 +22,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<car-list :datainfo="list" :tabval="tabval" :visitorType="visitorType" :wtdt="wtdt" type='comepeo' @getDelFn="getDelFn" @getDetail="getDetail"></car-list>
+			<car-list :datainfo="list" :tabval="tabval" :syList="sylist" :visitorType="visitorType" :wtdt="wtdt" type='comepeo' @getDelFn="getDelFn" @getDetail="getDetail"></car-list>
 		</view>
 		<block v-if="checkPermi(['wuYe:visitorManage:add'])">
 			<view style="height: 100rpx;"></view>
@@ -56,6 +56,7 @@
 				tabval:'1',
 				tablist:[{tit:'预约来访',val:1},{tit:'临时来访',val:2},],
 				visitorType:[],//访客状态
+				sylist:[],
 			}
 		},
 		onUnload() {
@@ -78,7 +79,17 @@
 		methods:{
 			checkPermi, checkRole,
 			init(){
-				
+				// 获取事由
+				getDictionaryFn('visit_reason').then(res=>{
+					if(res.code==200){
+						this.sylist = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			getAddFn(){
 				this.$tab.navigateTo("/people/pages/people/comeadd?type="+this.tabval)

property_ui/people/pages/people/staffadd.vue

@@ -105,7 +105,8 @@
 				</view>
 			</view>
 		</uni-forms>
-		<view class="pdlr12 mt55" v-if="rzflag&&checkPermi(['wuYe:staffManage:add'])">
+		<!-- &&checkPermi(['wuYe:staffManage:add']) -->
+		<view class="pdlr12 mt55" v-if="rzflag">
 			<!-- <view class="rhbtn" @click="getEditFn" v-if="isdisabled">修改</view> -->
 			<view class="rhbtn" @click="getSubmit">确定</view>
 		</view>
@@ -121,7 +122,7 @@
 	import config from '@/config'
 	const userType=config.userType;
 	import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
-	import {staffAdd,staffPut,staffDet,staffAddgly,staffrzDet,staffPutgly,staffglrzDet} from "@/api/work/people.js"
+	import {staffAdd,staffPut,staffDet,staffAddgly,staffPutgly,staffglrzDet} from "@/api/work/people.js"
 	import {getDictionaryFn} from "@/api/system/user.js"
 	import {selectValueKey,uploadIdentify} from "@/utils/common.js"
 	import wSelect from "@/people/components/w-select/w-select.vue"
@@ -191,9 +192,9 @@
 				this.rztype=e.type
 				this.rzflag=true;
 				this.datainfo.phoneNumber=this.$store.state.user.phonenumber;
+				this.datainfo.staffName=this.$store.state.user.nickName;
 				this.datainfo.userId=this.$store.state.user.userId;
-				// var userId=this.$store.state.user.userId;
-				// this.staffrzDet(userId)
+				
 			}else{
 				var tenantId=this.$store.state.user.tenantId;
 				this.datainfo.tenantId=tenantId;
@@ -340,7 +341,7 @@
 									this.$toast("新增成功,请等待审核")
 									setTimeout(function(){
 										uni.$emit("refStaffList")
-										var initFace='N';
+										var initFace='';
 										that.$store.dispatch('checkInitFace', initFace).then(() => {
 											
 										})
@@ -373,7 +374,7 @@
 									this.$toast("修改成功")
 									setTimeout(function(){
 										uni.$emit("refStaffList")
-										var initFace='N';
+										var initFace='';
 										that.$store.dispatch('checkInitFace', initFace).then(() => {
 											
 										})
@@ -428,19 +429,6 @@
 					})
 				}
 			},
-			// 认证信息详情 ,admin,首页切换到幸福里,修改
-			staffrzDet(id){
-				staffrzDet(id).then(res=>{
-					if(res.code==200&&res.data){
-						if(this.rztype=='rzadd'){
-							this.datainfo=res.data
-						}else{
-							this.ptype='edit';
-							this.datainfo=res.data;
-						}
-					}
-				})
-			},
 			// 头像
 			getPreview(url) {
 				var newArr=[];

property_ui/work/pages/manage/housedetail.vue

@@ -808,7 +808,7 @@
 
 									setTimeout(function(){
 										uni.$emit("residentInfoList")
-										var initFace='N';
+										var initFace='';
 										that.$store.dispatch('checkInitFace', initFace).then(() => {
 											
 										})
@@ -829,7 +829,7 @@
 									this.$toast("修改成功")
 									setTimeout(function(){
 										uni.$emit("residentInfoList")
-										var initFace='N';
+										var initFace='';
 										that.$store.dispatch('checkInitFace', initFace).then(() => {
 											
 										})