heyang

pages_safetyExamine/dangerManage/dangerDetail.vue

@@ -23,7 +23,7 @@
 				</view>
 				<view class="basics_li">
 					<text>楼栋：</text>
-					<text>{{infoData.buildName}}</text>
+					<text>{{infoData.buildName?infoData.buildName:'-'}}</text>
 				</view>
 				<view class="basics_li">
 					<text>检查类型：</text>

pages_safetyExamine/dangerManage/dangerManage.vue

@@ -251,6 +251,12 @@ export default {
 	// box-sizing: border-box;
 	padding-bottom: 20rpx;
 	box-sizing: border-box;
+	.null-img{
+		display block
+		width:276rpx;
+		height:321rpx;
+		margin:100rpx 0 0 274rpx;
+	}
 	.blue_color{
 		color: #0183FA;
 		border: 1rpx solid #0183FA;

pages_safetyExamine/examineManage/examineAdd.vue

@@ -436,6 +436,8 @@ export default {
 				this.$set(this.form,'subIds',data.data.subId);
 				this.form.checkResult=data.data.checkResult==null?'1':data.data.checkResult;
 				this.form.rectifyNotice=data.data.rectifyNotice==null?'1':data.data.rectifyNotice;
+				this.informIndex=this.form.rectifyNotice==1?0:1;
+				
 				if(data.data.checkHazardDtoList.length>0){//隐患项
 					this.form.checkHazardDtoList=data.data.checkHazardDtoList;
 					//语音备注
@@ -586,9 +588,9 @@ export default {
 		tabClick(index) {
 			this.informIndex = index;
 			if(index==0){
-				this.rectifyNotice='1';
+				this.form.rectifyNotice='1';
 			}else if(index==1){
-				this.rectifyNotice='2';
+				this.form.rectifyNotice='2';
 			}
 		
 		},

pages_safetyExamine/examineManage/examineDetail.vue

@@ -13,7 +13,7 @@
 			</view>
 			<view class="basics_li">
 				<text>楼栋：</text>
-				<text>{{infoData.buildName}}</text>
+				<text>{{infoData.buildName?infoData.buildName:'-'}}</text>
 			</view>
 			<view class="basics_li">
 				<text>检查类型：</text>

pages_safetyExamine/patrolPlan/patrolPlanAddLab.vue

@@ -97,6 +97,7 @@ export default {
 		  this.collegeIndex = e.target.value;
 		  this.getData.deptId=this.collegeList[e.target.value].deptId
 		  this.getData.deptName=this.collegeList[e.target.value].deptName
+		  this.getData.pageNum=1;
 		  this.dataList=[];
 		  this.getList();
 	  },
@@ -142,6 +143,7 @@ export default {
 	  	let _this = this;
 		let subIds=[];
 		this.$set(this.form,'subjectNum', this.seleteListLab.length)
+		this.$set(this.form,'seleteListLab', this.seleteListLab)
 		if(this.seleteListLab.length>0){
 			this.seleteListLab.forEach(function(item){
 				subIds.push(item.subId)
@@ -185,7 +187,7 @@ export default {
 			  _this.total=data.total;
 			  if(this.seleteListLab.length>0){//如果有选中的数据
 			  		for(let i=0;i<this.dataList.length;i++){
-			  			if(this.seleteListLab.findIndex((item)=>item.id===this.dataList[i].id) !=-1){//不等于-1说明数组里有当前元素,可以改为选中
+			  			if(this.seleteListLab.findIndex((item)=>item.subId===this.dataList[i].subId) !=-1){//不等于-1说明数组里有当前元素,可以改为选中
 			  				this.dataList[i].type=true;
 			  			}else{
 			  					  

pages_safetyExamine/patrolPlan/patrolPlanEdit.vue

@@ -575,19 +575,29 @@ export default {
 	    handleClick(item,doType){
 		  let self=this;
 		  
-		  if( doType=='subBtn'){//	
-			  console.log(11)
+		  if( doType=='subBtn'){
+			  
 		  }else if(doType=='detail'){//详情
-			 
-			  if(item.manageStatus==1){//检查中
-				  uni.navigateTo({
-				      url: '/pages_safetyExamine/examineManage/examineAdd?id='+item.id
-				  });
-			  }else{
-				  uni.navigateTo({
-				      url: '/pages_safetyExamine/examineManage/examineDetail?id='+item.id+'&manageStatus='+item.manageStatus+'&isSelfData='+item.isSelfData
-				  });
-			  }
+			if(item.manageStatus==1){//检查中
+				if(item.isSelfData==1){			 
+					uni.navigateTo({
+						url: '/pages_safetyExamine/examineManage/examineAdd?id='+item.id
+					});				 
+				}else{
+					uni.showToast({
+						  title: '当前用户暂无操作数据权限!',
+						  icon:"none",
+						  mask:true,
+						  duration: 2000
+					});
+				}			 
+			}else{
+				uni.navigateTo({
+					  url: '/pages_safetyExamine/examineManage/examineDetail?id='+item.id+'&manageStatus='+item.manageStatus+'&isSelfData='+item.isSelfData
+				});
+			}
+			
+			  
 			  
 			 
 		  }