From dfb5b38e438628767aeefa7b1d22ee7360072eea Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 25 十一月 2025 19:27:12 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 055bf43..1c95fe8 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -60,10 +60,13 @@
 							<checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
 						</view> -->
 						<view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
-						<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
-						<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
-						<view><text style="width: 400rpx;">寮�濮嬫椂闂达細{{item.startTime}}</text></view>
-						<view><text style="width: 400rpx;">缁撴潫鏃堕棿锛歿{item.endTime}}</text></view>
+						<view><text style="width: 400rpx;">鍚嶇О锛歿{item.maktx}}</text></view>
+						<!-- <view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view> -->
+						<view><text style="width: 400rpx;">灞炴�э細{{item.proType}}</text></view>
+						<view><text style="width: 400rpx;">瀹㈡埛鍥惧彿锛歿{item.temp2}}</text></view>
+						<view><text style="width: 400rpx;">鍚堝悓鍙凤細{{item.outOrderNo}}</text></view>
+<!-- 						<view><text style="width: 400rpx;">寮�濮嬫椂闂达細{{item.startTime}}</text></view>
+						<view><text style="width: 400rpx;">缁撴潫鏃堕棿锛歿{item.endTime}}</text></view> -->
 						<view>
 							<text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
 							<text style="margin-left: 100rpx;">鍗曚綅锛歿{item.unit}}</text>
@@ -91,10 +94,10 @@
 				<text  @click="reChecked()">鍙嶉��</text>
 			</label> -->
 
-			<label class="label-btn" style="width: 150rpx;">
+			<label class="label-btn flex justify-center align-center">
 				<button class="cu-btn" @click="resst()">閲嶇疆</button>
 			</label>
-			<label class="label-btn">
+			<label class="label-btn flex justify-center align-center">
 				<button class="cu-btn bg-blue " @click="comb()">缁勬墭</button>
 			</label>
 		</view>
@@ -107,13 +110,17 @@
 					<view class="color-block-blue"></view>
 					<text class="title">淇敼鎵瑰彿/鏁伴噺</text>
 				</view>
-				<view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
+<!-- 				<view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
 					<text style="display: inline-block;float: left;width: 50px;">鎵瑰彿锛�</text>
 					<input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="batch">
+				</view> -->
+				<view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
+					<text style="display: inline-block;float: left;width: 50px;">瀹㈡埛鍥惧彿锛�</text>
+					<input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="temp2">
 				</view>
 				<view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
-					<text style="display: inline-block;float: left;width: 50px;">鍗曚綅锛�</text>
-					<input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="unit">
+					<text style="display: inline-block;float: left;width: 50px;">鍚堝悓鍙凤細</text>
+					<input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="outOrderNo">
 				</view>
 				<view class="changeBox">
 					<view class="num-box">
@@ -155,7 +162,10 @@
 				checkText: '鍏ㄩ��',
 				checkedData: [],
 				batch: '',
-				unit: ''
+				unit: '',
+				outOrderNo:'',
+				proType:'',
+				temp2:''
 			}
 		},
 		onShow() {
@@ -183,7 +193,7 @@
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
 					var len = this.barcode.length
-					if (len != 8) {
+					if (len != 6) {
 						uni.showToast({
 							title: '鎵樼洏鐮佹湁璇閲嶈瘯',
 							icon: "none",
@@ -465,6 +475,10 @@
 			confirm() {
 				this.matList[this.rowNum].anfme = this.count
 				this.matList[this.rowNum].batch = this.batch
+				this.matList[this.rowNum].proType = this.proType
+				this.matList[this.rowNum].outOrderNo = this.outOrderNo
+				this.matList[this.rowNum].temp2 = this.temp2
+				
 				this.$refs.revise.close()
 				this.$forceUpdate() // 寮哄埗鍒锋柊
 			},

--
Gitblit v1.9.1