From 752f915caa8c38b44a927f47f3b074d6253566ca 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: Fri, 13 Dec 2024 14:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css                    | 15 +++--
 pages/home/home.vue                        |  2 +-
 pages/login/login.vue                      |  2 +-
 pages/management/alloc-maintenance_new.vue |  5 +-
 pages/management/check.vue                 |  5 +-
 pages/management/in-storage_new.vue        | 10 ++--
 pages/management/move-inventory.vue        |  5 +-
 pages/management/receive-confirm_new.vue   |  5 +-
 utils/mork2.js                             | 65 ++++++++++++++++++++++
 9 files changed, 94 insertions(+), 20 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index 331b66a..522e545 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -1,11 +1,14 @@
 /** 平板尺寸960*600 **/
 page {
     background-color: #0a2b57 !important;
-    height: 100% !important;
+    min-height: 100% !important;
 }
 uni-page-body {
 	background-color: #0a2b57 !important;
-	height: 100% !important;
+	min-height: 100% !important;
+}
+body, html {
+	min-height: 100% !important;
 }
 uni-button:after {
 	border: none;
@@ -27,9 +30,8 @@ uni-toast .uni-toast {
 
 .content{
 	width: 100%;
-	height: 100%;
+	min-height: 100%;
 	background: top center / 100% 100% url(./static/images/page_bg.jpg) repeat-y;
-	/* background-color: #040d1e; */
 }
 .footer{
 	width: 100%;
@@ -124,7 +126,6 @@ uni-toast .uni-toast {
 }
 .grid-wrap{
 	width: calc(100% - 20px);
-	height: calc(100% - 112px);
 	margin: 0 auto;
 	padding: 4px 0 10px 0;
 	border: 1px solid #01c2f3;
@@ -134,15 +135,13 @@ uni-toast .uni-toast {
 }
 .zdrow-wrap {
 	width: 100%;
+	min-height: 520px;
 	padding: 0 10px;
-	height: calc(100% - 40px);
-	overflow-y: auto;
 }
 .table-wrap {
 	width: calc(100% - 30px);
 	margin: 0 auto;
 	padding: 0;
-	max-height: 348px;
 	overflow-y: auto;
 }
 .table-wrap_1 {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 6dc2f9d..ea8b178 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -113,7 +113,7 @@
 @import '../../common/style/mixin.styl';
 .home_content
 	position relative
-	_wh(100%, 100%)
+	_wh(100%, 100vh)
 	_bis(,'../../static/images/home_bg.jpg', 100%, 100%,bottom)
 .header
 	height 60px
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 913dbaf..36893e0 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -175,7 +175,7 @@
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .login-bg
-	_wh(100%, 100%)
+	_wh(100%, 100vh)
 	_bis(#fff,'../../static/images/login_bg.jpg', 100%, 100%,bottom)
 .logo-wraper
 	_wh(90%, auto)
diff --git a/pages/management/alloc-maintenance_new.vue b/pages/management/alloc-maintenance_new.vue
index e3e7805..166e22c 100644
--- a/pages/management/alloc-maintenance_new.vue
+++ b/pages/management/alloc-maintenance_new.vue
@@ -60,7 +60,7 @@
 								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked}" :disabled="disabled1" @tap="_allocationBillConfirm(e)">直接调拨</button>
 							</view>
 						</view>
-						<view class="table-wrap">
+						<view class="table-wrap" :style="{height: e.subData.length >= 5 ? '230px' : (30 + 40 * e.subData.length) + 'px'}" @touchmove="handleInnerScroll">
 							<table class="grid-table">
 								<thead>
 									<tr>
@@ -255,6 +255,9 @@
 			}, 3000)
 		},
 		methods: {
+			handleInnerScroll(event) {
+				event.stopPropagation()
+			},
 			// 仓库下拉框
 			async _getWarehouseInfo () {
 				let res = await getWarehouseInfo()
diff --git a/pages/management/check.vue b/pages/management/check.vue
index 9ccbbb8..1c61253 100644
--- a/pages/management/check.vue
+++ b/pages/management/check.vue
@@ -50,7 +50,7 @@
 								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked || !e.subStatus2}" :disabled="disabled1" @tap="_stIvtCheckdtlBasedOnFinance(e)">财务为准</button>
 							</view>
 						</view>
-						<view class="table-wrap table-wrap_1">
+						<view class="table-wrap table-wrap_1" :style="{height: e.subData.length >= 5 ? '230px' : (30 + 40 * e.subData.length) + 'px'}" @touchmove="handleInnerScroll">
 							<table class="grid-table">
 								<thead>
 									<tr>
@@ -145,6 +145,9 @@
 			}, 3000)
 		},
 		methods: {
+			handleInnerScroll(event) {
+				event.stopPropagation()
+			},
 			// 仓库下拉框
 			async _getWarehouseInfo () {
 				let res = await getWarehouseInfo()
diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue
index 04feac3..81f0513 100644
--- a/pages/management/in-storage_new.vue
+++ b/pages/management/in-storage_new.vue
@@ -60,7 +60,7 @@
 					</view>
 					<!-- 二级表格start -->
 					<view v-if="e.subData.length > 0" class="zd-sec-wraper pd0">
-						<view class="table-wrap">
+						<view class="table-wrap" :style="{height: e.subData.length >= 5 ? '230px' : (30 + 40 * e.subData.length) + 'px'}" @touchmove="handleInnerScroll">
 							<table class="grid-table">
 								<thead>
 									<tr>
@@ -251,6 +251,9 @@
 			}
 		},
 		methods: {
+			handleInnerScroll(event) {
+				event.stopPropagation()
+			},
 			// 仓库下拉框
 			async _getWarehouseInfo () {
 				let res = await getWarehouseInfo()
@@ -584,11 +587,6 @@
 
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
-.pop-wraper
-	width 90%
-	left 5%
-.pop-grid-wraper
-	width 100%
 .mgr30
 	margin-right 30rpx
 .select_wraper
diff --git a/pages/management/move-inventory.vue b/pages/management/move-inventory.vue
index e88138a..4f68e72 100644
--- a/pages/management/move-inventory.vue
+++ b/pages/management/move-inventory.vue
@@ -46,7 +46,7 @@
 								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked}" :disabled="disabled1" @tap="_stIvtMoveinvConfirmMove(e)">确认移库</button>
 							</view>
 						</view>
-						<view class="table-wrap table-wrap_1">
+						<view class="table-wrap table-wrap_1" :style="{height: e.subData.length >= 5 ? '230px' : (30 + 40 * e.subData.length) + 'px'}" @touchmove="handleInnerScroll">
 							<table class="grid-table">
 								<thead>
 									<tr>
@@ -142,6 +142,9 @@
 			}, 3000)
 		},
 		methods: {
+			handleInnerScroll(event) {
+				event.stopPropagation()
+			},
 			// 仓库下拉框
 			async _getWarehouseInfo () {
 				let res = await getWarehouseInfo()
diff --git a/pages/management/receive-confirm_new.vue b/pages/management/receive-confirm_new.vue
index 51a0e82..e1ae340 100644
--- a/pages/management/receive-confirm_new.vue
+++ b/pages/management/receive-confirm_new.vue
@@ -60,7 +60,7 @@
 								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked || !e.subStatus1}" :disabled="disabled1" @tap="_receiptBillConfirm(e)">确认收货</button>
 							</view>
 						</view>
-						<view class="table-wrap table-wrap_1">
+						<view class="table-wrap table-wrap_1" :style="{height: e.subData.length >= 5 ? '230px' : (30 + 40 * e.subData.length) + 'px'}" @touchmove="handleInnerScroll">
 							<table class="grid-table">
 								<thead>
 									<tr>
@@ -261,6 +261,9 @@
 			}, 3000)
 		},
 		methods: {
+			handleInnerScroll(event) {
+				event.stopPropagation()
+			},
 			// 组织信息下拉框
 			async _getOrganizationInfo () {
 				let res = await getOrganizationInfo()
diff --git a/utils/mork2.js b/utils/mork2.js
index 0785241..a0662e7 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -410,6 +410,71 @@ export const easOutInBillDetailPage = (djid, page, size) => {
 		    "update_time": null,
 		    "czsl": 0.00,
 			"status": false
+		},
+		{
+		    "flid": "2",
+		    "id": '3',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '4',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '5',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '6',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '7',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '8',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '9',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '10',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '11',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '12',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '13',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '14',
+		    "djid": "btAAAAW8Wd5QCrde"
+		},
+		{
+		    "flid": "2",
+		    "id": '15',
+		    "djid": "btAAAAW8Wd5QCrde"
 		}
     ],
     "code": 1,