From c2accc29d778a9631cebcb494586909cba6f9464 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 19:50:55 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.2.0.1
---
apps/bMiniApp/src/subpackages/payrollManage/payrollManage/InnerPage.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/payrollManage/payrollManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/payrollManage/payrollManage/InnerPage.vue
index 137c23d..6b10245 100644
--- a/apps/bMiniApp/src/subpackages/payrollManage/payrollManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/payrollManage/payrollManage/InnerPage.vue
@@ -30,7 +30,7 @@
<IncomeDetailListItem
:title="item.code"
:funds="item.settlementAmount"
- :item="dayjs(item.settlementTime).format('YYYY-MM-DD HH:mm:ss')"
+ :item="item.settlementTime ? dayjs(item.settlementTime).format('YYYY-MM-DD HH:mm:ss') : ''"
@click="openPassword(item)"
>
</IncomeDetailListItem>
@@ -40,7 +40,7 @@
v-model="form.password"
v-model:visible="form.passwordVisible"
@focus="form.showKeyboard = true"
- tips="璇疯緭鍏ユ搷浣滃瘑鐮�"
+ tips="璇疯緭鍏�6浣嶆搷浣滃瘑鐮�"
desc="鏄庣粏闇�杈撳叆鎿嶄綔瀵嗙爜鎵嶈兘鏌ョ湅"
:length="6"
@complete="complete"
--
Gitblit v1.9.1