heyang

api/index.js

@@ -20,10 +20,18 @@ export const dataStatistics  = (data) => {
         data: data,
     })
 };
+//巡查计划-查询是否院级用户
+export const isSCollege  = (data) => {
+    return apiResquest({
+        url: `/security/collegCheck/isSCollege`,
+        method: 'GET',
+        data: data,
+    })
+};
 //巡查计划--添加
 export const checkPlanAdd  = (data) => {
     return apiResquest({
-        url: `/zd-security/checkPlan/add`,
+        url: `/zd-security/checkPlan/appAdd`,
         method: 'POST',
         data: {...data}
     })
@@ -31,7 +39,7 @@ export const checkPlanAdd  = (data) => {
 //巡查计划--列表
 export const checkPlanList  = (data) => {
     return apiResquest({
-        url: `/zd-security/checkPlan/list`,
+        url: `/zd-security/checkPlan/appList`,
         method: 'POST',
         data: {...data}
     })
@@ -39,7 +47,7 @@ export const checkPlanList  = (data) => {
 //巡查计划--详情
 export const checkPlanById  = (data) => {
     return apiResquest({
-        url: `/zd-security/checkPlan/findCheckPlan`,
+        url: `/zd-security/checkPlan/appFindCheckPlan`,
         method: 'GET',
         data: data,
     })
@@ -47,7 +55,7 @@ export const checkPlanById  = (data) => {
 //巡查计划--修改
 export const checkPlanEdit  = (data) => {
     return apiResquest({
-        url: `/zd-security/checkPlan/update`,
+        url: `/zd-security/checkPlan/appUpdate`,
         method: 'PUT',
         data: {...data}
     })
@@ -71,7 +79,7 @@ export const getManageStatusCount  = (data) => {
 //巡查计划--获取巡查组列表
 export const checkGroupList  = (data) => {
     return apiResquest({
-        url: `/zd-security/checkGroup/findGroupList`,
+        url: `/zd-security/checkGroup/appFindGroupList`,
         method: 'POST',
         data: {...data}
     })
@@ -79,7 +87,7 @@ export const checkGroupList  = (data) => {
 //巡查计划--巡查组详情
 export const checkGroupDetail  = (data) => {
     return apiResquest({
-        url: `/zd-security/checkGroup/find`,
+        url: `/zd-security/checkGroup/appFind`,
         method: 'GET',
         data: data,
     })
@@ -111,7 +119,7 @@ export const getAllSubNum  = (data) => {
 //巡查计划--添加
 export const findByCheckPlanId  = (data) => {
     return apiResquest({
-        url: `/zd-security/checkManage/findByCheckPlanId`,
+        url: `/zd-security/checkManage/appFindByCheckPlanId`,
         method: 'POST',
         data: {...data}
     })
@@ -121,7 +129,7 @@ export const findByCheckPlanId  = (data) => {
 //随手拍--添加
 export const checkClapAdd  = (data) => {
     return apiResquest({
-        url: `/security/checkClap/add`,
+        url: `/security/checkClap/appAdd`,
         method: 'POST',
         data: {...data}
     })
@@ -129,7 +137,7 @@ export const checkClapAdd  = (data) => {
 //随手拍--管理列表
 export const checkClapList  = (data) => {
     return apiResquest({
-        url: `/security/checkClap/list`,
+        url: `/security/checkClap/appList`,
         method: 'GET',
         data: data,
     })
@@ -154,7 +162,7 @@ export const getUserCollegCheck  = (data) => {
 //随手拍--详情
 export const checkClapById  = (data) => {
     return apiResquest({
-        url: `/security/checkClap/findById`,
+        url: `/security/checkClap/appFindById`,
         method: 'GET',
         data: data,
     })
@@ -180,7 +188,7 @@ export const subjectList = (data) => {
 //开展检查-获取巡查计划管理列表
 export const checkManageList  = (data) => {
 	return apiResquest({
-		url: `/zd-security/checkManage/list`,
+		url: `/zd-security/checkManage/appList`,
 		method: 'POST',
 		data: {...data}
 	})
@@ -188,7 +196,7 @@ export const checkManageList  = (data) => {
 //开展检查-安全隐患列表(在开展检查列表里待复核)
 export const checkHazardList = (data) => {
     return apiResquestForm({
-        url: '/security/checkHazard/list',
+        url: '/security/checkHazard/appList',
         method: 'GET',
         data: data
     })
@@ -196,16 +204,23 @@ export const checkHazardList = (data) => {
 //开展检查-通过id查询巡查管理
 export const findCheckManage = (data) => {
     return apiResquestForm({
-        url: '/zd-security/checkManage/findCheckManage',
+        url: '/zd-security/checkManage/appFindCheckManage',
         method: 'GET',
         data: data
     })
 };
-
-//开展检查--新增
+//开展检查--新增-该实验室没有计划的时候
 export const checkManageAdd  = (data) => {
     return apiResquest({
-        url: `/zd-security/checkManage/update`,
+        url: `/zd-security/checkManage/add`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//开展检查--新增--有计划的时候
+export const checkManageUpdate  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkManage/appUpdate`,
         method: 'PUT',
         data: {...data}
     })
@@ -261,7 +276,7 @@ export const queryDeptSignByUserId = (data) => {
 //开展检查-安全隐患列表
 export const checkHazardAppList = (data) => {
     return apiResquestForm({
-        url: '/security/checkHazard/appList',
+        url: '/security/checkHazard/appCheckHazardList',
         method: 'GET',
         data: data
     })
@@ -269,7 +284,7 @@ export const checkHazardAppList = (data) => {
 //开展检查-安全隐患详情
 export const getHazardById = (data) => {
     return apiResquestForm({
-        url: '/security/checkHazard/getHazardById',
+        url: '/security/checkHazard/getAppHazardById',
         method: 'GET',
         data: data
     })

api/request/config.js

@@ -1,7 +1,7 @@
 const config = {
 	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
-	// base_url: 'http://192.168.1.17:8080',//小飞
+	 //base_url: 'http://192.168.1.17:8080',//小飞
 	 //base_url: 'http://192.168.1.20:8080',//志伟
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
@@ -10,7 +10,7 @@ const config = {
 
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
 	base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
-    // base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
+     //base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
 	 //base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
       // base_url: 'https://lab.zjznai.com/labSaasSystem/', //矿大化工
 	// base_url: 'https://lab.zjznai.com/jdlabSystem/', //交大地址

pages/login.vue

@@ -87,17 +87,17 @@ export default {
 		if(data.code==200){
 		 
 		  // 如果是管理员 检查者和整改者 
-		  if(data.data.adminGentle && data.data.applyGentle && data.data.rectifyGentle){
+		  if(data.data.adminGentle && (data.data.applyGentle || data.data.myApplyGentle) && data.data.rectifyGentle){
 			   self.pageType=1
-		  }else if(data.data.adminGentle && data.data.applyGentle && !data.data.rectifyGentle){
+		  }else if(data.data.adminGentle && (data.data.applyGentle || data.data.myApplyGentle) && !data.data.rectifyGentle){
 			  self.pageType=1
 		  }else if(data.data.adminGentle && !data.data.applyGentle && data.data.rectifyGentle){
 			  self.pageType=1
-		  }else if(!data.data.adminGentle && data.data.applyGentle && data.data.rectifyGentle){
+		  }else if(!data.data.adminGentle && (data.data.applyGentle || data.data.myApplyGentle) && data.data.rectifyGentle){
 			  self.pageType=2
 		  }else if(data.data.adminGentle && !data.data.applyGentle && !data.data.rectifyGentle){
 			  self.pageType=1
-		  }else if(!data.data.adminGentle && data.data.applyGentle && !data.data.rectifyGentle){
+		  }else if(!data.data.adminGentle && (data.data.applyGentle || data.data.myApplyGentle) && !data.data.rectifyGentle){
 			  self.pageType=2
 		  }else if(!data.data.adminGentle && !data.data.applyGentle && data.data.rectifyGentle){
 			  self.pageType=3
@@ -106,6 +106,7 @@ export default {
 			  self.pageType='mine'
 		  }
 		  uni.setStorageSync('gentleIdentifier',self.pageType)
+		  uni.setStorageSync('gentleIdentifierData',data.data)
 		  console.log('安全检查身份',self.pageType)
 		  if(self.pageType=='mine'){
 			  uni.redirectTo({

pages/mine.vue

@@ -102,7 +102,7 @@
           <view class="view-three-type" :class="Quantity>0?'marginType':'colorA'">{{Quantity>0?'已配置'+Quantity+'个':''}}</view>
           <img class="right-img" src="@/images/icon_04.png">
         </view>
-		<view class="button-max-box" @click="goPage('snapshot')" v-if="userType==1">
+		<view class="button-max-box" @click="goPage('snapshot')">
 		  <img class="left-img" src="@/images/snapshot_icon.png">
 		  <view>随手拍</view>
 		  <img class="right-img" src="@/images/icon_04.png">
@@ -348,7 +348,7 @@ export default {
       }else if(type == 'snapshot'){
 		  
         uni.navigateTo({
-          url: '/pages/pages_safetyExamine/snapshotManage/snapshotAdd',//随手拍
+          url: '/pages_safetyExamine/snapshotManage/snapshotAdd',//随手拍
         });
       }
 	  

pages/safetyExamineWorkbench.vue

@@ -77,7 +77,9 @@
 					<view class="list_tow_li" v-for="(item,index) in  dataList2" :key="index">
 						<view class="list_tow_li_t">
 							<view class="list_tow_li_t_l">
-								<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+								<img v-if="item.checkRange==1" src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+								<img v-if="item.checkRange==2" src="@/images/Version3.3.3/icon_xyxc_xy.png"/>
+								<img v-if="item.checkRange==3" src="@/images/Version3.3.3/icon_xyxc_sys.png"/>
 								<text></text>
 							</view>
 							<view class="list_tow_li_t_c" v-if="curTabTow==0 || curTabTow==1">{{item.subjectName}}-{{item.roomNumber}}</view>
@@ -144,7 +146,9 @@
 					<view class="list_three_li" v-for="(item,index) in  dataList3" :key="index" @click="handleThreeClick(item,'detail')">
 						<view class="list_three_li_t">
 							<view class="list_three_li_t_l">
-								<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+								<img v-if="item.checkRange==1" src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+								<img v-if="item.checkRange==2" src="@/images/Version3.3.3/icon_xyxc_xy.png"/>
+								<img v-if="item.checkRange==3" src="@/images/Version3.3.3/icon_xyxc_sys.png"/>
 								<text></text>
 							</view>
 							<!-- 隐患 -->
@@ -184,7 +188,7 @@
 								<img src="@/images/Version3.3.3/icon_ssp_ry.png"/>
 								<text>上报人：{{item.createName}}</text>
 							</view>
-							<view class="list_three_li_b_r">{{item.createTime}}</view>
+							<view class="list_three_li_b_r">{{item.timeFlag}}</view>
 						</view>
 					</view>
 				</view>
@@ -245,7 +249,7 @@ export default {
 	  statisticsList:[
 		  {name:'本月已检查',value:'0'},
 		  {name:'本月检查隐患',value:'0'},
-		  {name:'本月已整改',value:''},
+		  {name:'本月已整改',value:'0'},
 		  {name:'本月检查合格率',value:'0%'},
 		  {name:'本月已检查',value:'0'},
 		  {name:'本月复核通过率',value:'0%'},
@@ -673,7 +677,6 @@ export default {
 	  		})
 	  		this.dataList2=[...this.dataList2,...data.data.records]
 	  		this.total2=data.data.total;
-			console.log(this.dataList2)
 	  	}
 	  },
 	  //待复核列表

pages_safetyExamine/dangerManage/dangerDetail.vue

@@ -149,7 +149,7 @@
 				</view>
 				<view class="describe">
 					<view class="describe_l">{{form.rectifyResult==1?'整改措施：':'原因描述：'}}</view>
-					<textarea class="describe_r" type="text" v-model="form.rectifyMeasure" maxlength="50" placeholder="请输入原因描述" placeholder-style="font-size:28rpx;color:#999;"></textarea>
+					<textarea class="describe_r" type="text" v-model="form.rectifyMeasure" maxlength="50" :placeholder="form.rectifyResult==1?'请输入整改描述：':'请输入原因描述：'" placeholder-style="font-size:28rpx;color:#999;"></textarea>
 				</view>
 				<view class="check-for-img-max-box">
 					<view class="left-title-p">隐患照片（最多上传5张）：</view>
@@ -282,9 +282,9 @@ export default {
 	    tabClick(index) {
 	  	  this.resultIndex = index;
 		  if(index==0){
-			  this.form.resultArray=1
+			  this.form.rectifyResult=1
 		  }else if(index==1){
-			  this.form.resultArray=0
+			  this.form.rectifyResult=0
 		  }
 	    },
 		//顶部tab点击
@@ -652,15 +652,16 @@ export default {
 			}
 			const {data} = await checkHazardAdd(obj);
 			if(data.code == 200){
+				uni.redirectTo({
+				    url: '/pages_safetyExamine/examineManage/examineList?pageType='+this.checkType
+				});
 			    uni.showToast({
 			        title: '提交成功',
 			        icon:"none",
 			        mask:true,
 			        duration: 2000
 			    });
-				uni.navigateTo({
-				    url: '/pages_safetyExamine/examineManage/examineList?pageType='+this.checkType
-				});
+				
 			   
 			}
 		},

pages_safetyExamine/dangerManage/dangerList.vue

@@ -30,7 +30,9 @@
 			<view class="list_three_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick(item,'detail')">
 				<view class="list_three_li_t">
 					<view class="list_three_li_t_l">
-						<img src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
+						<img v-if="item.checkRange==1" src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
+						<img v-if="item.checkRange==2" src="@/pages_safetyExamine/images/icon_xyxc_xy.png"/>
+						<img v-if="item.checkRange==3" src="@/pages_safetyExamine/images/icon_xyxc_sys.png"/>
 						<text></text>
 					</view>
 					<view class="list_three_li_t_c">{{item.subRoom}}</view>
@@ -76,7 +78,7 @@ export default {
 		 rectifyStatus:'',//1已完成 2待整改 3待复核 4 暂无法整改
 		 searchValue:'',
 		},
-		tabTextTow:['全部','待检查','待复核','已完成','暂无法整改'],
+		tabTextTow:['全部','待整改','待复核','已完成','暂无法整改'],
 		curTabTow:0,
 		form:{
 			name:'',
@@ -167,16 +169,14 @@ export default {
 		//滚动事件
 		scrollGet(){
 			let self=this;
-			if(this.pageType==1){//当页面切换到检查管理列表里的时候
-				if(self.total/self.getData.pageSize<=self.getData.pageNum){
-				    console.log('没有更多数据!')
-				}else{
-						setTimeout(function(){
-							self.getData.pageNum += 1;
-							self.getList(); 
-						},1000)
-							 
-				}
+			if(self.total/self.getData.pageSize<=self.getData.pageNum){
+			    console.log('没有更多数据!')
+			}else{
+					setTimeout(function(){
+						self.getData.pageNum += 1;
+						self.getList(); 
+					},1000)
+						 
 			}
 			
 		},
@@ -201,7 +201,7 @@ export default {
 	      if( doType=='subBtn'){//	
 	      
 	      }else if(doType=='detail'){//详情
-	    	  uni.navigateTo({
+	    	  uni.redirectTo({
 	    	  	 url: '/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
 	    	  })
 	      }

pages_safetyExamine/dangerManage/dangerManage.vue

@@ -36,7 +36,9 @@
 			<view class="list_three_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick(item,'detail')">
 				<view class="list_three_li_t">
 					<view class="list_three_li_t_l">
-						<img src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
+						<img v-if="item.checkRange==1" src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
+						<img v-if="item.checkRange==2" src="@/pages_safetyExamine/images/icon_xyxc_xy.png"/>
+						<img v-if="item.checkRange==3" src="@/pages_safetyExamine/images/icon_xyxc_sys.png"/>
 						<text></text>
 					</view>
 					<view class="list_three_li_t_c">{{item.subRoom}}</view>
@@ -84,7 +86,7 @@ export default {
 		},
 		tabText:['校院巡查隐患','实验室自查隐患'],
 		curTab:0,
-		tabTextTow:['全部','待检查','待复核','已完成','暂无法整改'],
+		tabTextTow:['全部','待整改','待复核','已完成','暂无法整改'],
 		curTabTow:0,
 		form:{
 			name:'',
@@ -190,16 +192,14 @@ export default {
 		//滚动事件
 		scrollGet(){
 			let self=this;
-			if(this.pageType==1){//当页面切换到检查管理列表里的时候
-				if(self.total/self.getData.pageSize<=self.getData.pageNum){
-				    console.log('没有更多数据!')
-				}else{
-						setTimeout(function(){
-							self.getData.pageNum += 1;
-							self.getList(); 
-						},1000)
-							 
-				}
+			if(self.total/self.getData.pageSize<=self.getData.pageNum){
+			    console.log('没有更多数据!')
+			}else{
+					setTimeout(function(){
+						self.getData.pageNum += 1;
+						self.getList(); 
+					},1000)
+						 
 			}
 			
 		},
@@ -224,7 +224,7 @@ export default {
 		  if( doType=='subBtn'){//	
 		  
 		  }else if(doType=='detail'){//详情
-			  uni.navigateTo({
+			  uni.redirectTo({
 			  	 url: '/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
 			  })
 		  }

pages_safetyExamine/examineManage/examineAdd.vue

@@ -39,16 +39,19 @@
 			
 			<view class="basics_li">
 				<view class="basics_li_l">计划标题</view>
-				<picker @change="planChange" :value="planIndex" :range="planArray" class="scope_r">
+				<picker v-if="isCustom" @change="planChange" :value="planIndex" :range="planArray" class="scope_r">
 					<view class="basics_li_r college_r">
 						<view>{{form.title?form.title:'选择计划标题'}}</view>
 						<img src="@/pages_safetyExamine/images/icon_06.png">
 					</view>
 				</picker>
+				<view v-if="!isCustom" class="basics_li_r college_r">
+				   <input type="text" v-model="form.title" placeholder="输入计划标题">
+				</view>
 			</view>
 			<view class="basics_li">
 				<view class="basics_li_l">检查类型</view>
-				<picker @change="categoryChange" :value="categoryIndex" :disabled="isCustom" :range="categoryArray" class="scope_r">
+				<picker @change="categoryChange" :value="categoryIndex" disabled :range="categoryArray" class="scope_r">
 					<view class="basics_li_r college_r">
 						<view>{{form.checkType?(form.checkType==1?'校院巡查':'实验室自查'):'选择检查类型'}}</view>
 						<img src="@/pages_safetyExamine/images/icon_06.png">
@@ -81,7 +84,7 @@
 			</view>
 			<view class="inspect_li" v-if="form.checkResult==0">
 				<view class="inspect_li_l">整改日期</view>
-				<picker mode="date" @change="rectifyDeadline(form,$event)">
+				<picker mode="date" @change="rectifyDeadline(form,$event)" :start="currentDate">
 					<view class="inspect_li_r date_r">
 						<input disabled class="picker-text" type="text" v-model="form.rectifyDeadline" placeholder="请选择日期" placeholder-style="font-size: 30rpx;color:#333;">
 						<img src="@/pages_safetyExamine/images/icon_rl.png">
@@ -101,7 +104,7 @@
 		<view class="popup-null" @click="popupClick(2)"></view>
 		<view class="popup-big-box">
 			<view class="popup-input-box">
-				<input type="text" maxlength="10" v-model="room" placeholder="请输入房间号">
+				<input type="text" maxlength="10" v-model="room" placeholder="请输入关键字">
 				<view @click="buildBySub">搜索</view>
 			</view>
 			<view class="popup-for-max-box">
@@ -134,7 +137,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import { buildBySub,listDepartments,subjectList,getCheckPlanBySubId,checkManageAdd,findCheckManage,getBuildingList} from '@/api/index.js'
+import { buildBySub,listDepartments,subjectList,getCheckPlanBySubId,checkManageUpdate,checkManageAdd,findCheckManage,getBuildingList} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -154,7 +157,7 @@ export default {
 			id:'',
 			checkPlanId:'',
 			manageStatus:'',//保存1  提交2
-			subId:'',//实验室
+			subIds:'',//实验室
 			subjectName:'',
 			title:'',//计划标题
 			deptId:'',//学院
@@ -163,7 +166,7 @@ export default {
 			buildName:'',
 			roomNumber:'',//房间号
 			checkType:'',// 检查类型(1校院巡查 2实验室自查)    
-			checkResult:'1',// 检查结果 0不符合 1符合 
+			checkResult:1,// 检查结果 0不符合 1符合 
 			rectifyDeadline:'',//整改期限
 			rectifyNotice:'1',//整改通知(1整改告知书 2整改通知书)
 			cycleStartTime:'',
@@ -206,9 +209,29 @@ export default {
 		buildingList:[],
 		//扫一扫进入
 		laboratoryList:[],
+		currentDate:'',//当前日期
 	}
   },
   onLoad(option) {
+	  //通过微信扫一扫进入
+	  if(option.q){
+		  
+	    let text = decodeURIComponent(option.q)
+	    console.log('text',text)
+	    let codeId = "";
+	    let newList = text.split("?")[1].split("&")
+	    let list = newList[0].split("=")[1].split("-")
+	    codeId = list[0];
+		uni.showToast({
+			title: codeId,
+			icon:"none",
+			mask:true,
+			duration: 2000
+		});
+		this.form.subIds=codeId
+		this.getCheckPlanBySubId(codeId)
+		this.getByIdLaboratoryList();
+	  }
 	 if(option.id){
 	 	this.id=option.id
 	 	this.findCheckManage()
@@ -218,7 +241,7 @@ export default {
 	 }
 	 //通过实验室id查询计划
 	 if(option.subId){
-		this.form.subId=option.subId
+		this.form.subIds=option.subId
 	 	this.getCheckPlanBySubId(option.subId)
 		this.getByIdLaboratoryList();
 	 }
@@ -228,6 +251,8 @@ export default {
 	  
   },
   mounted(){
+	  //获取当前日期
+	  this.currentDate=this.getNowFormatDate()
 	   this.listDepartments();
 	  
   },
@@ -236,6 +261,15 @@ export default {
 		scrollGet(){},
 	    handleClick(doType){
 		  let self=this;
+		  if(!this.form.rectifyDeadline){
+			  uni.showToast({
+			  	title: '整改日期不能为空!',
+			  	icon:"none",
+			  	mask:true,
+			  	duration: 2000
+			  });
+			  return
+		  }
 		  if( doType=='nextStep'){//下一步	
 			  uni.redirectTo({
 				  url: '/pages_safetyExamine/examineManage/examineAddTow?form='+encodeURIComponent(JSON.stringify(this.form))
@@ -252,12 +286,13 @@ export default {
 				self.form.checkType='';
 				self.form.cycleStartTime='';
 				self.form.cycleEndTime='';
+				
 			}else{//选择计划
 				
 				self.form.title='';
-				self.form.checkType='';
 				self.form.cycleStartTime='';
 				self.form.cycleEndTime='';
+				self.form.checkType=2;
 				self.$refs.popup.open()
 			}
 		},
@@ -288,7 +323,7 @@ export default {
 		},
 		//结束时间选中事件
 		endChange(form,e){
-			if(new Date(form.cycleStartTime).getTime()>=new Date(e.target.value).getTime()){
+			if(new Date(form.cycleStartTime).getTime()>new Date(e.target.value).getTime()){
 				 uni.showToast({
 					title: '结束时间不能小于开始时间',
 					icon:"none",
@@ -299,6 +334,17 @@ export default {
 				form.cycleEndTime=e.target.value
 			}
 		},
+		//获取当前日期函数
+		getNowFormatDate() {
+		  let date = new Date(),
+		    year = date.getFullYear(), //获取完整的年份(4位)
+		    month = date.getMonth() + 1, //获取当前月份(0-11,0代表1月)
+		    strDate = date.getDate() // 获取当前日(1-31)
+		  if (month < 10) month = `0${month}` // 如果月份是个位数，在前面补0
+		  if (strDate < 10) strDate = `0${strDate}` // 如果日是个位数，在前面补0
+		 
+		  return `${year}-${month}-${strDate}`
+		},
 		//详情
 		async findCheckManage(){
 			let _this = this;
@@ -306,7 +352,7 @@ export default {
 			if(data.code == 200){
 					this.form.id=data.data.id;
 					this.form.checkPlanId=data.data.checkPlanId;
-					this.form.subId=data.data.subId;
+					this.form.subIds=data.data.subId;
 					this.form.subjectName=data.data.subjectName;
 					this.form.title=data.data.title;
 					this.form.deptId=data.data.deptId;
@@ -331,7 +377,6 @@ export default {
 					}else{
 						this.form.checkHazardDtoList[0].voiceRemark=[];
 					}
-					this.form.id=data.data.id;
 					//根据实验室id查询实验室计划
 					if(data.data.subId){
 						this.form.cycleStartTime=data.data.cycleStartTime;
@@ -356,12 +401,18 @@ export default {
 		//根据实验室id查询该实验室有关计划
 		async getCheckPlanBySubId(subId){
 			let _this = this;
+			_this.planArray=[];
 			const {data} = await getCheckPlanBySubId({'subId':subId});
 			if(data.code == 200){
-				for(let i=0;i<data.data.length;i++){
-					_this.planArray.push(data.data[i].title)
+				if(data.data.length>0){
+					for(let i=0;i<data.data.length;i++){
+						_this.planArray.push(data.data[i].title)
+					}
+					_this.planList=data.data;	
+				}else{
+					_this.isCustom=false;
+					_this.form.checkType=2;
 				}
-				_this.planList=data.data;	
 			}
 		},
 		
@@ -407,20 +458,20 @@ export default {
 		//计划
 		planChange(e){
 			this.planIndex = e.target.value;
+			this.form.id=this.planList[e.target.value].id
 			this.form.title=this.planList[e.target.value].title
-			this.form.checkPlanId=this.planList[e.target.value].id
+			this.form.checkPlanId=this.planList[e.target.value].checkPlanId
 			
-			this.form.subId=this.planList[e.target.value].subId;
+			this.form.subIds=this.planList[e.target.value].subId;
 			this.form.subjectName=this.planList[e.target.value].subjectName;
 			this.form.deptId=this.planList[e.target.value].deptId;
 			this.form.collegeName=this.planList[e.target.value].collegeName;
 			this.form.buildId=this.planList[e.target.value].buildId;
 			this.form.buildName=this.planList[e.target.value].buildName;
 			this.form.checkType=this.planList[e.target.value].checkType;
-			this.form.checkResult=this.planList[e.target.value].checkResult==null?'1':data.data.checkResult;
 			this.form.cycleStartTime=this.planList[e.target.value].cycleStartTime;
 			this.form.cycleEndTime=this.planList[e.target.value].cycleEndTime;
-			this.form.cycleEndTime=this.planList[e.target.value].cycleEndTime;
+			
 			
 			
 			
@@ -437,6 +488,7 @@ export default {
 		//开始时间选中事件
 		rectifyDeadline(form,e){
 			form.rectifyDeadline=e.target.value
+			
 		},
 		//整改通知
 		tabClick(index) {
@@ -466,7 +518,7 @@ export default {
 				if(data.data[0]){
 					this.laboratoryList = data.data;
 					data.data.forEach(function(item){
-						if(self.form.subId==item.id){
+						if(self.form.subIds==item.id){
 							self.form.subjectName=item.name;
 							self.form.deptId=item.deptId;
 							self.form.buildId=item.buildId;
@@ -513,7 +565,7 @@ export default {
 		},
 		//确认搜索房间
 		popupClickItem(item){
-			this.$set(this.form,"subId",item.id)
+			this.$set(this.form,"subIds",item.id)
 			this.$set(this.form,"subjectName",item.name)
 			this.$set(this.form,"deptId",item.deptId)
 			this.$set(this.form,"buildId",item.buildId)
@@ -567,20 +619,39 @@ export default {
 		},
 	    //提交
 	    async submitForm(){
-			let _this = this;
+			let self = this;
 			this.form.manageStatus=2;
-			const {data} = await checkManageAdd(_this.form);
-			if(data.code == 200){
-				uni.showToast({
-					title: '提交成功',
-					icon:"none",
-					mask:true,
-					duration: 2000
-				});
-				uni.redirectTo({
-				    url: '/pages_safetyExamine/examineManage/examineList'
-				});
+			let obj=self.form;
+			//复合的情况下,删除隐患项
+			 obj.checkHazardDtoList=[];
+			if(self.form.checkPlanId){
+				const {data} = await checkManageUpdate(obj);
+				if(data.code == 200){
+					uni.showToast({
+						title: '提交成功',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+					uni.redirectTo({
+					    url: '/pages_safetyExamine/examineManage/examineList?pageType='+this.form.checkType
+					});
+				}
+			}else{
+				const {data} = await checkManageAdd(obj);
+				if(data.code == 200){
+					uni.showToast({
+						title: '提交成功',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+					uni.redirectTo({
+					    url: '/pages_safetyExamine/examineManage/examineList?pageType='+this.form.checkType
+					});
+				}
 			}
+			
 		  },
   }
 }

pages_safetyExamine/examineManage/examineAddTow.vue

@@ -71,7 +71,7 @@
 <script>
 	const myaudio  = uni.createInnerAudioContext();
     import { config } from '@/api/request/config.js'
-    import {checkOptionListNew,treeDepselect,checkManageAdd} from '@/api/index.js'
+    import {checkOptionListNew,treeDepselect,checkManageUpdate,checkManageAdd} from '@/api/index.js'
     export default {
         name: "startChecking",
         data() {
@@ -88,7 +88,7 @@
 					id:'',
 					checkPlanId:'',
 					manageStatus:'',//保存1  提交2
-					subId:'',//实验室
+					subIds:'',//实验室
 					subjectName:'',
 					title:'',//计划标题
 					deptId:'',//学院
@@ -137,7 +137,7 @@
 				recorderManager : wx.getRecorderManager(),
 				temporaryData:[],
 				gradeIndex :0,
-				gradeArray:['一般隐患','重大隐患','问题管理'],
+				gradeArray:['一般隐患','重大隐患','管理问题'],
 				bottomBtnList:['上一步','保存','提交'],
 				
             }
@@ -546,17 +546,32 @@
 						obj.checkHazardDtoList[i].voiceRemark=JSON.stringify(obj.checkHazardDtoList[i].voiceRemark)
 					}
 				}
-				const {data} = await checkManageAdd(obj);
-				if(data.code == 200){
-					uni.showToast({
-						title: '提交成功',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					uni.redirectTo({
-					    url: '/pages_safetyExamine/examineManage/examineList'
-					});
+				if(self.form.checkPlanId){
+					const {data} = await checkManageUpdate(obj);
+					if(data.code == 200){
+						uni.showToast({
+							title: '提交成功',
+							icon:"none",
+							mask:true,
+							duration: 2000
+						});
+						uni.redirectTo({
+						    url: '/pages_safetyExamine/examineManage/examineList?pageType='+this.form.checkType
+						});
+					}
+				}else{
+					const {data} = await checkManageAdd(obj);
+					if(data.code == 200){
+						uni.showToast({
+							title: '提交成功',
+							icon:"none",
+							mask:true,
+							duration: 2000
+						});
+						uni.redirectTo({
+						    url: '/pages_safetyExamine/examineManage/examineList?pageType='+this.form.checkType
+						});
+					}
 				}
 			  },
 			

pages_safetyExamine/examineManage/examineDetail.vue

@@ -23,10 +23,14 @@
 				<text>检查范围：</text>
 				<text>{{infoData.checkRange==1?'全校':(infoData.checkRange==2?'学院':'实验室')}}</text>
 			</view>
-			<view class="basics_li" style="border:none;">
+			<view class="basics_li" >
 				<text>计划标题：</text>
 				<text>{{infoData.title}}</text>
 			</view>
+			<view class="demand" style="border:none;">
+				<text>检查要求：</text>
+				<text>{{infoData.checkDemand?infoData.checkDemand:''}}</text>
+			</view>
 		</view>
 		<view class="attachment" v-if="infoData.isAttachment==1">
 			<view class="attachment_t">
@@ -44,11 +48,11 @@
 				<text>检查结果：</text>
 				<text>{{infoData.checkResult==0?'不符合':(infoData.checkResult==1?'符合':'')}}</text>
 			</view>
-			<view class="basics_li">
+			<view class="basics_li" v-if="infoData.checkResult==0">
 				<text>整改期限：</text>
 				<text>{{infoData.rectifyDeadline}}</text>	
 			</view>	
-			<view class="basics_li">
+			<view class="basics_li" v-if="infoData.checkResult==0">
 				<text>整改通知：</text>
 				<text style="color: #0183FA;" @click="rectifyInform">{{infoData.rectifyNotice == 1?'整改告知书':(infoData.rectifyNotice == 2?'整改通知书':'')}}</text>
 			</view>
@@ -61,10 +65,10 @@
 				<text>{{infoData.checkTime}}</text>
 			</view>
 		</view>
-		<view class="inconformity" @click="inconformityFun()" v-if="manageStatus==2">不符合项<img v-if="inconformityStatus" src="@/pages_safetyExamine/images/icon_bfhx_xq.png"/><img v-if="!inconformityStatus" src="@/pages_safetyExamine/images/icon_bfhx_sq.png"/></view>
-		<view v-for="(item,index) in infoData.checkHazardDtoList" v-if="manageStatus==2">
+		<view class="inconformity" @click="inconformityFun()" v-if="manageStatus==2 && infoData.checkResult==0">不符合项<img v-if="inconformityStatus" src="@/pages_safetyExamine/images/icon_bfhx_xq.png"/><img v-if="!inconformityStatus" src="@/pages_safetyExamine/images/icon_bfhx_sq.png"/></view>
+		<view v-for="(item,index) in infoData.checkHazardDtoList" v-if="manageStatus==2 && infoData.checkResult==0">
 			<view class="danger">
-				<view class="sort">{{item.sort}}</view>
+				<view class="sort">{{index+1}}</view>
 				<view class="grade" :style="item.switch?'border-bottom: 1rpx solid #D8D8D8;':'border:none;'">
 					<text>第{{index+1}}项隐患</text>
 					<text style="color: #0183FA;" @click="dangerItem(item)">{{item.rectifyStatus==1?'已完成':(item.rectifyStatus==2?'待整改':(item.rectifyStatus==3?'待复核':(item.rectifyStatus==4?'暂无法整改':'')))}} >></text>
@@ -98,7 +102,7 @@
 			<view class="pack_up" @click="switchFun(item)">{{item.switch?'收起':'展开'}}<img v-if="item.switch" src="@/pages_safetyExamine/images/icon_06_1.png"/><img v-if="!item.switch" src="@/pages_safetyExamine/images/icon_06.png"/></view>
 		</view>
 	</scroll-view>
-	<view class="report" @change="rectifyReport" v-if="manageStatus==2">整改报告</view>	
+	<view class="report" @change="rectifyReport" v-if="manageStatus==2 && infoData.checkResult==0">整改报告</view>	
 	<view class="bottom_btn" v-if="manageStatus==0" @click="handleClick('','startInspect')">开始检查</view>
   </view>
 
@@ -450,6 +454,27 @@ export default {
 			    text-overflow: ellipsis;
 			}
 		}
+		.demand{
+			>text{
+				display: block;
+			}
+			>text:nth-of-type(1){
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 70rpx;
+				width: 140rpx;
+			}
+			>text:nth-of-type(2){
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 40rpx;
+				text-align: left;
+			}
+		}
 	}
 	.attachment{
 		width: 690rpx;

pages_safetyExamine/examineManage/examineList.vue

@@ -30,7 +30,9 @@
 			<view class="list_three_li" v-for="(item,index) in  dataList" :key="index">
 				<view class="list_three_li_t">
 					<view class="list_three_li_t_l">
-						<img src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
+						<img v-if="item.checkRange==1" src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
+						<img v-if="item.checkRange==2" src="@/pages_safetyExamine/images/icon_xyxc_xy.png"/>
+						<img v-if="item.checkRange==3" src="@/pages_safetyExamine/images/icon_xyxc_sys.png"/>
 						<text></text>
 					</view>
 					<view class="list_three_li_t_c">{{item.subjectName}}-{{item.roomNumber}}</view>
@@ -48,14 +50,17 @@
 					</view>
 				</view>
 				<!-- 开始检查 -->
-				<view v-if="item.manageStatus==0 && item.notStarted" class="list_three_li_b" @click="handleClick(item,'add')">开始检查</view>
-				<view v-if="item.manageStatus==1" class="list_three_li_b" @click="handleClick(item,'edit')">编辑</view>
-				<view v-if="!item.notStarted" class="list_three_li_b_tow"><img src="@/pages_safetyExamine/images/icon_xyxcgl_jhwks.png"/>计划未开始</view>
-				<view v-if="item.manageStatus==2" class="list_three_li_b_three">
-					<img src="@/pages_safetyExamine/images/icon_djcsys.png"/>
-					<text>整改进度：</text>
-					<text @click="handleClick(item,'detail')">{{item.rectifySchedule}}</text>
-					<text class="report" @click="handleClick(item,'download')">整改报告</text>
+				<view v-if="buttonHide">
+					<view v-if="item.manageStatus==0 && item.notStarted" class="list_three_li_b" @click="handleClick(item,'add')">开始检查</view>
+					<view v-if="item.manageStatus==1" class="list_three_li_b" @click="handleClick(item,'edit')">编辑</view>
+					<view v-if="!item.notStarted" class="list_three_li_b_tow"><img src="@/pages_safetyExamine/images/icon_xyxcgl_jhwks.png"/>计划未开始</view>
+					<view v-if="item.manageStatus==2" class="list_three_li_b_three">
+						<img src="@/pages_safetyExamine/images/icon_djcsys.png"/>
+						<text>整改进度：</text>
+						<text v-if="item.checkResult==0" @click="handleClick(item,'detail')">{{item.rectifySchedule}}</text>
+						<text v-if="item.checkResult==1" @click="handleClick(item,'detail')">已完成</text>
+						<text v-if="item.isEndProcess==1" class="report" @click="handleClick(item,'download')">整改报告</text>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -104,19 +109,41 @@ export default {
 		collegeArray:[],
 		dataList:[],
 		currentDate:'',
+		myApplyGentle:'',//自查身份 校院巡查管理 里操作按钮隐藏 
+		applyGentle:'',//检查组身份 实验室自查管理 里操作按钮隐藏
+		buttonHide:false,//判断按钮显示隐藏
 	}
   },
   onLoad(option) {
+	   console.log(uni.getStorageSync('gentleIdentifierData'))
+	  this.myApplyGentle=uni.getStorageSync('gentleIdentifierData').myApplyGentle
+	  this.applyGentle=uni.getStorageSync('gentleIdentifierData').applyGentle
+	  
 	 if(option.pageType==1){
 	 		  this.getData.checkType=option.pageType
 	 		  uni.setNavigationBarTitle({
 	 		  		title:'校院巡查管理'
 	 		  })
+			  if(this.myApplyGentle && !this.applyGentle){
+				  this.buttonHide=false
+			  }if(!this.myApplyGentle && !this.applyGentle){
+				  this.buttonHide=false
+			  }else{
+				  this.buttonHide=true;
+			  }
+			  
 	 }else if(option.pageType==2){
 	 		   this.getData.checkType=option.pageType
 	 		  uni.setNavigationBarTitle({
 	 		  		title:'实验室自查管理'
 	 		  })
+			  if(!this.myApplyGentle && this.applyGentle){
+			  		this.buttonHide=false
+			  }if(!this.myApplyGentle && !this.applyGentle){
+				  this.buttonHide=false
+			  }else{
+			  		this.buttonHide=true;
+			  }
 	 }
   },
   onShow() {
@@ -202,19 +229,19 @@ export default {
 	    handleClick(row,doType){
 		  let self=this;
 		  if( doType=='add'){//开始检查	
-			  uni.navigateTo({
+			  uni.redirectTo({
 			      url: '/pages_safetyExamine/examineManage/examineAdd?id='+row.id
 			  });
 		  }else if(doType=='edit'){
-			  uni.navigateTo({
+			  uni.redirectTo({
 			      url: '/pages_safetyExamine/examineManage/examineAdd?id='+row.id
 			  });
 		  }else if(doType=='detail'){
-			  uni.navigateTo({
+			  uni.redirectTo({
 			      url: '/pages_safetyExamine/examineManage/examineDetail?id='+row.id+'&manageStatus='+row.manageStatus
 			  });
 		  }else if(doType=='startInspect'){//开始检查
-			  uni.navigateTo({
+			  uni.redirectTo({
 			      url: '/pages_safetyExamine/examineManage/examineAdd'
 			  });
 		  }else if(doType=='download'){//整改报告下载rectifyNotice 整改通知(1整改告知书 2整改通知书)
@@ -568,14 +595,16 @@ export default {
 		.list_three_li{
 			position: relative;
 			width: 690rpx;
-			height: 360rpx;
+			/* height: 360rpx; */
+			height: auto;
 			background: #fff;
 			border-radius: 10rpx;
 			overflow: hidden;
 			margin-bottom: 20rpx;
 			.list_three_li_t{
 				width: 100%;
-				position: absolute;
+				height: 110rpx;
+				position: relative;
 				left: 0;
 				top: 0;
 				.list_three_li_t_l{
@@ -638,9 +667,9 @@ export default {
 				}
 			}
 			.list_three_li_m{
-				position: absolute;
-				top: 110rpx;
-				left: 0;
+				// position: absolute;
+				// top: 110rpx;
+				// left: 0;
 				width: 690rpx;
 				height: 158rpx;
 				padding-left: 30rpx;
@@ -693,9 +722,9 @@ export default {
 			.list_three_li_b{
 				height: 80rpx;
 				width: 100%;
-				position: absolute;
-				top: 278rpx;
-				left: 0;
+				// position: absolute;
+				// top: 278rpx;
+				// left: 0;
 				border-top: 1rpx solid #E0E0E0;
 				font-size: 28rpx;
 				font-family: PingFang SC-Medium, PingFang SC;
@@ -707,9 +736,9 @@ export default {
 			.list_three_li_b_tow{
 				height: 80rpx;
 				width: 100%;
-				position: absolute;
-				top: 278rpx;
-				left: 0;
+				// position: absolute;
+				// top: 278rpx;
+				// left: 0;
 				border-top: 1rpx solid #E0E0E0;
 				font-size: 28rpx;
 				font-family: PingFang SC-Medium, PingFang SC;
@@ -727,9 +756,9 @@ export default {
 			}
 			.list_three_li_b_three{
 				height: 80rpx;
-				position: absolute;
-				top: 278rpx;
-				left: 0;
+				// position: absolute;
+				// top: 278rpx;
+				// left: 0;
 				display: flex;
 				justify-content: flex-start;
 				align-items: center;

pages_safetyExamine/patrolPlan/patrolPlanAdd.vue

@@ -40,7 +40,7 @@
 			<view class="scope_text" v-if="scopeIndex==2">已选择<text>{{form.subjectNum}}</text>间实验室</view>
 			<view class="title">
 				<view class="title_t">检查要求</view>
-				<textarea class="title_b" type="text" v-model="form.checkDemand" maxlength="200" placeholder="请输入检查计划标题" placeholder-style="color:#999999;font-size:30rpx;"></textarea>
+				<textarea class="title_b" type="text" v-model="form.checkDemand" maxlength="200" placeholder="请输入检查要求" placeholder-style="color:#999999;font-size:30rpx;"></textarea>
 			</view>
 		</view>
 		<view class="patrol_group" v-if="form.checkType==1">
@@ -79,7 +79,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import { checkPlanAdd,conditionCollegeInfo,getAllSubNum} from '@/api/index.js'
+import { checkPlanAdd,conditionCollegeInfo,getAllSubNum,isSCollege} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -109,7 +109,7 @@ export default {
 			subjectNum:0,//实验室数量
 			checkDemand:'',//检查要求
 			tiemQuickList:[],
-			scopeIndex:'',
+			scopeIndex:'',//0 全校 1学院 2实验室
 			seleteListLab:[],
 		},
 		tiemQuickList:[{name:'本月',type:false},{name:'本季度',type:false},{name:'全年',type:false}],
@@ -142,6 +142,7 @@ export default {
 	  
   },
   mounted(){
+	  this.isSCollege();
   },
   methods: {
 		//滚动事件
@@ -166,7 +167,7 @@ export default {
 		},
 	    //结束时间选中事件
 		endChange(form,e){
-			if(new Date(form.cycleStartTime).getTime()>=new Date(e.target.value).getTime()){
+			if(new Date(form.cycleStartTime).getTime()>new Date(e.target.value).getTime()){
 				 uni.showToast({
 					title: '结束时间不能小于开始时间',
 					icon:"none",
@@ -198,11 +199,34 @@ export default {
 			}
 			
 		},
+		//查询当前用户是否是院级
+		async isSCollege(){
+			let _this = this;
+			const {data} = await isSCollege();
+			if(data.code == 200){
+				if(data.data.userFlg){
+					// 院级
+					this.$set(this,'scopeArray',['学院','实验室']);
+				}else{
+					// 校级
+					this.$set(this,'scopeArray',['全校','学院','实验室']);
+				}
+			}
+		},
 		//检查范围
 		scopeChange(e){
 			let _this=this;
-			_this.scopeIndex = e.target.value;
-			_this.form.checkRange=Number(e.target.value)+1;//检查范围
+			console.log(this.scopeArray[e.target.value])
+			if(this.scopeArray[e.target.value]=='全校'){
+				_this.scopeIndex=0;
+				_this.form.checkRange=1;
+			}else if(this.scopeArray[e.target.value]=='学院'){
+				_this.scopeIndex=1;
+				_this.form.checkRange=2;
+			}else if(this.scopeArray[e.target.value]=='实验室'){
+				_this.scopeIndex=2;
+				_this.form.checkRange=3;
+			}
 			if(this.form.subjectNum>0){
 				uni.showModal({
 					content: '重新选择会删除现有选择的实验室,是否重选?',
@@ -215,24 +239,26 @@ export default {
 						_this.form.collegeNum =0;
 						_this.form.subIds ='';
 						_this.form.subjectNum =0;
-						if(e.target.value==1){//选择学院
+						
+						if(_this.scopeIndex==0){//全校
+						   _this.getAllSubNum();
+						}else if(_this.scopeIndex==1){//选择学院
 							_this.conditionCollegeInfo();
-						}else if(e.target.value==0){//全校
-							_this.getAllSubNum();
-						}else if(e.target.value==2){
+						}else if(_this.scopeIndex==2){
 							console.log('选择实验室')
 						}
+						
 					  } else if (res.cancel) {
 						  
 					  }
 					}
 				});
 			}else{
-				if(e.target.value==1){//选择学院
+				if(_this.scopeIndex==0){//全校
+				   _this.getAllSubNum();
+				}else if(_this.scopeIndex==1){//选择学院
 					_this.conditionCollegeInfo();
-				}else if(e.target.value==0){//全校
-					_this.getAllSubNum();
-				}else if(e.target.value==2){
+				}else if(_this.scopeIndex==2){
 					console.log('选择实验室')
 				}
 			}
@@ -307,6 +333,7 @@ export default {
 		dialogClose(){
 		   this.dialogVisible=false;
 	    },
+		
 		//选择学院确定
 		collegeConfirm(){
 			let _this=this;

pages_safetyExamine/patrolPlan/patrolPlanDetail.vue

@@ -90,7 +90,9 @@
 				<view class="list_three_li" v-for="(item,index) in  dataList" :key="index">
 					<view class="list_three_li_t">
 						<view class="list_three_li_t_l">
-							<img src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
+							<img v-if="item.checkRange==1" src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
+							<img v-if="item.checkRange==2" src="@/pages_safetyExamine/images/icon_xyxc_xy.png"/>
+							<img v-if="item.checkRange==3" src="@/pages_safetyExamine/images/icon_xyxc_sys.png"/>
 							<text></text>
 						</view>
 						<view class="list_three_li_t_c">实验室名称-房间号</view>

pages_safetyExamine/patrolPlan/patrolPlanEdit.vue

@@ -79,7 +79,7 @@
 				<view class="scope_text" v-if="scopeIndex==2">已选择<text>{{form.subjectNum}}</text>间实验室</view>
 				<view class="title">
 					<view class="title_t">检查要求</view>
-					<textarea class="title_b" type="text" v-model="form.checkDemand" maxlength="200" placeholder="请输入检查计划标题" placeholder-style="color:#999999;font-size:30rpx;"></textarea>
+					<textarea class="title_b" type="text" v-model="form.checkDemand" maxlength="200" placeholder="请输入检查要求" placeholder-style="color:#999999;font-size:30rpx;"></textarea>
 				</view>
 			</view>
 			<view class="attachment" v-if="form.uploadDtoList.length>0">
@@ -104,7 +104,7 @@
 				<view class="list">
 					<view class="list_title"><img src="@/pages_safetyExamine/images/icon_jcjh_cy.png">成员</view>
 					<view class="list_header"><text>工号</text><text>姓名</text></view>
-					<view class="list_li" v-for="(item,index) in form.checkMemberDtoList"><text>12345678</text><text>{{item.name}}</text></view>
+					<view class="list_li" v-for="(item,index) in form.checkMemberDtoList"><text>{{item.jobNum}}</text><text>{{item.name}}</text></view>
 					<view class="list_bottom" v-if="form.checkMemberDtoList.length==0">无数据</view>
 				</view>
 			</view>
@@ -136,7 +136,8 @@
 					<view class="list_three_li_b" v-if="item.manageStatus==2">
 						<img src="@/pages_safetyExamine/images/icon_djcsys.png"/>
 						<text>整改进度：</text>
-						<text>{{item.rectifySchedule}}</text>
+						<text  v-if="item.checkResult==0">{{item.rectifySchedule}}</text>
+						<text v-if="item.checkResult==1">已完成</text>
 					</view>
 				</view>
 			</view>
@@ -354,7 +355,7 @@ export default {
 	    },
 	    //结束时间选中事件
 	    endChange(form,e){
-	    	if(new Date(form.cycleStartTime).getTime()>=new Date(e.target.value).getTime()){
+	    	if(new Date(form.cycleStartTime).getTime()>new Date(e.target.value).getTime()){
 	    		 uni.showToast({
 	    			title: '结束时间不能小于开始时间',
 	    			icon:"none",
@@ -577,9 +578,18 @@ export default {
 		  if( doType=='subBtn'){//	
 			  console.log(11)
 		  }else if(doType=='detail'){//详情
-			  uni.navigateTo({
-			      url: '/pages_safetyExamine/examineManage/examineDetail?id='+item.id+'&manageStatus='+item.manageStatus
-			  });
+			 
+			  if(item.manageStatus==1){//检查中
+				  uni.navigateTo({
+				      url: '/pages_safetyExamine/examineManage/examineAdd?id='+item.id
+				  });
+			  }else{
+				  uni.navigateTo({
+				      url: '/pages_safetyExamine/examineManage/examineDetail?id='+item.id+'&manageStatus='+item.manageStatus
+				  });
+			  }
+			  
+			 
 		  }
 		  
 	    },

pages_safetyExamine/snapshotManage/snapshotAdd.vue

@@ -48,7 +48,7 @@
 		<view class="popup-null" @click="popupClick(2)"></view>
 		<view class="popup-big-box">
 			<view class="popup-input-box">
-				<input type="text" maxlength="10" v-model="room" placeholder="请输入房间号">
+				<input type="text" maxlength="10" v-model="room" placeholder="请输入关键字">
 				<view @click="buildBySub">搜索</view>
 			</view>
 			<view class="popup-for-max-box">

pages_safetyExamine/snapshotManage/snapshotList.vue

@@ -32,7 +32,7 @@
 						<img src="@/pages_safetyExamine/images/icon_ssp_ry.png"/>
 						<text>上报人：{{item.createName}}</text>
 					</view>
-					<view class="list_three_li_b_r">{{item.createTime}}</view>
+					<view class="list_three_li_b_r">{{item.timeFlag}}</view>
 				</view>
 			</view>
 		</view>