From feef207cddc10b94f195e3ed9ca2348479c17941 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期三, 07 五月 2025 16:04:02 +0800
Subject: [PATCH] 最新，修改工单状态前
---
夏蒙注塑报工/pages/scbg/scbg.vue | 77 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 25 deletions(-)
diff --git "a/\345\244\217\350\222\231\346\263\250\345\241\221\346\212\245\345\267\245/pages/scbg/scbg.vue" "b/\345\244\217\350\222\231\346\263\250\345\241\221\346\212\245\345\267\245/pages/scbg/scbg.vue"
index 683e82d..402fc22 100644
--- "a/\345\244\217\350\222\231\346\263\250\345\241\221\346\212\245\345\267\245/pages/scbg/scbg.vue"
+++ "b/\345\244\217\350\222\231\346\263\250\345\241\221\346\212\245\345\267\245/pages/scbg/scbg.vue"
@@ -196,7 +196,7 @@
<scroll-view scroll-y="true" class="history-scroll">
<view v-for="(record, index) in historyList" :key="index" class="history-record">
<view class="record-item">{{ record.itemBarcode }}</view>
- <view class="record-item">{{ record.quantity || '鏈煡鏁伴噺' }}</view>
+ <view class="record-item">{{ record.quantity }}</view>
<view class="record-item">{{ record.printDate }}</view>
<view class="record-item">{{ record.printedBy }}</view>
</view>
@@ -204,8 +204,8 @@
</view>
</view>
- <button @click="reprintLast" :disabled="isButtonDisabled2" class="uni-btn">{{ isButtonDisabled2 ? '璇风◢鍚�...' : '琛ユ墦涓婁竴寮�' }}</button>
- </view>
+ <!-- <button @click="reprintLast" :disabled="isButtonDisabled2" class="uni-btn">{{ isButtonDisabled2 ? '璇风◢鍚�...' : '琛ユ墦涓婁竴寮�' }}</button>
+ --></view>
</view>
</view>
@@ -226,9 +226,13 @@
{{ deviceState }}
</view>
</view>
-
+ <button @click="reprintLast" :disabled="isButtonDisabled2" class="uni-btn">{{ isButtonDisabled2 ? '璇风◢鍚�...' : '琛ユ墦涓婁竴寮�' }}</button>
+
<!-- 鎸夐挳鏀惧湪鐘舵�佹枃鏈殑涓嬫柟 -->
<!-- <button @click="manualCheck" class="check-button">鎵嬪姩妫�娴�</button> -->
+ <view class="version" v-if="version">
+ 鐗堟湰鍙凤細{{ version }}
+ </view>
</view>
<!-- <button @click="createLabel()" class="dycs">鎵撳嵃娴嬭瘯</button> -->
@@ -239,9 +243,7 @@
<button @click="sendForFirstInspection" class="round-btn">棣栨閫佹</button>
</view>
</view>
- <view class="version" v-if="version">
- 鐗堟湰鍙凤細{{ version }}
- </view>
+
</view>
</template>
@@ -496,9 +498,9 @@
}
let res = UsbModule.isUsbConnect();
- this.deviceState = res ? "USB 杩炴帴姝ｅ父" : "USB 杩炴帴澶辫触";
- console.log("USB 妫�娴嬬粨鏋�:", this.deviceState);
- if (this.deviceState == "USB 杩炴帴澶辫触") {
+ this.deviceState = res ? "鎵撳嵃鏈� 杩炴帴姝ｅ父" : "鎵撳嵃鏈� 杩炴帴澶辫触";
+ console.log("鎵撳嵃鏈� 妫�娴嬬粨鏋�:", this.deviceState);
+ if (this.deviceState == "鎵撳嵃鏈� 杩炴帴澶辫触") {
uni.showToast({
title: ` ${this.deviceState}`,
@@ -520,10 +522,10 @@
} catch (error) {
- console.error("USB 妫�娴嬮敊璇�:", error);
- this.deviceState = "USB 妫�娴嬪け璐�";
+ console.error("鎵撳嵃鏈� 妫�娴嬮敊璇�:", error);
+ this.deviceState = "鎵撳嵃鏈� 妫�娴嬪け璐�";
uni.showToast({
- title: "USB 妫�娴嬪け璐ワ紝璇锋鏌ユ彃浠�",
+ title: "鎵撳嵃鏈� 妫�娴嬪け璐ワ紝璇锋鏌ユ彃浠�",
duration: 2000,
icon: "none"
});
@@ -590,9 +592,9 @@
console.log("111", UsbModule)
let res = UsbModule.initUsbDevice();
if (res) {
- this.deviceState = "USB 杩炴帴姝ｅ父"
+ this.deviceState = "鎵撳嵃鏈� 杩炴帴姝ｅ父"
} else {
- this.deviceState = "USB 杩炴帴澶辫触"
+ this.deviceState = "鎵撳嵃鏈� 杩炴帴澶辫触"
}
uni.showToast({
title: this.deviceState,
@@ -1184,7 +1186,7 @@
if (!UsbModule || !UsbModule.isUsbConnect || !UsbModule.isUsbConnect()) {
uni.showModal({
title: ` ${this.networkState}`,
- content: "璇锋鏌SB杩炴帴",
+ content: "璇锋鏌ユ墦鍗版満杩炴帴",
showCancel: false,
success: () => {
this.modalVisible = false;
@@ -1330,7 +1332,7 @@
// 绗竴閮ㄥ垎锛氭潯鐮併�佸伐鍗曞彿銆佷緵搴斿晢淇℃伅 + 澶т簩缁寸爜
command.setBar(20, 40, "128", 100, 1, 0, 2, requestData.uniqueValue); // 鏉＄爜
- command.setText(20, 40, "TSS24.BF2", 1, 1, "鏉＄爜: ");
+ command.setText(20, 40, "TSS24.BF2", 1, 1, "鐗╂枡鏉＄爜: ");
command.setText(150, 40, "TSS24.BF2", 1, 1, requestData.uniqueValue);
// 宸ュ崟鍙�
@@ -1379,10 +1381,21 @@
// command.setFeed(30);
this.sendData = command.getData();
- // 鍙戦�佹暟鎹�
- this.senUSBData();
- // **鍏堣褰� "鎵撳嵃鍚�" 浜嬩欢**
- this.logPrintEvent("鎵撳嵃鍚�", "鎵撳嵃", requestData.uniqueValue);
+ // 1. 鎵ц鍙戦��
+ let printResult = this.senUSBData();
+
+ // 2. 鍒ゆ柇鍙戦�佹槸鍚︽垚鍔�
+ if (printResult.success) {
+ // 鉁� 鍙戦�佹垚鍔燂紝璁板綍鎵撳嵃鏃ュ織
+ this.logPrintEvent("鎵撳嵃鍚�", "鎵撳嵃", requestData.uniqueValue);
+ } else {
+ // 鉂� 鍙戦�佸け璐ワ紝鎻愮ず鐢ㄦ埛锛屼笉璁板綍鏃ュ織
+ uni.showToast({
+ title: "鎵撳嵃澶辫触锛屾湭璁板綍鏃ュ織",
+ duration: 2000
+ });
+ }
+
this.oldbgs = this.reportedQuantity;
//浠庢柊鍒锋柊宸ュ崟淇℃伅
loadOrderDetails();
@@ -1423,7 +1436,7 @@
if (!UsbModule || !UsbModule.isUsbConnect || !UsbModule.isUsbConnect()) {
uni.showModal({
title: ` ${this.networkState}`,
- content: "璇锋鏌SB杩炴帴",
+ content: "璇锋鏌ユ墦鍗版満杩炴帴",
showCancel: false,
success: () => {
this.modalVisible = false;
@@ -1498,7 +1511,7 @@
// 绗竴閮ㄥ垎锛氭潯鐮併�佸伐鍗曞彿銆佷緵搴斿晢淇℃伅 + 澶т簩缁寸爜
command.setBar(20, 40, "128", 100, 1, 0, 2, this.lastRequestData); // 鏉＄爜
- command.setText(20, 40, "TSS24.BF2", 1, 1, "鏉＄爜: ");
+ command.setText(20, 40, "TSS24.BF2", 1, 1, "鐗╂枡鏉＄爜: ");
command.setText(150, 40, "TSS24.BF2", 1, 1, this.lastRequestData);
// 宸ュ崟鍙�
@@ -1544,11 +1557,25 @@
command.setPagePrint();
command.setFeed(3);
this.sendData = command.getData();
-
+ // 1. 鎵ц鍙戦��
+ let printResult = this.senUSBData();
+
+ // 2. 鍒ゆ柇鍙戦�佹槸鍚︽垚鍔�
+ if (printResult.success) {
+ // 鍙戦�佹垚鍔燂紝璁板綍鎵撳嵃鏃ュ織
+ this.logPrintEvent("鎵撳嵃鍚�", "琛ユ墦", this.lastRequestData);
+ } else {
+ // 鍙戦�佸け璐ワ紝鎻愮ず鐢ㄦ埛锛屼笉璁板綍鏃ュ織
+ uni.showToast({
+ title: "鎵撳嵃澶辫触锛屾湭璁板綍鏃ュ織",
+ duration: 2000
+ });
+ }
+F
// 鍙戦�佹暟鎹�
this.senUSBData();
// **璁板綍 "琛ユ墦鍚�" 浜嬩欢**
- this.logPrintEvent("鎵撳嵃鍚�", "琛ユ墦", this.lastRequestData);
+
}
,
logPrintEvent(eventType, printType, barcodeValue) {
--
Gitblit v1.9.3