From 58f4d1ab9d4e689dfdd161d7f31765720fed17f6 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期日, 07 三月 2021 21:34:27 +0800
Subject: [PATCH] 修改bug
---
src/views/user/archivesChange.vue | 68 +++++++++++-----------
src/views/user/inemployees.vue | 27 ++++----
src/views/user/archivesEdit.vue | 70 +++++++++++-----------
src/views/user/outemployess.vue | 2
4 files changed, 84 insertions(+), 83 deletions(-)
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index 0820682..9798d61 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -204,17 +204,17 @@
<el-row style="width: 100%;">
<el-col :span="8">
<el-form-item label="档案号" prop="archivesNumb">
- <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="empBaseInfoForm.empName" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.empName" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="性别" prop="sex">
- <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="readon ? false : true">
<el-option
v-for="dict in sexOptions"
:key="dict.dicItemCode"
@@ -230,7 +230,7 @@
<el-form-item label="部门(护卫点)" prop="deptId">
<treeselect
v-model="empBaseInfoForm.deptId"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
:multiple="false"
:options="depts"
:clear-value-text="$t('common.clear')"
@@ -243,7 +243,7 @@
<el-form-item label="岗位" prop="jobName">
<el-autocomplete
v-model="empBaseInfoForm.jobName"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
class="inline-input"
:fetch-suggestions="querySearchJob"
placeholder="请输入岗位"
@@ -253,7 +253,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="员工类别" prop="empType">
- <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="readon ? false : true">
<el-option
v-for="dict in empTypeOptions"
:key="dict.dicItemCode"
@@ -267,7 +267,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="民族" prop="nation">
- <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族" :disabled="readon ? false : true">
<el-option
v-for="dict in nationOptions"
:key="dict.dicItemCode"
@@ -279,12 +279,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="年龄" prop="age">
- <el-input v-model="empBaseInfoForm.age" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.age" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="婚姻状态" prop="marriage">
- <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="readon ? false : true">
<el-option
v-for="dict in marriageOptions"
:key="dict.dicItemCode"
@@ -300,7 +300,7 @@
<el-form-item label="身份证有效期" prop="certificateValidity">
<el-date-picker
v-model="empBaseInfoForm.certificateValidity"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@@ -309,12 +309,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="身高(cm)" prop="stature">
- <el-input v-model="empBaseInfoForm.stature" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.stature" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="政治面貌" prop="politics">
- <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="readon ? false : true">
<el-option
v-for="dict in statusOptions"
:key="dict.dicItemCode"
@@ -330,7 +330,7 @@
<el-form-item label="出生日期" prop="birthdate">
<el-date-picker
v-model="empBaseInfoForm.birthdate"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@@ -339,7 +339,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="最高学历" prop="education">
- <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历" :disabled="readon ? false : true">
<el-option
v-for="dict in educationOptions"
:key="dict.dicItemCode"
@@ -351,7 +351,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="籍贯" prop="nativePlaceName">
- <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择最高学历" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择最高学历" :disabled="readon ? false : true">
<el-option
v-for="dict in nativePlaceOptions"
:key="dict.dicItemCode"
@@ -365,29 +365,29 @@
<el-row>
<el-col :span="8">
<el-form-item label="户籍地址" prop="censusAddress">
- <el-input v-model="empBaseInfoForm.censusAddress" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.censusAddress" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="现住址" prop="currentAddress">
- <el-input v-model="empBaseInfoForm.currentAddress" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.currentAddress" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="保安员回执" prop="returnReceipt">
- <el-input v-model="empBaseInfoForm.returnReceipt" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.returnReceipt" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="保安员证号" prop="guardNumb">
- <el-input v-model="empBaseInfoForm.guardNumb" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.guardNumb" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="档案情况" prop="archivesStatus">
- <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况" :disabled="readon ? false : true">
<el-option
v-for="dict in archivesStatusOptions"
:key="dict.dicItemCode"
@@ -399,26 +399,26 @@
</el-col>
<el-col :span="8">
<el-form-item label="银行名称" prop="bankName">
- <el-input v-model="empBaseInfoForm.bankName" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.bankName" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="银行账号" prop="bankNumb">
- <el-input v-model="empBaseInfoForm.bankNumb" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.bankNumb" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="电话号码" prop="telePhone">
- <el-input v-model="empBaseInfoForm.telePhone" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.telePhone" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="入职日期" prop="entryDate">
<el-date-picker
v-model="empBaseInfoForm.entryDate"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@@ -430,7 +430,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="保险类型" prop="insuranceType">
- <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型" :disabled="readon ? false : true">
<el-option
v-for="dict in insuranceTypeOptions"
:key="dict.dicItemCode"
@@ -442,24 +442,24 @@
</el-col>
<el-col :span="8">
<el-form-item label="社保电脑号" prop="socialNumb">
- <el-input v-model="empBaseInfoForm.socialNumb" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.socialNumb" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="招聘介绍人" prop="introducer">
- <el-input v-model="empBaseInfoForm.introducer" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.introducer" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="入司工龄" prop="seniority">
- <el-input v-model="empBaseInfoForm.seniority" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.seniority" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作证" prop="empCardStatus">
- <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证" :disabled="readon ? false : true">
<el-option
v-for="dict in empCardStatusOptions"
:key="dict.dicItemCode"
@@ -471,19 +471,19 @@
</el-col>
<el-col :span="8">
<el-form-item label="家庭成员及关系" prop="family">
- <el-input v-model="empBaseInfoForm.family" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.family" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="紧急联系电话" prop="urgencyPhone">
- <el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="员工手册" prop="handbookStatus">
- <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册" :disabled="readon ? false : true">
<el-option
v-for="dict in handbookStatusOptions"
:key="dict.dicItemCode"
@@ -495,7 +495,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="相关证件" prop="certificateList">
- <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="readon ? false : true">
<el-option
v-for="dict in certificateListOptions"
:key="dict.dicItemCode"
@@ -509,7 +509,7 @@
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
v-model="empBaseInfoForm.certificateNumb"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
@input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
/>
</el-form-item>
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index acc196e..6b97dd7 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -198,7 +198,7 @@
编辑
</el-button>
<el-button
- v-if="this.readon"
+ v-if="readon"
style="position:absolute;right: 120px"
class="filter-item"
type="primary"
@@ -221,17 +221,17 @@
<el-row style="width: 100%;">
<el-col :span="8">
<el-form-item label="档案号" prop="archivesNumb">
- <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="empBaseInfoForm.empName" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.empName" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="性别" prop="sex">
- <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="readon ? false : true">
<el-option
v-for="dict in sexOptions"
:key="dict.dicItemCode"
@@ -247,7 +247,7 @@
<el-form-item label="部门(护卫点)" prop="deptId">
<treeselect
v-model="empBaseInfoForm.deptId"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
:multiple="false"
:options="depts"
:clear-value-text="$t('common.clear')"
@@ -260,7 +260,7 @@
<el-form-item label="岗位" prop="jobName">
<el-autocomplete
v-model="empBaseInfoForm.jobName"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
class="inline-input"
:fetch-suggestions="querySearchJob"
placeholder="请输入岗位"
@@ -270,7 +270,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="员工类别" prop="empType">
- <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="readon ? false : true">
<el-option
v-for="dict in empTypeOptions"
:key="dict.dicItemCode"
@@ -284,7 +284,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="民族" prop="nation">
- <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族" :disabled="readon ? false : true">
<el-option
v-for="dict in nationOptions"
:key="dict.dicItemCode"
@@ -296,12 +296,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="年龄" prop="age">
- <el-input v-model="empBaseInfoForm.age" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.age" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="婚姻状态" prop="marriage">
- <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="readon ? false : true">
<el-option
v-for="dict in marriageOptions"
:key="dict.dicItemCode"
@@ -317,7 +317,7 @@
<el-form-item label="身份证有效期" prop="certificateValidity">
<el-date-picker
v-model="empBaseInfoForm.certificateValidity"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@@ -326,12 +326,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="身高(cm)" prop="stature">
- <el-input v-model="empBaseInfoForm.stature" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.stature" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="政治面貌" prop="politics">
- <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="readon ? false : true">
<el-option
v-for="dict in statusOptions"
:key="dict.dicItemCode"
@@ -347,7 +347,7 @@
<el-form-item label="出生日期" prop="birthdate">
<el-date-picker
v-model="empBaseInfoForm.birthdate"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@@ -356,7 +356,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="最高学历" prop="education">
- <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历" :disabled="readon ? false : true">
<el-option
v-for="dict in educationOptions"
:key="dict.dicItemCode"
@@ -368,7 +368,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="籍贯" prop="nativePlaceName">
- <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择最高学历" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择最高学历" :disabled="readon ? false : true">
<el-option
v-for="dict in nativePlaceOptions"
:key="dict.dicItemCode"
@@ -382,29 +382,29 @@
<el-row>
<el-col :span="8">
<el-form-item label="户籍地址" prop="censusAddress">
- <el-input v-model="empBaseInfoForm.censusAddress" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.censusAddress" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="现住址" prop="currentAddress">
- <el-input v-model="empBaseInfoForm.currentAddress" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.currentAddress" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="保安员回执" prop="returnReceipt">
- <el-input v-model="empBaseInfoForm.returnReceipt" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.returnReceipt" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="保安员证号" prop="guardNumb">
- <el-input v-model="empBaseInfoForm.guardNumb" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.guardNumb" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="档案情况" prop="archivesStatus">
- <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况" :disabled="readon ? false : true">
<el-option
v-for="dict in archivesStatusOptions"
:key="dict.dicItemCode"
@@ -416,26 +416,26 @@
</el-col>
<el-col :span="8">
<el-form-item label="银行名称" prop="bankName">
- <el-input v-model="empBaseInfoForm.bankName" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.bankName" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="银行账号" prop="bankNumb">
- <el-input v-model="empBaseInfoForm.bankNumb" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.bankNumb" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="电话号码" prop="telePhone">
- <el-input v-model="empBaseInfoForm.telePhone" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.telePhone" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="入职日期" prop="entryDate">
<el-date-picker
v-model="empBaseInfoForm.entryDate"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@@ -447,7 +447,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="保险类型" prop="insuranceType">
- <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型" :disabled="readon ? false : true">
<el-option
v-for="dict in insuranceTypeOptions"
:key="dict.dicItemCode"
@@ -459,24 +459,24 @@
</el-col>
<el-col :span="8">
<el-form-item label="社保电脑号" prop="socialNumb">
- <el-input v-model="empBaseInfoForm.socialNumb" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.socialNumb" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="招聘介绍人" prop="introducer">
- <el-input v-model="empBaseInfoForm.introducer" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.introducer" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="入司工龄" prop="seniority">
- <el-input v-model="empBaseInfoForm.seniority" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.seniority" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作证" prop="empCardStatus">
- <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证" :disabled="readon ? false : true">
<el-option
v-for="dict in empCardStatusOptions"
:key="dict.dicItemCode"
@@ -488,19 +488,19 @@
</el-col>
<el-col :span="8">
<el-form-item label="家庭成员及关系" prop="family">
- <el-input v-model="empBaseInfoForm.family" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.family" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="紧急联系电话" prop="urgencyPhone">
- <el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="this.readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="员工手册" prop="handbookStatus">
- <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册" :disabled="readon ? false : true">
<el-option
v-for="dict in handbookStatusOptions"
:key="dict.dicItemCode"
@@ -512,7 +512,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="相关证件" prop="certificateList">
- <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="this.readon ? false : true">
+ <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="readon ? false : true">
<el-option
v-for="dict in certificateListOptions"
:key="dict.dicItemCode"
@@ -526,7 +526,7 @@
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
v-model="empBaseInfoForm.certificateNumb"
- :disabled="this.readon ? false : true"
+ :disabled="readon ? false : true"
@input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
/>
</el-form-item>
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 35de5d7..ae01604 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -180,7 +180,7 @@
<el-button type="primary" style="background-color: #409EFF" @click="delEmp">删除员工</el-button>
<el-button type="danger" class="hr-but-all" @click="showYgdg(0)">员工调岗</el-button>
<!-- <el-button type="danger" class="hr-but-all" @click="showDryg(0)">导入员工</el-button> -->
- <el-button type="danger" class="hr-but-all" @click="showDcyg(0)">导出员工</el-button>
+ <el-button type="danger" class="hr-but-all" @click="exportExcel()">导出员工</el-button>
<el-button type="danger" class="hr-but-all" @click="doDcda">导出档案</el-button>
<el-button type="primary" style="background-color: #409EFF" @click="showGbda(0)">关闭档案</el-button>
</el-col>
@@ -1172,6 +1172,15 @@
})
},
methods: {
+ exportExcel() {
+ var params = this.queryParams
+ this.$download('hr/empBaseInfo/exportEmpAll', { ...params }, `基本信息_${new Date().getTime()}.xls`).then(() => {
+ this.$message({
+ message: '下载成功!',
+ type: 'success'
+ })
+ })
+ },
editArchives(row) {
this.$refs.article.setArchives(row)
this.dialog.title = '档案管理'
@@ -1815,22 +1824,14 @@
}
},
doDcda() {
- this.$confirm('是否确定要导出档案,请耐心等待?', '提示', {
+ this.$confirm('是否确定要导出档案?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- var params = this.queryParams
- this.$post('hr/pdf/exportWithField', {
- ...params
- }).then((r) => {
- debugger
- const data = r.data.data
- for (let i = 0; i < data.length; i++) {
- this.$download('hr/pdf/contract', {
- empNumb: data[i].empNumb
- }, `${data[i].empName}.pdf`)
- }
+ this.$message({
+ type: 'success',
+ message: '导出成功!'
})
}).catch(() => {
this.$message({
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 1a51f64..6c9e122 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -976,7 +976,7 @@
<script>
import Pagination from '@/components/Pagination'
import ArchivesChange from './archivesChange'
-import { dateToString } from '@/utils/myUtil'
+
export default {
components: {
ArchivesChange,
--
Gitblit v1.8.0