From a60acb4f1a580cdbace36a1c3687454e7902121e Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 13 Jan 2026 17:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=AC=E5=9C=B0=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=9C=BA=E6=B2=A1=E6=9C=89=E6=97=B6=E4=B8=8D=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E4=BA=91=E6=89=93=E5=8D=B0=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/settleAccount.vue | 10 +++++-----
 src/views/work/index.vue                    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/home/components/settleAccount.vue b/src/views/home/components/settleAccount.vue
index 0b4d38c..b26da66 100644
--- a/src/views/home/components/settleAccount.vue
+++ b/src/views/home/components/settleAccount.vue
@@ -227,11 +227,11 @@ async function printOrderLable(isBefore = false) {
         printStore.pushReceiptData(commOrderPrintData({ ...data, isBefore: isBefore }));
       } else {
         // 本地没有可用打印机使用云打印机
-        await orderPrint({
-          type: isBefore ? 1 : 0,
-          id: orderId,
-        });
-        ElMessage.success(`云打印${isBefore ? '预' : ''}结算单成功`);
+        // await orderPrint({
+        //   type: isBefore ? 1 : 0,
+        //   id: orderId,
+        // });
+        // ElMessage.success(`云打印${isBefore ? '预' : ''}结算单成功`);
       }
     }
   } catch (error) {
diff --git a/src/views/work/index.vue b/src/views/work/index.vue
index a7d47dc..f240476 100644
--- a/src/views/work/index.vue
+++ b/src/views/work/index.vue
@@ -86,7 +86,7 @@
                                 上岗时间：
                             </div>
                             <div class="box_content_right_tiemright">
-                                {{ dayjs(infoData.loginTime).format("YYYY-MM-DD HH:mm:ss") }}
+                                {{ dayjs(infoData.loginTime || new Date()).format("YYYY-MM-DD HH:mm:ss") }}
                             </div>
                         </div>
                         <div class="box_content_right_tiem">
@@ -94,7 +94,7 @@
                                 交班时间：
                             </div>
                             <div class="box_content_right_tiemright">
-                                {{ dayjs(infoData.handoverTime).format("YYYY-MM-DD HH:mm:ss") }}
+                                {{ dayjs(infoData.handoverTime || new Date()).format("YYYY-MM-DD HH:mm:ss") }}
                             </div>
                         </div>
                         <!-- <div class="box_content_right_tiem">
@@ -115,7 +115,7 @@
                         </div> -->
                         <div class="box_content_right_tiem">
                             <div class="box_content_right_tiemleft">
-                                收营员：
+                                收银员：
                             </div>
                             <div class="box_content_right_tiemright">
                                 {{ infoData.staffName || '无' }}