From 324945af3a5eee3f6e58843823a1e6ffa3a96b21 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 20 十一月 2024 11:17:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncPda' into nbncPda

---
 pages/order/orderComb.vue   |    2 +-
 pages/pakin/pickAgain.vue   |    2 +-
 pages/pakin/WarehouseIn.vue |    2 +-
 pages/warehouse/outMats.vue |    6 +++---
 pages/pakin/pakin.vue       |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/order/orderComb.vue b/pages/order/orderComb.vue
index 62f2959..af177b6 100644
--- a/pages/order/orderComb.vue
+++ b/pages/order/orderComb.vue
@@ -113,7 +113,7 @@
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
-							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474"
+							<uni-number-box :value="count" :step='1' :max="9999999" color="#747474"
 								@change="changeValue" />
 						</view>
 					</view>
diff --git a/pages/pakin/WarehouseIn.vue b/pages/pakin/WarehouseIn.vue
index 3ac0933..ed23e47 100644
--- a/pages/pakin/WarehouseIn.vue
+++ b/pages/pakin/WarehouseIn.vue
@@ -101,7 +101,7 @@
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
-							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
+							<uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
 						</view>
 					</view>
 					<view class="btn">
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 89bde36..35ccf35 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -124,7 +124,7 @@
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
-							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
+							<uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
 						</view>
 					</view>
 					<view class="btn">
diff --git a/pages/pakin/pickAgain.vue b/pages/pakin/pickAgain.vue
index 26810a9..0e381e0 100644
--- a/pages/pakin/pickAgain.vue
+++ b/pages/pakin/pickAgain.vue
@@ -40,7 +40,7 @@
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
-							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
+							<uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
 						</view>
 					</view>
 					<view class="btn">
diff --git a/pages/warehouse/outMats.vue b/pages/warehouse/outMats.vue
index 79f7a60..a9a1b1e 100644
--- a/pages/warehouse/outMats.vue
+++ b/pages/warehouse/outMats.vue
@@ -49,7 +49,7 @@
 					</view>
 					<view style="display: flex;">
 						<text class="desc_name">鏁伴噺锛�</text>
-						<uni-number-box :value="item.anfme" :step='1' :min="0" :max="item.maxCount" color="#747474" @change="changeValue(item,index,item.anfme)" />
+						<uni-number-box :value="item.anfme" :step='1' :min="0" :max="item.maxCount" color="#747474" @change="changeValue($event,item)" />
 						<!-- <text class="desc_connect">{{item.anfme}}</text> -->
 						
 					</view>
@@ -123,8 +123,8 @@
 			back() {
 				uni.navigateBack({})
 			},
-			changeValue(item,index,value) {
-				this.dataList[index].anfme = value
+			changeValue(e,item) {
+				item.anfme = e
 			},
 			checkboxChange(e) {
 				let items = this.dataList,

--
Gitblit v1.9.1