From a232dcf6d4a59c7c47e06b6619eb7566163f95b4 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 05 十一月 2025 19:26:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/pda-master into devlop

---
 pages/listing/matnrPalletising.vue |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pages/listing/matnrPalletising.vue b/pages/listing/matnrPalletising.vue
index 5469911..50618e4 100644
--- a/pages/listing/matnrPalletising.vue
+++ b/pages/listing/matnrPalletising.vue
@@ -46,6 +46,12 @@
 					</view>
 					<view class="cu-item">
 						<view class="content">
+							<text class="text-black">鐗╂枡缂栫爜:</text>
+							<text class="text-grey ">{{item.maktx}}</text>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="content">
 							<text class="text-black">ASN:</text>
 						</view>
 						<view class="action">
@@ -60,12 +66,9 @@
 							<text class="text-grey ">{{item.splrBatch}}</text>
 						</view>
 					</view>
-					<view class="cu-item">
+					<view class="cu-item">						
 						<view class="content">
-							<text class="text-black">璐ㄦ鐘舵��:</text>
-						</view>
-						<view class="action">
-							<text class="text-grey ">{{item.isptResult$}}</text>
+							<text class="text-black">璐ㄦ缁撴灉: <text class="text-grey ">{{item.inspect}}</text></text>
 						</view>
 					</view>
 					<!-- <view class="cu-item">
@@ -92,7 +95,7 @@
 					<view class="cu-item">
 						<view class="content">
 							<text class="text-black">鍙粍鐩樻暟閲�: <text
-									class="text-grey ">{{item.anfme - item.workQty}}</text></text>
+									class="text-grey ">{{item.anfme - item.workQty - item.qty}}</text></text>
 						</view>
 						
 					</view>
@@ -102,8 +105,8 @@
 								<view class="title text-blue"><text
 										class="text-red text-xl vertical-middle">*</text>缁勭洏鏁伴噺:
 								</view>
-								<uni-number-box style="width: 70%;" :max="max" v-model="item.receiptQty"
-									:step='1'></uni-number-box>
+								<uni-number-box style="width: 70%;" :min="0" :max="max" :decimal="2" :step="0.01" v-model="item.receiptQty"
+									></uni-number-box>
 							</view>
 						</view>
 					</view>
@@ -242,7 +245,11 @@
 					barcode: this.container
 				})
 				if (code === 200) {
-					this.list = data
+					uni.showToast({
+						title: msg,
+						icon: "success",
+						position: 'top'
+					})
 				} else {
 					uni.showToast({
 						title: msg,

--
Gitblit v1.9.1