From fb243f3345c6f3ed7e7c8c2d98c39b5afc782b9a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 20 十月 2025 10:24:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/payrollManage/payrollManage/InnerPage.vue | 8 ++++++--
1 files changed, 6 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..317f62a 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"
@@ -109,6 +109,7 @@
function openPassword(item: API.GetSettlementTasksQueryResultItem) {
form.passwordVisible = true;
+ form.showKeyboard = true;
form.id = item.id;
}
@@ -128,6 +129,9 @@
}
} catch (error) {
form.showKeyboard = false;
+ } finally {
+ form.password = '';
+ form.showKeyboard = false;
}
}
--
Gitblit v1.9.1