From 04d6e922af5b0124313d6320ee7e6ff3b0abc702 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: Wed, 18 Dec 2024 14:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css                    |  3 +-
 common/style/reset.css                     |  3 ++
 components/upTop.vue                       | 49 ++++++++++++++++++++++
 pages/management/alloc-maintenance_new.vue |  2 +-
 pages/management/check.vue                 |  2 +-
 pages/management/in-storage_LLCKD.vue      | 20 ++++++---
 pages/management/in-storage_new.vue        |  2 +-
 pages/management/move-inventory.vue        |  2 +-
 pages/management/receive-confirm_new.vue   |  2 +-
 9 files changed, 74 insertions(+), 11 deletions(-)
 create mode 100644 components/upTop.vue

diff --git a/common/style/layout.css b/common/style/layout.css
index 522e545..8053aa6 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -42,7 +42,7 @@ uni-toast .uni-toast {
 	margin: 10px auto;
 	border-radius: 6px;
 	padding: 10px;
-	background-color: rgba(1, 114, 195, 40%);
+	background: linear-gradient(-45deg,rgba(16, 131, 202, 1),rgba(8, 39, 87, 1));
 	border: 1px solid #00a3dd;
 	box-shadow: rgba(4, 136, 203, 0.2) -3px 6px 6px 1px, rgba(4, 136, 203, 0.2) 3px -3px 6px 1px;
 }
@@ -269,6 +269,7 @@ uni-toast .uni-toast {
 	width: 100%;
 	/* background: #142954 center / 100% 100% url(./static/images/grid_bg.png) no-repeat; */
 	overflow: hidden;
+	top: 52px;
 }
 .zd-sec-th-wraper {
 	width: 100%;
diff --git a/common/style/reset.css b/common/style/reset.css
index fc8a03f..9d385d9 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -156,6 +156,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 .mgl52 {
 	margin-left: 52px;
 }
+.mgr1 {
+	margin-right: 1px;
+}
 .mgr5 {
 	margin-right: 5px;
 }
diff --git a/components/upTop.vue b/components/upTop.vue
new file mode 100644
index 0000000..8298283
--- /dev/null
+++ b/components/upTop.vue
@@ -0,0 +1,49 @@
+<template>
+	<view class="back-top" @tap="toTop" v-show="showBtn">
+		<uni-icons type="arrow-up" size="26" color="#9a99ac"></uni-icons>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"upTop",
+		data() {
+			return {
+				showBtn: false
+			};
+		},
+		props: {
+			scrollTop: {
+				type: Number,
+				default: 0
+			}
+		},
+		methods: {
+			topData(e) {
+				this.showBtn = e > 50
+			},
+			// 返回顶部
+			toTop() {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 100
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.back-top
+	position: fixed;
+	z-index: 299;
+	right: 11px;
+	bottom: 11px;
+	background-color: rgba(4, 19, 36, 70%);
+	width: 40px;
+	height: 40px;
+	line-height: 40px;
+	border-radius: 50%;
+	text-align: center;
+	box-shadow: 1px 2px 5px #114d90;
+</style>
\ No newline at end of file
diff --git a/pages/management/alloc-maintenance_new.vue b/pages/management/alloc-maintenance_new.vue
index 166e22c..378514e 100644
--- a/pages/management/alloc-maintenance_new.vue
+++ b/pages/management/alloc-maintenance_new.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<nav-bar title="调拨维护"></nav-bar>
-		<view class="search-confirm-wrap">
+		<view class="sticky search-confirm-wrap">
 			<view class="zd-row">
 				<view class="zd-col-15 zd-row jcflexstart">
 					<view class="zd-col-10"><search-box placeholder="输入查询条件" v-model="val1" /></view>
diff --git a/pages/management/check.vue b/pages/management/check.vue
index 1c61253..b03730d 100644
--- a/pages/management/check.vue
+++ b/pages/management/check.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<nav-bar title="盘点"></nav-bar>
-		<view class="search-confirm-wrap">
+		<view class="sticky search-confirm-wrap">
 			<view class="zd-row">
 				<view class="zd-row zd-col-14">
 					<view class="zd-col-12"><search-box placeholder="输入查询条件" v-model="val1" /></view>
diff --git a/pages/management/in-storage_LLCKD.vue b/pages/management/in-storage_LLCKD.vue
index 9f4a2a8..4cdbdd3 100644
--- a/pages/management/in-storage_LLCKD.vue
+++ b/pages/management/in-storage_LLCKD.vue
@@ -1,16 +1,19 @@
 <template>
 	<view class="content">
 		<nav-bar :title="title"></nav-bar>
-		<view class="search-confirm-wrap">
+		<view class="sticky search-confirm-wrap">
 			<view class="zd-row">
 				<view class="zd-col-13 zd-row jcflexstart">
 					<view :class="crType === 'OUT' ? 'zd-col-10' : 'zd-col-16'"><search-box placeholder="输入查询条件" v-model="val1" /></view>
 					<view v-if="crType === 'OUT'" class="zd-col-6 select_wraper mgl10">
 						<zxz-uni-data-select placeholder="选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
 					</view>
-					<view class="relative zd-col-8 mgl10">
-						<switch :checked="isChecked" color="#007de7"/>
-						<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 75px; height: 26px;left: 0;"></text>
+					<view class="zd-col-8 mgl10 zd-row jcflexstart">
+						<view class="pop_label mgr1">全部数据</view>
+						<view class="relative">
+							<switch :checked="isChecked" color="#007de7"/>
+							<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 75px; height: 26px;left: 0;"></text>
+						</view>
 					</view>
 				</view>
 				<view class="zd-col-11 zd-row jcflexend">
@@ -191,6 +194,7 @@
 		<uni-popup ref="alertDialog" type="dialog">
 			<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="提示" content="是否提交库存？" @confirm="_inWarehouseCommit"></uni-popup-dialog>
 		</uni-popup>
+		<up-top ref="UT" :scrollTop="top"></up-top>
 	</view>
 </template>
 
@@ -200,6 +204,7 @@
 	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
+	import UpTop from '@/components/upTop.vue'
 	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync} from '@/utils/getData2.js'
 	// import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync} from '@/utils/getData2.js'
 	// import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation} from '@/utils/mork2.js'
@@ -209,11 +214,13 @@
 			SearchBox,
 			ScanInput,
 			Pagination,
-			GridDetail
+			GridDetail,
+			UpTop
 		},
 		data() {
 			return {
 				title: '',
+				top: 0,
 				id: '',
 				crType: '',
 				val1: '', // 模糊查询
@@ -242,6 +249,9 @@
 				isChecked: false
 			}
 		},
+		onPageScroll(e) {
+			this.$refs.UT.topData(e.scrollTop)
+		},
 		onLoad (options) {
 			this.id = options.id
 			this.title = options.name
diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue
index 81f0513..cddb566 100644
--- a/pages/management/in-storage_new.vue
+++ b/pages/management/in-storage_new.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<nav-bar :title="title"></nav-bar>
-		<view class="search-confirm-wrap">
+		<view class="sticky search-confirm-wrap">
 			<view class="zd-row">
 				<view class="zd-col-13 zd-row jcflexstart">
 					<view :class="crType === 'OUT' ? 'zd-col-10' : 'zd-col-16'"><search-box placeholder="输入查询条件" v-model="val1" /></view>
diff --git a/pages/management/move-inventory.vue b/pages/management/move-inventory.vue
index 4f68e72..7064137 100644
--- a/pages/management/move-inventory.vue
+++ b/pages/management/move-inventory.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<nav-bar title="移库"></nav-bar>
-		<view class="search-confirm-wrap">
+		<view class="sticky search-confirm-wrap">
 			<view class="zd-row">
 				<view class="zd-row zd-col-14">
 					<view class="zd-col-12"><search-box placeholder="输入查询条件" v-model="val1" /></view>
diff --git a/pages/management/receive-confirm_new.vue b/pages/management/receive-confirm_new.vue
index e1ae340..30b3c68 100644
--- a/pages/management/receive-confirm_new.vue
+++ b/pages/management/receive-confirm_new.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<nav-bar title="收货确认"></nav-bar>
-		<view class="search-confirm-wrap">
+		<view class="sticky search-confirm-wrap">
 			<view class="zd-row">
 				<view class="zd-col-14 zd-row jcflexstart">
 					<view class="zd-col-12"><search-box placeholder="请输入查询条件" v-model="val1" /></view>