From 4b3024e8fa2ce27a2e0b408778d4e62cc570b8b4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 10 七月 2025 17:00:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/personnelManagement/onboarding/index.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/views/personnelManagement/onboarding/index.vue b/src/views/personnelManagement/onboarding/index.vue
index a2f33b8..2254175 100644
--- a/src/views/personnelManagement/onboarding/index.vue
+++ b/src/views/personnelManagement/onboarding/index.vue
@@ -31,7 +31,7 @@
@selection-change="handleSelectionChange"
:tableLoading="tableLoading"
@pagination="pagination"
- :total="total"
+ :total="page.total"
></PIMTable>
</div>
<form-dia ref="formDia" @close="handleQuery"></form-dia>
@@ -60,7 +60,7 @@
if (params == 0) {
return "绂昏亴";
} else if (params == 1) {
- return "鍦ㄨ亴";
+ return "鍏ヨ亴";
} else {
return null;
}
@@ -98,6 +98,7 @@
{
label: "瀹跺涵浣忓潃",
prop: "adress",
+ width:200
},
{
label: "绗竴瀛﹀巻",
@@ -106,10 +107,12 @@
{
label: "涓撲笟",
prop: "profession",
+ width:100
},
{
label: "韬唤璇佸彿",
prop: "identityCard",
+ width:200
},
{
label: "骞撮緞",
@@ -118,14 +121,17 @@
{
label: "鑱旂郴鐢佃瘽",
prop: "phone",
+ width:150
},
{
label: "绱ф�ヨ仈绯讳汉",
prop: "emergencyContact",
+ width: 120
},
{
label: "鑱旂郴鐢佃瘽",
prop: "emergencyContactPhone",
+ width:150
},
{
label: "鍚堝悓骞撮檺",
@@ -134,10 +140,12 @@
{
label: "鍚堝悓寮�濮嬫棩鏈�",
prop: "contractStartTime",
+ width: 120
},
{
label: "鍚堝悓缁撴潫鏃ユ湡",
prop: "contractEndTime",
+ width: 120
},
{
dataType: "action",
@@ -161,8 +169,8 @@
const page = reactive({
current: 1,
size: 100,
+ total: 0,
});
-const total = ref(0);
const formDia = ref()
const { proxy } = getCurrentInstance()
@@ -182,7 +190,7 @@
staffJoinListPage({...page, ...searchForm.value, staffState: 1}).then(res => {
tableLoading.value = false;
tableData.value = res.data.records
- total.value = res.data.total;
+ page.total = res.data.total;
}).catch(err => {
tableLoading.value = false;
})
--
Gitblit v1.9.3