heyang

pages_safetyExamine/dangerManage/dangerManage.vue

@@ -113,9 +113,22 @@ export default {
 		this.form=JSON.parse(decodeURIComponent(option.form));
 		console.log(this.form)
 	 }
-    uni.setNavigationBarTitle({
-      title:'隐患整改'
-    })
+    if(option.pageType==1){
+      if(this.collegeGentle){
+        uni.setNavigationBarTitle({
+          title:'实验室自查隐患'
+        })
+      }else{
+        uni.setNavigationBarTitle({
+          title:'校院巡查隐患'
+        })
+      }
+
+    }else if(option.pageType==2){
+      uni.setNavigationBarTitle({
+        title:'实验室自查隐患'
+      })
+    }
   },
   onShow() {
 

pages_safetyExamine/patrolPlan/patrolPlanAdd.vue

@@ -500,6 +500,15 @@ export default {
 				});
 				return;
 			}
+			if( _this.form.checkCategory==2 &&_this.form.hazardNum==0){
+				uni.showToast({
+				    title: '请选择检查内容!',
+				    icon:"none",
+				    mask:true,
+				    duration: 2000
+				});
+				return;
+			}
 
 
 			const {data} = await checkPlanAdd(_this.form);