From 83e3cd81020eb300e929c8a3c2c635292a88b9d0 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Tue, 30 Dec 2025 16:38:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AD=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/controlroom/component/history.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/controlroom/component/history.vue b/pages/controlroom/component/history.vue
index 8cabebe..2ca9e38 100644
--- a/pages/controlroom/component/history.vue
+++ b/pages/controlroom/component/history.vue
@@ -14,7 +14,6 @@
 						待执行
 					</view>
 				</view>	
-				
 			</view>
 		</scroll-view>
 	</view>

From 1306e3bdd6b6843954ab60fc394385673cf20f0a Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Wed, 31 Dec 2025 10:12:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Warehouse/finish.vue                 |  2 +-
 pages/Warehouse/picking.vue                | 10 +++++-----
 pages/controlroom/component/changemenu.vue |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue
index 863cd9f..615b0e3 100644
--- a/pages/Warehouse/finish.vue
+++ b/pages/Warehouse/finish.vue
@@ -935,7 +935,7 @@
 						</view>
 						<view style="color: black;margin-top: 5rpx;">
 							<text style="color: #888888;">
-								采购数量：
+								采购数量:
 							</text>
 
 							<text style="font-weight: 600;color: #555555;">
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 95d43e2..5dfb65d 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -908,7 +908,7 @@
 						</view>
 						<view style="color: black;margin-top: 5rpx;">
 							<text style="color: #888888;">
-								采购数量：
+								采购数量:
 							</text>
 
 							<text style="font-weight: 600;color: #555555;">
@@ -925,7 +925,7 @@
 							<view
 								style="width: 100%;justify-content: space-between;display: flex;align-items: center;height: 60rpx;margin-top: 20rpx;">
 								<view class="">
-									拣货数量：
+									拣货数量:
 									<text style="font-weight: 600;color: #555555;">
 										{{item.crkNum}}
 									</text>
@@ -941,7 +941,7 @@
 							</view>
 							<view style="width: 100%;justify-content: space-between;display: flex;">
 								<view class="">
-									采购单价：
+									采购单价:
 
 									<text style="font-weight: 600;color: #555555;">
 										￥{{Number(item.oldPrice).toFixed(2)}}
@@ -949,7 +949,7 @@
 
 								</view>
 								<view class="">
-									拣货人：
+									拣货人:
 									<text style="color: #888888;font-weight: 600;">
 										{{item.createBy}}
 									</text>
@@ -958,7 +958,7 @@
 							</view>
 							<view style="width: 100%;justify-content: space-between;display: flex;margin-top: 10rpx;">
 								<view class="">
-									到货单价：
+									到货单价:
 									<text style="font-weight: 600;color: #555555;">
 										￥{{Number(item.newPrice).toFixed(2)}}
 									</text>
diff --git a/pages/controlroom/component/changemenu.vue b/pages/controlroom/component/changemenu.vue
index 8f91293..49def76 100644
--- a/pages/controlroom/component/changemenu.vue
+++ b/pages/controlroom/component/changemenu.vue
@@ -53,7 +53,7 @@
 	import {
 		queryPadPageList
 	} from '@/pages/watch/api/lunpan.js'
-	const menutarget = ref(0)
+	const menutarget = ref(-1)
 	// 1️⃣ 定义 emit 事件（推荐写法）
 	const emit = defineEmits(['change'])
 	const clickmenu = (index) => {