From afb5c0be4ce7520964008b26976b12d5e32f421f Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 10 May 2023 15:32:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css              |  4 ++++
 pages/management/FinishedInStore.vue | 19 ++++++++++++++-----
 pages/management/HcxOutError.vue     | 10 +++++-----
 pages/management/TaskOperate.vue     | 16 +++++++++-------
 pages/management/hcxcheck.vue        | 15 ++++++---------
 pages/management/inscanerror.vue     | 12 ++++--------
 6 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index fe82d4e..645a669 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -13,6 +13,10 @@ uni-button:after {
 	border: none;
 }
 
+uni-button{
+	font-size: 16px;
+}
+
 .content{
 	width: 100%;
 	height: 100%;
diff --git a/pages/management/FinishedInStore.vue b/pages/management/FinishedInStore.vue
index 0193b4c..b34cd9a 100644
--- a/pages/management/FinishedInStore.vue
+++ b/pages/management/FinishedInStore.vue
@@ -17,11 +17,11 @@
 						/>
 					</view>
 				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toDelect">清空</button>
-				<button class="confirm-button" @tap="toSelect">选择订单</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': !index1 || !val1 || dataList.length === 0}" :disabled="disabled" @tap="toSure">入库确认</button>
+				<view class="search-item flexend">
+					<button class="confirm-button" @tap="toDelect">清空</button>
+					<button class="confirm-button" @tap="toSelect">选择订单</button>
+					<button class="confirm-button" :class="{'confirm-button_disabled': !index1 || !val1 || dataList.length === 0}" :disabled="disabled" @tap="toSure">入库确认</button>
+				</view>
 			</view>
 		</view>
 		<view class="grid-wrap">
@@ -143,3 +143,12 @@
 		}
 	}
 </script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.search-item
+	&:nth-child(1),&:nth-child(2)
+		width 30%
+	&:nth-child(3)
+		width 36%
+</style>
diff --git a/pages/management/HcxOutError.vue b/pages/management/HcxOutError.vue
index 2028781..84232e4 100644
--- a/pages/management/HcxOutError.vue
+++ b/pages/management/HcxOutError.vue
@@ -29,10 +29,10 @@
 						/>
 					</view>
 				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch()">查询</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
+				<view class="search-item_2 flexend">
+					<button class="confirm-button" @tap="toSearch()">查询</button>
+					<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
+				</view>
 			</view>
 		</view>
 		<view class="grid-wrap">
@@ -149,5 +149,5 @@
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .grid-wrap
-	height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
+	height: calc(100% - 187px); /** 42+ 15*5+ 35*2 */
 </style>
\ No newline at end of file
diff --git a/pages/management/TaskOperate.vue b/pages/management/TaskOperate.vue
index 16529ec..417ae10 100644
--- a/pages/management/TaskOperate.vue
+++ b/pages/management/TaskOperate.vue
@@ -66,12 +66,12 @@
 						<input type="text" class="search-input-l" v-model="endDate"  @click="open2">
 					</view>
 				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch()">查询</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('8')">取消</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('7')">完成</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('5')">重发</button>
+				<view class="search-item_2 flexend">
+					<button class="confirm-button" @tap="toSearch()">查询</button>
+					<button class="confirm-button" :disabled="disabled" @tap="toSure('8')">取消</button>
+					<button class="confirm-button" :disabled="disabled" @tap="toSure('7')">完成</button>
+					<button class="confirm-button" :disabled="disabled" @tap="toSure('5')">重发</button>
+				</view>
 			</view>
 		</view>
 		<view class="grid-wrap">
@@ -293,7 +293,9 @@
 .grid-wrap
 	height: auto
 	overflow: auto
-	height: calc(100% - 387px); /** 42+ 15*9+ 35*6 */
+	height: calc(100% - 337px); /** 42+ 15*8+ 35*5 */
 /deep/ .uni-calendar-item__weeks-box-item
 	height: 40px !important
+>>>.search_input
+	padding-right 60px
 </style>
\ No newline at end of file
diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue
index a945ce3..021988b 100644
--- a/pages/management/hcxcheck.vue
+++ b/pages/management/hcxcheck.vue
@@ -15,7 +15,7 @@
 						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
 					</view>
 				</view>
-				<view class="search-item search-item1">
+				<view class="search-item flexend">
 					<button class="confirm-button" @tap="toSearch()">刷&nbsp;&nbsp;新</button>
 				</view>
 			</view>
@@ -336,15 +336,12 @@
 	z-index 99
 .addHeight
 	transition height .2s linear
-	height 315px
+	height 215px /** 35*4+ 15*5 */
 .delHeight
 	transition height .2s linear
 	height 0
-.search-item
-	width 42%
-	&:nth-child(1)
-		margin-right 10px
-.search-item1
-	width calc(16% - 10px)
-	justify-content flex-end
+// .search-item
+// 	width 42%
+// 	&:nth-child(1)
+// 		margin-right 10px
 </style>
diff --git a/pages/management/inscanerror.vue b/pages/management/inscanerror.vue
index e62b2c5..01af448 100644
--- a/pages/management/inscanerror.vue
+++ b/pages/management/inscanerror.vue
@@ -29,14 +29,10 @@
 						/>
 					</view>
 				</view>
-				<!-- <view class="search-item search-item-btns">
+				<view class="search-item_2">
 					<button class="confirm-button" @tap="toSearch">查询</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1}" :disabled="disabled" @tap="toSure">确认</button>
-				</view> -->
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch">查询</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">确认</button>
+					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">确认</button>
+				</view>
 			</view>
 		</view>
 		<view class="grid-wrap">
@@ -175,5 +171,5 @@
 
 <style lang="stylus" scoped>
 .grid-wrap	
-    height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
+    height: calc(100% - 187px); /** 42+ 15*5+ 35*2 */
 </style>
\ No newline at end of file