zc

pages.json

@@ -130,14 +130,6 @@
 				"navigationBarTextStyle": "white", //导航文字颜色
 				"navigationBarBackgroundColor": "#0183FA" //导航背景色
 			}
-		},
-		{
-			"path": "pages/exploitDemoPage", //开发测试页面
-			"style": {
-				"navigationBarTitleText": "开发测试页面",
-				"navigationBarTextStyle": "white", //导航文字颜色
-				"navigationBarBackgroundColor": "#0183FA" //导航背景色
-			}
 		}
 	],
 	"subPackages": [

pages/exploitDemoPage.vue

@@ -1,66 +0,0 @@
-<template>
-	<view class="exploitDemoPage">
-		<view @click="checkItemModuleButton('open')">开启</view>
-		<checkItemModule :propsData="propsData" v-if="checkItemModuleType"></checkItemModule>
-	</view>
-</template>
-
-<script>
-	import {
-		checkItemModule
-	} from '@/pages/checkItemModule.vue'
-	export default {
-		name: "exploitDemoPage",
-		components: {
-			checkItemModule
-		},
-		data() {
-			return {
-				pageType:1,
-				checkItemModuleType:false,
-				propsData:{
-					infoType:0,
-					manageId:'1839113478692855815',
-					checkType:0,
-					planId:'',
-					planSetId:'',
-					subId:'',
-					searchValue:'',
-				},
-			}
-		},
-		onLoad(option) {
-			
-		},
-		onShow() {
-
-		},
-		mounted() {
-
-		},
-		methods: {
-			checkItemModuleButton(type,item){
-				if(type == 'open'){
-					this.$set(this,'propsData',{
-						infoType:0,
-						manageId:'1839113478692855815',
-						checkType:0,
-						planId:'',
-						planSetId:'',
-						subId:'',
-						searchValue:'',
-					});
-					this.$set(this,'checkItemModuleType',true);
-				}else if(type == 'out'){
-					this.$set(this,'checkItemModuleType',false);
-					this.$set(this,'propsData',{});
-				}else if(type == 'submit'){
-					console.log('已选中-item', item)
-				}
-			},
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-</style>

pages/checkItemModule.vue

@@ -384,6 +384,7 @@
 		overflow: hidden;
 		display: flex;
 		flex-direction: column;
+		background-color: #fff;
 
 		.checkItemModule-title-box {
 			display: flex;

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -17,7 +17,7 @@
 					<view :class="checkFlag == 0 ?'search-B':'search-A'" @click="checkFlagChange(0)">不符合</view>
 				</view>
 				<view class="search-r" :class="(pageType == 0 && curTabTow == 0)||(pageType != 0) ?'search-r-margin':''"
-					@click="inspectionItemsClick()">
+					@click="checkItemModuleButton('open')">
 					<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png">
 					{{newData.hazardCheckCode?newData.hazardCheckCode:''}}{{newData.hazardCheckName?newData.hazardCheckName:'搜索检查项'}}
 				</view>
@@ -55,6 +55,7 @@
 			</view>
 			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 		</scroll-view>
+		<checkItemModule :propsData="propsData" v-if="checkItemModuleType"></checkItemModule>
 	</view>
 
 </template>
@@ -68,10 +69,13 @@
 		securityAppCheckDangerReviewList,
 		securityAppCheckDangerGetCheckDangerSubId,
 	} from '@/pages_safetyCheck/api/index.js'
+	import {
+		checkItemModule
+	} from '@/pages_safetyCheck/component/checkItemModule.vue'
 	export default {
 		name: "hiddenDangerItems",
 		components: {
-
+			checkItemModule
 		},
 		data() {
 			return {
@@ -98,7 +102,9 @@
 				dataList: [],
 				getDataType: false,
 				searchIndex: 0,
-
+				//检查项组件数据
+				checkItemModuleType:false,
+				propsData:{},
 			}
 		},
 		onLoad(option) {
@@ -167,14 +173,31 @@
 				this.$set(this.queryParams,'page',1);
 				this.getList()
 			},
-			//搜索项跳转
-			inspectionItemsClick() {
-				this.pageType = 2; //1随手拍检查项
-				uni.redirectTo({
-					url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsSearch?form=' + encodeURIComponent(
-						JSON.stringify(this.newData))
-				});
+			checkItemModuleButton(type,item){
+				if(type == 'open'){
+					let obj = {
+						infoType:this.pageType,
+						checkType:this.curTabTow,
+					}
+					if(this.curTabTow == 0){
+						//检查
+						obj.manageId = this.newData.manageId
+					}else if(this.curTabTow != 0){
+						//复查/整改
+						obj.planId = this.newData.planId;
+						obj.planSetId = this.newData.planSetId;
+						obj.subId = this.newData.subId;
+					}
+					this.$set(this,'propsData',obj);
+					this.$set(this,'checkItemModuleType',true);
+				}else if(type == 'out'){
+					this.$set(this,'checkItemModuleType',false);
+					this.$set(this,'propsData',{});
+				}else if(type == 'submit'){
+					this.itemsClick(item);
+				}
 			},
+			//检查项选中
 			itemsClick(row) {
 				let infoData = row;
 				infoData.pageType = this.pageType;