测试修改

property_ui/health/pages/health/add.vue

@@ -34,7 +34,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">
@@ -194,7 +194,7 @@
 					"idCardBack":"",//身份证反面
 				},
 				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: '请选择居住门户' }]},

property_ui/pages/index/index.vue

@@ -156,7 +156,12 @@
 						<view class="txt">物业费管理</view>
 					</view>
 					<view class="list bimga" @click="getHouseFn"  v-if="checkPermi(['wuYe:houseInfo:list'])">
-						<view class="imgs"><image :src="htabh" class="imgd"></image></view>
+						<view class="imgs"><image :src="htabh" class="imgd"></image>
+							<view class="tips">
+								<block v-if="countTips.residentInfoAuthenticationCount>98">99+</block>
+								<block v-else>{{countTips.residentInfoAuthenticationCount||0}}</block>
+							</view>
+						</view>
 						<view class="txt">房屋管理</view>
 					</view>
 				</view>
@@ -167,11 +172,11 @@
 					<view>物业服务</view>
 				</view>
 				<view class="lists">
-					<view class="list bimga" @click="getPatrolFn" v-if="checkPermi(['wuYe:checkPointRecord:applist'])">
+					<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:applist'])">
+					<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>
@@ -182,9 +187,8 @@
 					<view class="list bimga" @click="getStaffFn"  v-if="checkPermi(['wuYe:staffManage:list'])">
 						<view class="imgs"><image :src="htabk" class="imgb"></image>
 							<view class="tips">
-								<block>aa</block>
-								<!-- <block v-if="countTips.complaintSuggestion>98">99+</block>
-								<block v-else>{{countTips.complaintSuggestion||0}}</block> -->
+								<block v-if="countTips.staffManageAuthenticationCount>98">99+</block>
+								<block v-else>{{countTips.staffManageAuthenticationCount||0}}</block>
 							</view>
 						</view>
 						<view class="txt">员工管理</view>

property_ui/people/pages/people/staffadd.vue

@@ -36,7 +36,7 @@
 							  :valuea="datainfo.tenantId"
 							  :chosevalue="tenantName?tenantName:statusFormats(datainfo.tenantId,voList,'tenant')"
 							  :filterable='filterable'
-							  :isdisabled="(ptype=='edit'&&datainfo.examine!='3')?true:false"
+							  :isdisabled="(ptype=='edit'&&datainfo.examine=='2')?true:false"
 						      @change='getchange'
 						    >
 						    </w-select>
@@ -47,6 +47,12 @@
 							<view class="rimg"><image :src="rimg"></image></view>
 						</view>
 					</uni-forms-item>
+					<uni-forms-item label="身份证号" name="idCard">
+						<view class="flexc">
+							<uni-easyinput :disabled="isdisabled" v-model="datainfo.idCard" :inputBorder='false' placeholder="请输入身份证号" />
+							<view class="rimg"></view>
+						</view>
+					</uni-forms-item>
 					<uni-forms-item label="上传头像" name="facePhoto">
 						<view class="addimgs">
 							<block v-if="datainfo.avatarPhoto">
@@ -74,7 +80,7 @@
 								<view class="rimg"><image :src="rimg"></image></view>
 							</picker>
 						</view> -->
-						<picker range-key='dictLabel' :disabled="isdisabled" :value="yglbidx" :range="yglbList"   @change='bindDateChange'>
+						<picker range-key='dictLabel' :disabled="(ptype=='edit'&&datainfo.examine=='2')?true:false"  :value="yglbidx" :range="yglbList"   @change='bindDateChange'>
 							<view class="flexc">
 								<view class="flex1 txr f13 co27" v-if="datainfo.staffCategory&&!yglb">{{statusFormats(datainfo.staffCategory,yglbList,'yglb')}}</view>
 								<view class="flex1 txr f13" v-else :class="yglb?'co27':'coa'">{{yglb||"请选择员工类别"}}</view>
@@ -97,17 +103,11 @@
 							<view class="rimg"></view>
 						</view>
 					</uni-forms-item>
-					<uni-forms-item label="身份证号" name="idCard">
-						<view class="flexc">
-							<uni-easyinput :disabled="isdisabled" v-model="datainfo.idCard" :inputBorder='false' placeholder="请输入身份证号" />
-							<view class="rimg"></view>
-						</view>
-					</uni-forms-item>
 				</view>
 			</view>
 		</uni-forms>
 		<!-- &&checkPermi(['wuYe:staffManage:add']) -->
-		<view class="pdlr12 mt55" v-if="rzflag&&datainfo.examine!=2">
+		<view class="pdlr12 mt55" v-if="rzflag">
 			<!-- <view class="rhbtn" @click="getEditFn" v-if="isdisabled">修改</view> -->
 			<view class="rhbtn" @click="getSubmit">确定</view>
 		</view>
@@ -404,9 +404,9 @@
 							}else{
 								this.datainfo=res.data;
 							}
-							if(res.data.examine=='2'){
-								this.isdisabled=true;
-							}
+							// if(res.data.examine=='2'){
+							// 	this.isdisabled=true;
+							// }
 						}
 					})
 				}else{

property_ui/work/pages/manage/housedetail.vue

@@ -3,7 +3,7 @@
 		<uni-forms ref="form" :model="datainfo" :rules="rules">
 			<view class="cbox">
 				<view class="chmain">
-					<picker range-key='dictLabel' :disabled="ptype=='edit'?true:false" :value="rylxidx" :range="rylxList"   @change='bindDateChangee'>
+					<picker range-key='dictLabel' :disabled="isdisabled" :value="rylxidx" :range="rylxList"   @change='bindDateChangee'>
 						<uni-forms-item label="人员类型" required name="residentType">
 							<view class="flexc mh35">
 								<view class="flex1 txr f13 co27" v-if="datainfo.residentType&&!rylx">{{statusFormats(datainfo.residentType,rylxList,'rylx')}}</view>
@@ -279,14 +279,13 @@
 						</block>
 				</block>
 				</uni-collapse>
-				<view class="hfbtns flexcj" >
-					<block v-if="datainfo.examine==1&&checkPermi(['wuYe:residentInfo:examineStaff'])">
-						<view class="btn btn1" @click.stop="getShFn('3')">拒绝</view>
-						<view class="btn btn2" @click.stop="getShFn('2')">通过</view>
-					</block>
-					<!-- v-if="datainfo.examine==3&&checkPermi(['wuYe:residentInfo:editAuthentication'])" -->
-					<view class="btn btn2 flex1"  @click.stop="getSubmit">修改提交</view>
-				</view>
+			</view>
+			<view class="hfbtns flexcj" >
+				<block v-if="datainfo.examine==1&&checkPermi(['wuYe:residentInfo:examineStaff'])">
+					<view class="btn btn1" @click.stop="getShFn('3')">拒绝</view>
+					<view class="btn btn2" @click.stop="getShFn('2')">通过</view>
+				</block>
+				<view class="btn btn2 flex1" v-if="datainfo.examine!=1&&checkPermi(['wuYe:residentInfo:editAuthentication'])"  @click.stop="getSubmit">修改提交</view>
 			</view>
 		</uni-forms>
 		
@@ -1037,8 +1036,8 @@
 .check /deep/ .is-required{font-size: 26rpx;color: #F40027;margin-right: 4rpx;}
 .check /deep/ .uni-collapse{background-color: transparent;}
 // .check /deep/ .uni-collapse .chmain{margin-bottom: 24rpx;}
-.check{min-height: 100vh;box-sizing: border-box;padding: 20rpx 18rpx 54rpx;}
-.cbox{
+.check{min-height: 100vh;box-sizing: border-box;padding: 20rpx 6rpx 54rpx;}
+.cbox{padding: 0 12rpx;
 	.chtit{font-weight: 500;font-size: 24rpx;color: #666666;padding:20rpx 14rpx;}
 	.chmain{
 		padding: 0rpx 28rpx;background: #FFFFFF;border-radius: 20rpx;
@@ -1072,11 +1071,12 @@
 		.delimg{width: 24rpx;height: 24rpx;position: absolute;right: 0;top: 0;}
 	}
 }
-.hfbtns{margin-top: 60rpx;
-	.btn{height: 88rpx;background: #FFF8F8;border-radius: 20rpx;width: 316rpx;display: flex;align-items: center;justify-content: center;font-weight: bold;
-font-size: 26rpx;box-sizing: border-box;
+.hfbtns{margin-top: 60rpx;justify-content: space-between;
+	.btn{height: 88rpx;background: #FFF8F8;border-radius: 20rpx;display: flex;align-items: center;justify-content: center;font-weight: bold;
+font-size: 26rpx;box-sizing: border-box;flex: 1;margin: 0 12rpx;
 		&.btn1{border: 2rpx solid #FF6969;background: #FFF8F8;color: #FF6969;}
 		&.btn2{background: #0256FD;color: #ffffff;}
+		&.btn3{border: 2rpx solid #0256FD;background: #ffffff;color: #0256FD;}
 	}
 }
 </style>