From 932a5a31be28cd64b446778efb3e320794022928 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 11 May 2024 16:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E8=BD=B4=E9=85=8D=E9=80=81=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/ZjDelivery.vue        | 42 ++++++++-----------
 pages/SecondPhase/slitting/ZjDelivery.vue | 51 ++++++++++++-----------
 2 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/pages/ProductManage/ZjDelivery.vue b/pages/ProductManage/ZjDelivery.vue
index 36f9fe4..cf3007a 100644
--- a/pages/ProductManage/ZjDelivery.vue
+++ b/pages/ProductManage/ZjDelivery.vue
@@ -27,14 +27,21 @@
 						/>
 					</view>
 				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">载具码</span>
+				<view class="zd-row mgb10">
+					<view class="zd-col-19">
+						<view class="filter_item">
+							<view class="filter_label_wraper">
+								<span class="filter_label">载具码</span>
+							</view>
+							<view class="filter_input_wraper">
+								<search-box
+								v-model="val1"
+								/>
+							</view>
+						</view>
 					</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
+					<view class="zd-col-4">
+						<button class="btn-submit btn-success" @tap="_queryMaterialInfo">查询</button>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -47,9 +54,6 @@
 						/>
 					</view>
 				</view>
-				<view class="zd-row">
-					<button class="zd-col-22 btn-submit btn-success letter-30" @tap="_queryMaterialInfo">查询</button>
-				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -57,7 +61,7 @@
 						<thead>
 							<tr>
 								<th>序号</th>
-								<th>选择</th>
+								<th class="th_2">选择</th>
 								<th>气涨轴</th>
 								<th>机台编号</th>
 								<th>分切组</th>
@@ -75,9 +79,9 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}" @tap="toCheck(e)">
 								<td>{{Number(i) + 1}}</td>
-								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td class="td_2"><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}">&#xe66b;</span></td>
 								<td>{{e.qzzno}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.split_group}}</td>
@@ -320,14 +324,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
diff --git a/pages/SecondPhase/slitting/ZjDelivery.vue b/pages/SecondPhase/slitting/ZjDelivery.vue
index 36f9fe4..6e08b38 100644
--- a/pages/SecondPhase/slitting/ZjDelivery.vue
+++ b/pages/SecondPhase/slitting/ZjDelivery.vue
@@ -27,14 +27,21 @@
 						/>
 					</view>
 				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">载具码</span>
+				<view class="zd-row mgb10">
+					<view class="zd-col-19">
+						<view class="filter_item">
+							<view class="filter_label_wraper">
+								<span class="filter_label">载具码</span>
+							</view>
+							<view class="filter_input_wraper">
+								<search-box
+								v-model="val1"
+								/>
+							</view>
+						</view>
 					</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
+					<view class="zd-col-4">
+						<button class="btn-submit btn-success" @tap="_queryMaterialInfo">查询</button>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -47,9 +54,6 @@
 						/>
 					</view>
 				</view>
-				<view class="zd-row">
-					<button class="zd-col-22 btn-submit btn-success letter-30" @tap="_queryMaterialInfo">查询</button>
-				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -57,7 +61,7 @@
 						<thead>
 							<tr>
 								<th>序号</th>
-								<th>选择</th>
+								<th class="th_2">选择</th>
 								<th>气涨轴</th>
 								<th>机台编号</th>
 								<th>分切组</th>
@@ -75,9 +79,9 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}" @tap="toCheck(e)">
 								<td>{{Number(i) + 1}}</td>
-								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td class="td_2"><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}">&#xe66b;</span></td>
 								<td>{{e.qzzno}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.split_group}}</td>
@@ -105,20 +109,24 @@
 			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': !checkArr.length || !val3}" :disabled="disabled2" @tap="_shippingConfirm">配送确认</button>
 			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': !val3 || checkArr.length > 0}" :disabled="disabled3" @tap="_returnVehicle">载具送回</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 {queryProductArea, queryDeviceByarea, queryMaterialInfo3, needVehicle, shippingConfirm, returnVehicle, shippingCheck, acrossVehicle} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
-			SearchBox
+			SearchBox,
+			UpTop
 		},
 		data() {
 			return {
+				top: 0,
 				val1: '',
 				val2: '',
 				val3: '',
@@ -136,6 +144,9 @@
 				checkArr: []
 			};
 		},
+		onPageScroll(e) {
+			this.$refs.UT.topData(e.scrollTop)
+		},
 		created () {
 			this._queryProductArea()
 			this._queryMaterialInfo()
@@ -320,14 +331,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