来访管理

property_ui/App.vue

@@ -182,6 +182,7 @@ import {updateUserProfile,findVersion} from "@/api/system/user.js"
  /deep/ .uniui-calendar::before{display: none;}
 /deep/ .uni-date__x-input{text-align: right;color: #272727;}
 /deep/ .uni-easyinput__content-textarea{margin: 0;}
+/deep/ .uni-date-editor--x__disabled{opacity: 1 !important;}
 </style>
 <style lang="scss">
 @import "@/static/style.css";

property_ui/people/components/car/list.vue

@@ -169,15 +169,15 @@
 						<view class="txt cc" v-if="ite.isCar=='Y'">驾车</view>
 					</view>
 					<view class="clists">
-						<!-- <view class="clist"><view class="tit">预约时间</view>{{ite.reserveTime}}</view> -->
-						<view class="clist"><view class="tit">来访时间</view>{{ite.visitorTime}}</view>
+						<view class="clist" v-if="tabval==1"><view class="tit">预约时间</view>{{ite.reserveTime}}</view>
+						<view class="clist" v-else><view class="tit">来访时间</view>{{ite.visitorTime}}</view>
 						<view class="w50 flexc">
 							<view class="clist"><view class="tit">访客姓名</view>{{ite.name}}</view>
 							<view class="clist"><view class="tit">来访人数</view>{{ite.num}}人</view>
 						</view>
 						<view class="w50 flexc">
 							<view class="clist"><view class="tit">来访事由</view>{{kaType(ite.reason,syList)}}</view>
-							<view class="clist"><view class="tit">车牌号码</view>{{ite.plateNumber}}</view>
+							<view class="clist"><view class="tit" v-if="ite.isCar=='Y'">车牌号码</view>{{ite.plateNumber}}</view>
 						</view>
 						<view class="clist"><view class="tit">手机号码</view>{{ite.mobileNumber}}</view>
 					</view>

property_ui/people/pages/people/comeadd.vue

@@ -14,11 +14,21 @@
 							<!-- <uni-data-checkbox selectedColor="#0156FE" selectedTextColor="#272727" v-model="datainfo.sex" :localdata="sexs" /> -->
 						</view>
 					</uni-forms-item>
-					<uni-forms-item label="来访人数" name="num">
+					<!-- <uni-forms-item label="来访人数" name="num">
 						<view class="flexc">
 							<uni-easyinput :disabled="isdisabled" v-model="datainfo.num" type="Number" :inputBorder='false' placeholder="请输入来访人数" />
 							<view class="rimg"><image :src="rimg"></image></view>
 						</view>
+					</uni-forms-item> -->
+					<uni-forms-item label="来访人数" name="num">
+						<view class="flexc">
+
+							<view class="libox flexcw rslist">
+								<view class="sylist flexcc" :class="datainfo.num==ite.value?'act':''" v-for="(ite,idx) in rslist" :key="idx" @click="getRsFn(ite)">{{ite.label}}</view>
+							</view>
+							<uni-easyinput  :disabled="isdisabled" v-model="datainfo.num" type="Number" :inputBorder='false' placeholder="输入" />
+							<view class="rimg"><image :src="rimg"></image></view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="来访时间" name="visitorTime" v-if="tabval==1">
 						<view class="flexc">
@@ -34,12 +44,10 @@
 						</picker> -->
 					</uni-forms-item>
 					<uni-forms-item label="来访事由" name="reason">
-						<view class="flexc">
-							<uni-easyinput  :disabled="isdisabled" v-model="datainfo.reason" :inputBorder='false' placeholder="请输入来访事由" />
+						<view class="flexc ">
+							<view class="flex1"></view>
+							<view class="sylist flexcc" :class="datainfo.reason==ite.dictValue?'act':''" v-for="(ite,idx) in sylist" :key="idx" @click="getSyFn(ite.dictValue)">{{ite.dictLabel}}</view>
 							<view class="rimg"><image :src="rimg"></image></view>
-							<!-- <picker range-key='dictLabel' :value="syqxidx" :range="sexs"   @change='bindDateChange'>
-								<view class="rimg"><image :src="rimg"></image></view>
-							</picker> -->
 						</view>
 					</uni-forms-item>
 					<uni-forms-item label="来访门户" name="houseId">
@@ -55,6 +63,7 @@
 						      keyName="value"
 							  :chosevalue="datainfo.houseAddress"
 							  :filterable='filterable'
+							   :isdisabled="isdisabled"
 						      @change='getchange'
 						    >
 						    </w-select>
@@ -79,10 +88,10 @@
 							<image :src="ncheck" v-else class="checkimg"></image>
 						</view>
 					</uni-forms-item>
-					<uni-forms-item label="车牌号码" name="plateNumber">
+					<uni-forms-item label="车牌号码" name="plateNumber" v-if="datainfo.isCar=='Y'">
 						<view class="flexc">
 							<!-- disabled -->
-							<uni-easyinput :disabled="isdisabled" v-model="datainfo.plateNumber" :inputBorder='false' placeholder="拍照自动识别" />
+							<uni-easyinput disabled v-model="datainfo.plateNumber" :inputBorder='false' placeholder="拍照自动识别" />
 							<view class="aphoto" @click="getaddImagea">
 								<image :src="aphoto"></image>
 							</view>
@@ -101,9 +110,9 @@
 				</view>
 			</view>
 		</uni-forms>
-		<view class="pdlr12 mt63">
-			<view class="rhbtn" @click="getEditFn" v-if="isdisabled">修改</view>
-			<view class="rhbtn" @click="getSubmit" v-else>确定</view>
+		<view class="pdlr12 mt63" v-if="checkPermi(['wuYe:reservRecord:add'])&&tabval==1||checkPermi(['wuYe:visitorManage:add'])&&tabval==2">
+			<!-- <view class="rhbtn" @click="getEditFn" v-if="isdisabled">修改</view> -->
+			<view class="rhbtn" @click="getSubmit">确定</view>
 		</view>
 
 		<loading></loading>
@@ -113,6 +122,7 @@
 <script>
 	import config from '@/config'
 	import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
+	import {getDictionaryFn} from "@/api/system/user.js"
 	import {uploadIdentify,uploadmore} from '@/utils/common.js'
 	import {visitorAdd,reservAdd,visitorDet,reservDet,visitorPut,reservPut} from "@/api/work/people.js"
 	import {houseInfolistNoPage} from "@/api/work/work.js"
@@ -153,6 +163,10 @@
 				filterable:true,
 				chooseValue:'',
 				fwlist:[],
+				sylist:[],
+				rsidx:'',
+				rslist:[{label:'1',value:'1'},{label:'2',value:'2'},{label:'3',value:'3'},{label:'4',value:'4'},{label:'5',value:'5'},{label:'6',value:'6'},{label:'7',value:'7'}],
+				syidx:'',
 				tabval:'',//1预约，2 临时
 				id:'',
 				isdisabled:false,
@@ -165,9 +179,13 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype="edit";
-				// this.isdisabled=true;
 				this.getDetail()
 			}
+			if(checkPermi(['wuYe:reservRecord:add'])&&this.tabval==1||checkPermi(['wuYe:visitorManage:add'])&&this.tabval==2){
+				this.isdisabled=false;
+			}else{
+				this.isdisabled=true;
+			}
 			this.init()
 			this.time()
 		},
@@ -177,6 +195,20 @@
 			getEditFn(){
 				this.isdisabled=false;
 			},
+			getSyFn(e){
+				if(this.isdisabled){
+					return
+				}
+				this.syidx=e;
+				this.datainfo.reason=e;
+			},
+			getRsFn(e){
+				if(this.isdisabled){
+					return
+				}
+				this.rsidx=e.value;
+				this.datainfo.num=e.label;
+			},
 			time() {
 				var date = new Date();
 				var y = date.getFullYear();
@@ -204,6 +236,17 @@
 						})
 					}
 				})
+				// 来访事由
+				getDictionaryFn('visit_reason').then(res=>{
+					if(res.code==200){
+						this.sylist = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			bindDateChange(e){
 				var val=e.detail.value;
@@ -251,7 +294,7 @@
 						return
 					}
 					if(params.isCar=='Y'&&!params.plateNumber){
-						this.$toast("请输入车牌号")
+						this.$toast("请拍照识别车牌号")
 						return
 					}
 					if(this.tabval==1){
@@ -438,4 +481,14 @@
 	
 }
 .tips{font-weight: 500;font-size: 22rpx;color: #0256FD;padding: 20rpx 0;}
+.libox{
+	&.rslist{
+		.sylist{min-width:40rpx;height: 40rpx;margin-left: 14rpx;}
+	}
+}
+.sylist{background: #F0F0F0;border-radius: 26rpx;border:2rpx solid #DADADA;margin-left: 26rpx;font-weight: 500;min-width:112rpx;height: 54rpx;box-sizing: border-box;
+font-size: 26rpx;
+color: #666666;
+	&.act{border: 2rpx solid #0256FD;background: #DCE8FF;color: #0256FD;}
+}
 </style>

property_ui/people/pages/people/comegl.vue

@@ -24,7 +24,7 @@
 		<view class="carlists">
 			<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'])">
+		<block v-if="checkPermi(['wuYe:reservRecord:add'])&&tabval==1||checkPermi(['wuYe:visitorManage:add'])&&tabval==2">
 			<view style="height: 100rpx;"></view>
 			<view class="rfbtn"  @click="getAddFn">访客信息登记</view>
 		</block>
@@ -160,10 +160,10 @@
 					pageNum: this.pageNum,
 				}
 				if(this.text){
-					params.houseAddress=this.tabval
+					params.houseAddress=this.text
 				}
 				if(this.xzrq){
-					params.visitorTime=this.xzrq
+					params['params[createTime]']=this.xzrq
 				}
 				if(this.tabval==1){
 					reservList(params).then(res=>{

property_ui/service/components/car/list.vue

@@ -74,7 +74,7 @@
 					</view>
 				</view>
 				<view class="bxsteps">
-					<uni-collapse ref="collapse" v-model="value">
+					<uni-collapse ref="collapse" >
 						<uni-collapse-item title-border="none">
 								<template v-slot:title>
 									<view class="chtop flexc" >
@@ -91,7 +91,7 @@
 										</view>
 										<view class="flex1">
 											<view class="hfstit co01">已完成 <text>{{ite.completionTime}}</text></view>
-											<view class="hfstxt">【{{ite.staffName}} {{ite.staffPhone}}】已完成报修业务</view>
+											<view class="hfstxt"><text @click.stop="getPhoneFn(ite.staffPhone)">【{{ite.staffName}} {{ite.staffPhone}}】</text>已完成报修业务</view>
 											<view class="hfimgs flexcw" v-if="ite.completionPhoto&&ite.completionPhoto.length">
 												<image :src="baseUrl+aite" @click="getPreviewImage(ite.completionPhoto,aidx)" v-for="(aite,aidx) in ite.completionPhoto" :key="aidx"></image>
 											</view>
@@ -104,7 +104,7 @@
 										</view>
 										<view class="flex1">
 											<view class="hfstit">处理中 <text>{{ite.visitTime}}</text></view>
-											<view class="hfstxt">【{{ite.staffName}} {{ite.staffPhone}}】已上门处理中</view>
+											<view class="hfstxt"><text @click.stop="getPhoneFn(ite.staffPhone)">【{{ite.staffName}} {{ite.staffPhone}}】</text>已上门处理中</view>
 											<view class="hfimgs flexcw" v-if="ite.visitPhoto&&ite.visitPhoto.length">
 												<image :src="baseUrl+aite" @click="getPreviewImage(ite.visitPhoto,aidx)" v-for="(aite,aidx) in ite.visitPhoto" :key="aidx"></image>
 											</view>
@@ -161,7 +161,7 @@
 					</view>
 				</view>
 				<view class="bxsteps">
-					<uni-collapse ref="collapse" v-model="value">
+					<uni-collapse ref="collapse">
 						<uni-collapse-item title-border="none">
 								<template v-slot:title>
 									<view class="chtop flexc" >
@@ -313,7 +313,6 @@
 				cira:require('@/service/static/service/cira.png'),
 				cirb:require('@/service/static/service/cirb.png'),
 				filico:require('@/work/static/filico.png'),
-				value:[],
 				autoplay:false,
 				incolorh:'#C0C3C3',
 				activecolorh:'#FFFFFF',

property_ui/service/components/popup/popup.vue

@@ -255,6 +255,7 @@
 					data.staffName=peoinfo.staffName;
 					data.staffId=peoinfo.staffId;
 					data.staffPhone=peoinfo.phoneNumber;
+					data.staffUserId=peoinfo.userId;
 				}else if(type=='assigncheck'){
 					var peoinfo=JSON.parse(JSON.stringify(this.phofile))
 					if(peoinfo.length<1){

property_ui/service/pages/service/patrol.vue

@@ -159,7 +159,8 @@
 			},
 			getCount(){
 				var params={};
-				params.createTime=this.time()
+				// params['params[createTime]']=this.time()
+				// params.createTime=this.time()
 				xgdjlCount(params).then(res=>{
 					if(res.code==200){
 						var data=res.data;
@@ -187,7 +188,8 @@
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
 				}
-				params.createTime=this.time()
+				params['params[createTime]']=this.time()
+				// params.createTime=this.time()
 				if(this.tabval!=0){
 					params.checkStatus=this.tabval;
 				}

property_ui/service/pages/service/patrolrecord.vue

@@ -124,7 +124,8 @@
 					pageNum: this.pageNum,
 				}
 				if(this.cxrq){
-					params.createTime=this.cxrq
+					params['params[createTime]']=this.cxrq
+					// params.createTime=this.cxrq
 				}
 				xgdjlList(params).then(res=>{
 					if(res.code==200){

property_ui/service/pages/service/warranty.vue

@@ -61,7 +61,9 @@
 				type:'',
 				repairId:'',
 				staffId:'',
+				staffUserId:'',
 				repairStatus:'',//维修状态
+				userId:this.$store.state.user.userId
 			}
 		},
 		onUnload() {
@@ -250,6 +252,9 @@
 				if(this.tabval!=-1){
 					params.repairStatus=this.tabval
 				}
+				if(checkPermi(['wuYe:repair:repairlist'])){
+					params.staffUserId=this.userId
+				}
 				repairList(params).then(res=>{
 					if(res.code==200){
 						if (res.rows.length < this.pageSize) {

property_ui/work/pages/manage/housedetail.vue

@@ -76,7 +76,7 @@
 						</block>
 					</block>
 				</view>
-				<uni-collapse ref="collapse" v-model="value" >
+				<uni-collapse ref="collapse" >
 					<block>
 						<view class="chtit">人员信息</view>
 							<block>
@@ -316,7 +316,6 @@
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				backgroundColor: "transparent",
-				value:'',
 				datainfo: {
 					"tenantId":"",//租户id
 					"residentType":"",//人员类型：1:业主 2:租户 3:其他