heyang

api/commonality/permission.js

@@ -20,9 +20,9 @@ export const systemSubjectGetListByPower = (data) => {
 	})
 };
 //根据权限查询实验室列表
-export const laboratorySubRelInfoSelectByPage = (data) => {
+export const laboratorySubRelInfoSelectInfoByPage = (data) => {
 	return apiResquest({
-		url: `/laboratory/subRelInfo/selectByPage`,
+		url: `/laboratory/subRelInfo/selectInfoByPage`,
 		method: 'POST',
 		data: { ...data }
 	})

pages_manage/views/laboratory/safetyCardScan.vue

@@ -208,6 +208,12 @@
 				},
 				checkPlanSetVoList: null,
 				form: {},
+				OptionListArr:[],//临时存储检查项
+				planId:'',
+				planTitle:'',
+				checkTypeName:'',
+				crossCheck:'',
+				
 
 			}
 		},
@@ -261,6 +267,10 @@
 			batchClick(row) {
 				let self = this;
 				if (this.dialogStatus == 0) { //计划点击
+					this.$set(this, 'planId', row.planId);
+					this.$set(this, 'planTitle', row.planTitle);
+					this.$set(this, 'checkTypeName', row.checkTypeName);
+					this.$set(this, 'crossCheck', row.crossCheck);
 					if (row.checkPlanSetVoList.length == 1) {
 						//如果只有1个检查批次不弹窗
 						let planSetId = row.checkPlanSetVoList[0].planSetId
@@ -317,6 +327,10 @@
 					data.data.records = list2
 
 					if (data.data.records.length == 1) { //一个计划
+						this.$set(this, 'planId', data.data.records[0].planId);
+						this.$set(this, 'planTitle', data.data.records[0].planTitle);
+						this.$set(this, 'checkTypeName', data.data.records[0].checkTypeName);
+						this.$set(this, 'crossCheck', data.data.records[0].crossCheck);
 						if (data.data.records[0].checkPlanSetVoList.length == 1) { //1个批次
 							let planSetId = data.data.records[0]
 							if (data.data.records[0].checkPlanSetVoList[0]) { //一个批次
@@ -372,7 +386,7 @@
 					//this.shadeList = data.data.records;
 					if (data.data.records[0]) {
 						let manageId = data.data.records[0].manageId;
-						self.securityAppCheckSetOptionList(data.data.records[0]);
+						self.securityAppCheckSetOptionList(data.data.records[0],0);
 					} else {
 						self.dialogStatus = 0;
 						self.dialogVisible = false;
@@ -388,30 +402,63 @@
 				}
 			},
 			//查询检查项
-			async securityAppCheckSetOptionList(item) {
+			async securityAppCheckSetOptionList(item,checkStatus) {
 				let self = this;
 				let upData = item;
 				let obj = {
 					page: 1,
 					pageSize: 20,
-					checkStatus: '0',
+					checkStatus: checkStatus,
 					manageId: upData.manageId,
 				}
 				const {
 					data
 				} = await securityAppCheckSetOptionList(obj);
-				if (data.code == 200) {
+				if (data.code == 200 && checkStatus==0) {//先查询待检查数据
+					if (data.data.records[0]) {
+						let infoData = {};
+						infoData.pageType = 0;
+						infoData.itemsStatus = 0;
+						infoData.subName = upData.subName;
+						infoData.checkPlanSetVoList = self.checkPlanSetVoList;
+						infoData.planId = self.planId;
+						infoData.planTitle = self.planTitle;
+						infoData.checkTypeName = self.checkTypeName;
+						infoData.crossCheck = self.crossCheck;
+						
+						infoData.roomNum = upData.roomNum;
+						infoData.subId = data.data.records[0].subId;
+						infoData.manageId = data.data.records[0].manageId;
+						infoData.setOptionId = data.data.records[0].setOptionId;
+						infoData.hazardCheckPro = data.data.records[0].hazardCheckPro;
+						infoData.checkCategory = data.data.records[0].checkCategory;
+						uni.navigateTo({
+							url: '/pages_safetyCheck/views/inspectManage/conductInspections?infoData=' +
+								encodeURIComponent(
+									JSON
+									.stringify(infoData))
+						});
+					} else {
+						self.securityAppCheckSetOptionList(item,2);
+						
+					}
+				}else if (data.code == 200 && checkStatus==2) {//查询检查中数据
 					if (data.data.records[0]) {
 						let infoData = {};
 						infoData.pageType = 0;
 						infoData.itemsStatus = 0;
 						infoData.subName = upData.subName;
 						infoData.checkPlanSetVoList = self.checkPlanSetVoList;
+						infoData.planId = self.planId;
+						infoData.planTitle = self.planTitle;
+						infoData.checkTypeName = self.checkTypeName;
+						infoData.crossCheck = self.crossCheck;
 						infoData.roomNum = upData.roomNum;
 						infoData.subId = data.data.records[0].subId;
 						infoData.manageId = data.data.records[0].manageId;
 						infoData.setOptionId = data.data.records[0].setOptionId;
 						infoData.hazardCheckPro = data.data.records[0].hazardCheckPro;
+						infoData.checkCategory = data.data.records[0].checkCategory;
 						uni.navigateTo({
 							url: '/pages_safetyCheck/views/inspectManage/conductInspections?infoData=' +
 								encodeURIComponent(

pages_safetyCheck/api/index.js

@@ -206,7 +206,7 @@ export const securityAppCheckPlanCheckInfo = (data) => {
 //开始检查-保存草稿-详情
 export const securityDraftFindBySetOptionId = (data) => {
     return apiResquest({
-        url: '/security/draft/findBySetOptionId',
+        url: '/security/appDraft/findBySetOptionId',
        method: 'GET',
        data: { ...data }
     })

pages_safetyCheck/component/checkItemModule.vue

@@ -93,7 +93,7 @@
 				<view class="out-button" @click="outButton()">取消</view>
 			</view>
 			<view class="input-for-max-box">
-				<view class="for-box" @click="checkItemButton(item)" v-for="(item,index) in dataList" :key="index">
+				<view class="for-box"  v-for="(item,index) in dataList" :key="index">
 					<view class="for-box-n">
 						{{item.hazardCheckCode1}}{{item.hazardCheckName1}}
 					</view>
@@ -103,8 +103,8 @@
 					<view class="for-box-n">
 						{{item.hazardCheckCode}}{{item.hazardCheckName}}
 					</view>
-					<view class="for-box-n" v-html="brightenKeyword(item.hazardCheckPoint,searchValue)">
-						{{item.hazardCheckPoint}}
+					<view class="for-box-n" @click="checkItemButton(item,item2)" v-for="(item2,index2) in item.hazardCheckPointList" v-html="brightenKeyword(item2,searchValue)">
+						{{item2}}
 					</view>
 				</view>
 			</view>
@@ -181,6 +181,7 @@
 			getSearchValue() {
 				if (this.optionData.infoType == 0) {
 					//检查
+					this.dataList=[];
 					this.securityAppCheckSetOptionList();
 				} else if (this.optionData.infoType == 1) {
 					//复查
@@ -229,13 +230,13 @@
 					this.$set(this, 'checkList', item.children);
 					console.log(this.checkList)
 				} else if (item.level == 3) {
-					this.checkItemButton(item);
+					this.checkItemButton(item,item2);
 
 				}
 			},
 			//选中检查项
-			checkItemButton(item) {
-				this.$parent.checkItemModuleButton('submit', item);
+			checkItemButton(item,item2) {
+				this.$parent.checkItemModuleButton('submit', item,item2);
 			},
 			//高亮
 			brightenKeyword(val, editKeyword) {
@@ -271,7 +272,7 @@
 					data
 				} = await securityAppCheckSetOptionList({
 					manageId: this.optionData.manageId,
-					checkStatus: this.optionData.checkType,
+					checkStatus: '0',
 					searchValue: this.searchValue
 				});
 				if (data.code == 200) {
@@ -280,8 +281,50 @@
 						let minList = JSON.parse(JSON.stringify(data.data))
 						this.cascadeData(maxList, minList);
 					}
+					console.log(data.data)
+					if(data.data[0]){
+						data.data.forEach(function(item){
+							console.log(item)
+							console.log(item.hazardCheckPoint)
+							if(item.hazardCheckPoint){
+								item.hazardCheckPointList=item.hazardCheckPoint.split('#')
+							}
+						})
+					}
+					console.log(data.data)
+					//查询数据
+					this.dataList = [...this.dataList, ...JSON.parse(JSON.stringify(data.data))]
+					//this.$set(this, 'dataList', JSON.parse(JSON.stringify(data.data)));
+					this.securityAppCheckSetOptionListTow()
+				}
+			},
+			async securityAppCheckSetOptionListTow(maxList) {
+				let self = this;
+				const {
+					data
+				} = await securityAppCheckSetOptionList({
+					manageId: this.optionData.manageId,
+					checkStatus: '2',
+					searchValue: this.searchValue
+				});
+				if (data.code == 200) {
+					//级联数据
+					if (maxList) {
+						let minList = JSON.parse(JSON.stringify(data.data))
+						this.cascadeData(maxList, minList);
+					}
+					if(data.data[0]){
+						data.data.forEach(function(item){
+							console.log(item)
+							console.log(item.hazardCheckPoint)
+							if(item.hazardCheckPoint){
+								item.hazardCheckPointList=item.hazardCheckPoint.split('#')
+							}
+						})
+					}
 					//查询数据
-					this.$set(this, 'dataList', JSON.parse(JSON.stringify(data.data)));
+					this.dataList = [...this.dataList, ...JSON.parse(JSON.stringify(data.data))]
+					//this.$set(this, 'dataList', JSON.parse(JSON.stringify(data.data)));
 				}
 			},
 			/********************** 复查相关查询 **********************/

pages_safetyCheck/views/inspectManage/conductInspections.vue

@@ -3,17 +3,48 @@
 	<view class="inspectAdd">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 			<!-- <view class="tip">{{optionData.checkPlanSetVoList.checkName}}</view> -->
-			<view class="items">
+			<!-- <view class="items">
 				<view class="items-t" @click="checkItemModuleButton('open')">
 					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
 					<img class="items-t-img" src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
 				</view>
 				<view class="items-b">＜ {{newData.hazardCheckCode2}} {{newData.hazardCheckName2}}
 					＜{{newData.hazardCheckCode1}} {{newData.hazardCheckName1}}</view>
-			</view>
-			<view class="items-number">此检查项在当前实验室累计出现<text>{{hazardCheckNum}}</text>次隐患</view>
+			</view> -->
 			<view class="list">
-				<view class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
+				<view class="list-li srearch">
+					<view class="srearch-l">{{newData.subName?newData.subName:'实验室名称'}}</view>
+					<!-- <img class="srearch-r" src="@/pages_safetyCheck/images/icon_wd_gd@1x.png"> -->
+				</view>
+				<view class="list-li" style="margin-bottom: 20rpx;border:none;">
+					<view>
+						{{newData.roomNum?newData.roomNum:''}}房间＆{{newData.buildName?newData.buildName:'楼栋'}}＆{{newData.deptName?newData.deptName:'学院单位'}}
+					</view>
+				</view>
+				<view class="list-li">
+					<view>现场照片</view>
+				</view>
+				<view v-if="form.photoList[0]" 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.photoList" :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.photoList.length<6"> -->
+					</view>
+				</view>
+				<view class="list-li" @click="checkItemModuleButton('open')">
+					<view> {{newData.hazardCheckCode?newData.hazardCheckCode:''}}
+						{{newData.hazardCheckName?newData.hazardCheckName:'检查项'}}
+					</view>
+					<view style="color: #0183FA;">
+						<img src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
+					</view>
+				</view>
+				<!-- <view class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
 					<view>检查要点</view>
 					<view>
 						<img v-if="!newData.inspectDot" src="@/pages_safetyCheck/images/icon_06.png">
@@ -22,42 +53,30 @@
 				</view>
 				<view class="hidden-content" v-if="newData.hazardCheckName!='' && newData.inspectDot">
 					{{newData.hazardCheckPoint}}
-				</view>
-				<view class="radio_group" v-if="newData.inspectDot">
+				</view> -->
+				<!-- <view class="radio_group" v-if="newData.inspectDot">
 					<view class="radio" v-for="(item,index) in radioList" :key="index" @click="radioClick(item)">
 						<img v-if="!item.checked" src="@/pages_safetyCheck/images/icon_aqjc_5.png">
 						<img v-if="item.checked" src="@/pages_safetyCheck/images/icon_aqjc_6.png">
 						<text>{{item.name}}</text>
 					</view>
-				</view>
+				</view> -->
 				<view class="list-li" v-if="!form.checkFlag">
-					<view>检查隐患</view>
+					<view>隐患描述</view>
 					<view>
 						<!-- <img src="@/pages_safetyCheck/images/icon_06.png"> -->
 					</view>
 				</view>
-				<textarea v-if="!form.checkFlag && !checkItemModuleType" class="describe" type="text"
-					v-model="form.hazardDescribe" maxlength="200" placeholder="请填写隐患描述"
-					placeholder-style="font-size:24rpx;color:#999;"></textarea>
-				<view class="list-li">
-					<view>现场照片</view>
-				</view>
-				<view v-if="!form.checkFlag" 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.photoList" :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.photoList.length<6"> -->
-					</view>
+				<view class="describe">
+					<textarea v-if="!form.checkFlag && !checkItemModuleType" cursor-spacing="40" class="describe-n" type="text"
+						v-model="form.hazardDescribe" maxlength="200" placeholder="请填写隐患描述"
+						placeholder-style="font-size:24rpx;color:#999;"></textarea>
 				</view>
+
 			</view>
 			<view class="voice">
 				<view class="voice_t">
-					<view class="voice_t_t" v-if="!form.voiceList[0]">语音备注：(选填)</view>
+					<view class="voice_t_t" v-if="!form.voiceList[0]"><text>语音备注：</text><text>按住话筒录音</text></view>
 					<view class="voice_t_b" v-if="form.voiceList[0]">语音备注：({{form.voiceList.length}})</view>
 				</view>
 				<view class="voice_b" v-if="form.voiceList[0]" v-for="(voiceItem,voiceIndex) in form.voiceList"
@@ -94,6 +113,7 @@
 </template>
 
 <script>
+	const myaudio = uni.createInnerAudioContext();
 	import {
 		config
 	} from '@/api/request/config.js'
@@ -101,7 +121,6 @@
 		securityAppCheckPlanCheckInfo,
 		securityAppCheckSetOptionCheckCommit,
 		securityDraftFindBySetOptionId,
-		securityAppCheckPhotoGetCheckNumBySub,
 	} from '@/pages_safetyCheck/api/index.js'
 	import {
 		checkItemModule
@@ -137,7 +156,6 @@
 				manageId: '', //检查管理id
 				subId: '',
 				hazardCheckPro: '',
-				hazardCheckNum: 0,
 				sendLock: true, //发送锁，当为true时上锁，false时解锁发送
 				recorderManager: wx.getRecorderManager(),
 				optionData: null,
@@ -148,6 +166,7 @@
 		},
 		onLoad(option) {
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
+			console.log('开展检查',optionData)
 			uni.setNavigationBarTitle({
 				title: optionData.subName + '(' + (optionData.pageType == 0 ? (optionData.roomNum ? optionData
 					.roomNum : '-') : (optionData
@@ -168,18 +187,19 @@
 		},
 		mounted() {
 			if (this.pageType == 0) {
-				//检查
-				if (this.itemsStatus == 0 || this.itemsStatus == 1) {
+				if(this.optionData.checkDraftVo){//检查中,已检查
+					if(this.optionData.checkDraftVo.checkStatus==2){//检查中
+						//保存草稿详情
+						this.securityDraftFindBySetOptionId();
+					}else{
+						//开始检查-提交的详情
+						this.securityAppCheckPlanCheckInfo();
+					}
+				}else{//待见擦汗
 					//开始检查-提交的详情
 					this.securityAppCheckPlanCheckInfo();
-				} else if (this.itemsStatus == 2) {
-					//保存草稿详情
-					this.securityDraftFindBySetOptionId();
-
-
 				}
 			}
-			this.securityAppCheckPhotoGetCheckNumBySub();
 		},
 		methods: {
 			//折叠展开
@@ -203,7 +223,13 @@
 					console.log(data.data.hazardCheckPoin)
 					//编辑的时候
 					this.$set(this.form, 'checkFlag', data.data.checkFlag ? data.data.checkFlag : false);
-					this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe ? data.data.hazardDescribe:data.data.hazardCheckPoint);
+					if(data.data.hazardDescribe){
+						this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe);
+					}else{
+						let list=[];
+						list=data.data.hazardCheckPoint.split('#');
+						this.$set(this.form, 'hazardDescribe', list[0]);
+					}
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
 					this.$set(this.form, 'voiceList', data.data.voiceList ? data.data.voiceList : []);
 
@@ -221,28 +247,21 @@
 					//编辑的时候
 					data.data.inspectDot = true;
 					this.$set(this, 'newData', data.data);
-					this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe ? data.data.hazardDescribe:data.data.hazardCheckPoint);
+					if(data.data.hazardDescribe){
+						this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe);
+					}else{
+						let list=[];
+						list=data.data.hazardCheckPoint.split('#');
+						this.$set(this.form, 'hazardDescribe', list[0]);
+					}
 					this.$set(this.newData, 'checkPlanSetVoList', this.optionData.checkPlanSetVoList);
 					this.$set(this.form, 'checkFlag', data.data.checkFlag ? data.data.checkFlag : false);
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
 					this.$set(this.form, 'voiceList', data.data.voiceList ? data.data.voiceList : []);
 				}
 			},
-			//获取检查项在当前实验室出现的次数
-			async securityAppCheckPhotoGetCheckNumBySub() {
-				let obj = {
-					subId: this.subId,
-					hazardCheckPro: this.hazardCheckPro,
-				}
-				const {
-					data
-				} = await securityAppCheckPhotoGetCheckNumBySub(obj);
-				if (data.code == 200) {
-					this.$set(this, 'hazardCheckNum', data.data);
 
-				}
-			},
-			checkItemModuleButton(type, item) {
+			checkItemModuleButton(type, item,keyPoint) {
 				if (type == 'open') {
 					let obj = {
 						infoType: this.pageType,
@@ -264,10 +283,9 @@
 					this.$set(this.newData, 'hazardCheckCode2', item.hazardCheckCode2);
 					this.$set(this.newData, 'hazardCheckName2', item.hazardCheckName2);
 					this.$set(this.newData, 'hazardCheckPoint', item.hazardCheckPoint);
-					this.$set(this.form, 'hazardDescribe', item.hazardCheckPoint);
+					this.$set(this.form, 'hazardDescribe', keyPoint);
 					this.$set(this, 'setOptionId', item.setOptionId);
 					this.$set(this, 'hazardCheckPro', item.hazardCheckPro);
-					this.securityAppCheckPhotoGetCheckNumBySub();
 					this.$set(this, 'checkItemModuleType', false);
 				}
 			},
@@ -320,18 +338,8 @@
 							duration: 2000
 						});
 					}
-					let infoData = {
-						setOptionId: this.setOptionId,
-						manageId: this.manageId,
-						subId: this.subId,
-						hazardCheckPro: this.hazardCheckPro,
-						pageType: this.pageType,
-						itemsStatus: status == 1 ? 2 : 0,
-						checkPlanSetVoList: this.optionData.checkPlanSetVoList,
-						subName: this.optionData.subName,
-						roomNum: this.optionData.roomNum,
-						subRoom: this.optionData.subRoom,
-					};
+					let infoData = this.optionData;
+					infoData.itemsStatus = status == 1 ? 2 : 0;
 					uni.redirectTo({
 						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
 							encodeURIComponent(JSON
@@ -361,7 +369,7 @@
 			},
 			/******图片上传******/
 			selectImage() {
-				let self=this;
+				let self = this;
 				let photoMaxNun = 0;
 				if (this.form.photoList.length > 5) {
 					uni.showToast({
@@ -716,9 +724,8 @@
 		}
 
 		.list {
-			width: 690rpx;
-			margin: 20rpx 30rpx 0;
-			background: #FFFFFF;
+			width: 750rpx;
+			margin: 20rpx 0rpx 0;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
 			overflow: hidden;
 
@@ -729,12 +736,16 @@
 				padding: 0 30rpx;
 				box-sizing: border-box;
 				border-bottom: 1rpx solid #E0E0E0;
+				background: #fff;
 
 				>view:nth-of-type(1) {
 					font-size: 30rpx;
 					color: #333333;
 					line-height: 80rpx;
 					text-align: left;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
 				}
 
 				>view:nth-of-type(2) {
@@ -747,8 +758,8 @@
 					align-items: center;
 
 					>img {
-						width: 24rpx;
-						height: 12rpx;
+						width: 30rpx;
+						height: 30rpx;
 						margin-left: 10rpx;
 					}
 				}
@@ -790,19 +801,26 @@
 			}
 
 			.describe {
-				width: 636rpx;
-				height: 180rpx;
-				border-radius: 10rpx 10rpx 10rpx 10rpx;
-				border: 1rpx solid #E0E0E0;
-				margin: 20rpx 0 20rpx 28rpx;
-				padding: 12rpx 16rpx;
-				box-sizing: border-box;
-				font-size: 24rpx;
-				color: #333333;
+				width: 750rpx;
+				background: #fff;
+				overflow: hidden;
+			
+				.describe-n {
+					width: 690rpx;
+					min-height: 180rpx;
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					border: 1rpx solid #E0E0E0;
+					margin: 40rpx;
+					padding: 22rpx;
+					box-sizing: border-box;
+					background: #F5F5F5;
+				}
 			}
 
 			.check-for-img-max-box {
-				margin: 20px 28rpx;
+				padding: 20px 28rpx;
+				box-sizing: border-box;
+				background: #fff;
 
 				.left-title-p {
 					width: 100%;
@@ -889,15 +907,32 @@
 			}
 		}
 
+		.srearch {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.srearch-l {
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 100rpx;
+				text-align: left;
+			}
+
+			.srearch-r {
+				width: 30rpx;
+				height: 30rpx;
+				margin-right: 0rpx;
+			}
+		}
+
 		/* 语音备注 */
 		.voice {
-			width: 690rpx;
+			width: 750rpx;
 			min-height: 100rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			margin: 0rpx 30rpx;
-			padding: 0 30rpx;
-			box-sizing: border-box;
+			
 			overflow: hidden;
 
 			.voice_t {
@@ -905,15 +940,23 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-
+				padding: 0 30rpx;
+				box-sizing: border-box;
+				border-top: 2rpx solid #E0E0E0;
 				.voice_t_t {
 					width: 100%;
-					font-size: 30rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
-					font-weight: 400;
-					color: #333333;
-					line-height: 100rpx;
-					text-align: center;
+					display: flex;
+					justify-content: space-between;
+					>text:nth-of-type(1) {
+						font-size: 30rpx;
+						color: #333333;
+						line-height: 100rpx;
+					}
+					>text:nth-of-type(2) {
+						font-size: 28rpx;
+						color: #999999;
+						line-height: 100rpx;
+					}
 				}
 
 				.voice_t_b {
@@ -932,7 +975,8 @@
 				justify-content flex-start;
 				align-items center;
 				margin-bottom: 20rpx;
-
+				padding: 0 30rpx;
+				box-sizing: border-box;
 				.voice_b_l {
 					width: 400rpx;
 					height: 40rpx;

pages_safetyCheck/views/inspectManage/inspectAdd.vue

@@ -13,7 +13,7 @@
 			</view>
 			<view class="items-number">此检查项在当前实验室累计出现<text>{{hazardCheckNum}}</text>次隐患</view>
 			<view class="list">
-				<view class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
+				<!-- <view class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
 					<view>检查要点</view>
 					<view>
 						<img v-if="!newData.inspectDot" src="@/pages_safetyCheck/images/icon_06.png">
@@ -29,15 +29,16 @@
 						<img v-if="item.checked" src="@/pages_safetyCheck/images/icon_aqjc_6.png">
 						<text>{{item.name}}</text>
 					</view>
-				</view>
+				</view> -->
 				<view class="list-li" v-if="!form.checkFlag">
 					<view>检查隐患</view>
 					<view>
 						<!-- <img src="@/pages_safetyCheck/images/icon_06.png"> -->
 					</view>
 				</view>
-				<textarea v-if="!form.checkFlag" class="describe" type="text" v-model="form.hazardDescribe"
-					maxlength="200" placeholder="请填写隐患描述" placeholder-style="font-size:24rpx;color:#999;"></textarea>
+				<textarea v-if="!form.checkFlag" class="describe" cursor-spacing="40" type="text"
+					v-model="form.hazardDescribe" maxlength="200" placeholder="请填写隐患描述"
+					placeholder-style="font-size:24rpx;color:#999;"></textarea>
 				<view v-if="!form.checkFlag" class="check-for-img-max-box">
 					<view class="left-title-p"></view>
 					<view class="right-img-box">
@@ -73,10 +74,11 @@
 				</view>
 			</view>
 		</scroll-view>
-		<view class="sub-btn">
+		<view class="sub-btn" v-if="newData.checkStatus !=1">
 			<view @click="submitForm(1)">保存草稿</view>
 			<view @click="submitForm(2)">提交</view>
 		</view>
+		<view class="sub-btn-tow" v-if="newData.checkStatus ==1" @click="submitForm(2)">提交</view>
 	</view>
 
 </template>
@@ -153,15 +155,18 @@
 		},
 		mounted() {
 			if (this.pageType == 0) {
-				//检查
-				if (this.itemsStatus == 0 || this.itemsStatus == 1) {
+				
+				if(this.optionData.checkDraftVo){//检查中,已检查
+					if(this.optionData.checkDraftVo.checkStatus==2){//检查中
+						//保存草稿详情
+						this.securityDraftFindBySetOptionId();
+					}else{
+						//开始检查-提交的详情
+						this.securityAppCheckPlanCheckInfo();
+					}
+				}else{//待见擦汗
 					//开始检查-提交的详情
 					this.securityAppCheckPlanCheckInfo();
-				} else if (this.itemsStatus == 2) {
-					//保存草稿详情
-					this.securityDraftFindBySetOptionId();
-
-
 				}
 			}
 			this.securityAppCheckPhotoGetCheckNumBySub();
@@ -203,10 +208,16 @@
 						this.radioList[1].checked = true
 					}
 
-					this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe ? data.data.hazardDescribe:data.data.hazardCheckPoint);
+					if (data.data.hazardDescribe) {
+						this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe);
+					} else {
+						let list = [];
+						list = data.data.hazardCheckPoint.split('#');
+						this.$set(this.form, 'hazardDescribe', list[0]);
+					}
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
 					this.$set(this.form, 'voiceList', data.data.voiceList ? data.data.voiceList : []);
-					
+
 				}
 			},
 			//获取草稿详情
@@ -230,7 +241,13 @@
 						this.radioList[0].checked = false
 						this.radioList[1].checked = true
 					}
-				    this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe ? data.data.hazardDescribe: data.data.hazardCheckPoint);
+					if (data.data.hazardDescribe) {
+						this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe);
+					} else {
+						let list = [];
+						list = data.data.hazardCheckPoint.split('#');
+						this.$set(this.form, 'hazardDescribe', list[0]);
+					}
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
 					this.$set(this.form, 'voiceList', data.data.voiceList ? data.data.voiceList : []);
 				}
@@ -334,7 +351,7 @@
 			},
 			/******图片上传******/
 			selectImage() {
-				let self=this;
+				let self = this;
 				let photoMaxNun = 0;
 				if (this.form.photoList.length > 5) {
 					uni.showToast({
@@ -980,4 +997,18 @@
 			text-align: center;
 		}
 	}
+
+	.sub-btn-tow {
+		position: fixed;
+		left: 30rpx;
+		bottom: 30rpx;
+		width: 690rpx;
+		height: 100rpx;
+		background: #0183FA;
+		border-radius: 50rpx 50rpx 50rpx 50rpx;
+		font-size: 29rpx;
+		color: #FFFFFF;
+		line-height: 100rpx;
+		text-align: center;
+	}
 </style>

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -32,7 +32,7 @@
 							<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png">
 						</view>
 						<input class="srearch-c" type="text"  v-model="searchValue"
-							placeholder="搜索实验室" />
+							placeholder="搜索实验室" disabled />
 					</view>
 				</view>
 				
@@ -77,6 +77,7 @@
 		securityAppCheckManageList,
 		securityAppCheckDangerGetCheckDangerSubList,
 		securityAppCheckDangerReviewSubList,
+		securityAppCheckSetOptionList,
 	} from '@/pages_safetyCheck/api/index.js'
 	export default {
 		name: "snapshotList",
@@ -270,6 +271,49 @@
 					}
 				});
 			},
+			//查询检查项
+			async securityAppCheckSetOptionList(item) {
+				let self = this;
+				let upData = item;
+				let obj = {
+					page: 1,
+					pageSize: 20,
+					checkStatus: '0',
+					manageId: upData.manageId,
+				}
+				const {
+					data
+				} = await securityAppCheckSetOptionList(obj);
+				if (data.code == 200) {
+					if (data.data.records[0]) {
+						let infoData = self.optionData;
+						infoData.pageType = self.tabIndexTow;;
+						infoData.itemsStatus = 0;
+						infoData.subName = upData.subName;
+						infoData.roomNum = upData.roomNum;
+						infoData.subId = data.data.records[0].subId;
+						infoData.manageId = data.data.records[0].manageId;
+						infoData.setOptionId = data.data.records[0].setOptionId;
+						infoData.hazardCheckPro = data.data.records[0].hazardCheckPro;
+						uni.navigateTo({
+							url: '/pages_safetyCheck/views/inspectManage/conductInspections?infoData=' +
+								encodeURIComponent(
+									JSON
+									.stringify(infoData))
+						});
+					} else {
+						self.dialogStatus = 0;
+						self.dialogVisible = false;
+						uni.showToast({
+							title: '该实验室暂无检查项!',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+						return
+					}
+				}
+			},
 			//扫一扫查询数据
 			async saoList(subId) {
 				let obj = {
@@ -283,15 +327,16 @@
 					} = await securityAppCheckManageList(obj);
 					if (data.code == 200) {
 						if (data.data.records[0]) {
+							this.securityAppCheckSetOptionList(data.data.records[0])
 							//跳转检查项列表页面
-							let infoData = 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))
-							});
+							}); */
 						} else {
 							//未找到数据提示
 							uni.showToast({

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -76,7 +76,7 @@
 			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 		</scroll-view>
 		<checkItemModule :propsData="propsData" v-if="checkItemModuleType"></checkItemModule>
-		<view class="sub-btn" v-if="pageType==0 && total !=0">
+		<view class="sub-btn" v-if="pageType==0 && inspectRemporary">
 			<view @click="submitBtn(1)">开展检查</view>
 			<view @click="submitBtn(2)">检查完成</view>
 		</view>
@@ -130,7 +130,8 @@
 				//检查项组件数据
 				checkItemModuleType: false,
 				propsData: {},
-				inspectRemporary:[],//临时存储待检查和检查中数据
+				inspectRemporary:false,//待检查和检查中数据状态
+				inspectRemporaryList:[],//待检查和检查中数据状态
 			}
 		},
 		onLoad(option) {
@@ -191,8 +192,7 @@
 		},
 		mounted() {
 			if(this.pageType==0){
-				this.securityAppCheckSetOptionList(0)
-				this.securityAppCheckSetOptionList(2)
+				this.securityAppCheckSetOptionList(this.newData,0)
 			}
 		},
 		methods: {
@@ -268,14 +268,14 @@
 				infoData.hazardCheckPro = row.hazardCheckPro;
 				/* infoData.checkCategory = this.newData.checkCategory;
 				infoData.checkPlanSetVoList = this.newData.checkPlanSetVoList; */
-				if (this.pageType == 0 && this.curTabTow == 0) {
+				if (this.pageType == 0) {
 					//待检查
 					uni.redirectTo({
 						url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(
 							JSON
 							.stringify(infoData))
 					});
-				}
+				}/* 
 				if (this.pageType == 0 && this.curTabTow == 2) {
 					//检查中
 					uni.redirectTo({
@@ -291,7 +291,7 @@
 							encodeURIComponent(JSON
 								.stringify(infoData))
 					});
-				} else if (this.pageType == 1 && this.curTabTow == 0) {
+				} */ else if (this.pageType == 1 && this.curTabTow == 0) {
 					//待复查
 					uni.redirectTo({
 						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerRectification?infoData=' +
@@ -347,20 +347,7 @@
 						encodeURIComponent(JSON.stringify(infoData))
 				});
 			},
-			//判断当前实验室是否有待检查检查中数据
-			async securityAppCheckSetOptionList(checkStatus){
-				let self = this;
-				let obj = JSON.parse(JSON.stringify(this.queryParams))
-				obj.manageId = this.newData.manageId;
-				obj.checkStatus = checkStatus;
-				obj.checkFlag = this.checkFlag;
-				const {
-					data
-				} = await securityAppCheckSetOptionList(obj);
-				if (data.code == 200) {
-					this.inspectRemporary = [...this.inspectRemporary, ...data.data.records]
-				}
-			},
+			
 			//
 			async getList() {
 				let self = this;
@@ -440,13 +427,43 @@
 					}
 				}
 			},
+			//查询检查项
+			async securityAppCheckSetOptionList(item,checkStatus) {
+				let self = this;
+				let upData = item;
+				let obj = {
+					page: 1,
+					pageSize: 20,
+					checkStatus: checkStatus,
+					manageId: upData.manageId,
+				}
+				this.inspectRemporaryList=[];
+				const {
+					data
+				} = await securityAppCheckSetOptionList(obj);
+				if (data.code == 200 && checkStatus==0) {//先查询待检查数据
+					if (data.data.records[0]) {
+						self.inspectRemporary = true;
+						this.inspectRemporaryList = [...this.inspectRemporaryList, ...JSON.parse(JSON.stringify(data.data.records))]
+					} else {
+						self.securityAppCheckSetOptionList(item,2);
+						
+					}
+				}else if (data.code == 200 && checkStatus==2) {//查询检查中数据
+					if (data.data.records[0]) {
+						self.inspectRemporary = true;
+						this.inspectRemporaryList = [...this.inspectRemporaryList, ...JSON.parse(JSON.stringify(data.data.records))]
+					} else {
+						self.inspectRemporary = false;
+					}
+				}
+			},
 			//检查完成
 			async submitBtn(status) {
 				
 				if (status == 1) {
-					console.log(this.inspectRemporary)
 					//开展检查
-					let infoData = this.dataList[0];
+					let infoData = this.inspectRemporaryList[0];
 					infoData.pageType = this.pageType;
 					infoData.itemsStatus = this.curTabTow;
 					infoData.checkCategory = this.newData.checkCategory;

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -16,7 +16,7 @@
 			<view class="items-number" v-if="newData.hazardCheckName!=''" @click="hiddenDangerClick()">
 				此检查项在当前实验室累计出现<text>{{hazardCheckNum}}</text>次隐患</view>
 			<view class="list">
-				<view class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
+				<!-- <view class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
 					<view>检查要点</view>
 					<view>
 						<img v-if="!newData.inspectDot" src="@/pages_safetyCheck/images/icon_06.png">
@@ -24,7 +24,7 @@
 					</view>
 				</view>
 				<view v-if="newData.hazardCheckName!='' && newData.inspectDot" class="hidden-content">{{newData.hazardCheckPoint}}
-				</view>
+				</view> -->
 				<view class="list-li" @click="checkCollapse()">
 					<view>{{newData.checkFlag?'检查结果':'检查隐患'}}</view>
 					<view :id="newData.checkFlag?'fontColor-B':'fontColor-C'">
@@ -158,11 +158,7 @@
 		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);
@@ -171,6 +167,11 @@
 			this.$set(this, 'hazardCheckPro', optionData.hazardCheckPro);
 			this.$set(this, 'hiddenDangerRecordStatus', optionData.hiddenDangerRecordStatus);
 			this.$set(this, 'optionData', optionData);
+			this.$set(this, 'lotName',
+				optionData.pageType == 0 ? optionData.checkPlanSetVoList.checkName : (
+					optionData.checkPlanSetVoList.overdueUnrectify ? '整改期限' + optionData.checkPlanSetVoList
+					.checkStartTime +
+					'（逾期未完成整改关闭实验室）' : '整改期限' + optionData.checkPlanSetVoList.checkStartTime));
 			
 			
 			

pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -14,7 +14,7 @@
 			<view class="items-number" v-if="newData.hazardCheckName!=''" @click="hiddenDangerClick()">
 				此检查项在当前实验室累计出现<text>{{hazardCheckNum}}</text>次隐患</view>
 			<view class="list">
-				<view class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
+				<!-- <view class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
 					<view>检查要点</view>
 					<view>
 						<img v-if="!newData.inspectDot" src="@/pages_safetyCheck/images/icon_06.png">
@@ -22,7 +22,7 @@
 					</view>
 				</view>
 				<view v-if="newData.hazardCheckName!='' && newData.inspectDot" class="hidden-content">{{newData.hazardCheckPoint}}
-				</view>
+				</view> -->
 				<view class="list-li" @click="checkCollapse()">
 					<view>检查隐患</view>
 					<view :id="newData.checkFlag?'fontColor-B':'fontColor-A'">

pages_safetyCheck/views/safetyCheck.vue

@@ -44,7 +44,8 @@
 					<!-- <img src="@/pages_safetyCheck/images/icon_06.png"> -->
 				</view>
 				<view class="batch">
-					<view class="batch-li" @click="batchClick(item)" v-for="(item,index) in batchList.checkPlanSetVoList">
+					<view class="batch-li" @click="batchClick(item)"
+						v-for="(item,index) in batchList.checkPlanSetVoList">
 						<view class="batch-li-l">
 							<text>{{item.checkName}}</text>
 							<text>开始检查日期：{{item.checkStartTime}}</text>
@@ -102,14 +103,14 @@
 				queryParams: {
 					page: 1,
 					pageSize: 20,
-					checkCategory:1,//1校院巡查 2学院自查
+					checkCategory: 1, //1校院巡查 2学院自查
 				},
 				total: 0,
 				dataList: [],
 				getDataType: false,
 				dialogVisible: false,
 				batchList: [],
-				batchData:{},
+				batchData: {},
 			}
 		},
 		onLoad(option) {
@@ -117,10 +118,10 @@
 
 		},
 		onShow() {
-
+			this.getList()
 		},
 		mounted() {
-			this.getList()
+
 		},
 		methods: {
 			//滚动加载事件
@@ -139,7 +140,7 @@
 			tabClick(index) {
 				this.$set(this.queryParams, 'page', 1);
 				this.$set(this, 'total', 0);
-				
+
 				if (this.curTab != index) {
 					this.$set(this, 'dataList', []);
 					if (index == 0) {
@@ -162,37 +163,39 @@
 			},
 			//检查批次点击
 			batchClick(row) {
-				this.$set(this.batchData,'checkPlanSetVoList',row);
-				this.$nextTick(()=>{
+				this.$set(this.batchData, 'checkPlanSetVoList', row);
+				this.$nextTick(() => {
 					uni.navigateTo({
-						url: '/pages_safetyCheck/views/inspectManage/inspectList?infoData=' + encodeURIComponent(JSON.stringify(this.batchData))
+						url: '/pages_safetyCheck/views/inspectManage/inspectList?infoData=' +
+							encodeURIComponent(JSON.stringify(this.batchData))
 					});
 				})
 			},
 			planClick(row) {
-				if(row.checkPlanSetVoList.length>1){
-					this.$set(this,'batchData',{
-						planId:row.planId,
-						planTitle:row.planTitle,
-						checkCategory:row.checkCategory,
-						checkTypeName:row.checkTypeName,
-						crossCheck:row.crossCheck,
+				if (row.checkPlanSetVoList.length > 1) {
+					this.$set(this, 'batchData', {
+						planId: row.planId,
+						planTitle: row.planTitle,
+						checkCategory: row.checkCategory,
+						checkTypeName: row.checkTypeName,
+						crossCheck: row.crossCheck,
 					});
 					this.$set(this, 'batchList', row);
 					this.dialogVisible = true;
-				}else{
+				} else {
 					//如果只有1个检查批次不弹窗
-					this.$set(this,'batchData',{
-						planId:row.planId,
-						planTitle:row.planTitle,
-						checkCategory:row.checkCategory,
-						checkTypeName:row.checkTypeName,
-						crossCheck:row.crossCheck,
-						checkPlanSetVoList:row.checkPlanSetVoList[0]
+					this.$set(this, 'batchData', {
+						planId: row.planId,
+						planTitle: row.planTitle,
+						checkCategory: row.checkCategory,
+						checkTypeName: row.checkTypeName,
+						crossCheck: row.crossCheck,
+						checkPlanSetVoList: row.checkPlanSetVoList[0]
 					});
-					this.$nextTick(()=>{
+					this.$nextTick(() => {
 						uni.navigateTo({
-							url: '/pages_safetyCheck/views/inspectManage/inspectList?infoData=' + encodeURIComponent(JSON.stringify(this.batchData))
+							url: '/pages_safetyCheck/views/inspectManage/inspectList?infoData=' +
+								encodeURIComponent(JSON.stringify(this.batchData))
 						});
 					})
 				}

pages_safetyCheck/views/snapshotManage/laboratorySearch.vue

@@ -9,6 +9,9 @@
 						<input type="text" v-model="queryParams.searchValue" placeholder="学院单位、实验室名称或房间号" name="search"
 							@confirm='searchBtn' confirm-type='search' maxlength="50"
 							placeholder-style="color: #333333;font-size:24rpx;">
+						<view v-if="queryParams.searchValue" class="left-icons" @click="delSearchValue()">
+							<uni-icons color="#0183FA" type="clear" size="20"></uni-icons>
+						</view>
 					</view>
 					<view class="cancel" @click="cancelBtn()">取消</view>
 				</view>
@@ -45,7 +48,7 @@
 	} from '@/api/request/config.js'
 
 	import {
-		laboratorySubRelInfoSelectByPage,
+		laboratorySubRelInfoSelectInfoByPage,
 	} from '@/api/commonality/permission.js'
 	import {
 		securityCheckOptionList,
@@ -116,12 +119,39 @@
 				this.dataList = [];
 				this.getList();
 			},
+			//清除输入框内容
+			delSearchValue() {
+				if (this.queryParams.searchValue) {
+					this.$set(this.queryParams, 'searchValue', '');
+					this.$set(this, 'dataList', []);
+					this.getList();
+				}
+			},
+			//级联等级
 			//取消
 			cancelBtn() {
 				let self = this;
-				self.queryParams.searchValue = '';
+				/* self.queryParams.searchValue = '';
 				self.dataList = [];
-				self.getList();
+				self.getList(); */
+				
+				if (this.form.laboratoryStatus == 0 || this.form.laboratoryStatus == 1 || this.form.laboratoryStatus ==
+					2) {
+					uni.redirectTo({
+						url: '/pages_safetyCheck/views/inspectManage/inspectList?infoData=' +
+							encodeURIComponent(
+								JSON.stringify(this.form))
+					});
+					
+				} else if (this.form.laboratoryStatus == 3) { //从计划实验室列表返回
+					uni.redirectTo({
+						url: '/pages_safetyCheck/views/snapshotManage/snapshotList?form=' +
+							encodeURIComponent(JSON.stringify(this.form))
+					});
+					
+				}
+				
+				
 			},
 			//十六进制颜色值和RGB格式转换
 			hexToRgb(hex, opacity = 1) {
@@ -225,7 +255,7 @@
 				} else if (this.laboratoryStatus == 3) {
 					const {
 						data
-					} = await laboratorySubRelInfoSelectByPage(this.queryParams);
+					} = await laboratorySubRelInfoSelectInfoByPage(this.queryParams);
 					if (data.code == 200) {
 						if (data.data.records[0]) {
 							data.data.records.forEach(function(item) {

pages_safetyCheck/views/snapshotManage/snapshotList.vue

@@ -442,6 +442,7 @@
 						console.log('二维码', codeData)
 						if (codeData.code) {
 							self.$set(self.form, "subId", codeData.subId)
+							self.$set(self.form, "laboratoryStatus", 3)// 标识是从那个页面进入的实验室搜索页面
 							uni.navigateTo({
 								url: '/pages_safetyCheck/views/snapshotManage/laboratorySearch?form=' + encodeURIComponent(
 									JSON.stringify(self.form))