heyang 1 rok temu
rodzic
commit
a488dcc2b1

+ 6 - 6
pages_safetyExamine/examineManage/examineDetail.vue

@@ -70,7 +70,7 @@
 			</view>
 			</view>
 		</view>
 		</view>
 		<!-- 综合检查 -->
 		<!-- 综合检查 -->
-		<viw v-if="checkCategory==1">
+		<viw v-if="infoData.checkCategory==1">
 			<view class="inconformity" @click="inconformityFun()" v-if="manageStatus==2 && infoData.checkResult==0">不符合项<img v-if="inconformityStatus" src="@/pages_safetyExamine/images/icon_bfhx_xq.png"/><img v-if="!inconformityStatus" src="@/pages_safetyExamine/images/icon_bfhx_sq.png"/></view>
 			<view class="inconformity" @click="inconformityFun()" v-if="manageStatus==2 && infoData.checkResult==0">不符合项<img v-if="inconformityStatus" src="@/pages_safetyExamine/images/icon_bfhx_xq.png"/><img v-if="!inconformityStatus" src="@/pages_safetyExamine/images/icon_bfhx_sq.png"/></view>
 			<view v-for="(item,index) in infoData.checkHazardDtoList" v-if="manageStatus==2 && infoData.checkResult==0">
 			<view v-for="(item,index) in infoData.checkHazardDtoList" v-if="manageStatus==2 && infoData.checkResult==0">
 				<view class="danger">
 				<view class="danger">
@@ -109,7 +109,7 @@
 			</view>
 			</view>
 		</viw>
 		</viw>
 		<!-- 专项检查 -->
 		<!-- 专项检查 -->
-		<view v-if="checkCategory==2 && manageStatus==2"  v-for="(itemAll,indexAll) in infoData.checkHazardInfoVoList">
+		<view v-if="infoData.checkCategory==2 && manageStatus==2"  v-for="(itemAll,indexAll) in infoData.checkHazardInfoVoList">
 			<view class="inconformity_tow" @click="inconformityFun2(itemAll)" >{{itemAll.hazardName}}<img v-if="inconformityStatus2" src="@/pages_safetyExamine/images/icon_bfhx_xq.png"/><img v-if="!inconformityStatus2" src="@/pages_safetyExamine/images/icon_bfhx_sq.png"/></view>
 			<view class="inconformity_tow" @click="inconformityFun2(itemAll)" >{{itemAll.hazardName}}<img v-if="inconformityStatus2" src="@/pages_safetyExamine/images/icon_bfhx_xq.png"/><img v-if="!inconformityStatus2" src="@/pages_safetyExamine/images/icon_bfhx_sq.png"/></view>
 			<view class="danger_border">
 			<view class="danger_border">
 				<view class="ident">检查项目</view>
 				<view class="ident">检查项目</view>
@@ -118,7 +118,7 @@
 						<view class="sort">{{index+1}}</view>
 						<view class="sort">{{index+1}}</view>
 						<text>第{{index+1}}项隐患</text>
 						<text>第{{index+1}}项隐患</text>
 						<viwe :class="item.checkFlag==0?'noConform':'isConform'">{{item.checkFlag==0?'不符合':'符合'}}</viwe>
 						<viwe :class="item.checkFlag==0?'noConform':'isConform'">{{item.checkFlag==0?'不符合':'符合'}}</viwe>
-						<text style="color: #0183FA;" @click="dangerItem(item)">{{item.rectifyStatus==1?'已完成':(item.rectifyStatus==2?'待整改':(item.rectifyStatus==3?'待复核':(item.rectifyStatus==4?'暂无法整改':'')))}} >></text>
+						<text style="color: #0183FA;" v-if="item.checkFlag==0" @click="dangerItem(item)">{{item.rectifyStatus==1?'已完成':(item.rectifyStatus==2?'待整改':(item.rectifyStatus==3?'待复核':(item.rectifyStatus==4?'暂无法整改':'')))}} >></text>
 					</view>
 					</view>
 					<view class="small_items">{{item.hazardCheckProStr}}</view>
 					<view class="small_items">{{item.hazardCheckProStr}}</view>
 					<view v-if="item.switch">
 					<view v-if="item.switch">
@@ -138,7 +138,7 @@
 							</view>
 							</view>
 						</view>
 						</view>
 					</view>
 					</view>
-					<view class="pack_up" @click="switchFun(item)">{{item.switch?'收起':'展开'}}<img v-if="item.switch" src="@/pages_safetyExamine/images/icon_06_1.png"/><img v-if="!item.switch" src="@/pages_safetyExamine/images/icon_06.png"/></view>
+					<view class="pack_up" v-if="item.checkFlag==0" @click="switchFun(item)">{{item.switch?'收起':'展开'}}<img v-if="item.switch" src="@/pages_safetyExamine/images/icon_06_1.png"/><img v-if="!item.switch" src="@/pages_safetyExamine/images/icon_06.png"/></view>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -823,12 +823,12 @@ export default {
 		background: #FFFFFF;
 		background: #FFFFFF;
 		padding: 0;
 		padding: 0;
 		box-sizing: border-box;
 		box-sizing: border-box;
-		margin: 0 30rpx;
+		margin: 0 30rpx 12rpx;
 		border-radius: 0;
 		border-radius: 0;
 		.grade{
 		.grade{
 			height: 80rpx;
 			height: 80rpx;
 			display: flex;
 			display: flex;
-			justify-content: space-between;
+			justify-content: flex-start;
 			border-bottom: 1rpx solid #D8D8D8;
 			border-bottom: 1rpx solid #D8D8D8;
 			position: relative;
 			position: relative;
 			background: #F5F5F5;
 			background: #F5F5F5;