heyang vor 6 Monaten
Ursprung
Commit
bfa75fdd6d

+ 2 - 2
api/request/config.js

@@ -1,12 +1,12 @@
 const config = {
 	// base_url: 'http://192.168.1.43/api', //43服务器
 	// base_url: 'http://192.168.1.8/api',//1.8服务器
-	//base_url: 'http://192.168.1.9:8080',//柴
+	base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.43/api',//小飞
-	 base_url: 'http://192.168.1.20:8080',//志伟
+	// base_url: 'http://192.168.1.20:8080',//志伟
 	// base_url: 'http://192.168.1.39:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'https://demo.zjznai.com/xzgd/',

+ 4 - 2
pages_safetyCheck/views/inspectManage/inspectAdd.vue

@@ -125,6 +125,10 @@
 		},
 		onLoad(option) {
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
+			uni.setNavigationBarTitle({
+				title: optionData.subName + '(' + (optionData.pageType == 0 ? optionData.roomNum : optionData
+					.subRoom) + ')'
+			})
 			this.$set(this, 'pageType', optionData.pageType);
 			this.$set(this, 'itemsStatus', optionData.itemsStatus);
 			this.$set(this, 'setOptionId', optionData.setOptionId);
@@ -206,8 +210,6 @@
 			},
 			//提交
 			async submitForm(status) {
-				console.log(this.pageType)
-				console.log(this.itemsStatus)
 				if(!this.form.checkFlag){
 					if(!this.form.hazardDescribe){
 						uni.showToast({

+ 115 - 92
pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -39,8 +39,8 @@
 					</view>
 				</view>
 				<view class="level">
-					<view class="level-li" :id="levelId==item.levelId?'levelColor-A':'levelColor-B'" @click="levelClick(item.levelId)"
-						v-for="(item,index) in levelList">{{item.levelName}}</view>
+					<view class="level-li" :id="levelId==item.levelId?'levelColor-A':'levelColor-B'"
+						@click="levelClick(item.levelId)" v-for="(item,index) in levelList">{{item.levelName}}</view>
 				</view>
 			</view>
 			<view class="hidden">
@@ -98,11 +98,11 @@
 				tabListTow: ['检查任务', '复查验证', '隐患整改'],
 				tabIndexTow: 0,
 				//学院选择
-				deptData:{
-					index:null,
-					list:[],
-					id:null,
-					name:null
+				deptData: {
+					index: null,
+					list: [],
+					id: null,
+					name: null
 				},
 				deptIndex: null,
 				deptList: [],
@@ -116,17 +116,17 @@
 					planCategory: [], //检查类别
 				},
 				//实验室/房间号
-				searchValue:'',
-				subId:'',
-				planSetId:null,
+				searchValue: '',
+				subId: '',
+				planSetId: null,
 				// 查询参数
 				queryParams: {
 					page: 1,
 					pageSize: 10,
 				},
 				dataList: [],
-				total:0,
-				getDataType:false,
+				total: 0,
+				getDataType: false,
 			}
 		},
 		onLoad(option) {
@@ -141,10 +141,10 @@
 			this.$set(this, 'optionData', optionData);
 			this.$set(this, 'planSetId', optionData.checkPlanSetVoList.planSetId);
 		},
-    created() {
+		created() {
 			this.systemDeptDropList();
 			this.laboratoryClassLevelGetList();
-    },
+		},
 		mounted() {
 			let self = this;
 			setTimeout(() => {
@@ -166,31 +166,31 @@
 			},
 			//级别切换
 			levelClick(id) {
-				if(this.levelId == id){
-					this.$set(this,'levelId',null);
-				}else{
-					this.$set(this,'levelId',id);
+				if (this.levelId == id) {
+					this.$set(this, 'levelId', null);
+				} else {
+					this.$set(this, 'levelId', id);
 				}
 				this.$set(this, 'getDataType', false);
-				this.$set(this.queryParams,'page',1);
+				this.$set(this.queryParams, 'page', 1);
 				this.getList();
 			},
 			//查询类型切换
 			tabClickTow(index) {
-				this.$set(this.queryParams,'page',1);
-				this.$set(this,'deptData',{
-					index:null,
-					list:this.deptData.list,
-					id:null,
-					name:null
+				this.$set(this.queryParams, 'page', 1);
+				this.$set(this, 'deptData', {
+					index: null,
+					list: this.deptData.list,
+					id: null,
+					name: null
 				});
-				this.$set(this,'searchValue',null);
-				this.$set(this,'levelId',null);
+				this.$set(this, 'searchValue', null);
+				this.$set(this, 'levelId', null);
 				this.$set(this, 'getDataType', false);
 				this.$set(this, 'dataList', []);
 				this.$set(this, 'total', 0);
-				this.$set(this,'tabIndexTow',index);
-				this.$nextTick(()=>{
+				this.$set(this, 'tabIndexTow', index);
+				this.$nextTick(() => {
 					this.getList();
 				})
 			},
@@ -264,25 +264,28 @@
 				});
 			},
 			//扫一扫查询数据
-			async saoList(subId){
+			async saoList(subId) {
 				let obj = {
-					planSetId:this.planSetId,
-					subId:subId,
+					planSetId: this.planSetId,
+					subId: subId,
 				}
-				if(this.tabIndexTow == 0){
+				if (this.tabIndexTow == 0) {
 					//检查计划
-					const { data } = await securityAppCheckManageList(obj);
+					const {
+						data
+					} = await securityAppCheckManageList(obj);
 					if (data.code == 200) {
-						if(data.data.records[0]){
+						if (data.data.records[0]) {
 							//跳转检查项列表页面
 							let infoData = data.data.records[0];
 							infoData.pageType = this.tabIndexTow;
 							infoData.checkPlanSetVoList = this.optionData.checkPlanSetVoList;
 							uni.navigateTo({
-								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(
-									JSON.stringify(infoData))
+								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' +
+									encodeURIComponent(
+										JSON.stringify(infoData))
 							});
-						}else{
+						} else {
 							//未找到数据提示
 							uni.showToast({
 								title: '未找到该实验室与本计划批次关联的数据',
@@ -292,21 +295,24 @@
 							});
 						}
 					}
-				}else if(this.tabIndexTow == 1){
+				} else if (this.tabIndexTow == 1) {
 					//复查计划
 					obj.planId = this.optionData.planId;
-					const { data } = await securityAppCheckDangerReviewSubList(obj);
+					const {
+						data
+					} = await securityAppCheckDangerReviewSubList(obj);
 					if (data.code == 200) {
-						if(data.data.records[0]){
+						if (data.data.records[0]) {
 							//跳转检查项列表页面
 							let infoData = data.data.records[0];
 							infoData.pageType = this.tabIndexTow;
 							infoData.checkPlanSetVoList = this.optionData.checkPlanSetVoList;
 							uni.navigateTo({
-								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(
-									JSON.stringify(infoData))
+								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' +
+									encodeURIComponent(
+										JSON.stringify(infoData))
 							});
-						}else{
+						} else {
 							//未找到数据提示
 							uni.showToast({
 								title: '未找到该实验室与本计划批次关联的数据',
@@ -316,21 +322,24 @@
 							});
 						}
 					}
-				} else if(this.tabIndexTow == 2){
+				} else if (this.tabIndexTow == 2) {
 					//整改计划
 					obj.planId = this.optionData.planId;
-					const { data } = await securityAppCheckDangerGetCheckDangerSubList(obj);
+					const {
+						data
+					} = await securityAppCheckDangerGetCheckDangerSubList(obj);
 					if (data.code == 200) {
-						if(data.data.records[0]){
+						if (data.data.records[0]) {
 							//跳转检查项列表页面
 							let infoData = data.data.records[0];
 							infoData.pageType = this.tabIndexTow;
 							infoData.checkPlanSetVoList = this.optionData.checkPlanSetVoList;
 							uni.navigateTo({
-								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(
-									JSON.stringify(infoData))
+								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' +
+									encodeURIComponent(
+										JSON.stringify(infoData))
 							});
-						}else{
+						} else {
 							//未找到数据提示
 							uni.showToast({
 								title: '未找到该实验室与本计划批次关联的数据',
@@ -346,18 +355,18 @@
 			deptChange(e) {
 				let self = this;
 				self.deptData.list.forEach(function(item, index) {
-						if (index == e.detail.value) {
-							if(!item.deptId){
-								self.$set(self.deptData, 'id', null)
-								self.$set(self.deptData, 'name', null)
-							}else{
-								self.$set(self.deptData, 'id', item.deptId)
-								self.$set(self.deptData, 'name', item.deptName)
-							}
+					if (index == e.detail.value) {
+						if (!item.deptId) {
+							self.$set(self.deptData, 'id', null)
+							self.$set(self.deptData, 'name', null)
+						} else {
+							self.$set(self.deptData, 'id', item.deptId)
+							self.$set(self.deptData, 'name', item.deptName)
 						}
+					}
 				})
 				this.$set(this, 'getDataType', false);
-				this.$set(this.queryParams,'page',1);
+				this.$set(this.queryParams, 'page', 1);
 				this.getList();
 			},
 			//获取院系
@@ -371,10 +380,10 @@
 				});
 				if (data.code == 200) {
 					data.data.unshift({
-						deptid:null,
-						deptName:'全部'
+						deptid: null,
+						deptName: '全部'
 					})
-					this.$set(this.deptData,'list',data.data);
+					this.$set(this.deptData, 'list', data.data);
 				}
 			},
 			//获取分级
@@ -383,13 +392,13 @@
 					data
 				} = await laboratoryClassLevelGetList({});
 				if (data.code == 200) {
-					this.$set(this,'levelList',data.data);
+					this.$set(this, 'levelList', data.data);
 				}
 			},
 			//回车触发
 			carriageReturnRequest() {
 				this.$set(this, 'getDataType', false);
-				this.$set(this.queryParams,'page',1);
+				this.$set(this.queryParams, 'page', 1);
 				this.getList();
 			},
 			//检查任务
@@ -397,12 +406,14 @@
 				let self = this;
 				let obj = JSON.parse(JSON.stringify(this.queryParams));
 				obj.planSetId = this.planSetId;
-				obj.deptId = this.deptData.id?this.deptData.id:'';
-				obj.searchValue = this.searchValue?this.searchValue:'';
-				obj.levelId = this.levelId?this.levelId:'';
-				if(this.tabIndexTow == 0){
+				obj.deptId = this.deptData.id ? this.deptData.id : '';
+				obj.searchValue = this.searchValue ? this.searchValue : '';
+				obj.levelId = this.levelId ? this.levelId : '';
+				if (this.tabIndexTow == 0) {
 					//检查计划
-					const { data } = await securityAppCheckManageList(obj);
+					const {
+						data
+					} = await securityAppCheckManageList(obj);
 					if (data.code == 200) {
 						if (self.queryParams.page == 1) {
 							this.dataList = data.data.records;
@@ -418,10 +429,12 @@
 							}
 						}
 					}
-				}else if(this.tabIndexTow == 1){
+				} else if (this.tabIndexTow == 1) {
 					//复查计划
 					obj.planId = this.optionData.planId;
-					const { data } = await securityAppCheckDangerReviewSubList(obj);
+					const {
+						data
+					} = await securityAppCheckDangerReviewSubList(obj);
 					if (data.code == 200) {
 						this.dataList = data.data;
 						this.$set(this, 'getDataType', true);
@@ -440,11 +453,13 @@
 						// 	}
 						// }
 					}
-					
-				}else if(this.tabIndexTow == 2){
+
+				} else if (this.tabIndexTow == 2) {
 					//整改计划
 					obj.planId = this.optionData.planId;
-					const { data } = await securityAppCheckDangerGetCheckDangerSubList(obj);
+					const {
+						data
+					} = await securityAppCheckDangerGetCheckDangerSubList(obj);
 					if (data.code == 200) {
 						this.dataList = data.data;
 						this.$set(this, 'getDataType', true);
@@ -463,7 +478,7 @@
 						// 	}
 						// }
 					}
-					
+
 				}
 			},
 
@@ -479,12 +494,14 @@
 		height: 100%;
 		display flex;
 		overflow: hidden;
-		.info-max-box{
-			padding-top:20rpx;
+
+		.info-max-box {
+			padding-top: 20rpx;
 		}
+
 		.title {
 			width: 690rpx;
-			margin:0 30rpx 20rpx;
+			margin: 0 30rpx 20rpx;
 			height: 150rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
@@ -605,13 +622,15 @@
 				overflow: hidden;
 				text-overflow: ellipsis;
 				white-space: nowrap;
-				>view{
-					width:124rpx;
-					display:block;
-					overflow:hidden;
-					text-overflow:ellipsis;
-					white-space:nowrap;
+
+				>view {
+					width: 124rpx;
+					display: block;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
 				}
+
 				>img {
 					display: block;
 					width: 24rpx;
@@ -816,9 +835,11 @@
 		.hidden {
 			box-sizing: border-box;
 			margin: 20rpx 0;
-			.hidden-li:nth-child(1){
-				border-top:none;
+
+			.hidden-li:nth-child(1) {
+				border-top: none;
 			}
+
 			.hidden-li {
 				padding: 0 30rpx;
 				height: 80rpx;
@@ -859,30 +880,32 @@
 						height: 24rpx;
 					}
 				}
-				.manageClass{
-					color: #009c1f !important;;
+
+				.manageClass {
+					color: #009c1f !important;
 				}
 			}
 
 			.hidden-li:last-of-type {
 				border: none;
 			}
+
 			.get-data-p {
 				height: 100rpx;
 				text-align: center;
-			
+
 				.get-data-img {
 					width: 30rpx;
 					height: 30rpx;
 					margin: 0 auto;
 					margin-top: 15rpx;
 				}
-			
+
 				.get-data-text {
 					text-align: center;
 				}
 			}
-			
+
 			.get-data-null-p {
 				height: 100rpx;
 				line-height: 100rpx;
@@ -902,4 +925,4 @@
 			color: #16B531;
 		}
 	}
-</style>
+</style>

+ 47 - 23
pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -76,7 +76,10 @@
 			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 		</scroll-view>
 		<checkItemModule :propsData="propsData" v-if="checkItemModuleType"></checkItemModule>
-		<view v-if="pageType==0 && total !=0" @click="submitBtn()" class="sub-btn">检查完成</view>
+		<view class="sub-btn" v-if="pageType==0 && total !=0">
+			<view @click="submitBtn(1)">开展检查</view>
+			<view @click="submitBtn(2)">检查完成</view>
+		</view>
 	</view>
 
 </template>
@@ -427,20 +430,26 @@
 				}
 			},
 			//检查完成
-			async submitBtn() {
-				let obj = {
-					manageId: this.newData.manageId,
-				}
-				const {
-					data
-				} = await securityAppCheckSetOptionFinishCheck(obj);
-				if (data.code == 200) {
-					let infoData=this.newData;
-					uni.redirectTo({
-						url: '/pages_safetyCheck/views/inspectManage/inspectList?infoData=' + encodeURIComponent(JSON
-							.stringify(infoData))
-					});
+			async submitBtn(status) {
+				if(status==1){
+					//开展检查
+				}else if(status==2){
+					//检查完成
+					let obj = {
+						manageId: this.newData.manageId,
+					}
+					const {
+						data
+					} = await securityAppCheckSetOptionFinishCheck(obj);
+					if (data.code == 200) {
+						let infoData=this.newData;
+						uni.redirectTo({
+							url: '/pages_safetyCheck/views/inspectManage/inspectList?infoData=' + encodeURIComponent(JSON
+								.stringify(infoData))
+						});
+					}
 				}
+				
 			},
 
 		}
@@ -715,18 +724,33 @@
 		}
 
 		.sub-btn {
-			width: 686rpx;
-			height: 100rpx;
-			background: #0183FA;
-			border-radius: 50rpx 50rpx 50rpx 50rpx;
+			display: flex;
+			justify-content: center;
 			position: fixed;
 			left: 30rpx;
 			bottom: 30rpx;
-			font-weight: 400;
-			font-size: 30rpx;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
+		
+			>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>

+ 15 - 16
pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -16,13 +16,14 @@
 			<view class="items-number" v-if="newData.hazardCheckName!=''">
 				此检查项在当前实验室累计出现<text>{{hazardCheckNum}}</text>次隐患</view>
 			<view class="list">
-				<view class="list-li" v-if="newData.hazardCheckName!=''">
+				<view class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
 					<view>检查要点</view>
 					<view>
-						<img src="@/pages_safetyCheck/images/icon_06.png">
+						<img v-if="!newData.inspectDot" src="@/pages_safetyCheck/images/icon_06.png">
+						<img v-if="newData.inspectDot" src="@/pages_safetyCheck/images/icon_06_1.png">
 					</view>
 				</view>
-				<view v-if="newData.hazardCheckName!=''" class="hidden-content">{{newData.hazardCheckPoint}}
+				<view v-if="newData.hazardCheckName!='' && newData.inspectDot" class="hidden-content">{{newData.hazardCheckPoint}}
 				</view>
 				<view class="list-li" @click="checkCollapse()">
 					<view>{{newData.checkFlag?'检查结果':'检查隐患'}}</view>
@@ -73,8 +74,8 @@
 					</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?'退回整改':'')}}
+						<view :id="item.examineResult?'fontColor-B':'fontColor-C'">
+							{{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>
@@ -207,6 +208,7 @@
 							.subRoom) + ')'
 					})
 					data.data.checkCollapse=true;
+					data.data.inspectDot=false;
 					this.$set(this, 'newData', data.data);
 					this.$set(this.newData, 'checkTime', parseTime(data.data.checkTime, "{y}-{m}-{d}"));
 					
@@ -225,6 +227,7 @@
 						title: this.optionData.subName + '(' + (this.pageType == 0 ? this.optionData.roomNum : this.optionData.subRoom) + ')'
 					})
 					data.data.checkCollapse=true;
+					data.data.inspectDot=false;
 					this.$set(this, 'newData', data.data);
 					this.$set(this.newData, 'checkPlanSetVoList', this.optionData.checkPlanSetVoList);
 					this.$set(this.newData, 'subName', this.optionData.subName);
@@ -249,7 +252,7 @@
 						title: data.data.subName + '(' + data.data.roomNum + ')'
 					})
 					data.data.checkCollapse=false;
-					
+					data.data.inspectDot=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}");
@@ -294,6 +297,7 @@
 							pageType: this.pageType,
 							itemsStatus: this.itemsStatus,
 							checkPlanSetVoList: this.optionData.checkPlanSetVoList,
+							editStatus:true,
 						};
 						uni.redirectTo({
 							url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(
@@ -309,6 +313,7 @@
 							pageType: this.pageType,
 							itemsStatus: this.itemsStatus,
 							checkPlanSetVoList: this.optionData.checkPlanSetVoList,
+							editStatus:true,
 						};
 						uni.redirectTo({
 							url: '/pages_safetyCheck/views/itemsManage/hiddenDangerRectification?infoData=' + encodeURIComponent(
@@ -324,6 +329,7 @@
 							pageType: this.pageType,
 							itemsStatus: this.itemsStatus,
 							checkPlanSetVoList: this.optionData.checkPlanSetVoList,
+							editStatus:true,
 						};
 						uni.redirectTo({
 							url: '/pages_safetyCheck/views/itemsManage/hiddenDangerRectification?infoData=' + encodeURIComponent(
@@ -370,6 +376,9 @@
 				})
 			},
 			//折叠展开
+			inspectDot(){
+				this.newData.inspectDot=!this.newData.inspectDot
+			},
 			checkCollapse(row){
 				this.newData.checkCollapse=!this.newData.checkCollapse
 			},
@@ -379,16 +388,6 @@
 			reviewCollapse(row){
 				row.reviewCollapse=!row.reviewCollapse
 			},
-			//整改页面
-			rectificationBtn() {
-				let self = this;
-				let infoData = self.newData;
-				console.log(self.newData)
-				uni.navigateTo({
-					url: '/pages_safetyCheck/views/itemsManage/snapshotRectification?infoData=' +
-						encodeURIComponent(JSON.stringify(infoData))
-				});
-			},
 		}
 	}
 </script>

+ 59 - 11
pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -14,13 +14,14 @@
 			<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 class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
 					<view>检查要点</view>
 					<view>
-						<img src="@/pages_safetyCheck/images/icon_06.png">
+						<img v-if="!newData.inspectDot" src="@/pages_safetyCheck/images/icon_06.png">
+						<img v-if="newData.inspectDot" src="@/pages_safetyCheck/images/icon_06_1.png">
 					</view>
 				</view>
-				<view v-if="newData.hazardCheckName!=''" class="hidden-content">{{newData.hazardCheckPoint}}
+				<view v-if="newData.hazardCheckName!='' && newData.inspectDot" class="hidden-content">{{newData.hazardCheckPoint}}
 				</view>
 				<view class="list-li" @click="checkCollapse()">
 					<view>检查隐患</view>
@@ -71,8 +72,8 @@
 					</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?'退回整改':'')}}
+						<view :id="item.examineResult?'fontColor-B':'fontColor-C'">
+							{{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>
@@ -172,6 +173,7 @@
 				optionData: null,
 				fontNum:0,
 				rectifyId:null,
+				editStatus:null,
 			}
 		},
 		onLoad(option) {
@@ -179,6 +181,7 @@
 			console.log('整改',optionData)
 			this.$set(this, 'pageType', optionData.pageType);
 			this.$set(this, 'optionData', optionData);
+			this.$set(this, 'editStatus', optionData.editStatus);
 		},
 		onShow() {
 
@@ -205,22 +208,27 @@
 						title: data.data.subName + '(' + data.data.roomNum + ')'
 					})
 					data.data.checkCollapse=false;
+					data.data.inspectDot=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){
+								//编辑数据的时候数据回填
+								if(self.pageType==1 && self.editStatus){
+									item.rectifyCollapse=true;
+									item.reviewTime=null;
 									self.$set(self.form, 'examineOpinion', item.examineOpinion?item.examineOpinion:'');
 									self.$set(self.form, 'imgDtoList', item.examineUploadList?item.examineUploadList:[]);
 									
-								}else if(self.pageType==2){
+								}else if(self.pageType==2 && self.editStatus){
+									item.reviewCollapse=true;
+									item.rectifyTime=null;
 									self.$set(self.form, 'rectifyMeasure', item.rectifyMeasure?item.rectifyMeasure:'');
 									self.$set(self.form, 'imgDtoList', item.rectifyUploadList?item.rectifyUploadList:[]);
 								}
@@ -358,6 +366,9 @@
 				this.$forceUpdate();
 			},
 			//折叠展开
+			inspectDot(){
+				this.newData.inspectDot=!this.newData.inspectDot
+			},
 			checkCollapse(row){
 				this.newData.checkCollapse=!this.newData.checkCollapse
 			},
@@ -372,6 +383,25 @@
 			async submitForm(status) {
 				let self = this;
 				if(self.pageType==1){
+					if(!this.form.examineOpinion){
+						uni.showToast({
+							title: '请填写复查验证描述!',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+						return
+					}
+					if(!this.form.imgDtoList[0]){
+						uni.showToast({
+							title: '请选择现场照片!',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+						return
+					}
+					
 					//复查
 					let obj = {
 						rectifyId: this.rectifyId,
@@ -390,13 +420,31 @@
 							duration: 2000
 						});
 						let infoData = this.optionData;
-						uni.navigateTo({
+						uni.redirectTo({
 							url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
 								encodeURIComponent(JSON.stringify(infoData))
 						});
 					
 					}
 				}else if(self.pageType==2){
+					if(!this.form.rectifyMeasure){
+						uni.showToast({
+							title: '请填写隐患整改描述!',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+						return
+					}
+					if(!this.form.imgDtoList[0]){
+						uni.showToast({
+							title: '请选择现场照片!',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+						return
+					}
 					//整改
 					let obj = {
 						checkCategory: this.optionData.checkCategory,
@@ -418,7 +466,7 @@
 							duration: 2000
 						});
 						let infoData = this.optionData;
-						uni.navigateTo({
+						uni.redirectTo({
 							url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
 								encodeURIComponent(JSON.stringify(infoData))
 						});

+ 10 - 10
pages_safetyCheck/views/safetyCheck.vue

@@ -230,21 +230,21 @@
 
 		.header {
 			width: 100%;
-			height: 235px;
+			height: 482rpx;
 			// position: fixed;
 			// top: 0rpx;
 			// z-index: 100;
 
 			.header-bg {
 				width: 750rpx;
-				height: 336rpx;
+				height: 310rpx;
 				position: absolute;
 
 			}
 
 			.tabTitle {
 				width: 690rpx;
-				height: 250rpx;
+				height: 242rpx;
 				background: #FFFFFF;
 				border-radius: 20rpx 20rpx 20rpx 20rpx;
 				display flex;
@@ -255,14 +255,14 @@
 				top: 208rpx;
 
 				.tabTitle_li {
-					height: 250rpx;
+					height: 242rpx;
 					flex: 1;
 					position: relative;
 					text-align center;
 
 					.line {
 						width: 2rpx;
-						height: 30rpx;
+						height: 20rpx;
 						background: #D8D8D8;
 						border-radius: 0rpx 0rpx 0rpx 0rpx;
 						position: absolute;
@@ -276,13 +276,13 @@
 						align-items: center;
 
 						>img {
-							width: 80rpx;
-							height: 80rpx;
-							margin-top: 48rpx;
+							width: 82rpx;
+							height: 82rpx;
+							margin-top: 44rpx;
 						}
 
 						>view:nth-of-type(1) {
-							font-size: 28rpx;
+							font-size: 30rpx;
 							color: #333333;
 							line-height: 40rpx;
 							text-align: left;
@@ -290,7 +290,7 @@
 						}
 
 						>view:nth-of-type(2) {
-							font-size: 22rpx;
+							font-size: 24rpx;
 							color: #666666;
 							line-height: 30rpx;
 							text-align: left;

+ 21 - 16
pages_safetyCheck/views/snapshotManage/snapshotDetail.vue

@@ -34,17 +34,27 @@
 				<view class="photo">
 					<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
 				</view>
-				<view class="list-li">
+				<view class="list-li" @click="rectifyCollapse()">
 					<view>隐患整改</view>
 					<view :id="newData.rectifyStatus==0?'fontColor-A':(newData.rectifyStatus==1?'fontColor-B':'fontColor-C')">
 						{{newData.rectifyStatus==0?'待整改':(newData.rectifyStatus==1?'已整改':'暂无法整改')}}
 						<img src="@/pages_safetyCheck/images/icon_06.png">
 					</view>
 				</view>
-				<view class="hidden-content" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">{{newData.rectifyDescribe}}
-				</view>
-				<view class="photo" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
-					<img v-for="(item,index) in newData.zgDtoList" :src="baseUrl+item.fileUrl">
+				<view v-if="newData.rectifyCollapse && newData.rectifyTime">
+					<view class="hidden-content" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">{{newData.rectifyDescribe}}
+					</view>
+					<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>姓名:</view>
+						<view>{{newData.rectifyUserName}}</view>
+					</view>
+					<view class="list-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
+						<view>时间:</view>
+						<view>{{newData.rectifyTime}}</view>
+					</view>
 				</view>
 				<!-- <view class="list-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
 					<view>整改方案</view>
@@ -54,18 +64,9 @@
 					<img src="@/pages_safetyCheck/images/icon_djc_wj.png">
 					<view>{{newData.rectifyProjectName}}</view>
 				</view> -->
-				<view class="list-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
-					<view>姓名:</view>
-					<view>{{newData.rectifyUserName}}</view>
-				</view>
-				<view class="list-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
-					<view>时间:</view>
-					<view>{{newData.rectifyTime}}</view>
-				</view>
-				
 			</view>
 		</scroll-view>
-		<view class="sub-btn" @click="rectificationBtn">{{newData.rectifyStatus==0?'整改':'继续整改'}}</view>
+		<view v-if="newData.rectifyStatus==0" class="sub-btn" @click="rectificationBtn">{{newData.rectifyStatus==0?'整改':'继续整改'}}</view>
 	</view>
 
 </template>
@@ -109,15 +110,19 @@
 					data
 				} = await securityAppCheckPhotoDetail({photoId:this.photoId});
 				if (data.code == 200) {
+					data.data.rectifyCollapse=true;
 					this.$set(this, 'newData', data.data);
 				}
 			},
+			rectifyCollapse(){
+				this.newData.rectifyCollapse=!this.newData.rectifyCollapse
+			},
 			//整改页面
 			rectificationBtn(){
 				let self=this;
 				let infoData=self.newData;
 				console.log(self.newData)
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages_safetyCheck/views/snapshotManage/snapshotRectification?infoData=' + encodeURIComponent(JSON.stringify(infoData))
 				});
 			},

+ 2 - 2
pages_safetyCheck/views/snapshotManage/snapshotRectification.vue

@@ -72,7 +72,7 @@
 				</view> -->
 			</view>
 		</scroll-view>
-		<view class="sub-btn">
+		<view class="sub-btn" >
 			<view @click="submitForm(2)">暂无法整改</view>
 			<view @click="submitForm(1)">完成整改</view>
 		</view>
@@ -267,7 +267,7 @@
 						duration: 2000
 					});
 					let infoData=this.newData;
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages_safetyCheck/views/snapshotManage/snapshotDetail?infoData=' + encodeURIComponent(JSON.stringify(infoData))
 					});