From 19e798f42e5bb40cfe484f364394a168e44e9800 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 11 May 2024 16:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E4=B8=8A=E6=96=99=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96=EF=BC=8C=E8=BF=94=E5=9B=9E=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ProductManage/SlittingFeeding.vue       | 14 ++---------
 .../SecondPhase/slitting/SlittingFeeding.vue  | 25 ++++++++-----------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/pages/ProductManage/SlittingFeeding.vue b/pages/ProductManage/SlittingFeeding.vue
index 7bccfe3..dfd6717 100644
--- a/pages/ProductManage/SlittingFeeding.vue
+++ b/pages/ProductManage/SlittingFeeding.vue
@@ -36,7 +36,7 @@
 						<thead>
 							<tr>
 								<th>序号</th>
-								<th>母卷号</th>
+								<th class="th_2">母卷号</th>
 								<th>子卷号</th>
 								<th>机台编号</th>
 								<th>分切组</th>
@@ -55,7 +55,7 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
 								<td>{{Number(i) + 1}}</td>
-								<td>{{e.source_container_name}}</td>
+								<td class="td_2">{{e.source_container_name}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.split_group}}</td>
@@ -319,13 +319,3 @@
 		}
 	}
 </script>
-
-<style lang="stylus">
-	.slide_new table td:first-child, .slide_new table th:first-child
-		width 92rpx
-	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
-		position sticky
-		left 89rpx
-		z-index 102
-		box-shadow 1px 0 2px rgba(0,0,0,.12)
-</style>
diff --git a/pages/SecondPhase/slitting/SlittingFeeding.vue b/pages/SecondPhase/slitting/SlittingFeeding.vue
index 7bccfe3..a909ddd 100644
--- a/pages/SecondPhase/slitting/SlittingFeeding.vue
+++ b/pages/SecondPhase/slitting/SlittingFeeding.vue
@@ -36,7 +36,7 @@
 						<thead>
 							<tr>
 								<th>序号</th>
-								<th>母卷号</th>
+								<th class="th_2">母卷号</th>
 								<th>子卷号</th>
 								<th>机台编号</th>
 								<th>分切组</th>
@@ -55,7 +55,7 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
 								<td>{{Number(i) + 1}}</td>
-								<td>{{e.source_container_name}}</td>
+								<td class="td_2">{{e.source_container_name}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.split_group}}</td>
@@ -120,20 +120,24 @@
 			</view>
 		</view>
 		<view v-if="active" class="msg_mask"></view>
+		<up-top ref="UT" :scrollTop="top"></up-top>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import UpTop from '@/components/upTop.vue'
 	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingHandleConfirm, feedingVehicleReturn} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
-			SearchBox
+			SearchBox,
+			UpTop
 		},
 		data() {
 			return {
+				top: 0,
 				val1: '',
 				val2: '',
 				options: [],
@@ -160,6 +164,9 @@
 				disabled2: false
 			};
 		},
+		onPageScroll(e) {
+			this.$refs.UT.topData(e.scrollTop)
+		},
 		created () {
 			this._queryProductArea()
 		},
@@ -318,14 +325,4 @@
 			},
 		}
 	}
-</script>
-
-<style lang="stylus">
-	.slide_new table td:first-child, .slide_new table th:first-child
-		width 92rpx
-	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
-		position sticky
-		left 89rpx
-		z-index 102
-		box-shadow 1px 0 2px rgba(0,0,0,.12)
-</style>
+</script>
\ No newline at end of file