From 67e02ec7bf50b7c30b1131c54d72893fa8632dd5 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 22 Mar 2023 18:57:35 +0800
Subject: [PATCH] no message

---
 common/style/layout.css           | 16 ++++++++------
 pages/management/hcxcheck.vue     | 12 +++++++++--
 pages/management/inscanerror.vue  | 34 +++++++++++++++--------------
 pages/management/outscanerror.vue | 36 ++++++++++++++++---------------
 4 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index 5b5d99a..81884ec 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -13,12 +13,16 @@ uni-button:after {
 }
 
 .content{
-	/* display: flex; */
 	width: 100%;
 	height: 100%;
-	background-color: #fff;/* 
-	justify-content: space-between;
-	align-items: flex-start; */
+	background-color: #f5f5f5;
+}
+.search-confirm-wrap {
+	width: calc(100% - 60rpx);
+	background-color: #fff;
+	margin: 30rpx auto;
+	border-radius: 12rpx;
+	padding-bottom: 30rpx;
 }
 .search-wrap{
 	display: flex;
@@ -89,8 +93,8 @@ uni-button:after {
 }
 .grid-wrap{
 	width: 100%;
-	height: calc(100% - 324rpx); /** 88+ 30+ 90 + 30+ 86*/
-	padding: 30rpx;
+	height: calc(100% - 420rpx); /** 88+ 30*4+ 86*2*/
+	padding: 0 30rpx 30rpx 30rpx;
 	overflow-y: scroll;
 }
 .grid-table{
diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue
index 239d03a..ade43a0 100644
--- a/pages/management/hcxcheck.vue
+++ b/pages/management/hcxcheck.vue
@@ -1,11 +1,19 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<nav-bar title="缓存线盘点"></nav-bar>
+		<view class="status-wrap">
+			
+		</view>
+		<view class="material-wrap"></view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
 	export default {
+		components: {
+			NavBar
+		},
 		data() {
 			return {
 				
diff --git a/pages/management/inscanerror.vue b/pages/management/inscanerror.vue
index b6dc68f..c626a9b 100644
--- a/pages/management/inscanerror.vue
+++ b/pages/management/inscanerror.vue
@@ -1,26 +1,28 @@
 <template>
 	<view class="content">
 		<nav-bar title="入箱扫码异常"></nav-bar>
-		<view class="search-wrap">
-			<view class="search-item">
-				<label class="search-label">缓存线</label>
-				<view class="filter_input_wraper">
-					<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+		<view class="search-confirm-wrap">
+			<view class="search-wrap">
+				<view class="search-item">
+					<label class="search-label">缓存线</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">料箱码</label>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
 				</view>
 			</view>
-			<view class="search-item">
-				<label class="search-label">料箱码</label>
-				<view class="filter_input_wraper">
-					<search-box
-					v-model="val1"
-					/>
-				</view>
+			<view class="confirm-button-wrap">
+				<button class="confirm-button" @tap="toSearch()">查询</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
 			</view>
 		</view>
-		<view class="confirm-button-wrap">
-			<button class="confirm-button" @tap="toSearch()">查询</button>
-			<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
-		</view>
 		<view class="grid-wrap">
 			<table class="grid-table">
 				<thead>
diff --git a/pages/management/outscanerror.vue b/pages/management/outscanerror.vue
index b2a839a..e8f60ff 100644
--- a/pages/management/outscanerror.vue
+++ b/pages/management/outscanerror.vue
@@ -1,26 +1,28 @@
 <template>
 	<view class="content">
 		<nav-bar title="出箱扫码异常"></nav-bar>
-		<view class="search-wrap">
-			<view class="search-item">
-				<label class="search-label">缓存线</label>
-				<view class="filter_input_wraper">
-					<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+		<view class="search-confirm-wrap">
+			<view class="search-wrap">
+				<view class="search-item">
+					<label class="search-label">缓存线</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">料箱码</label>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
 				</view>
 			</view>
-			<view class="search-item">
-				<label class="search-label">料箱码</label>
-				<view class="filter_input_wraper">
-					<search-box
-					v-model="val1"
-					/>
-				</view>
+			<view class="confirm-button-wrap">
+				<button class="confirm-button" @tap="toSearch()">查询</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
 			</view>
 		</view>
-		<view class="confirm-button-wrap">
-			<button class="confirm-button" @tap="toSearch()">查询</button>
-			<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
-		</view>
 		<view class="grid-wrap">
 			<table class="grid-table">
 				<thead>
@@ -66,7 +68,7 @@
 				options1: [],
 				index1: '',
 				val1: '',
-				dataList: [],
+				dataList: [{instruct_uuid: '1'}],
 				pkId: '',
 				disabled: false
 			};