zc

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -149,12 +149,8 @@
 			})
 			this.$set(this, 'pageType', optionData.pageType);
 			this.$set(this, 'lotName',
-				optionData.pageType == 0 ? optionData.checkPlanSetVoList.checkName : (
-					optionData.checkPlanSetVoList.overdueUnrectify ? '整改期限' + optionData.checkPlanSetVoList
-					.rectifyDeadline +
-					'（逾期未完成整改关闭实验室）' : '整改期限' + optionData.checkPlanSetVoList.rectifyDeadline));
-
-
+				optionData.pageType == 0 ? optionData.checkPlanSetVoList.checkName : 
+				(optionData.checkPlanSetVoList.overdueUnrectify ? '整改期限' + optionData.checkPlanSetVoList.rectifyDeadline +'（逾期未完成整改关闭实验室）' : '整改期限' + optionData.checkPlanSetVoList.rectifyDeadline));
 			this.$set(this, 'tabTextTow',
 				optionData.pageType == 0 ? (optionData.manageStatus == 2 ? [{
 					value: '1',
@@ -190,12 +186,12 @@
 			if (optionData.pageType == 0) {
 				if (optionData.manageStatus == 2) {
 					this.$set(this, 'curTabTow', '1');
-				} else {
-					this.$set(this, 'curTabTow', optionData.pageType == 0 ? (optionData.curTabTow == 1 ? '1' : '0') : (
-						optionData
-						.pageType == 1 ? '0' : (optionData
-							.pageType == 2 ? '2' : '')));
 				}
+			} else {
+				this.$set(this, 'curTabTow', 
+				optionData.pageType == 0 ? (optionData.curTabTow == 1 ? '1' : '0') : (
+					optionData.pageType == 1 ? '0' : (
+					optionData.pageType == 2 ? '2' : '')));
 			}
 
 			this.$set(this, 'optionData', optionData);

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -163,7 +163,9 @@
 			return {
 				baseUrl: config.base_url,
 				inspectionItems: 0, //0有检查项 1无检查项
-				newData: {},
+				newData: {
+					voiceList:[],
+				},
 				setOptionId: '',
 				manageId: '',
 				subId: '',
@@ -377,7 +379,8 @@
 					uni.setNavigationBarTitle({
 						title: data.data.subName + '(' + data.data.roomNum + ')'
 					})
-					data.data.checkCollapse = false;
+					data.data.checkCollapse = true;
+					// data.data.checkCollapse = false;
 					data.data.inspectDot = false;
 					data.data.checkTime = parseTime(data.data.checkTime, "{y}-{m}-{d}");
 					data.data.checkRectifyVoList.forEach(function(item, index) {

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.rectifyDeadline}}（逾期未完成整改关闭实验室）</view>
+			<view class="tip">整改期限{{optionData.checkPlanSetVoList.rectifyDeadline}}{{optionData.checkPlanSetVoList.overdueUnrectify?'（逾期未完成整改关闭实验室）':''}}</view>
 			<view class="items" v-if="newData.hazardCheckName!=''">
 				<view class="items-t">
 					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>