From 54b6152a634728bf0718a476ff424161c59136a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Tue, 10 Dec 2024 18:00:18 +0800
Subject: [PATCH] css

---
 common/style/layout.css                    | 7 ++++---
 pages/management/alloc-maintenance_new.vue | 2 +-
 pages/management/in-storage_new.vue        | 2 --
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index 166a413..331b66a 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -46,7 +46,7 @@ uni-toast .uni-toast {
 }
 .search-confirm-wrap_2 {
 	width: calc(100% - 20px);
-	margin: 0 auto;
+	margin: 0 auto 10px auto;
 }
 .search-label{
 	height: 35px;
@@ -139,9 +139,10 @@ uni-toast .uni-toast {
 	overflow-y: auto;
 }
 .table-wrap {
-	width: 100%;
+	width: calc(100% - 30px);
 	margin: 0 auto;
-	padding: 15px 0 10px 0;
+	padding: 0;
+	max-height: 348px;
 	overflow-y: auto;
 }
 .table-wrap_1 {
diff --git a/pages/management/alloc-maintenance_new.vue b/pages/management/alloc-maintenance_new.vue
index 43d1675..e3e7805 100644
--- a/pages/management/alloc-maintenance_new.vue
+++ b/pages/management/alloc-maintenance_new.vue
@@ -210,7 +210,7 @@
 	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
-	import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate, easOutInBillSync, inWarehouseAssignLocation, addAssignDtl, inWarehouseCommit, viewAssignDtl, updateAssignDtl} from '@/utils/mork2.js'
+	import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate, easOutInBillSync, inWarehouseAssignLocation, addAssignDtl, inWarehouseCommit, viewAssignDtl, updateAssignDtl} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue
index 65e5246..04feac3 100644
--- a/pages/management/in-storage_new.vue
+++ b/pages/management/in-storage_new.vue
@@ -589,8 +589,6 @@
 	left 5%
 .pop-grid-wraper
 	width 100%
-.table-wrap
-	padding: 15px 0 15px 0
 .mgr30
 	margin-right 30rpx
 .select_wraper