From 8e4840cbd4e026e783c9a9b1b8aefe0f43c67a29 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 09 三月 2026 10:43:42 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
---
src/views/personnelManagement/employeeRecord/components/EducationWorkSection.vue | 74 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/views/personnelManagement/employeeRecord/components/EducationWorkSection.vue b/src/views/personnelManagement/employeeRecord/components/EducationWorkSection.vue
index 10ed6ac..c1470e7 100644
--- a/src/views/personnelManagement/employeeRecord/components/EducationWorkSection.vue
+++ b/src/views/personnelManagement/employeeRecord/components/EducationWorkSection.vue
@@ -8,11 +8,11 @@
鏁欒偛缁忓巻
</span>
</template>
- <el-table :data="form.educationList" border>
- <el-table-column label="瀛﹀巻" prop="degree" width="120">
+ <el-table :data="form.staffEducationList" border>
+ <el-table-column label="瀛﹀巻" prop="education" width="120">
<template #default="{ row }">
<el-select
- v-model="row.degree"
+ v-model="row.education"
placeholder="璇烽�夋嫨"
clearable
style="width: 100%"
@@ -25,10 +25,10 @@
</el-select>
</template>
</el-table-column>
- <el-table-column label="姣曚笟闄㈡牎" prop="school" min-width="160">
+ <el-table-column label="姣曚笟闄㈡牎" prop="schoolName" min-width="160">
<template #default="{ row }">
<el-input
- v-model="row.school"
+ v-model="row.schoolName"
placeholder="璇疯緭鍏�"
clearable
maxlength="30"
@@ -36,10 +36,10 @@
/>
</template>
</el-table-column>
- <el-table-column label="鍏ュ鏃堕棿" prop="admissionDate" width="150">
+ <el-table-column label="鍏ュ鏃堕棿" prop="enrollTime" width="150">
<template #default="{ row }">
<el-date-picker
- v-model="row.admissionDate"
+ v-model="row.enrollTime"
type="date"
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
@@ -49,10 +49,10 @@
/>
</template>
</el-table-column>
- <el-table-column label="姣曚笟鏃堕棿" prop="graduationDate" width="150">
+ <el-table-column label="姣曚笟鏃堕棿" prop="graduateTime" width="150">
<template #default="{ row }">
<el-date-picker
- v-model="row.graduationDate"
+ v-model="row.graduateTime"
type="date"
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
@@ -73,10 +73,10 @@
/>
</template>
</el-table-column>
- <el-table-column label="瀛︿綅" prop="academicDegree" width="140">
+ <el-table-column label="瀛︿綅" prop="degree" width="140">
<template #default="{ row }">
<el-input
- v-model="row.academicDegree"
+ v-model="row.degree"
placeholder="璇疯緭鍏�"
clearable
maxlength="20"
@@ -87,7 +87,7 @@
<el-table-column label="鎿嶄綔" width="80" align="center">
<template #default="scope">
<el-button
- v-if="form.educationList.length > 1"
+ v-if="form.staffEducationList.length > 1"
type="primary"
link
@click="removeEducationRow(scope.$index)"
@@ -108,11 +108,11 @@
宸ヤ綔缁忓巻
</span>
</template>
- <el-table :data="form.workExperienceList" border>
- <el-table-column label="鍓嶅叕鍙�" prop="company" min-width="180">
+ <el-table :data="form.staffWorkExperienceList" border>
+ <el-table-column label="鍓嶅叕鍙�" prop="formerCompany" min-width="180">
<template #default="{ row }">
<el-input
- v-model="row.company"
+ v-model="row.formerCompany"
placeholder="璇疯緭鍏�"
clearable
maxlength="30"
@@ -120,10 +120,10 @@
/>
</template>
</el-table-column>
- <el-table-column label="鍓嶅叕鍙搁儴闂�" prop="department" min-width="140">
+ <el-table-column label="鍓嶅叕鍙搁儴闂�" prop="formerDept" min-width="140">
<template #default="{ row }">
<el-input
- v-model="row.department"
+ v-model="row.formerDept"
placeholder="璇疯緭鍏�"
clearable
maxlength="20"
@@ -131,10 +131,10 @@
/>
</template>
</el-table-column>
- <el-table-column label="鍓嶅叕鍙歌亴浣�" prop="position" min-width="140">
+ <el-table-column label="鍓嶅叕鍙歌亴浣�" prop="formerPosition" min-width="140">
<template #default="{ row }">
<el-input
- v-model="row.position"
+ v-model="row.formerPosition"
placeholder="璇疯緭鍏�"
clearable
maxlength="20"
@@ -168,10 +168,10 @@
/>
</template>
</el-table-column>
- <el-table-column label="宸ヤ綔鎻忚堪" prop="description" min-width="220">
+ <el-table-column label="宸ヤ綔鎻忚堪" prop="workDesc" min-width="220">
<template #default="{ row }">
<el-input
- v-model="row.description"
+ v-model="row.workDesc"
type="textarea"
:rows="2"
placeholder="璇疯緭鍏�"
@@ -184,7 +184,7 @@
<el-table-column label="鎿嶄綔" width="80" align="center">
<template #default="scope">
<el-button
- v-if="form.workExperienceList.length > 1"
+ v-if="form.staffWorkExperienceList.length > 1"
type="primary"
link
@click="removeWorkRow(scope.$index)"
@@ -211,35 +211,35 @@
const { form } = toRefs(props);
const addEducationRow = () => {
- form.value.educationList.push({
- degree: "",
- school: "",
- admissionDate: "",
- graduationDate: "",
+ form.value.staffEducationList.push({
+ education: "",
+ schoolName: "",
+ enrollTime: "",
+ graduateTime: "",
major: "",
- academicDegree: "",
+ degree: "",
});
};
const removeEducationRow = (index) => {
- if (form.value.educationList.length <= 1) return;
- form.value.educationList.splice(index, 1);
+ if (form.value.staffEducationList.length <= 1) return;
+ form.value.staffEducationList.splice(index, 1);
};
const addWorkRow = () => {
- form.value.workExperienceList.push({
- company: "",
- department: "",
- position: "",
+ form.value.staffWorkExperienceList.push({
+ formerCompany: "",
+ formerDept: "",
+ formerPosition: "",
startDate: "",
endDate: "",
- description: "",
+ workDesc: "",
});
};
const removeWorkRow = (index) => {
- if (form.value.workExperienceList.length <= 1) return;
- form.value.workExperienceList.splice(index, 1);
+ if (form.value.staffWorkExperienceList.length <= 1) return;
+ form.value.staffWorkExperienceList.splice(index, 1);
};
</script>
--
Gitblit v1.9.3