From 4243f25a01f4e79b3f83218dfcbe94d9befee43d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 20 十月 2025 09:59:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_7004' into dev_7004
---
src/views/personnelManagement/onboarding/index.vue | 245 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 201 insertions(+), 44 deletions(-)
diff --git a/src/views/personnelManagement/onboarding/index.vue b/src/views/personnelManagement/onboarding/index.vue
index 2ad1e89..d993ee6 100644
--- a/src/views/personnelManagement/onboarding/index.vue
+++ b/src/views/personnelManagement/onboarding/index.vue
@@ -4,12 +4,28 @@
<div>
<span class="search_title">濮撳悕锛�</span>
<el-input
- v-model="searchForm.customerName"
+ v-model="searchForm.staffName"
style="width: 240px"
- placeholder="璇疯緭鍏ュ悕绉版悳绱�"
+ placeholder="璇疯緭鍏ュ鍚嶆悳绱�"
@change="handleQuery"
clearable
:prefix-icon="Search"
+ />
+ <span style="margin-left: 10px;" class="search_title">鍚堝悓寮�濮嬫棩鏈燂細</span>
+ <el-date-picker
+ v-model="searchForm.entryDateStart"
+ type="date"
+ placeholder="璇烽�夋嫨鍚堝悓寮�濮嬫棩鏈�"
+ size="default"
+ @change="(date) => handleDateChange(date,1)"
+ />
+ <span style="margin-left: 10px;" class="search_title">鍚堝悓缁撴潫鏃ユ湡锛�</span>
+ <el-date-picker
+ v-model="searchForm.entryDateEnd"
+ type="date"
+ placeholder="璇烽�夋嫨鍚堝悓缁撴潫鏃ユ湡"
+ size="default"
+ @change="(date) => handleDateChange(date,2)"
/>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px"
>鎼滅储</el-button
@@ -17,6 +33,8 @@
</div>
<div>
<el-button type="primary" @click="openForm('add')">鏂板鍏ヨ亴</el-button>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+ <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
</div>
<div class="table_list">
@@ -29,53 +47,46 @@
@selection-change="handleSelectionChange"
:tableLoading="tableLoading"
@pagination="pagination"
- :total="total"
+ :total="page.total"
></PIMTable>
</div>
- <form-dia ref="formDia"></form-dia>
+ <form-dia ref="formDia" @close="handleQuery"></form-dia>
</div>
</template>
<script setup>
import { Search } from "@element-plus/icons-vue";
-import { ref } from "vue";
+import {onMounted, ref} from "vue";
import FormDia from "@/views/personnelManagement/onboarding/components/formDia.vue";
+import {staffJoinDel, staffJoinListPage} from "@/api/personnelManagement/onboarding.js";
+import {ElMessageBox} from "element-plus";
+import dayjs from "dayjs";
const data = reactive({
searchForm: {
- customerName: "",
- },
- form: {
- salesLedgerId: "",
- customerName: "",
- salesman: "",
- projectName: "",
- productData: [],
- },
- rules: {
- salesLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ staffName: "",
},
});
-const { searchForm, form, rules } = toRefs(data);
+const { searchForm } = toRefs(data);
const tableColumn = ref([
{
label: "鐘舵��",
- prop: "paymentDate",
+ prop: "staffState",
dataType: "tag",
formatData: (params) => {
if (params == 0) {
- return "鍦ㄨ亴";
- } else if (params == 1) {
return "绂昏亴";
+ } else if (params == 1) {
+ return "鍏ヨ亴";
} else {
return null;
}
},
formatType: (params) => {
if (params == 0) {
- return "primary";
- } else if (params == 1) {
return "danger";
+ } else if (params == 1) {
+ return "primary";
} else {
return null;
}
@@ -83,67 +94,121 @@
},
{
label: "鍛樺伐缂栧彿",
- prop: "supplierName",
+ prop: "staffNo",
},
{
label: "濮撳悕",
- prop: "currentPaymentAmount",
+ prop: "staffName",
},
{
label: "鎬у埆",
- prop: "paymentMethod",
+ prop: "sex",
},
{
label: "绫嶈疮",
- prop: "registrant",
+ prop: "nativePlace",
},
{
label: "宀椾綅",
- prop: "registrationtDate",
+ prop: "postJob",
},
{
label: "瀹跺涵浣忓潃",
- prop: "registrationtDate",
+ prop: "adress",
+ width:200
},
{
label: "绗竴瀛﹀巻",
- prop: "registrationtDate",
+ prop: "firstStudy",
},
{
label: "涓撲笟",
- prop: "registrationtDate",
+ prop: "profession",
+ width:100
},
{
label: "韬唤璇佸彿",
- prop: "registrationtDate",
+ prop: "identityCard",
+ width:200
},
{
label: "骞撮緞",
- prop: "registrationtDate",
+ prop: "age",
},
{
label: "鑱旂郴鐢佃瘽",
- prop: "registrationtDate",
+ prop: "phone",
+ width:150
},
{
label: "绱ф�ヨ仈绯讳汉",
- prop: "registrationtDate",
+ prop: "emergencyContact",
+ width: 120
},
{
label: "鑱旂郴鐢佃瘽",
- prop: "registrationtDate",
+ prop: "emergencyContactPhone",
+ width:150
},
{
- label: "鍚堝悓骞撮檺",
- prop: "registrationtDate",
+ label: "璇曠敤鏈燂紙鏈堬級",
+ prop: "probationPeriod",
+ width: 120,
+ },
+ // {
+ // label: "杞鏃ユ湡",
+ // prop: "probationEndDate",
+ // width: 120,
+ // formatData: (row) => {
+ // // 淇敼涓轰娇鐢ㄥ悎鍚屽紑濮嬫棩鏈熻绠楄浆姝ｆ棩鏈�
+ // if (row.contractStartTime && row.probationPeriod) {
+ // // 璁＄畻杞鏃ユ湡锛堝悎鍚屽紑濮嬫棩鏈熷姞涓婅瘯鐢ㄦ湡鏈堟暟锛�
+ // return dayjs(row.contractStartTime).add(row.probationPeriod, 'month').format('YYYY-MM-DD');
+ // }
+ // return '';
+ // },
+ // formatType: (row) => {
+ // // 淇敼涓轰娇鐢ㄥ悎鍚屽紑濮嬫棩鏈熸鏌ユ槸鍚︿复杩戣浆姝ｏ紙7澶╁唴锛�
+ // if (row.contractStartTime && row.probationPeriod) {
+ // const probationEndDate = dayjs(row.contractStartTime).add(row.probationPeriod, 'month');
+ // const daysUntilProbationEnd = probationEndDate.diff(dayjs(), 'day');
+
+ // if (daysUntilProbationEnd >= 0 && daysUntilProbationEnd <= 7) {
+ // return 'warning'; // 浣跨敤璀﹀憡鏍峰紡鏍囪涓磋繎杞鐨勫憳宸�
+ // }
+ // }
+ // return '';
+ // }
+ // },
+ {
+ label: "鍚堝悓骞撮檺锛堝勾锛�",
+ prop: "contractTerm",
+ width: 120,
},
{
label: "鍚堝悓寮�濮嬫棩鏈�",
- prop: "registrationtDate",
+ prop: "contractStartTime",
+ width: 120
},
{
label: "鍚堝悓缁撴潫鏃ユ湡",
- prop: "registrationtDate",
+ prop: "contractEndTime",
+ width: 120
+ },
+ {
+ dataType: "action",
+ label: "鎿嶄綔",
+ align: "center",
+ fixed: 'right',
+ operation: [
+ {
+ name: "缂栬緫",
+ type: "text",
+ clickFun: (row) => {
+ openForm("edit", row);
+ },
+ },
+ ],
},
]);
const tableData = ref([]);
@@ -152,11 +217,25 @@
const page = reactive({
current: 1,
size: 100,
+ total: 0,
});
-const total = ref(0);
const formDia = ref()
const { proxy } = getCurrentInstance()
+const handleDateChange = (value,type) => {
+ searchForm.value.entryDateEnd = null
+ searchForm.value.entryDateStart = null
+ if(type === 1){
+ if (value) {
+ searchForm.value.entryDateStart = dayjs(value).format("YYYY-MM-DD");
+ }
+ }else{
+ if (value) {
+ searchForm.value.entryDateEnd = dayjs(value).format("YYYY-MM-DD");
+ }
+ }
+ getList();
+};
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
@@ -170,14 +249,50 @@
};
const getList = () => {
tableLoading.value = true;
+ staffJoinListPage({...page, ...searchForm.value, staffState: 1}).then(res => {
+ tableLoading.value = false;
+ tableData.value = res.data.records
+ page.total = res.data.total;
+
+ // 妫�鏌ユ槸鍚︽湁涓磋繎杞鐨勫憳宸ュ苟鎻愰啋
+ checkProbationEnding(tableData.value);
+ }).catch(err => {
+ tableLoading.value = false;
+ })
+};
+// 妫�鏌ヤ复杩戣浆姝ｇ殑鍛樺伐骞舵彁閱�
+const checkProbationEnding = (data) => {
+ const probationEndingSoon = [];
+ data.forEach(item => {
+ // 淇敼涓轰娇鐢ㄥ悎鍚屽紑濮嬫棩鏈熸鏌�
+ if (item.contractStartTime && item.probationPeriod) {
+ const probationEndDate = dayjs(item.contractStartTime).add(item.probationPeriod, 'month');
+ const daysUntilProbationEnd = probationEndDate.diff(dayjs(), 'day');
+
+ if (daysUntilProbationEnd >= 0 && daysUntilProbationEnd <= 7) {
+ probationEndingSoon.push({
+ staffName: item.staffName,
+ probationEndDate: probationEndDate.format('YYYY-MM-DD'),
+ daysLeft: daysUntilProbationEnd
+ });
+ }
+ }
+ });
+
+ if (probationEndingSoon.length > 0) {
+ let message = '浠ヤ笅鍛樺伐灏嗗湪7澶╁唴杞锛歕n';
+ probationEndingSoon.forEach(item => {
+ message += `${item.staffName}锛�${item.probationEndDate}锛岃繕鏈�${item.daysLeft}澶╋級\n`;
+ });
+
+ // 鏄剧ず鎻愰啋娑堟伅
+ proxy.$modal.msgInfo(message);
+ }
};
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
- console.log("selection", selection);
- selectedRows.value = selection.filter(
- (item) => item.salesContractNo !== undefined
- );
+ selectedRows.value = selection;
};
// 鎵撳紑寮规
@@ -186,6 +301,48 @@
formDia.value?.openDialog(type, row)
})
};
+
+// 鍒犻櫎
+const handleDelete = () => {
+ let ids = [];
+ if (selectedRows.value.length > 0) {
+ ids = selectedRows.value.map((item) => item.id);
+ } else {
+ proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ staffJoinDel(ids).then((res) => {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList();
+ });
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+};
+// 瀵煎嚭
+const handleOut = () => {
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ proxy.download("/staff/staffJoinLeaveRecord/export", {staffState: 1}, "浜哄憳鍏ヨ亴.xlsx");
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+};
+onMounted(() => {
+ getList();
+});
</script>
<style scoped></style>
--
Gitblit v1.9.3