From a72eca88f85e0a2e1b7383697002817d3c8ae01b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 07 十一月 2025 11:45:03 +0800
Subject: [PATCH] 合同管理加下载合同功能
---
src/views/personnelManagement/employeeRecord/components/formDia.vue | 153 +++++++++++++++++----
src/views/personnelManagement/onboarding/components/formDiaXJHT.vue | 97 +++++++------
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 98 +++++++++++++
src/views/personnelManagement/contractManagement/index.vue | 18 ++
src/views/personnelManagement/onboarding/index.vue | 4
5 files changed, 288 insertions(+), 82 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index 24bb1d0..e0af994 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -39,6 +39,63 @@
</el-form-item>
</el-col>
</el-row>
+ <!-- 璇峰亣鏃堕棿锛堜粎褰� approveType 涓� 2 鏃舵樉绀猴級 -->
+ <el-row :gutter="30" v-if="props.approveType == 2">
+ <el-col :span="12">
+ <el-form-item label="璇峰亣寮�濮嬫椂闂达細" prop="leaveStartTime">
+ <el-date-picker
+ v-model="form.leaveStartTime"
+ type="date"
+ placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="璇峰亣缁撴潫鏃堕棿锛�" prop="leaveEndTime">
+ <el-date-picker
+ v-model="form.leaveEndTime"
+ type="date"
+ placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!-- 鎶ラ攢閲戦锛堜粎褰� approveType 涓� 4 鏃舵樉绀猴級 -->
+ <el-row v-if="props.approveType == 4">
+ <el-col :span="24">
+ <el-form-item label="鎶ラ攢閲戦锛�" prop="reimbursementAmount">
+ <el-input-number
+ v-model="form.reimbursementAmount"
+ placeholder="璇疯緭鍏ユ姤閿�閲戦"
+ :min="0"
+ :precision="2"
+ :step="0.01"
+ style="width: 100%"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!-- 鍑哄樊鍦扮偣锛堜粎褰� approveType 涓� 3 鏃舵樉绀猴級 -->
+ <el-row v-if="props.approveType == 3">
+ <el-col :span="24">
+ <el-form-item label="鍑哄樊鍦扮偣锛�" prop="businessTripLocation">
+ <el-input
+ v-model="form.businessTripLocation"
+ placeholder="璇疯緭鍏ュ嚭宸湴鐐�"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
<!-- 瀹℃壒浜洪�夋嫨锛堝姩鎬佽妭鐐癸級 -->
<el-row>
<el-col :span="24">
@@ -175,7 +232,11 @@
approveReason: "",
checkResult: "",
tempFileIds: [],
- approverList: [] // 鏂板瀛楁锛屽瓨鍌ㄦ墍鏈夎妭鐐圭殑瀹℃壒浜篿d
+ approverList: [], // 鏂板瀛楁锛屽瓨鍌ㄦ墍鏈夎妭鐐圭殑瀹℃壒浜篿d
+ leaveStartTime: "", // 璇峰亣寮�濮嬫椂闂�
+ leaveEndTime: "", // 璇峰亣缁撴潫鏃堕棿
+ reimbursementAmount: null, // 鎶ラ攢閲戦
+ businessTripLocation: "" // 鍑哄樊鍦扮偣
},
rules: {
approveTime: [{ required: false, message: "璇疯緭鍏�", trigger: "change" },],
@@ -184,6 +245,10 @@
approveDeptId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
approveReason: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkResult: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+ leaveStartTime: [{ required: true, message: "璇烽�夋嫨璇峰亣寮�濮嬫椂闂�", trigger: "change" }],
+ leaveEndTime: [{ required: true, message: "璇烽�夋嫨璇峰亣缁撴潫鏃堕棿", trigger: "change" }],
+ reimbursementAmount: [{ required: true, message: "璇疯緭鍏ユ姤閿�閲戦", trigger: "blur" }],
+ businessTripLocation: [{ required: true, message: "璇疯緭鍏ュ嚭宸湴鐐�", trigger: "blur" }],
},
});
const { form, rules } = toRefs(data);
@@ -211,7 +276,6 @@
// 鎵撳紑寮规
const openDialog = (type, row) => {
- console.log('openDialog', type, row)
operationType.value = type;
dialogFormVisible.value = true;
userListNoPageByTenantId().then((res) => {
@@ -278,6 +342,36 @@
proxy.$modal.msgError("璇蜂负鎵�鏈夊鎵硅妭鐐归�夋嫨瀹℃壒浜猴紒")
return
}
+ // 褰� approveType 涓� 2 鏃讹紝鏍￠獙璇峰亣鏃堕棿
+ if (props.approveType == 2) {
+ if (!form.value.leaveStartTime) {
+ proxy.$modal.msgError("璇烽�夋嫨璇峰亣寮�濮嬫椂闂达紒")
+ return
+ }
+ if (!form.value.leaveEndTime) {
+ proxy.$modal.msgError("璇烽�夋嫨璇峰亣缁撴潫鏃堕棿锛�")
+ return
+ }
+ // 鏍￠獙缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�
+ if (new Date(form.value.leaveEndTime) < new Date(form.value.leaveStartTime)) {
+ proxy.$modal.msgError("璇峰亣缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂达紒")
+ return
+ }
+ }
+ // 褰� approveType 涓� 3 鏃讹紝鏍￠獙鍑哄樊鍦扮偣
+ if (props.approveType == 3) {
+ if (!form.value.businessTripLocation || form.value.businessTripLocation.trim() === '') {
+ proxy.$modal.msgError("璇疯緭鍏ュ嚭宸湴鐐癸紒")
+ return
+ }
+ }
+ // 褰� approveType 涓� 4 鏃讹紝鏍￠獙鎶ラ攢閲戦
+ if (props.approveType == 4) {
+ if (!form.value.reimbursementAmount || form.value.reimbursementAmount <= 0) {
+ proxy.$modal.msgError("璇疯緭鍏ユ湁鏁堢殑鎶ラ攢閲戦锛�")
+ return
+ }
+ }
proxy.$refs.formRef.validate(valid => {
if (valid) {
if (operationType.value === "add" || currentApproveStatus.value == 3) {
diff --git a/src/views/personnelManagement/contractManagement/index.vue b/src/views/personnelManagement/contractManagement/index.vue
index 9fcd73a..700ace1 100644
--- a/src/views/personnelManagement/contractManagement/index.vue
+++ b/src/views/personnelManagement/contractManagement/index.vue
@@ -70,8 +70,8 @@
</template>
<script setup>
-import { Search } from "@element-plus/icons-vue";
-import { onMounted, ref } from "vue";
+import { Search, UploadFilled } from "@element-plus/icons-vue";
+import { onMounted, ref, reactive, toRefs, getCurrentInstance, nextTick } from "vue";
import FormDia from "@/views/personnelManagement/contractManagement/components/formDia.vue";
import { ElMessageBox } from "element-plus";
import { staffOnJobListPage } from "@/api/personnelManagement/employeeRecord.js";
@@ -183,7 +183,7 @@
label: "鎿嶄綔",
align: "center",
fixed: 'right',
- width: 120,
+ width: 180,
operation: [
{
name: "璇︽儏",
@@ -197,6 +197,13 @@
type: "text",
clickFun: (row) => {
openFilesFormDia(row);
+ },
+ },
+ {
+ name: "涓嬭浇鍚堝悓",
+ type: "text",
+ clickFun: (row) => {
+ handleDownloadContract(row);
},
},
],
@@ -278,6 +285,11 @@
proxy.$modal.msg("宸插彇娑�");
});
};
+// 涓嬭浇鍚堝悓
+const handleDownloadContract = (row) => {
+ const fileName = `${row.staffName}鍔冲姩鍚堝悓.xlsx`;
+ proxy.download("/staff/staffOnJob/exportCopy", { ...row }, fileName);
+};
const upload = reactive({
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鍚堝悓瀵煎叆锛�
open: false,
diff --git a/src/views/personnelManagement/employeeRecord/components/formDia.vue b/src/views/personnelManagement/employeeRecord/components/formDia.vue
index 3c9674c..dab16ed 100644
--- a/src/views/personnelManagement/employeeRecord/components/formDia.vue
+++ b/src/views/personnelManagement/employeeRecord/components/formDia.vue
@@ -6,16 +6,58 @@
width="70%"
@close="closeDia"
>
- <PIMTable
- rowKey="id"
- :column="tableColumn"
- :tableData="tableData"
- :tableLoading="tableLoading"
- height="600"
- ></PIMTable>
+ <el-descriptions class="detail-descriptions" :column="2" border size="small">
+ <el-descriptions-item label="鍛樺伐缂栧彿">{{ formData.staffNo || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="濮撳悕">{{ formData.staffName || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鎬у埆">{{ formData.sex || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="骞撮緞">{{ formData.age || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="韬唤璇佸彿">{{ formData.identityCard || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鎴风睄浣忓潃" :span="2">{{ formData.nativePlace || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鐜颁綇鍧�" :span="2">{{ formData.adress || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="宀椾綅">{{ formData.postJob || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="绗竴瀛﹀巻">{{ formData.firstStudy || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="涓撲笟">{{ formData.profession || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鑱旂郴鐢佃瘽">{{ formData.phone || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="绱ф�ヨ仈绯讳汉">{{ formData.emergencyContact || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="绱ф�ヨ仈绯讳汉鐢佃瘽">{{ formData.emergencyContactPhone || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鍚堝悓绛捐鏃ユ湡">{{ formData.signDate || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鍔冲姩鍚堝悓鏈熼檺閫夋嫨">
+ <span v-if="formData.dateSelect === 'A'">A銆佹湁鍥哄畾鏈熼檺</span>
+ <span v-else-if="formData.dateSelect === 'B'">B銆佹棤鍥哄畾鏈熼檺</span>
+ <span v-else-if="formData.dateSelect === 'C'">C銆佷互瀹屾垚涓�瀹氬伐浣滀换鍔′负鏈熼檺</span>
+ <span v-else>-</span>
+ </el-descriptions-item>
+ <el-descriptions-item label="鍚堝悓骞撮檺">{{ formattedContractTerm }}</el-descriptions-item>
+ <el-descriptions-item label="璇曠敤鏈熷紑濮嬫棩鏈�" v-if="formData.dateSelect === 'A' || formData.dateSelect === 'B'">
+ {{ formData.trialStartDate || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="璇曠敤鏈熺粨鏉熸棩鏈�" v-if="formData.dateSelect === 'A' || formData.dateSelect === 'B'">
+ {{ formData.trialEndDate || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="璇曠敤鏈熷伐璧�" v-if="formData.dateSelect === 'A' || formData.dateSelect === 'B'">
+ {{ formData.proSalary ? formData.proSalary.toFixed(2) : '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍚堝悓寮�濮嬫棩鏈�">{{ formData.contractStartTime || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鍚堝悓缁撴潫鏃ユ湡" v-if="formData.dateSelect === 'A'">
+ {{ formData.contractEndTime || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="宸ヨ祫鎶ラ叕" :span="2">
+ <span v-if="formData.salarySelect === 'A'">
+ A銆佷箼鏂圭殑宸ヨ祫鎶ラ叕鎸夌収鐢叉柟渚濇硶鍒跺畾鐨勮绔犲埗搴︿腑鐨勫唴閮ㄥ伐璧勫垎閰嶅姙娉曠‘瀹氾紝鏍规嵁涔欐柟鐨勫伐浣滃矖浣嶇‘瀹氬叾姣忔湀宸ヨ祫銆�
+ </span>
+ <span v-else-if="formData.salarySelect === 'B'">
+ B銆佺敳鏂瑰涔欐柟瀹炶鍩烘湰宸ヨ祫鍜岀哗鏁堝伐璧勭浉缁撳悎鐨勫唴閮ㄥ伐璧勫垎閰嶅姙娉曪紝涔欐柟鐨勬敹鍏ュ寘鎷熀鏈伐璧勩�佽椁愩�佷氦閫氥�佺敓娲讳綇瀹跨瓑鍚勯」琛ュ姪锛屽鏈夊彉鍔ㄦ牴鎹唴閮ㄥ伐璧勫垎閰嶅姙娉曡皟鏁村叾宸ヨ祫锛涚哗鏁堝伐璧勬牴鎹箼鏂圭殑宸ヤ綔涓氱哗銆佸姵鍔ㄦ垚鏋滃拰瀹為檯璐＄尞鎸夌収鍐呴儴鍒嗛厤鍔炴硶鑰冩牳纭畾銆�
+ </span>
+ <span v-else-if="formData.salarySelect === 'C'">
+ C銆佺敳鏂瑰疄琛岃浠跺伐璧勫埗锛屼互鐢叉柟鎺ュ埌璁㈠崟鍙婂叕鍙哥敓浜ц鍒掞紝鎸夌収瀹氶鍜岃浠跺崟浠凤紝鏍规嵁涔欐柟瀹屾垚鐨勪笟缁╋紝鎸夋椂瓒抽鏀粯涔欐柟鐨勫伐璧勬姤閰��
+ </span>
+ <span v-else>-</span>
+ </el-descriptions-item>
+ <el-descriptions-item label="绂忓埄寰呴亣" :span="2">{{ formData.remark || '-' }}</el-descriptions-item>
+ </el-descriptions>
<template #footer>
<div class="dialog-footer">
- <el-button @click="closeDia">鍙栨秷</el-button>
+ <el-button @click="closeDia">鍏抽棴</el-button>
</div>
</template>
</el-dialog>
@@ -23,38 +65,67 @@
</template>
<script setup>
-import {ref} from "vue";
-import {staffOnJobInfo} from "@/api/personnelManagement/employeeRecord.js";
-const { proxy } = getCurrentInstance()
+import {ref, reactive, computed} from "vue";
const emit = defineEmits(['close'])
const dialogFormVisible = ref(false);
const operationType = ref('')
-const tableColumn = ref([
- // {
- // label: "鍚堝悓骞撮檺",
- // prop: "contractTerm",
- // },
- {
- label: "鍚堝悓寮�濮嬫棩鏈�",
- prop: "contractStartTime",
- },
- {
- label: "鍚堝悓缁撴潫鏃ユ湡",
- prop: "contractEndTime",
- },
-]);
-const tableData = ref([]);
-const tableLoading = ref(false);
+const formData = reactive({
+ staffNo: "",
+ staffName: "",
+ sex: "",
+ identityCard: "",
+ nativePlace: "",
+ postJob: "",
+ adress: "",
+ firstStudy: "",
+ profession: "",
+ age: 0,
+ phone: "",
+ emergencyContact: "",
+ emergencyContactPhone: "",
+ dateSelect: "",
+ trialStartDate: "",
+ trialEndDate: "",
+ proSalary: null,
+ signDate: "",
+ salarySelect: "",
+ contractStartTime: "",
+ contractEndTime: "",
+ contractTerm: null,
+ remark: "",
+});
+
+const formattedContractTerm = computed(() => {
+ const value = formData.contractTerm;
+ if (value === null || value === undefined || value === "") {
+ return "-";
+ }
+ const numberValue = Number(value);
+ if (!isNaN(numberValue)) {
+ return `${numberValue}骞碻;
+ }
+ return value;
+});
// 鎵撳紑寮规
const openDialog = (type, row) => {
operationType.value = type;
dialogFormVisible.value = true;
- if (operationType.value === 'edit') {
- staffOnJobInfo({staffNo: row.staffNo}).then(res => {
- tableData.value = res.data
- })
+ // 閲嶇疆琛ㄥ崟鏁版嵁
+ Object.keys(formData).forEach(key => {
+ if (key === 'age') {
+ formData[key] = 0;
+ } else if (["proSalary", "contractTerm"].includes(key)) {
+ formData[key] = null;
+ } else {
+ formData[key] = "";
+ }
+ });
+
+ if (operationType.value === 'edit' && row) {
+ // 鐩存帴浣跨敤 row 鏁版嵁璧嬪��
+ Object.assign(formData, row);
}
}
@@ -69,5 +140,25 @@
</script>
<style scoped>
+.detail-descriptions {
+ margin-bottom: 16px;
+ border-radius: 6px;
+ overflow: hidden;
+}
+.detail-descriptions :deep(.el-descriptions__cell) {
+ padding: 12px 16px !important;
+}
+
+.detail-descriptions :deep(.el-descriptions__label) {
+ width: 140px;
+ color: #606266;
+ background-color: #f7f9fc;
+ font-weight: 500;
+}
+
+.detail-descriptions :deep(.el-descriptions__content) {
+ color: #303133;
+ line-height: 20px;
+}
</style>
\ No newline at end of file
diff --git a/src/views/personnelManagement/onboarding/components/formDiaXJHT.vue b/src/views/personnelManagement/onboarding/components/formDiaXJHT.vue
index fa0c9e6..71022bf 100644
--- a/src/views/personnelManagement/onboarding/components/formDiaXJHT.vue
+++ b/src/views/personnelManagement/onboarding/components/formDiaXJHT.vue
@@ -59,6 +59,11 @@
</el-col>
</el-row>
<el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="韬唤璇佸彿锛�" prop="identityCard">
+ <el-input v-model="form.identityCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙风爜" clearable maxlength="18" />
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="骞撮緞锛�" prop="age">
<el-input-number v-model="form.age" :precision="0" :step="1" style="width: 100%"/>
@@ -84,9 +89,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍚堝悓绛捐鏃ユ湡锛�" prop="trialStartDate">
+ <el-form-item label="鍚堝悓绛捐鏃ユ湡锛�" prop="signDate">
<el-date-picker
- v-model="form.trialStartDate"
+ v-model="form.signDate"
type="date"
placeholder="璇烽�夋嫨鏃ユ湡"
value-format="YYYY-MM-DD"
@@ -116,9 +121,9 @@
</el-row>
<el-row :gutter="30" v-if="showProbationDates">
<el-col :span="12">
- <el-form-item label="璇曠敤鏈熷紑濮嬫棩鏈燂細" prop="signDate">
+ <el-form-item label="璇曠敤鏈熷紑濮嬫棩鏈燂細" prop="trialStartDate">
<el-date-picker
- v-model="form.signDate"
+ v-model="form.trialStartDate"
type="date"
placeholder="璇烽�夋嫨鏃ユ湡"
value-format="YYYY-MM-DD"
@@ -142,13 +147,13 @@
</el-form-item>
</el-col>
</el-row>
-<!-- <el-row :gutter="30">-->
-<!-- <el-col :span="12">-->
-<!-- <el-form-item label="鍚堝悓骞撮檺锛�" prop="contractTerm">-->
-<!-- <el-input-number v-model="form.contractTerm" :precision="0" :step="1" style="width: 100%" :disabled="true"/>-->
-<!-- </el-form-item>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="鍚堝悓骞撮檺锛�" prop="contractTerm">
+ <el-input-number v-model="form.contractTerm" :precision="0" :step="1" style="width: 100%" :disabled="true"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍚堝悓寮�濮嬫棩鏈燂細" prop="contractStartTime">
@@ -160,6 +165,7 @@
format="YYYY-MM-DD"
clearable
style="width: 100%"
+ @change="calculateContractTerm"
/>
</el-form-item>
</el-col>
@@ -173,6 +179,7 @@
format="YYYY-MM-DD"
clearable
style="width: 100%"
+ @change="calculateContractTerm"
/>
</el-form-item>
</el-col>
@@ -234,6 +241,7 @@
staffNo: "",
staffName: "",
sex: "",
+ identityCard: "",
nativePlace: "",
postJob: "",
adress: "",
@@ -244,12 +252,12 @@
emergencyContact: "",
emergencyContactPhone: "",
dateSelect: "",
- signDate: "",
+ trialStartDate: "",
trialEndDate: "",
proSalary: null,
- trialStartDate: "",
+ signDate: "",
salarySelect: "",
- // contractTerm: 0,
+ contractTerm: 0,
contractStartTime: "",
contractEndTime: "",
staffState: "",
@@ -258,6 +266,7 @@
staffNo: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
staffName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
sex: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ identityCard: [{ required: true, message: "璇疯緭鍏ヨ韩浠借瘉鍙风爜", trigger: "blur" }],
nativePlace: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
postJob: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
adress: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -268,11 +277,11 @@
emergencyContact: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
remark: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
dateSelect: [{ required: true, message: "璇烽�夋嫨鍔冲姩鍚堝悓鏈熼檺", trigger: "change" }],
- signDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ trialStartDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
trialEndDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- trialStartDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ signDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
salarySelect: [{ required: true, message: "璇烽�夋嫨宸ヨ祫鎶ラ叕鏂瑰紡", trigger: "change" }],
- // contractTerm: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ contractTerm: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
contractStartTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
contractEndTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
},
@@ -302,7 +311,7 @@
getStaffJoinInfo(row.id).then(res => {
form.value = {...res.data}
// 缂栬緫鏃朵篃璁＄畻涓�娆″悎鍚屽勾闄�
- // calculateContractTerm();
+ calculateContractTerm();
})
}
}
@@ -326,32 +335,32 @@
})
}
// 璁＄畻鍚堝悓骞撮檺
-// const calculateContractTerm = () => {
-// if (form.value.contractStartTime && form.value.contractEndTime) {
-// const startDate = new Date(form.value.contractStartTime);
-// const endDate = new Date(form.value.contractEndTime);
-//
-// if (endDate > startDate) {
-// // 璁＄畻骞翠唤宸�
-// const yearDiff = endDate.getFullYear() - startDate.getFullYear();
-// const monthDiff = endDate.getMonth() - startDate.getMonth();
-// const dayDiff = endDate.getDate() - startDate.getDate();
-//
-// let years = yearDiff;
-//
-// // 濡傛灉缁撴潫鏃ユ湡鐨勬湀鏃ュ皬浜庡紑濮嬫棩鏈熺殑鏈堟棩锛屽垯鍑忓幓1骞�
-// if (monthDiff < 0 || (monthDiff === 0 && dayDiff < 0)) {
-// years = yearDiff - 1;
-// }
-//
-// form.value.contractTerm = Math.max(0, years);
-// } else {
-// form.value.contractTerm = 0;
-// }
-// } else {
-// form.value.contractTerm = 0;
-// }
-// };
+const calculateContractTerm = () => {
+ if (form.value.contractStartTime && form.value.contractEndTime) {
+ const startDate = new Date(form.value.contractStartTime);
+ const endDate = new Date(form.value.contractEndTime);
+
+ if (endDate > startDate) {
+ // 璁＄畻骞翠唤宸�
+ const yearDiff = endDate.getFullYear() - startDate.getFullYear();
+ const monthDiff = endDate.getMonth() - startDate.getMonth();
+ const dayDiff = endDate.getDate() - startDate.getDate();
+
+ let years = yearDiff;
+
+ // 濡傛灉缁撴潫鏃ユ湡鐨勬湀鏃ュ皬浜庡紑濮嬫棩鏈熺殑鏈堟棩锛屽垯鍑忓幓1骞�
+ if (monthDiff < 0 || (monthDiff === 0 && dayDiff < 0)) {
+ years = yearDiff - 1;
+ }
+
+ form.value.contractTerm = Math.max(0, years);
+ } else {
+ form.value.contractTerm = 0;
+ }
+ } else {
+ form.value.contractTerm = 0;
+ }
+};
// 鍏抽棴寮规
const closeDia = () => {
diff --git a/src/views/personnelManagement/onboarding/index.vue b/src/views/personnelManagement/onboarding/index.vue
index 9151a6c..a0c168e 100644
--- a/src/views/personnelManagement/onboarding/index.vue
+++ b/src/views/personnelManagement/onboarding/index.vue
@@ -57,8 +57,8 @@
<script setup>
import { Search } from "@element-plus/icons-vue";
import {onMounted, ref} from "vue";
-import FormDia from "@/views/personnelManagement/onboarding/components/formDia.vue";
-// import FormDia from "@/views/personnelManagement/onboarding/components/formDiaXJHT.vue"; // 鏂扮枂椋熷搧鍏徃鐢ㄧ殑琛ㄥ崟
+// import FormDia from "@/views/personnelManagement/onboarding/components/formDia.vue";
+import FormDia from "@/views/personnelManagement/onboarding/components/formDiaXJHT.vue"; // 鏂扮枂椋熷搧鍏徃鐢ㄧ殑琛ㄥ崟
import {staffJoinDel, staffJoinListPage} from "@/api/personnelManagement/onboarding.js";
import {ElMessageBox} from "element-plus";
import dayjs from "dayjs";
--
Gitblit v1.9.3