zc

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -16,7 +16,9 @@
 				<img class="title-r" :src="imagesUrl('commonality/icon_wd_gd@1x.png')">
 			</view>
 			<view class="tabTitleTow">
-				<view :class="tabIndexTow==index?'tab-C':'tab-D'" v-for="(item,index) in tabListTow"
+				<!-- <view :class="tabIndexTow==index?'tab-C':'tab-D'" v-for="(item,index) in tabListTow"
+					@click="tabClickTow(index)">{{item}}</view> -->
+				<view :class="tabIndexTow==index || tabIndexTow==index+1?'tab-C':'tab-D'" v-for="(item,index) in tabListTow"
 					@click="tabClickTow(index)">{{item}}</view>
 			</view>
 			<view>
@@ -155,7 +157,8 @@
 				baseUrl: config.base_url,
 				pageType: 0,
 				userType: 1,
-				tabListTow: ['检查任务', '复查验证', '隐患整改'],
+				// tabListTow: ['检查任务', '复查验证', '隐患整改'],
+				tabListTow: ['检查任务', '隐患整改'],
 				tabIndexTow: 0,
 				//学院选择
 				deptData: {
@@ -202,9 +205,13 @@
 			uni.setNavigationBarTitle({
 				title: optionData.checkPlanSetVoList.checkName
 			})
+			// this.$set(this, 'tabListTow',
+			// 	optionData.checkCategory == 1 ? ['检查任务', '复查验证', '隐患整改'] :
+			// 	(optionData.checkCategory == 2 ? ['自查任务', '复查验证', '隐患整改'] : [])
+			// )
 			this.$set(this, 'tabListTow',
-				optionData.checkCategory == 1 ? ['检查任务', '复查验证', '隐患整改'] :
-				(optionData.checkCategory == 2 ? ['自查任务', '复查验证', '隐患整改'] : [])
+				optionData.checkCategory == 1 ? ['检查任务', '隐患整改'] :
+				(optionData.checkCategory == 2 ? ['自查任务', '隐患整改'] : [])
 			)
 			this.$set(this, 'optionData', optionData);
 			this.$set(this, 'planSetId', optionData.checkPlanSetVoList.planSetId);
@@ -296,7 +303,8 @@
 				this.$set(this, 'classes', []);
 				this.$set(this, 'buildId', '');
 				this.$set(this, 'floorId', '');
-				this.$set(this, 'tabIndexTow', index);
+				// this.$set(this, 'tabIndexTow', index);
+				this.$set(this, 'tabIndexTow', index==0?0:2);
 				this.$nextTick(() => {
 					this.getList();
 				})
@@ -891,16 +899,27 @@
 			justify-content: center;
 			margin: 20rpx 0 0 30rpx;
 
+			// >view:nth-of-type(1) {
+			// 	width: 230rpx;
+			// 	height: 80rpx;
+			// 	border-radius: 50rpx 0rpx 0rpx 50rpx;
+			// }
+
+			// >view:nth-of-type(2) {
+			// 	width: 230rpx;
+			// 	height: 80rpx;
+			// 	border-radius: 0rpx 0rpx 0rpx 0rpx;
+			// }
 			>view:nth-of-type(1) {
-				width: 230rpx;
+				width: 345rpx;
 				height: 80rpx;
 				border-radius: 50rpx 0rpx 0rpx 50rpx;
 			}
 
 			>view:nth-of-type(2) {
-				width: 230rpx;
+				width: 345rpx;
 				height: 80rpx;
-				border-radius: 0rpx 0rpx 0rpx 0rpx;
+				border-radius: 0rpx 50rpx 50rpx 0rpx;
 			}
 
 			>view:nth-of-type(3) {

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -72,7 +72,8 @@
 							<view>{{item.rectifyTime}}</view>
 						</view>
 					</view>
-					<view class="list-li" v-if="item.reviewTime" @click="reviewCollapse(item)">
+					<!----复查相关暂时注释----开始---->
+					<!-- <view class="list-li" v-if="item.reviewTime" @click="reviewCollapse(item)">
 						<view>复查验证</view>
 						<view :id="item.examineResult?'fontColor-B':'fontColor-C'">
 							{{item.examineResult?'复查完毕':'退回整改'}}
@@ -89,15 +90,12 @@
 						<view class="photo" v-if="item.examineUploadList[0]" @click="lockImg(item.examineUploadList)">
 							<img v-for="(item3,index3) in item.examineUploadList" :src="baseUrl+item3.fileUrl">
 						</view>
-						<!-- <view class="list-li">
-							<view>复查者：</view>
-							<view>{{item.reviewName}}</view>
-						</view> -->
 						<view class="list-li">
 							<view>复查时间</view>
 							<view>{{item.reviewTime}}</view>
 						</view>
-					</view>
+					</view> -->
+					<!----复查相关暂时注释----结束---->
 				</view>
 				<view class="voice" v-if="newData.voiceList[0] && !newData.rectifyStatus">
 					<view class="voice_t">

pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -75,7 +75,8 @@
 							<view>{{item.rectifyTime}}</view>
 						</view>
 					</view>
-					<view class="list-li" v-if="item.reviewTime" @click="reviewCollapse(item)">
+					<!----复查相关暂时注释----开始---->
+					<!-- <view class="list-li" v-if="item.reviewTime" @click="reviewCollapse(item)">
 						<view>复查验证</view>
 						<view :id="item.examineResult?'fontColor-B':'fontColor-C'">
 							{{item.examineResult?'复查完毕':'退回整改'}}
@@ -89,28 +90,34 @@
 						<view class="photo" v-if="item.examineUploadList[0]" @click="lockImg(item.examineUploadList)">
 							<img v-for="(item3,index3) in item.examineUploadList" :src="baseUrl+item3.fileUrl">
 						</view>
-						<!-- <view class="list-li">
-							<view>姓名：</view>
-							<view>{{item.reviewName}}</view>
-						</view> -->
 						<view class="list-li">
 							<view>复查时间</view>
 							<view>{{item.reviewTime}}</view>
 						</view>
-					</view>
+					</view> -->
+					<!----复查相关暂时注释----结束---->
 				</view>
 				<view class="list-li">
-					<view v-if="pageType==1">复查验证</view>
-					<view v-if="pageType==2">隐患整改({{fontNum}}/500)</view>
+					<!----复查相关暂时注释----开始---->
+					<!-- <view v-if="pageType==1">复查验证</view>
+					<view v-if="pageType==2">隐患整改({{fontNum}}/500)</view> -->
+					<!----复查相关暂时注释----结束---->
+					<view>隐患整改({{fontNum}}/500)</view>
 					<view>
 						<img :src="imagesUrl('commonality/icon_06.png')">
 					</view>
 				</view>
-				<textarea v-if="pageType==1" class="describe" type="text" v-model="form.examineOpinion" maxlength="500"
+					<!----复查相关暂时注释----开始---->
+				<!-- <textarea v-if="pageType==1" class="describe" type="text" v-model="form.examineOpinion" maxlength="500"
 					placeholder="请填写隐患描述"
 					placeholder-style="font-size:24rpx;color:#999;"></textarea>
 				<textarea v-if="pageType==2" class="describe" type="text" v-model="form.rectifyMeasure" maxlength="500"
 					@input="sumfontnum" placeholder="立整立改的请填写相关文字及整改前后照片对比等，不能立整立改的请说明原因并附整改计划、措施等"
+					placeholder-style="font-size:24rpx;color:#999;"></textarea> -->
+					<!----复查相关暂时注释----结束---->
+				
+				<textarea class="describe" type="text" v-model="form.rectifyMeasure" maxlength="500"
+					@input="sumfontnum" placeholder="立整立改的请填写相关文字及整改前后照片对比等，不能立整立改的请说明原因并附整改计划、措施等"
 					placeholder-style="font-size:24rpx;color:#999;"></textarea>
 					
 				<view class="check-for-img-max-box">
@@ -139,8 +146,12 @@
 			</view>
 		</scroll-view>
 		<view class="sub-btn">
-			<view @click="submitForm(2)">{{pageType==1?'退回整改':'暂无法整改'}}</view>
-			<view @click="submitForm(1)">{{pageType==1?'复查完毕':'完成整改'}}</view>
+					<!----复查相关暂时注释----开始---->
+			<!-- <view @click="submitForm(2)">{{pageType==1?'退回整改':'暂无法整改'}}</view>
+			<view @click="submitForm(1)">{{pageType==1?'复查完毕':'完成整改'}}</view> -->
+					<!----复查相关暂时注释----结束---->
+			<view @click="submitForm(2)">暂无法整改</view>
+			<view @click="submitForm(1)">完成整改</view>
 		</view>
 	</view>