From c82b7a4583f57d7bbb2f0eb4a6c5846ce0308075 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 12 三月 2021 02:37:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/archivesChange.vue | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index a2cfad0..338b199 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -1269,8 +1269,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="workExperienceForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="workExperienceForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="workExperienceForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="workExperienceForm.jobName" />
@@ -1371,8 +1371,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="physicalExamForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="physicalExamForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="physicalExamForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="physicalExamForm.jobName" />
@@ -1480,8 +1480,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="contractInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="contractInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="contractInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="contractInfoForm.jobName" />
@@ -1562,8 +1562,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="dimissionAttendForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="dimissionAttendForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="dimissionAttendForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="dimissionAttendForm.jobName" />
@@ -1651,8 +1651,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="leaveInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="leaveInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="leaveInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="leaveInfoForm.jobName" />
@@ -1730,8 +1730,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="resignForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="resignForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="resignForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="resignForm.jobName" />
@@ -1805,8 +1805,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="unemploymentForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="unemploymentForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="unemploymentForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="unemploymentForm.jobName" />
@@ -1894,8 +1894,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="insuranceForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="insuranceForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="insuranceForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="insuranceForm.jobName" />
@@ -1975,8 +1975,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="accidentCasesForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="accidentCasesForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="accidentCasesForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="accidentCasesForm.jobName" />
@@ -2127,8 +2127,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="occupationalForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="occupationalForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="occupationalForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="occupationalForm.jobName" />
@@ -2334,8 +2334,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="laborTroubleForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="laborTroubleForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="laborTroubleForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="laborTroubleForm.jobName" />
@@ -2428,8 +2428,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="badRecordForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="badRecordForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="badRecordForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="badRecordForm.jobName" />
@@ -2500,8 +2500,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="remarkInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="remarkInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="remarkInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="remarkInfoForm.jobName" />
--
Gitblit v1.8.0