heyang

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"  v-for="(item,index) in dataList" :key="index">
+				<view class="for-box" v-for="(item,index) in dataList" :key="index" v-if="optionData.infoType==0">
 					<view class="for-box-n">
 						{{item.hazardCheckCode1}}{{item.hazardCheckName1}}
 					</view>
@@ -103,10 +103,17 @@
 					<view class="for-box-n">
 						{{item.hazardCheckCode}}{{item.hazardCheckName}}
 					</view>
-					<view class="for-box-n" @click="checkItemButton(item,item2)" v-for="(item2,index2) in item.hazardCheckPointList" v-html="brightenKeyword(item2,searchValue)">
+					<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 class="for-box" @click="checkItemButton(item,'')" v-for="(item,index) in dataList" :key="index"
+					v-if="optionData.infoType==1 || optionData.infoType==2">
+					<view class="for-box-n">
+						{{item.hazardCheckCode}}{{item.hazardCheckName}}
+					</view>
+				</view>
 			</view>
 		</view>
 		<!-- 级联选择模块 -->
@@ -181,7 +188,7 @@
 			getSearchValue() {
 				if (this.optionData.infoType == 0) {
 					//检查
-					this.dataList=[];
+					this.dataList = [];
 					this.securityAppCheckSetOptionList();
 				} else if (this.optionData.infoType == 1) {
 					//复查
@@ -230,13 +237,13 @@
 					this.$set(this, 'checkList', item.children);
 					console.log(this.checkList)
 				} else if (item.level == 3) {
-					this.checkItemButton(item,item2);
+					this.checkItemButton(item, item2);
 
 				}
 			},
 			//选中检查项
-			checkItemButton(item,item2) {
-				this.$parent.checkItemModuleButton('submit', item,item2);
+			checkItemButton(item, item2) {
+				this.$parent.checkItemModuleButton('submit', item, item2);
 			},
 			//高亮
 			brightenKeyword(val, editKeyword) {
@@ -282,12 +289,12 @@
 						this.cascadeData(maxList, minList);
 					}
 					console.log(data.data)
-					if(data.data[0]){
-						data.data.forEach(function(item){
+					if (data.data[0]) {
+						data.data.forEach(function(item) {
 							console.log(item)
 							console.log(item.hazardCheckPoint)
-							if(item.hazardCheckPoint){
-								item.hazardCheckPointList=item.hazardCheckPoint.split('#')
+							if (item.hazardCheckPoint) {
+								item.hazardCheckPointList = item.hazardCheckPoint.split('#')
 							}
 						})
 					}
@@ -313,12 +320,12 @@
 						let minList = JSON.parse(JSON.stringify(data.data))
 						this.cascadeData(maxList, minList);
 					}
-					if(data.data[0]){
-						data.data.forEach(function(item){
+					if (data.data[0]) {
+						data.data.forEach(function(item) {
 							console.log(item)
 							console.log(item.hazardCheckPoint)
-							if(item.hazardCheckPoint){
-								item.hazardCheckPointList=item.hazardCheckPoint.split('#')
+							if (item.hazardCheckPoint) {
+								item.hazardCheckPointList = item.hazardCheckPoint.split('#')
 							}
 						})
 					}

pages_safetyCheck/views/inspectManage/inspectAdd.vue

@@ -74,11 +74,11 @@
 				</view>
 			</view>
 		</scroll-view>
-		<view class="sub-btn" v-if="newData.checkStatus !=1">
+		<view class="sub-btn" v-if="newData.checkStatus !=1 && newData.checkSetProgress !=100">
 			<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 class="sub-btn-tow" v-if="newData.checkStatus ==1 && newData.checkSetProgress !=100" @click="submitForm(2)">提交</view>
 	</view>
 
 </template>

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -146,8 +146,8 @@
 			this.$set(this, 'lotName',
 				optionData.pageType == 0 ? optionData.checkPlanSetVoList.checkName : (
 					optionData.checkPlanSetVoList.overdueUnrectify ? '整改期限' + optionData.checkPlanSetVoList
-					.checkStartTime +
-					'（逾期未完成整改关闭实验室）' : '整改期限' + optionData.checkPlanSetVoList.checkStartTime));
+					.rectifyDeadline +
+					'（逾期未完成整改关闭实验室）' : '整改期限' + optionData.checkPlanSetVoList.rectifyDeadline));
 			this.$set(this, 'tabTextTow',
 				optionData.pageType == 0 ? [{
 					value: '0',
@@ -263,6 +263,7 @@
 			itemsClick(row) {
 				let infoData = this.newData;
 				infoData.pageType = this.pageType;
+				infoData.checkDraftVo = row.checkDraftVo;
 				infoData.itemsStatus = this.curTabTow;
 				infoData.setOptionId = row.setOptionId;
 				infoData.hazardCheckPro = row.hazardCheckPro;

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -170,8 +170,8 @@
 			this.$set(this, 'lotName',
 				optionData.pageType == 0 ? optionData.checkPlanSetVoList.checkName : (
 					optionData.checkPlanSetVoList.overdueUnrectify ? '整改期限' + optionData.checkPlanSetVoList
-					.checkStartTime +
-					'（逾期未完成整改关闭实验室）' : '整改期限' + optionData.checkPlanSetVoList.checkStartTime));
+					.rectifyDeadline +
+					'（逾期未完成整改关闭实验室）' : '整改期限' + optionData.checkPlanSetVoList.rectifyDeadline));
 			
 			
 			
@@ -308,6 +308,12 @@
 					if(this.pageType==0){
 						//检查
 						let infoData = this.optionData;
+						if(this.itemsStatus==2){
+							infoData.checkDraftVo={
+								checkStatus:2,
+							}
+						}
+						
 						infoData.editStatus = true;
 						uni.redirectTo({
 							url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(

pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="snapshotDetail">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-			<view class="tip">整改期限{{optionData.checkPlanSetVoList.checkStartTime}}（逾期未完成整改关闭实验室）</view>
+			<view class="tip">整改期限{{optionData.checkPlanSetVoList.rectifyDeadline}}（逾期未完成整改关闭实验室）</view>
 			<view class="items" v-if="newData.hazardCheckName!=''">
 				<view class="items-t">
 					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>