From 49ae6ced4e61a0c8039af7790c9a686192b2c20d Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 11 May 2024 16:00:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E7=AE=94=E5=B7=A5=E5=BA=8F=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

---
 common/style/layout.styl                    | 18 +++++++++++---
 pages/ProductManage/SboProcess.vue          | 18 +++-----------
 pages/SecondPhase/production/SboProcess.vue | 27 +++++++++------------
 3 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index 3b1ab27..aca6888 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -282,7 +282,6 @@ uni-button:after {
 	font-weight: bold;
 	box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
 }
-
 .slide_new table td.td_2 {
 	position: sticky;
 	left: 86rpx;
@@ -297,12 +296,23 @@ uni-button:after {
 	color: #d7592f;
 	font-weight: bold;
 }
+.slide_new table tr.checked {
+	background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
+}
 .slide_new table tr.checked td {
-	background-color: #f0c560;
-	color: #fff;
+	background: transparent;
 }
 .slide_new table tr.checked td:first-child {
-	border-left: 6rpx solid #ff8227;
+	background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
+}
+.slide_new table tr.checked td:nth-child(2) {
+	background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
+}
+.slide_new table tr.checked td:first-child {
+	border-left: 1rpx solid #6798ef;
+}
+.slide_new table tr.checked td:last-child {
+	border-right: 1rpx solid #6798ef;
 }
 
 /** 提交栏 **/
diff --git a/pages/ProductManage/SboProcess.vue b/pages/ProductManage/SboProcess.vue
index e0191f2..088c4f6 100644
--- a/pages/ProductManage/SboProcess.vue
+++ b/pages/ProductManage/SboProcess.vue
@@ -31,7 +31,7 @@
 						<thead>
 							<tr>
 								<th>状态</th>
-								<th>母卷号</th>
+								<th class="th_2">母卷号</th>
 								<th>工单号</th>
 								<th>机台编码</th>
 								<th>产品编码</th>
@@ -47,7 +47,7 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
 								<td>{{e.status_name}}</td>
-								<td>{{e.container_name}}</td>
+								<td class="td_2">{{e.container_name}}</td>
 								<td>{{e.mfg_order_name}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.product_name}}</td>
@@ -256,16 +256,4 @@
 			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-	.zd_content
-		padding-bottom 154rpx
-	.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
diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue
index ecb0201..3a2b8ff 100644
--- a/pages/SecondPhase/production/SboProcess.vue
+++ b/pages/SecondPhase/production/SboProcess.vue
@@ -38,7 +38,7 @@
 						<thead>
 							<tr>
 								<th>状态</th>
-								<th>母卷号</th>
+								<th class="th_2">母卷号</th>
 								<th>工单号</th>
 								<th>机台编码</th>
 								<th>产品编码</th>
@@ -54,7 +54,7 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
 								<td>{{e.status_name}}</td>
-								<td>{{e.container_name}}</td>
+								<td class="td_2">{{e.container_name}}</td>
 								<td>{{e.mfg_order_name}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.product_name}}</td>
@@ -79,21 +79,25 @@
 			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled2" @tap="_confirmBlanking">准备就绪</button>
 			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled3" @tap="_finishBlanking">确认下卷</button>
 		</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 {queryRawFoilList, needEmptyVehicle, confirmBlanking, finishBlanking, finish} from '@/utils/getData1.js'
 	import {needEmptyAxisTest, createOrder} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
-			SearchBox
+			SearchBox,
+			UpTop
 		},
 		data() {
 			return {
+				top: 0,
 				val1: '',
 				val2: '',
 				dataList: [],
@@ -116,6 +120,9 @@
 				pageSize: 10
 			};
 		},
+		onPageScroll(e) {
+			this.$refs.UT.topData(e.scrollTop)
+		},
 		created () {
 			// this._queryRawFoilList()
 		},
@@ -280,16 +287,4 @@
 			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-	.zd_content
-		padding-bottom 154rpx
-	.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