heyang

pages.json

@@ -919,12 +919,7 @@
 						"navigationBarTitleText": "安全检查"
 					}
 				},
-				{
-					"path": "views/itemsManage/snapshotRectification",
-					"style": {
-						"navigationBarTitleText": "整改"
-					}
-				},
+				
 				{
 					"path": "views/inspectManage/inspectAdd",
 					"style": {
@@ -981,6 +976,19 @@
 						"navigationBarTitleText": "随手拍"
 					}
 				},
+				{
+					"path": "views/snapshotManage/snapshotItems",
+					"style": {
+						"navigationBarTitleText": "随手拍整改项"
+					}
+				},
+				
+				{
+					"path": "views/snapshotManage/snapshotRectification",
+					"style": {
+						"navigationBarTitleText": "整改"
+					}
+				},
 				{
 					"path": "views/materialAttachments",
 					"style": {

pages_safetyCheck/api/index.js

@@ -152,7 +152,14 @@ export const securityAppCheckDangerCheckRectify = (data) => {
        data: { ...data }
     })
 };
-
+//实验室下-复查-复查完毕/退回整改
+export const securityAppCheckDangerApprove = (data) => {
+    return apiResquest({
+        url: '/security/appCheckDanger/approve',
+       method: 'POST',
+       data: { ...data }
+    })
+};
 
 
 //实验室下-复查验证-检查项查询

pages_safetyCheck/component/checkItemModule.vue

@@ -241,16 +241,16 @@
 				} = await securityAppCheckSetOptionList({
 					manageId: this.optionData.manageId,
 					checkStatus: this.optionData.checkType,
-					searchValue: this.searchValue
+					searchValue: this.searchValue	
 				});
 				if (data.code == 200) {
 					//级联数据
 					if (maxList) {
-						let minList = JSON.parse(JSON.stringify(data.data.records))
+						let minList = JSON.parse(JSON.stringify(data.data))
 						this.cascadeData(maxList,minList);
 					}
 					//查询数据
-					this.$set(this,'dataList',JSON.parse(JSON.stringify(data.data.records)));
+					this.$set(this,'dataList',JSON.parse(JSON.stringify(data.data)));
 				}
 			},
 			/********************** 复查相关查询 **********************/

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -49,7 +49,8 @@
 					<view class="hidden-li-c">{{item.subName}}</view>
 					<view class="hidden-li-r" :class="item.manageStatus == 2?'manageClass':''" v-if="tabIndexTow==0">
 						{{item.manageStatus == 2?'已检查':'待检查'+item.unCheckCount+'项'}}
-						<img src="@/pages_safetyCheck/images/icon_ssp_gd@1x.png">
+						<img v-if="item.manageStatus != 2" src="@/pages_safetyCheck/images/icon_ssp_gd@1x.png">
+						<img v-if="item.manageStatus == 2" src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
 					</view>
 					<view class="hidden-li-r" :class="item.manageStatus == 2?'manageClass':''" v-if="tabIndexTow==1">
 						{{item.overCheck?'已复查':'待复查'+item.stayExamineCheckNum+'项'}}

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -49,6 +49,11 @@
 							<img v-if="item.checkFlag==false" src="@/pages_safetyCheck/images/icon_xz_zg@1x.png">
 							<img v-if="item.checkFlag==true" src="@/pages_safetyCheck/images/icon_xz_fc@1x.png">
 						</view>
+						<view v-if="pageType == 1">
+							<img v-if="curTabTow==0" src="@/pages_safetyCheck/images/icon_zg_zh@1x.png">
+							<img v-if="curTabTow==1" src="@/pages_safetyCheck/images/icon_xz_zg@1x.png">
+							<img v-if="curTabTow==2" src="@/pages_safetyCheck/images/icon_xz_fc@1x.png">
+						</view>
 						<view v-if="pageType == 2">
 							<img v-if="curTabTow==2" src="@/pages_safetyCheck/images/icon_zg_zh@1x.png">
 							<img v-if="curTabTow==1" src="@/pages_safetyCheck/images/icon_xz_zg@1x.png">
@@ -56,6 +61,9 @@
 						</view>
 						<view>{{item.hazardCheckCode}}{{item.hazardCheckName}}</view>
 					</view>
+					<view v-if="pageType == 1 && item.hazardNum" class="list-li-b" @click="hiddenDangerClick(item)">
+						此检查项在当前实验室累计出现<text>{{item.hazardNum}}</text>次隐患
+					</view>
 					<view v-if="pageType == 2 && item.dangerNum" class="list-li-b" @click="hiddenDangerClick(item)">
 						此检查项在当前实验室累计出现<text>{{item.dangerNum}}</text>次隐患
 					</view>
@@ -225,10 +233,10 @@
 						infoType: this.pageType,
 						checkType: this.curTabTow,
 					}
-					if (this.curTabTow == 0) {
+					if (this.pageType == 0) {
 						//检查
 						obj.manageId = this.newData.manageId
-					} else if (this.curTabTow != 0) {
+					} else if (this.pageType != 0) {
 						//复查/整改
 						obj.planId = this.newData.checkPlanSetVoList.planId;
 						obj.planSetId = this.newData.checkPlanSetVoList.planSetId;
@@ -248,6 +256,7 @@
 				let infoData = row;
 				infoData.pageType = this.pageType;
 				infoData.itemsStatus = this.curTabTow;
+				infoData.checkCategory=this.newData.checkCategory;
 				infoData.checkPlanSetVoList = this.newData.checkPlanSetVoList;
 				if (this.pageType == 0 && this.curTabTow == 0) {
 					//待检查
@@ -280,9 +289,31 @@
 					});
 				} else if (this.pageType == 1 && this.curTabTow == 0) {
 					//待复查
+					infoData.subId=this.newData.subId;
+					uni.redirectTo({
+						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerRectification?infoData=' +
+							encodeURIComponent(JSON
+								.stringify(infoData))
+					});
+				}else if (this.pageType == 1 && this.curTabTow == 1) {
+					//复查完毕
+					infoData.subId=this.newData.subId;
+					uni.redirectTo({
+						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
+							encodeURIComponent(JSON
+								.stringify(infoData))
+					});
+				}else if (this.pageType == 1 && this.curTabTow == 2) {
+					//退回整改
+					infoData.subId=this.newData.subId;
+					uni.redirectTo({
+						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
+							encodeURIComponent(JSON
+								.stringify(infoData))
+					});
 				} else if (this.pageType == 2 && this.curTabTow == 2) {
 					//待整改
-					infoData.checkCategory=this.newData.checkCategory;
+					
 					infoData.subId=this.newData.subId;
 					uni.redirectTo({
 						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerRectification?infoData=' +
@@ -291,10 +322,20 @@
 					});
 				}else if (this.pageType == 2 && this.curTabTow == 1) {
 					//已完成
-					
+					infoData.subId=this.newData.subId;
+					uni.redirectTo({
+						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
+							encodeURIComponent(JSON
+								.stringify(infoData))
+					});
 				}else if (this.pageType == 2 && this.curTabTow == 4) {
 					//暂无法整改
-					
+					infoData.subId=this.newData.subId;
+					uni.redirectTo({
+						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
+							encodeURIComponent(JSON
+								.stringify(infoData))
+					});
 				}
 
 			},

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -2,8 +2,9 @@
 <template>
 	<view class="snapshotDetail">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-			<view class="tip" v-if="pageType==0">{{optionData.checkPlanSetVoList.checkName}}</view>
-			<view class="tip-tow" v-if="pageType==1 || pageType==2">{{optionData.checkPlanSetVoList.checkName}}</view>
+			<!-- <view class="tip" v-if="pageType==0">{{optionData.checkPlanSetVoList.checkName}}</view>
+			<view class="tip-tow" v-if="pageType==1 || pageType==2">{{optionData.checkPlanSetVoList.checkName}}</view> -->
+			<view class="lotName" :class="pageType != 0?'lotNameOne':''" v-if="lotName">{{lotName}}</view>
 			<view class="items">
 				<view class="items-t" v-if="newData.hazardCheckName!=''">
 					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
@@ -23,33 +24,91 @@
 				</view>
 				<view v-if="newData.hazardCheckName!=''" class="hidden-content">{{newData.hazardCheckPoint}}
 				</view>
-				<view class="list-li">
+				<view class="list-li" @click="checkCollapse()">
 					<view>{{newData.checkFlag?'检查结果':'检查隐患'}}</view>
 					<view :id="newData.checkFlag?'fontColor-B':'fontColor-C'">
 						{{newData.checkFlag?'符合':'不符合'}}
-						<img src="@/pages_safetyCheck/images/icon_06.png">
+						<img v-if="!newData.checkCollapse" src="@/pages_safetyCheck/images/icon_06.png">
+						<img v-if="newData.checkCollapse" src="@/pages_safetyCheck/images/icon_06_1.png">
 					</view>
 				</view>
-				<view class="hidden-content" v-if="!newData.checkFlag">{{newData.hazardDescribe}}
-				</view>
-				<view class="photo" v-if="!newData.checkFlag" @click="lockImg(newData.photoList)">
-					<img v-for="(item,index) in newData.photoList" :src="baseUrl+item.fileUrl">
-				</view>
-				<view class="list-li">
-					<view>姓名：</view>
-					<view>{{newData.checkUserName}}</view>
+				<view v-if="newData.checkCollapse">
+					<view class="hidden-content" v-if="!newData.checkFlag">{{newData.hazardDescribe}}
+					</view>
+					<view class="photo">
+						<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
+					</view>
+					<view class="list-li">
+						<view>姓名：</view>
+						<view>{{newData.checkUserName}}</view>
+					</view>
+					<view class="list-li">
+						<view>检查时间</view>
+						<view>{{newData.checkTime}}</view>
+					</view>
 				</view>
-				<view class="list-li">
-					<view>检查时间：</view>
-					<view>{{newData.checkTime}}</view>
+				<view v-if="pageType==1 || pageType==2" v-for="(item,index) in newData.checkRectifyVoList" :key="index">
+					<view class="list-li" v-if="item.rectifyTime" @click="rectifyCollapse(item)">
+						<view>隐患整改</view>
+						<view :id="item.rectifyResult?'fontColor-B':(item.rectifyResult?'fontColor-C':'')">
+							{{item.rectifyResult?'已整改':(item.rectifyResult?'暂无法整改':'')}}
+							<img v-if="!item.rectifyCollapse" src="@/pages_safetyCheck/images/icon_06.png">
+							<img v-if="item.rectifyCollapse" src="@/pages_safetyCheck/images/icon_06_1.png">
+						</view>
+					</view>
+					<view v-if="item.rectifyCollapse && item.rectifyTime">
+						<view class="hidden-content">{{item.rectifyMeasure}}
+						</view>
+						<view class="photo"  @click="lockImg(item.rectifyUploadList)">
+							<img v-for="(item2,index2) in item.rectifyUploadList" :src="baseUrl+item2.fileUrl">
+						</view>
+						<view class="list-li">
+							<view>姓名：</view>
+							<view>{{item.rectifyName}}</view>
+						</view>
+						<view class="list-li">
+							<view>整改时间</view>
+							<view>{{item.rectifyTime}}</view>
+						</view>
+					</view>
+					<view class="list-li" v-if="item.reviewTime" @click="reviewCollapse(item)">
+						<view>复查验证</view>
+						<view :id="item.examineResult?'fontColor-B':(item.examineResult?'fontColor-C':'')">
+							{{item.examineResult?'复查完毕':(item.examineResult?'退回整改':'')}}
+							<img v-if="!item.reviewCollapse" src="@/pages_safetyCheck/images/icon_06.png">
+							<img v-if="item.reviewCollapse" src="@/pages_safetyCheck/images/icon_06_1.png">
+						</view>
+					</view>
+					<view v-if="item.reviewCollapse && item.reviewTime">
+						<view class="hidden-content" >{{item.examineOpinion}}
+						</view>
+						<view class="photo"  @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>
 		</scroll-view>
 		<view class="sub-btn" v-if="pageType==0 && !newData.checkFlag">
 			<view @click="submitBtn(1)">编辑</view>
 			<view @click="submitBtn(2)">继续检查</view>
 		</view>
+		<view class="sub-btn" v-if="pageType==1">
+			<view @click="submitBtn(1)">编辑</view>
+			<view @click="submitBtn(2)">继续复查</view>
+		</view>
+		<view class="sub-btn" v-if="pageType==2">
+			<view @click="submitBtn(1)">编辑</view>
+			<view @click="submitBtn(2)">继续整改</view>
+		</view>
 		<view v-if="pageType==0 && newData.checkFlag" @click="submitBtn(2)" class="sub-btn-tow">继续检查</view>
 	</view>
 
@@ -66,6 +125,7 @@
 		securityAppCheckPlanCheckInfo,
 		securityDraftFindBySetOptionId,
 		securityAppCheckPhotoGetCheckNumBySub,
+		securityAppCheckDangerGetCheckProDetail,
 	} from '@/pages_safetyCheck/api/index.js'
 	export default {
 		name: "snapshotDetail",
@@ -85,12 +145,18 @@
 				pageType: 0, //0检查 1复查 2整改
 				itemsStatus:'',
 				optionData:null,
+				lotName: null,
 
 			}
 		},
 		onLoad(option) {
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
-			
+			console.log('详情',optionData)
+			this.$set(this, 'lotName',
+				optionData.pageType == 0 ? optionData.checkPlanSetVoList.checkName : (
+					optionData.checkPlanSetVoList.overdueUnrectify ? '整改期限' + optionData.checkPlanSetVoList
+					.checkStartTime +
+					'（逾期未完成整改关闭实验室）' : '整改期限' + optionData.checkPlanSetVoList.checkStartTime));
 			this.$set(this, 'pageType', optionData.pageType);
 			this.$set(this, 'itemsStatus', optionData.itemsStatus);
 			this.$set(this, 'setOptionId', optionData.setOptionId);
@@ -98,6 +164,8 @@
 			this.$set(this, 'subId', optionData.subId);
 			this.$set(this, 'hazardCheckPro', optionData.hazardCheckPro);
 			this.$set(this, 'optionData', optionData);
+			
+			
 		},
 		onShow() {
 
@@ -114,11 +182,11 @@
 					
 					
 				}
+			}else if(this.pageType==1 || this.pageType==2){
+				//复查-整改
+				this.securityAppCheckDangerGetCheckProDetail();
 			}
 			
-			
-			
-			
 			this.securityAppCheckPhotoGetCheckNumBySub();
 		},
 		methods: {
@@ -138,6 +206,7 @@
 						title: data.data.subName + '(' + (this.pageType == 0 ? data.data.roomNum : data.data
 							.subRoom) + ')'
 					})
+					data.data.checkCollapse=true;
 					this.$set(this, 'newData', data.data);
 					this.$set(this.newData, 'checkTime', parseTime(data.data.checkTime, "{y}-{m}-{d}"));
 					
@@ -155,6 +224,7 @@
 					uni.setNavigationBarTitle({
 						title: this.optionData.subName + '(' + (this.pageType == 0 ? this.optionData.roomNum : this.optionData.subRoom) + ')'
 					})
+					data.data.checkCollapse=true;
 					this.$set(this, 'newData', data.data);
 					this.$set(this.newData, 'checkPlanSetVoList', this.optionData.checkPlanSetVoList);
 					this.$set(this.newData, 'subName', this.optionData.subName);
@@ -162,6 +232,39 @@
 					this.$set(this.newData, 'checkTime', parseTime(data.data.checkTime, "{y}-{m}-{d}"));
 				}
 			},
+			//整改详情
+			async securityAppCheckDangerGetCheckProDetail() {
+				let obj = {
+					planId: this.optionData.checkPlanSetVoList.planId,
+					planSetId: this.optionData.checkPlanSetVoList.planSetId,
+					checkCategory: this.optionData.checkCategory,
+					hazardCheckPro: this.optionData.hazardCheckPro,
+					subId: this.optionData.subId,
+				}
+				const {
+					data
+				} = await securityAppCheckDangerGetCheckProDetail(obj);
+				if (data.code == 200) {
+					uni.setNavigationBarTitle({
+						title: data.data.subName + '(' + data.data.roomNum + ')'
+					})
+					data.data.checkCollapse=false;
+					
+					data.data.checkTime= parseTime(data.data.checkTime, "{y}-{m}-{d}");
+					data.data.checkRectifyVoList.forEach(function(item,index){
+						item.rectifyTime= parseTime(item.rectifyTime, "{y}-{m}-{d}");
+						item.reviewTime= parseTime(item.reviewTime, "{y}-{m}-{d}");
+						item.rectifyCollapse=false;
+						item.reviewCollapse=false;
+						if(index==data.data.checkRectifyVoList.length-1){
+							item.rectifyCollapse=true;
+							item.reviewCollapse=true;
+						}
+					})
+					this.$set(this, 'newData', data.data);
+			
+				}
+			},
 			
 			//获取检查项在当前实验室出现的次数
 			async securityAppCheckPhotoGetCheckNumBySub() {
@@ -181,23 +284,60 @@
 			submitBtn(status) {
 				if (status == 1) {
 					//编辑
-					let infoData = {
-						setOptionId: this.setOptionId,
-						manageId: this.manageId,
-						subId: this.subId,
-						hazardCheckPro: this.hazardCheckPro,
-						pageType: this.pageType,
-						itemsStatus: this.itemsStatus,
-						checkPlanSetVoList: this.optionData.checkPlanSetVoList,
-					};
-					uni.redirectTo({
-						url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(
-							JSON
-							.stringify(infoData))
-					});
+					if(this.pageType==0){
+						//检查
+						let infoData = {
+							setOptionId: this.setOptionId,
+							manageId: this.manageId,
+							subId: this.subId,
+							hazardCheckPro: this.hazardCheckPro,
+							pageType: this.pageType,
+							itemsStatus: this.itemsStatus,
+							checkPlanSetVoList: this.optionData.checkPlanSetVoList,
+						};
+						uni.redirectTo({
+							url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(
+								JSON
+								.stringify(infoData))
+						});
+					}else if(this.pageType==1){
+						//复核
+						let infoData = {
+							subId: this.subId,
+							hazardCheckPro: this.hazardCheckPro,
+							checkCategory:this.optionData.checkCategory,
+							pageType: this.pageType,
+							itemsStatus: this.itemsStatus,
+							checkPlanSetVoList: this.optionData.checkPlanSetVoList,
+						};
+						uni.redirectTo({
+							url: '/pages_safetyCheck/views/itemsManage/hiddenDangerRectification?infoData=' + encodeURIComponent(
+								JSON
+								.stringify(infoData))
+						});
+					}else if(this.pageType==2){
+						//整改
+						let infoData = {
+							subId: this.subId,
+							hazardCheckPro: this.hazardCheckPro,
+							checkCategory:this.optionData.checkCategory,
+							pageType: this.pageType,
+							itemsStatus: this.itemsStatus,
+							checkPlanSetVoList: this.optionData.checkPlanSetVoList,
+						};
+						uni.redirectTo({
+							url: '/pages_safetyCheck/views/itemsManage/hiddenDangerRectification?infoData=' + encodeURIComponent(
+								JSON
+								.stringify(infoData))
+						});
+						
+					}
+					
 				} else if (status == 2) {
 					//继续检查
 					let infoData = {
+						subId: this.subId,
+						checkCategory:this.optionData.checkCategory,
 						subName: this.newData.subName,
 						roomNum: this.newData.roomNum,
 						manageId: this.manageId,
@@ -229,6 +369,16 @@
 					complete: function(res) {},
 				})
 			},
+			//折叠展开
+			checkCollapse(row){
+				this.newData.checkCollapse=!this.newData.checkCollapse
+			},
+			rectifyCollapse(row){
+				row.rectifyCollapse=!row.rectifyCollapse
+			},
+			reviewCollapse(row){
+				row.reviewCollapse=!row.reviewCollapse
+			},
 			//整改页面
 			rectificationBtn() {
 				let self = this;
@@ -297,6 +447,19 @@
 			line-height: 80rpx;
 			text-align: center;
 		}
+		.lotName {
+			height: 70rpx;
+			line-height: 70rpx;
+			font-size: 28rpx;
+			background: rgba(1, 131, 250, 0.2);
+			color: #0183FA;
+			text-align: center;
+		}
+		
+		.lotNameOne {
+			background: #F7E0C4;
+			color: #FF8C00;
+		}
 
 		.items {
 			width: 690rpx;
@@ -485,9 +648,9 @@
 				}
 			}
 
-			.list-li:last-of-type {
+			/* .list-li:last-of-type {
 				border: none;
-			}
+			} */
 		}
 
 	}

pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -4,13 +4,15 @@
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 			<view class="tip">整改期限{{optionData.checkPlanSetVoList.checkStartTime}}（逾期未完成整改关闭实验室）</view>
 			<view class="items" v-if="newData.hazardCheckName!=''">
-				<view class="items-t" >
+				<view class="items-t">
 					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
 				</view>
-				<view class="items-b" >＜ {{newData.hazardCheckCode2}}
-					{{newData.hazardCheckName2}} ＜ {{newData.hazardCheckCode1}} {{newData.hazardCheckName1}}</view>
+				<view class="items-b">＜ {{newData.hazardCheckCode2}}
+					{{newData.hazardCheckName2}} ＜ {{newData.hazardCheckCode1}} {{newData.hazardCheckName1}}
+				</view>
 			</view>
-			<view class="items-number" v-if="newData.hazardCheckName!=''">此检查项在当前实验室累计出现<text>{{newData.hazardCheckNum}}</text>次隐患</view>
+			<view class="items-number" v-if="newData.hazardCheckName!=''">
+				此检查项在当前实验室累计出现<text>{{newData.hazardCheckNum}}</text>次隐患</view>
 			<view class="list">
 				<view class="list-li" v-if="newData.hazardCheckName!=''">
 					<view>检查要点</view>
@@ -20,33 +22,91 @@
 				</view>
 				<view v-if="newData.hazardCheckName!=''" class="hidden-content">{{newData.hazardCheckPoint}}
 				</view>
-				<view class="list-li">
+				<view class="list-li" @click="checkCollapse()">
 					<view>检查隐患</view>
-					<view style="color: #FF8C00;">
-						<img src="@/pages_safetyCheck/images/icon_06.png">
+					<view :id="newData.checkFlag?'fontColor-B':'fontColor-A'">
+						{{newData.checkFlag?'符合':'不符合 '}}
+						<img v-if="!newData.checkCollapse" src="@/pages_safetyCheck/images/icon_06.png">
+						<img v-if="newData.checkCollapse" src="@/pages_safetyCheck/images/icon_06_1.png">
 					</view>
 				</view>
-				<view class="hidden-content">{{newData.hazardDescribe}}
-				</view>
-				<view class="photo">
-					<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
-				</view>
-				<view class="list-li">
-					<view>姓名：</view>
-					<view>{{newData.createName}}</view>
+				<view v-if="newData.checkCollapse">
+					<view class="hidden-content" v-if="!newData.checkFlag">{{newData.hazardDescribe}}
+					</view>
+					<view class="photo">
+						<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
+					</view>
+					<view class="list-li">
+						<view>姓名：</view>
+						<view>{{newData.checkUserName}}</view>
+					</view>
+					<view class="list-li">
+						<view>检查时间</view>
+						<view>{{newData.checkTime}}</view>
+					</view>
 				</view>
-				<view class="list-li">
-					<view>检查时间 ：</view>
-					<view>{{newData.createTime}}</view>
+				<view v-if="pageType==1 || pageType==2" v-for="(item,index) in newData.checkRectifyVoList" :key="index">
+					<view class="list-li" v-if="item.rectifyTime" @click="rectifyCollapse(item)">
+						<view>隐患整改</view>
+						<view :id="item.rectifyResult?'fontColor-B':(item.rectifyResult?'fontColor-C':'')">
+							{{item.rectifyResult?'已整改':(item.rectifyResult?'暂无法整改':'')}}
+							<img v-if="!item.rectifyCollapse" src="@/pages_safetyCheck/images/icon_06.png">
+							<img v-if="item.rectifyCollapse" src="@/pages_safetyCheck/images/icon_06_1.png">
+						</view>
+					</view>
+					<view v-if="item.rectifyCollapse && item.rectifyTime">
+						<view class="hidden-content">{{item.rectifyMeasure}}
+						</view>
+						<view class="photo"  @click="lockImg(item.rectifyUploadList)">
+							<img v-for="(item2,index2) in item.rectifyUploadList" :src="baseUrl+item2.fileUrl">
+						</view>
+						<view class="list-li">
+							<view>姓名：</view>
+							<view>{{item.rectifyName}}</view>
+						</view>
+						<view class="list-li">
+							<view>整改时间</view>
+							<view>{{item.rectifyTime}}</view>
+						</view>
+					</view>
+					<view class="list-li" v-if="item.reviewTime" @click="reviewCollapse(item)">
+						<view>复查验证</view>
+						<view :id="item.examineResult?'fontColor-B':(item.examineResult?'fontColor-C':'')">
+							{{item.examineResult?'复查完毕':(item.examineResult?'退回整改':'')}}
+							<img v-if="!item.reviewCollapse" src="@/pages_safetyCheck/images/icon_06.png">
+							<img v-if="item.reviewCollapse" src="@/pages_safetyCheck/images/icon_06_1.png">
+						</view>
+					</view>
+					<view v-if="item.reviewCollapse && item.reviewTime">
+						<view class="hidden-content" >{{item.examineOpinion}}
+						</view>
+						<view class="photo"  @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 class="list-li">
-					<view>隐患整改</view>
+					<view v-if="pageType==1">复查验证</view>
+					<view v-if="pageType==2">隐患整改({{fontNum}}/500)</view>
 					<view>
 						<img src="@/pages_safetyCheck/images/icon_06.png">
 					</view>
 				</view>
-				<textarea class="describe" type="text" v-model="form.rectifyDescribe" maxlength="500"
-					placeholder="立整立改的请填写相关文字及整改前后照片对比等，不能立整立改的请说明原因并附整改计划、措施等" placeholder-style="font-size:24rpx;color:#999;"></textarea>
+				<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>
+					
 				<view class="check-for-img-max-box">
 					<view class="left-title-p"></view>
 					<view class="right-img-box">
@@ -73,14 +133,17 @@
 			</view>
 		</scroll-view>
 		<view class="sub-btn">
-			<view @click="submitForm(2)">暂无法整改</view>
-			<view @click="submitForm(1)">完成整改</view>
+			<view @click="submitForm(2)">{{pageType==1?'退回整改':'暂无法整改'}}</view>
+			<view @click="submitForm(1)">{{pageType==1?'复查完毕':'完成整改'}}</view>
 		</view>
 	</view>
 
 </template>
 
 <script>
+	import {
+		parseTime
+	} from '@/component/public.js'
 	import {
 		config
 	} from '@/api/request/config.js'
@@ -88,6 +151,7 @@
 		securityAppCheckPhotoUpdate,
 		securityAppCheckDangerGetCheckProDetail,
 		securityAppCheckDangerCheckRectify,
+		securityAppCheckDangerApprove,
 	} from '@/pages_safetyCheck/api/index.js'
 	export default {
 		name: "snapshotDetail",
@@ -98,18 +162,22 @@
 			return {
 				baseUrl: config.base_url,
 				inspectionItems: 0, //0有检查项 1无检查项
+				pageType:null,
 				form: {
 					imgDtoList: [],
-					rectifyProjectName:'',
-					rectifyProjectUrl:'',
+					rectifyProjectName: '',
+					rectifyProjectUrl: '',
 				},
 				newData: {},
-				optionData:null,
+				optionData: null,
+				fontNum:0,
+				rectifyId:null,
 			}
 		},
 		onLoad(option) {
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
-			console.log(optionData)
+			console.log('整改',optionData)
+			this.$set(this, 'pageType', optionData.pageType);
 			this.$set(this, 'optionData', optionData);
 		},
 		onShow() {
@@ -120,11 +188,12 @@
 		},
 		methods: {
 			//详情
-			async securityAppCheckDangerGetCheckProDetail(){
+			async securityAppCheckDangerGetCheckProDetail() {
+				let self=this;
 				let obj = {
 					planId: this.optionData.checkPlanSetVoList.planId,
 					planSetId: this.optionData.checkPlanSetVoList.planSetId,
-					checkCategory:  this.optionData.checkCategory,
+					checkCategory: this.optionData.checkCategory,
 					hazardCheckPro: this.optionData.hazardCheckPro,
 					subId: this.optionData.subId,
 				}
@@ -135,25 +204,53 @@
 					uni.setNavigationBarTitle({
 						title: data.data.subName + '(' + data.data.roomNum + ')'
 					})
+					data.data.checkCollapse=false;
+					data.data.checkTime= parseTime(data.data.checkTime, "{y}-{m}-{d}");
+					if(data.data.checkRectifyVoList[0]){
+						data.data.checkRectifyVoList.forEach(function(item,index){
+							item.rectifyTime= parseTime(item.rectifyTime, "{y}-{m}-{d}");
+							item.reviewTime= parseTime(item.reviewTime, "{y}-{m}-{d}");
+							item.rectifyCollapse=false;
+							item.reviewCollapse=false;
+							if(index==data.data.checkRectifyVoList.length-1){
+								item.rectifyCollapse=true;
+								item.reviewCollapse=true;
+								self.$set(self, 'rectifyId', item.rectifyId);
+								if(self.pageType==1){
+									self.$set(self.form, 'examineOpinion', item.examineOpinion?item.examineOpinion:'');
+									self.$set(self.form, 'imgDtoList', item.examineUploadList?item.examineUploadList:[]);
+									
+								}else if(self.pageType==2){
+									self.$set(self.form, 'rectifyMeasure', item.rectifyMeasure?item.rectifyMeasure:'');
+									self.$set(self.form, 'imgDtoList', item.rectifyUploadList?item.rectifyUploadList:[]);
+								}
+								
+							}
+						})
+					}
 					this.$set(this, 'newData', data.data);
-					
+
 				}
 			},
+			// 限制文本框字数
+			sumfontnum(e) {
+				this.fontNum = e.detail.value.length
+			},
 			//滚动事件
 			scrollGet() {},
 			/******文件上传******/
 			selectFile() {
 				let self = this;
 				wx.chooseMessageFile({
-				  count: 1,
-				  type: 'file',
-				  success (res) {
-					  console.log(res)
-				    // tempFilePath可以作为img标签的src属性显示图片
-				    const tempFilePaths = res.tempFiles[0].path
-					self.form.rectifyProjectName=res.tempFiles[0].name
-					self.uploadFile(tempFilePaths);
-				  }
+					count: 1,
+					type: 'file',
+					success(res) {
+						console.log(res)
+						// tempFilePath可以作为img标签的src属性显示图片
+						const tempFilePaths = res.tempFiles[0].path
+						self.form.rectifyProjectName = res.tempFiles[0].name
+						self.uploadFile(tempFilePaths);
+					}
 				})
 			},
 			async uploadFile(tempFilePaths) {
@@ -176,7 +273,7 @@
 						let res = JSON.parse(uploadFileRes.data);
 						console.log(res)
 						if (res.code == 200) {
-							self.form.rectifyProjectUrl=res.data.url;
+							self.form.rectifyProjectUrl = res.data.url;
 						} else {
 							uni.showToast({
 								title: res.msg,
@@ -237,7 +334,7 @@
 							this.form.imgDtoList.push({
 								'fileUrl': res.data.url,
 								'fileName': res.data.name,
-								'fileType':2,
+								'fileType': 2,
 							});
 							console.log(res.data.url)
 						} else {
@@ -260,37 +357,76 @@
 				this.form.imgDtoList.splice(minIndex, 1);
 				this.$forceUpdate();
 			},
-			
-			//整改/暂无法整改
+			//折叠展开
+			checkCollapse(row){
+				this.newData.checkCollapse=!this.newData.checkCollapse
+			},
+			rectifyCollapse(row){
+				row.rectifyCollapse=!row.rectifyCollapse
+			},
+			reviewCollapse(row){
+				row.reviewCollapse=!row.reviewCollapse
+			},
+
+			//提交
 			async submitForm(status) {
 				let self = this;
-				
-				let obj={
-					checkCategory:this.optionData.checkCategory,
-					dangerId:this.newData.dangerId,
-					rectifyMaterialName:'',//待定字段
-					rectifyMaterialUrl:'',//待定字段
-					rectifyMeasure:this.form.rectifyDescribe,
-					rectifyResult:status==1?true:false,//true已整改false暂无法整改
-					rectifyUploadList:this.form.imgDtoList,
-				}
-				console.log(obj)
-				const {
-					data
-				} = await securityAppCheckDangerCheckRectify(obj);
-				if (data.code == 200) {
-					uni.showToast({
-						title: '提交成功',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-					let infoData=this.optionData;
-					uni.navigateTo({
-						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' + encodeURIComponent(JSON.stringify(infoData))
-					});
+				if(self.pageType==1){
+					//复查
+					let obj = {
+						rectifyId: this.rectifyId,
+						examineOpinion: this.form.examineOpinion,
+						examineResult: status == 1 ? 1 : 0, //1是通过，0是驳回
+						examineUploadList: this.form.imgDtoList,
+					}
+					const {
+						data
+					} = await securityAppCheckDangerApprove(obj);
+					if (data.code == 200) {
+						uni.showToast({
+							title: '提交成功',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+						let infoData = this.optionData;
+						uni.navigateTo({
+							url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
+								encodeURIComponent(JSON.stringify(infoData))
+						});
+					
+					}
+				}else if(self.pageType==2){
+					//整改
+					let obj = {
+						checkCategory: this.optionData.checkCategory,
+						dangerId: this.newData.dangerId,
+						rectifyMaterialName: '', //待定字段
+						rectifyMaterialUrl: '', //待定字段
+						rectifyMeasure: this.form.rectifyMeasure,
+						rectifyResult: status == 1 ? true : false, //true已整改false暂无法整改
+						rectifyUploadList: this.form.imgDtoList,
+					}
+					const {
+						data
+					} = await securityAppCheckDangerCheckRectify(obj);
+					if (data.code == 200) {
+						uni.showToast({
+							title: '提交成功',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+						let infoData = this.optionData;
+						uni.navigateTo({
+							url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
+								encodeURIComponent(JSON.stringify(infoData))
+						});
 					
+					}
 				}
+
+				
 			},
 		}
 	}
@@ -316,6 +452,14 @@
 			color: #E11608;
 		}
 
+		#fontColor-A {
+			color: #FF8C00;
+		}
+
+		#fontColor-B {
+			color: #16B531;
+		}
+
 		.tip {
 			width: 750rpx;
 			height: 80rpx;
@@ -610,9 +754,9 @@
 				}
 			}
 
-			.list-li:last-of-type {
+			/* .list-li:last-of-type {
 				border: none;
-			}
+			} */
 		}
 
 	}

pages_safetyCheck/views/itemsManage/snapshotRectification.vue

@@ -1,630 +0,0 @@
-<!-- 随手拍隐患项整改 -->
-<template>
-	<view class="snapshotDetail">
-		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-			<view class="tip">整改期限2024-10-06（逾期未完成整改关闭实验室）</view>
-			<view class="items" v-if="newData.hazardCheckName!=''">
-				<view class="items-t" >
-					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
-				</view>
-				<view class="items-b" >＜ {{newData.hazardCheckCode2}}
-					{{newData.hazardCheckName2}} ＜ {{newData.hazardCheckCode1}} {{newData.hazardCheckName1}}</view>
-			</view>
-			<view class="items-number" v-if="newData.hazardCheckName!=''">此检查项在当前实验室累计出现<text>{{newData.hazardCheckNum}}</text>次隐患</view>
-			<view class="list">
-				<view class="list-li" v-if="newData.hazardCheckName!=''">
-					<view>检查要点</view>
-					<view>
-						<img src="@/pages_safetyCheck/images/icon_06.png">
-					</view>
-				</view>
-				<view v-if="newData.hazardCheckName!=''" class="hidden-content">{{newData.hazardCheckPoint}}
-				</view>
-				<view class="list-li">
-					<view>检查隐患</view>
-					<view style="color: #FF8C00;">
-						<img src="@/pages_safetyCheck/images/icon_06.png">
-					</view>
-				</view>
-				<view class="hidden-content">{{newData.hazardDescribe}}
-				</view>
-				<view class="photo">
-					<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
-				</view>
-				<view class="list-li">
-					<view>姓名：</view>
-					<view>{{newData.createName}}</view>
-				</view>
-				<view class="list-li">
-					<view>时间：</view>
-					<view>{{newData.createTime}}</view>
-				</view>
-				<view class="list-li">
-					<view>隐患整改</view>
-					<view>
-						<img src="@/pages_safetyCheck/images/icon_06.png">
-					</view>
-				</view>
-				<textarea class="describe" type="text" v-model="form.rectifyDescribe" maxlength="200"
-					placeholder="请填写整改措施" placeholder-style="font-size:24rpx;color:#999;"></textarea>
-				<view class="check-for-img-max-box">
-					<view class="left-title-p"></view>
-					<view class="right-img-box">
-						<view class="img-box" v-for="(imgUrl,imgIndex) in form.imgDtoList" :key="imgIndex">
-							<img class="img-data" :src="baseUrl+imgUrl.fileUrl">
-							<img class="position-img" src="@/pages_safetyCheck/images/icon_ssp_closure.png"
-								@click="delImg(imgIndex)">
-						</view>
-						<img class="add-button" src="@/pages_safetyCheck/images/img_ssp_pz@1x.png"
-							@click="selectImage()" v-if="form.imgDtoList.length<5">
-					</view>
-				</view>
-				<view class="list-li-tow">
-					<view>整改方案（上传文件）</view>
-					<view @click="selectFile()">
-						<img src="@/pages_safetyCheck/images/icon_aqjc_sc.png">
-					</view>
-				</view>
-				<view class="file-li" v-if="form.rectifyProjectName">
-					<img src="@/pages_safetyCheck/images/icon_djc_wj.png">
-					<view>{{form.rectifyProjectName}}</view>
-					<img src="@/pages_safetyCheck/images/icon_yybz_sc.png">
-				</view>
-			</view>
-		</scroll-view>
-		<view class="sub-btn">
-			<view @click="submitForm(2)">暂无法整改</view>
-			<view @click="submitForm(1)">完成整改</view>
-		</view>
-	</view>
-
-</template>
-
-<script>
-	import {
-		config
-	} from '@/api/request/config.js'
-	import {
-		securityAppCheckPhotoUpdate,
-	} from '@/pages_safetyCheck/api/index.js'
-	export default {
-		name: "snapshotDetail",
-		components: {
-
-		},
-		data() {
-			return {
-				baseUrl: config.base_url,
-				inspectionItems: 0, //0有检查项 1无检查项
-				form: {
-					imgDtoList: [],
-					rectifyProjectName:'',
-					rectifyProjectUrl:'',
-				},
-				newData: {},
-			}
-		},
-		onLoad(option) {
-			console.log(option.infoData)
-			this.$set(this, 'newData', JSON.parse(decodeURIComponent(option.infoData)));
-			console.log(this.newData)
-		},
-		onShow() {
-
-		},
-		mounted() {
-
-		},
-		methods: {
-			//滚动事件
-			scrollGet() {},
-			/******文件上传******/
-			selectFile() {
-				let self = this;
-				wx.chooseMessageFile({
-				  count: 1,
-				  type: 'file',
-				  success (res) {
-					  console.log(res)
-				    // tempFilePath可以作为img标签的src属性显示图片
-				    const tempFilePaths = res.tempFiles[0].path
-					self.form.rectifyProjectName=res.tempFiles[0].name
-					self.uploadFile(tempFilePaths);
-				  }
-				})
-			},
-			async uploadFile(tempFilePaths) {
-				var self = this;
-				uni.showLoading({
-					title: '上传中',
-					mask: true
-				});
-				uni.uploadFile({
-					url: config.base_url + '/system/file/upload', //仅为示例，非真实的接口地址
-					header: {
-						'Authorization': uni.getStorageSync('token')
-					},
-					filePath: tempFilePaths,
-					name: 'file',
-					formData: {
-						'user': 'test'
-					},
-					success: (uploadFileRes) => {
-						let res = JSON.parse(uploadFileRes.data);
-						console.log(res)
-						if (res.code == 200) {
-							self.form.rectifyProjectUrl=res.data.url;
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: "none",
-								mask: true,
-								duration: 2000
-							});
-						}
-					},
-					fail: err => {},
-					complete: () => {
-						uni.hideLoading()
-					}
-				});
-			},
-			/******图片上传******/
-			selectImage() {
-				let self = this;
-				if (this.form.imgDtoList.length > 4) {
-					uni.showToast({
-						title: '最多上传5张图片',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-					return
-				}
-				wx.chooseImage({
-					count: 1,
-					sizeType: ["original", "compressed"],
-					sourceType: ["album", "camera"],
-					success: function(res) {
-						let tempFilePaths = res.tempFilePaths[0];
-						console.log(tempFilePaths)
-						self.uploadImg(tempFilePaths);
-					}
-				});
-			},
-			async uploadImg(tempFilePaths) {
-				var self = this;
-				uni.showLoading({
-					title: '上传中',
-					mask: true
-				});
-				uni.uploadFile({
-					url: config.base_url + '/system/file/upload', //仅为示例，非真实的接口地址
-					header: {
-						'Authorization': uni.getStorageSync('token')
-					},
-					filePath: tempFilePaths,
-					name: 'file',
-					formData: {
-						'user': 'test'
-					},
-					success: (uploadFileRes) => {
-						let res = JSON.parse(uploadFileRes.data);
-						if (res.code == 200) {
-							this.form.imgDtoList.push({
-								'fileUrl': res.data.url,
-								'fileName': res.data.name
-							});
-							console.log(res.data.url)
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: "none",
-								mask: true,
-								duration: 2000
-							});
-						}
-					},
-					fail: err => {},
-					complete: () => {
-						uni.hideLoading()
-					}
-				});
-			},
-			//删除图片
-			delImg(minIndex) {
-				this.form.imgDtoList.splice(minIndex, 1);
-				this.$forceUpdate();
-			},
-			//整改/暂无法整改
-			async submitForm(status) {
-				let self = this;
-				if (status ==2 && this.form.rectifyProjectUrl=='') {
-					uni.showToast({
-						title: '请上传整改方案!',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-					return
-				}
-				let obj={
-					photoId:this.newData.photoId,
-					rectifyStatus:status,//1已整改2暂无法整改
-					rectifyDescribe:this.form.rectifyDescribe,
-					imgDtoList:this.form.imgDtoList,
-					rectifyProjectName:this.form.rectifyProjectName,
-					rectifyProjectUrl:this.form.rectifyProjectUrl,
-				}
-				const {
-					data
-				} = await securityAppCheckPhotoUpdate(obj);
-				if (data.code == 200) {
-					uni.showToast({
-						title: '提交成功',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-					let infoData=this.newData;
-					uni.navigateTo({
-						url: '/pages_safetyCheck/views/snapshotManage/snapshotDetail?infoData=' + encodeURIComponent(JSON.stringify(infoData))
-					});
-					
-				}
-			},
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-	.snapshotDetail {
-		height: 100%;
-		display flex;
-		box-sizing: border-box;
-		padding-bottom: 160rpx;
-		box-sizing: border-box;
-
-		#bgColor-A {
-			color: #FFD400;
-		}
-
-		#bgColor-B {
-			color: #FF8C00;
-		}
-
-		#bgColor-C {
-			color: #E11608;
-		}
-
-		.tip {
-			width: 750rpx;
-			height: 80rpx;
-			background: rgba(255, 140, 0, 0.2);
-			font-weight: normal;
-			font-size: 28rpx;
-			color: #FF8C00;
-			line-height: 80rpx;
-			text-align: center;
-		}
-
-		.items {
-			width: 690rpx;
-			min-height: 165rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			margin: 20rpx 0 0 30rpx;
-
-			.items-li {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 0 30rpx;
-				box-sizing: border-box;
-				border-bottom: 1rpx solid #E0E0E0;
-
-				>view:nth-of-type(1) {
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 80rpx;
-					text-align: left;
-				}
-
-				>view:nth-of-type(2) {
-					font-size: 28rpx;
-					color: #666666;
-					line-height: 80rpx;
-					text-align: left;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-				}
-			}
-
-			.items-t {
-				border-bottom: 1rpx solid #E0E0E0;
-				height: 80rpx;
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				padding: 0 30rpx;
-				box-sizing: border-box;
-
-				.items-t-l {
-					width: 175rpx;
-					height: 50rpx;
-					background: #E11608;
-					border-radius: 50rpx 50rpx 50rpx 50rpx;
-					font-size: 30rpx;
-					color: #FFFFFF;
-					line-height: 50rpx;
-					text-align: center;
-					margin-right: 14rpx;
-				}
-
-				.items-t-r {
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 42rpx;
-					text-align: left;
-				}
-			}
-
-			.items-b {
-				padding: 0 30rpx;
-				box-sizing: border-box;
-				height: 80rpx;
-				font-size: 28rpx;
-				color: #666666;
-				line-height: 80rpx;
-				text-align: left;
-			}
-		}
-
-		.items-number {
-			font-size: 24rpx;
-			color: #3D3D3D;
-			line-height: 34rpx;
-			text-align: right;
-			margin: 20rpx 60rpx 0 0;
-
-			>text {
-				font-size: 24rpx;
-				color: #FF0000;
-				line-height: 34rpx;
-				text-align: right;
-			}
-		}
-
-		.list {
-			width: 690rpx;
-			margin: 20rpx 30rpx 0;
-			background: #FFFFFF;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-
-			.list-li {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 0 30rpx;
-				box-sizing: border-box;
-				border-bottom: 1rpx solid #E0E0E0;
-
-				>view:nth-of-type(1) {
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 80rpx;
-					text-align: left;
-				}
-
-				>view:nth-of-type(2) {
-					font-size: 28rpx;
-					color: #666666;
-					line-height: 80rpx;
-					text-align: left;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-
-					>img {
-						width: 24rpx;
-						height: 12rpx;
-						margin-left: 10rpx;
-					}
-				}
-
-			}
-
-			.list-li-tow {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 0 30rpx;
-				box-sizing: border-box;
-				border-top: 1rpx solid #E0E0E0;
-				border-bottom: 1rpx solid #E0E0E0;
-
-				>view:nth-of-type(1) {
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 80rpx;
-					text-align: left;
-				}
-
-				>view:nth-of-type(2) {
-					font-size: 28rpx;
-					color: #666666;
-					line-height: 80rpx;
-					text-align: left;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-
-					>img {
-						width: 30rpx;
-						height: 28rpx;
-						margin-left: 10rpx;
-					}
-				}
-
-			}
-
-			.file-li {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 0 30rpx;
-				box-sizing: border-box;
-
-				>img:nth-of-type(1) {
-					width: 30rpx;
-					height: 30rpx;
-				}
-
-				>view {
-					flex: 1;
-					font-size: 28rpx;
-					color: #333333;
-					line-height: 80rpx;
-					text-align: left;
-					margin: 0 92rpx 0 16rpx;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-				}
-
-				>img:nth-of-type(2) {
-					width: 30rpx;
-					height: 30rpx;
-				}
-			}
-
-			.hidden-content {
-				width: 630rpx;
-				min-height: 200rpx;
-				background: #F5F5F5;
-				border-radius: 20rpx 20rpx 20rpx 20rpx;
-				margin: 20rpx 30rpx 0;
-				padding: 20rpx;
-				box-sizing: border-box;
-				font-size: 28rpx;
-				color: #666666;
-				line-height: 39rpx;
-				text-align: left;
-			}
-
-			.photo {
-				display: flex;
-				justify-content: flex-start;
-				flex-wrap: wrap;
-				margin-top: 20rpx;
-				padding: 0 30rpx;
-				box-sizing: border-box;
-
-				>img {
-					width: 150rpx;
-					height: 150rpx;
-					border-radius: 10rpx 10rpx 10rpx 10rpx;
-					margin: 0 10rpx 10rpx 0;
-				}
-			}
-
-			.describe {
-				width: 636rpx;
-				height: 120rpx;
-				border-radius: 10rpx 10rpx 10rpx 10rpx;
-				border: 1rpx solid #E0E0E0;
-				margin: 20rpx 0 0 28rpx;
-				padding: 12rpx 16rpx;
-				box-sizing: border-box;
-			}
-
-			.check-for-img-max-box {
-				margin: 20px 28rpx;
-
-				.left-title-p {
-					width: 100%;
-					text-align: left;
-					font-size: 30rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
-					font-weight: 400;
-					color: #333333;
-					line-height: 80rpx;
-				}
-
-				.right-img-box {
-					.img-box {
-						display inline-block;
-						height: 150rpx;
-						width: 150rpx;
-						position relative;
-						margin: 0 14rpx 20rpx 0;
-						border-radius 10rpx;
-						overflow hidden;
-
-						.img-data {
-							height: 150rpx;
-							width: 150rpx;
-						}
-
-						.position-img {
-							position absolute;
-							right: 0;
-							top: 0;
-							width: 36rpx;
-							height: 36rpx;
-						}
-					}
-
-					.img-box:nth-of-type(3n+3) {
-						margin-right: 0rpx;
-					}
-
-					.add-button {
-						margin: 0 0rpx 20rpx 0;
-						border-radius 10rpx;
-						overflow hidden;
-						display inline-block;
-						height: 150rpx;
-						width: 150rpx;
-					}
-				}
-			}
-
-			.list-li:last-of-type {
-				border: none;
-			}
-		}
-
-	}
-
-	.sub-btn {
-		display: flex;
-		justify-content: center;
-		position: fixed;
-		left: 30rpx;
-		bottom: 30rpx;
-
-		>view:nth-of-type(1) {
-			width: 345rpx;
-			height: 100rpx;
-			background: #FF8C00;
-			border-radius: 50rpx 0rpx 0rpx 50rpx;
-			font-size: 30rpx;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
-		}
-
-		>view:nth-of-type(2) {
-			width: 345rpx;
-			height: 100rpx;
-			background: #0183FA;
-			border-radius: 0rpx 50rpx 50rpx 0rpx;
-			font-size: 30rpx;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
-		}
-	}
-</style>

pages_safetyCheck/views/snapshotManage/snapshotDetail.vue

@@ -46,14 +46,14 @@
 				<view class="photo" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
 					<img v-for="(item,index) in newData.zgDtoList" :src="baseUrl+item.fileUrl">
 				</view>
-				<view class="list-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
+				<!-- <view class="list-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
 					<view>整改方案</view>
 					<view></view>
 				</view>
 				<view class="file-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
 					<img src="@/pages_safetyCheck/images/icon_djc_wj.png">
 					<view>{{newData.rectifyProjectName}}</view>
-				</view>
+				</view> -->
 				<view class="list-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
 					<view>姓名：</view>
 					<view>{{newData.rectifyUserName}}</view>
@@ -118,7 +118,7 @@
 				let infoData=self.newData;
 				console.log(self.newData)
 				uni.navigateTo({
-					url: '/pages_safetyCheck/views/itemsManage/snapshotRectification?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+					url: '/pages_safetyCheck/views/snapshotManage/snapshotRectification?infoData=' + encodeURIComponent(JSON.stringify(infoData))
 				});
 			},
 		}

pages_safetyCheck/views/snapshotManage/snapshotList.vue

@@ -227,12 +227,13 @@
 				let infoData=row;
 				infoData.pageType=2;
 				uni.navigateTo({
-					url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+					url: '/pages_safetyCheck/views/snapshotManage/snapshotItems?infoData=' + encodeURIComponent(JSON.stringify(infoData))
 				});
 			},
 			tabClick(index) {
 				this.tabIndex = index;
 				this.pageType = index;
+				this.dataList=[];
 				if(index==1){
 					this.getList();
 				}else if(index==2){
@@ -242,6 +243,7 @@
 			tabClickTow(index) {
 				this.tabIndexTow = index;
 				this.pageType = index;
+				this.dataList=[];
 				if(index==1){
 					this.getList();
 				}else if(index==2){