From 2fba03784ea493f1d52e75aa9a6b023c7d12d510 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 03 三月 2021 21:44:04 +0800
Subject: [PATCH] 修改bug
---
src/views/user/search.vue | 227 ++++++++++++++++++++++++++++
src/views/user/Informationinput.vue | 222 ---------------------------
2 files changed, 230 insertions(+), 219 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index c724345..9f01333 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -52,9 +52,7 @@
<el-col :span="24">
<el-button class="commonBtn" @click.native="dialogIsShow()">新增</el-button>
<el-button class="commonBtn" @click.native="butDelete()">删除</el-button>
- <el-button class="hr-but-all" @click.native="showDcyg(0)">导出员工</el-button>
- <el-button class="hr-but-all" @click.native="showDryg(0)">导入员工</el-button>
- <el-button class="commonBtn" style="float: right">导入员工信息</el-button>
+ <el-button class="commonBtn" style="float: right" @click.native="showDryg(0)">导入员工信息</el-button>
</el-col>
</el-row>
<el-table
@@ -559,199 +557,19 @@
</el-col>
</el-main>
</el-container>
- <el-dialog title="导出员工 请勾选需要导出的字段" :visible.sync="dialogShowDcyg" width="40%">
- <table id="dcygTable" width="100%">
- <tr>
- <td colspan="6" style="text-align: left;">
- <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" @change="handleCheckAllChange" />
- 全部字段
- </td>
- </tr>
- <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
- <tr>
- <td>档案号</td>
- <td>
- <el-checkbox label="archivesNumb"><span /></el-checkbox>
- </td>
- <td>姓名</td>
- <td>
- <el-checkbox label="empName"><span /></el-checkbox>
- </td>
- <td>性别</td>
- <td>
- <el-checkbox label="sexName"><span /></el-checkbox>
- </td>
- </tr>
- <tr>
- <td>部门(护卫点)</td>
- <td>
- <el-checkbox label="deptName"><span /></el-checkbox>
- </td>
- <td>所属岗位</td>
- <td>
- <el-checkbox label="jobName"><span /></el-checkbox>
- </td>
- <td>员工类别</td>
- <td>
- <el-checkbox label="empTypeName"><span /></el-checkbox>
- </td>
- </tr>
- <tr>
- <td>民族</td>
- <td>
- <el-checkbox label="nationName"><span /></el-checkbox>
- </td>
- <td>身份证号码</td>
- <td>
- <el-checkbox label="certificateNumb"><span /></el-checkbox>
- </td>
- <td>年龄</td>
- <td>
- <el-checkbox label="age"><span /></el-checkbox>
- </td>
- </tr>
- <tr>
- <td>婚姻状况</td>
- <td>
- <el-checkbox label="marriageName"><span /></el-checkbox>
- </td>
- <td>身份证有效期</td>
- <td>
- <el-checkbox label="certificateValidity"><span /></el-checkbox>
- </td>
- <td>身高</td>
- <td>
- <el-checkbox label="stature"><span /></el-checkbox>
- </td>
- </tr>
- <tr>
- <td>政治面貌</td>
- <td>
- <el-checkbox label="politicsName"><span /></el-checkbox>
- </td>
- <td>出生日期</td>
- <td>
- <el-checkbox label="birthdate"><span /></el-checkbox>
- </td>
- <td>最高学历</td>
- <td>
- <el-checkbox label="educationName"><span /></el-checkbox>
- </td>
- </tr>
- <tr>
- <td>籍贯</td>
- <td>
- <el-checkbox label="nativePlaceName"><span /></el-checkbox>
- </td>
- <td>户籍地址</td>
- <td>
- <el-checkbox label="censusAddress"><span /></el-checkbox>
- </td>
- <td>现住址</td>
- <td>
- <el-checkbox label="currentAddress"><span /></el-checkbox>
- </td>
- </tr>
- <tr>
- <td>保安员证号</td>
- <td>
- <el-checkbox label="guardNumb"><span /></el-checkbox>
- </td>
- <td>保安员回执</td>
- <td>
- <el-checkbox label="returnReceipt"><span /></el-checkbox>
- </td>
- <td>档案情况</td>
- <td>
- <el-checkbox label="archivesStatusName"><span /></el-checkbox>
- </td>
- </tr>
- <tr>
- <td>银行名称</td>
- <td>
- <el-checkbox label="bankName"><span /></el-checkbox>
- </td>
- <td>银行账号</td>
- <td>
- <el-checkbox label="bankNumb"><span /></el-checkbox>
- </td>
- <td>电话号码</td>
- <td>
- <el-checkbox label="telePhone"><span /></el-checkbox>
- </td>
- </tr>
- <tr>
- <td>入职日期</td>
- <td>
- <el-checkbox label="entryDate"><span /></el-checkbox>
- </td>
- <td>保险类型</td>
- <td>
- <el-checkbox label="InsuranceTypeName"><span /></el-checkbox>
- </td>
- <td>社保电脑号</td>
- <td>
- <el-checkbox label="socialNumb"><span /></el-checkbox>
- </td>
- </tr>
- <tr>
- <td>招聘介绍人</td>
- <td>
- <el-checkbox label="introducer"><span /></el-checkbox>
- </td>
- <td>入司工龄</td>
- <td>
- <el-checkbox label="seniority"><span /></el-checkbox>
- </td>
- <td>工作证</td>
- <td>
- <el-checkbox label="empCardStatus"><span /></el-checkbox>
- </td>
- </tr>
- <tr>
- <td>相关证件</td>
- <td>
- <el-checkbox label="certificateList"><span /></el-checkbox>
- </td>
- <td>紧急联系电话</td>
- <td>
- <el-checkbox label="urgencyPhone"><span /></el-checkbox>
- </td>
- <td>员工手册</td>
- <td>
- <el-checkbox label="handbookStatusName"><span /></el-checkbox>
- </td>
- </tr>
- <tr>
- <td>家庭成员及关系</td>
- <td>
- <el-checkbox label="family"><span /></el-checkbox>
- </td>
- <td />
- <td />
- <td />
- <td />
- </tr>
- </el-checkbox-group>
- </table>
- <div slot="footer" class="dialog-footer">
- <el-button @click="showDcyg(1)">取 消</el-button>
- <el-button type="primary" @click="showDcyg(2)">确 定</el-button>
- </div>
- </el-dialog>
<el-dialog title="导入员工信息" :visible.sync="dialogShowDryg" width="50%">
<el-form :model="baseicInformationForm" label-position="right" label-width="120px">
<el-row>
<el-col span="24">
<el-form-item label="员工模板下载" prop="region">
- <a href="/员工信息.xls" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
+ <a href="http://120.24.23.155:8000/员工信息.xls" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
<span style="margin-left: 100px;">点击下载</span>
</el-form-item>
<el-form-item label="导入员工">
<el-upload
ref="upload"
class="upload-demo"
- action="http://120.24.23.155:8301/hr/empBaseInfo/importEmp"
+ action="http://127.0.0.1:8301/hr/empBaseInfo/importEmp"
accept=".xls, .xlsx, .excel"
:headers="headers()"
:file-list="fileList"
@@ -2205,10 +2023,6 @@
baseicInformationForm: {
},
dialogShowDryg: false,
- dialogShowDcyg: false,
- isIndeterminate: false,
- checkedCities: [],
- checkAll: false,
empBaseInfoImageUrl: '',
total: 0, // 总数量
queryParams: {}, // 查询参数
@@ -2986,15 +2800,6 @@
return null
}
},
- handleCheckedCitiesChange(value) {
- const checkedCount = value.length
- this.checkAll = checkedCount === this.cityOptions.length
- this.isIndeterminate = checkedCount > 0 && checkedCount < this.cityOptions.length
- },
- handleCheckAllChange(val) {
- this.checkedCities = val ? this.cityOptions : []
- this.isIndeterminate = false
- },
showDryg(operate) {
switch (operate) {
case 0:
@@ -3008,26 +2813,7 @@
break
}
},
- showDcyg(operate) {
- switch (operate) {
- case 0:
- this.dialogShowDcyg = true
- break
- case 1:
- this.dialogShowDcyg = false
- break
- case 2:
- var params = this.queryParams
- params.exportField = this.checkedCities.join(',')
- this.$download('hr/empBaseInfo/exportWithField', { ...params }, '在职员工列表.xls').then(() => {
- this.$message({
- message: '下载成功!',
- type: 'success'
- })
- })
- break
- }
- },
+
// 获取图片的Blob值
getImageBlob(url, cb) {
var xhr = new XMLHttpRequest()
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index c353150..8d78250 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -220,7 +220,7 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button size="mini" class="hr-but" type="success" @click.native="exportExcel">
+ <el-button size="mini" class="hr-but" type="success" @click.native="showDcyg(0)">
{{ $t('table.export') }}
</el-button>
</el-col>
@@ -245,6 +245,186 @@
<el-table-column prop="entryDate" label="入职日期" />
<el-table-column prop="dimissionDate" label="离职日期" />
</el-table>
+ <el-dialog title="导出员工 请勾选需要导出的字段" :visible.sync="dialogShowDcyg" width="40%">
+ <table id="dcygTable" width="100%">
+ <tr>
+ <td colspan="6" style="text-align: left;">
+ <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" @change="handleCheckAllChange" />
+ 全部字段
+ </td>
+ </tr>
+ <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
+ <tr>
+ <td>档案号</td>
+ <td>
+ <el-checkbox label="archivesNumb"><span /></el-checkbox>
+ </td>
+ <td>姓名</td>
+ <td>
+ <el-checkbox label="empName"><span /></el-checkbox>
+ </td>
+ <td>性别</td>
+ <td>
+ <el-checkbox label="sexName"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>部门(护卫点)</td>
+ <td>
+ <el-checkbox label="deptName"><span /></el-checkbox>
+ </td>
+ <td>所属岗位</td>
+ <td>
+ <el-checkbox label="jobName"><span /></el-checkbox>
+ </td>
+ <td>员工类别</td>
+ <td>
+ <el-checkbox label="empTypeName"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>民族</td>
+ <td>
+ <el-checkbox label="nationName"><span /></el-checkbox>
+ </td>
+ <td>身份证号码</td>
+ <td>
+ <el-checkbox label="certificateNumb"><span /></el-checkbox>
+ </td>
+ <td>年龄</td>
+ <td>
+ <el-checkbox label="age"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>婚姻状况</td>
+ <td>
+ <el-checkbox label="marriageName"><span /></el-checkbox>
+ </td>
+ <td>身份证有效期</td>
+ <td>
+ <el-checkbox label="certificateValidity"><span /></el-checkbox>
+ </td>
+ <td>身高</td>
+ <td>
+ <el-checkbox label="stature"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>政治面貌</td>
+ <td>
+ <el-checkbox label="politicsName"><span /></el-checkbox>
+ </td>
+ <td>出生日期</td>
+ <td>
+ <el-checkbox label="birthdate"><span /></el-checkbox>
+ </td>
+ <td>最高学历</td>
+ <td>
+ <el-checkbox label="educationName"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>籍贯</td>
+ <td>
+ <el-checkbox label="nativePlaceName"><span /></el-checkbox>
+ </td>
+ <td>户籍地址</td>
+ <td>
+ <el-checkbox label="censusAddress"><span /></el-checkbox>
+ </td>
+ <td>现住址</td>
+ <td>
+ <el-checkbox label="currentAddress"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>保安员证号</td>
+ <td>
+ <el-checkbox label="guardNumb"><span /></el-checkbox>
+ </td>
+ <td>保安员回执</td>
+ <td>
+ <el-checkbox label="returnReceipt"><span /></el-checkbox>
+ </td>
+ <td>档案情况</td>
+ <td>
+ <el-checkbox label="archivesStatusName"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>银行名称</td>
+ <td>
+ <el-checkbox label="bankName"><span /></el-checkbox>
+ </td>
+ <td>银行账号</td>
+ <td>
+ <el-checkbox label="bankNumb"><span /></el-checkbox>
+ </td>
+ <td>电话号码</td>
+ <td>
+ <el-checkbox label="telePhone"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>入职日期</td>
+ <td>
+ <el-checkbox label="entryDate"><span /></el-checkbox>
+ </td>
+ <td>保险类型</td>
+ <td>
+ <el-checkbox label="InsuranceTypeName"><span /></el-checkbox>
+ </td>
+ <td>社保电脑号</td>
+ <td>
+ <el-checkbox label="socialNumb"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>招聘介绍人</td>
+ <td>
+ <el-checkbox label="introducer"><span /></el-checkbox>
+ </td>
+ <td>入司工龄</td>
+ <td>
+ <el-checkbox label="seniority"><span /></el-checkbox>
+ </td>
+ <td>工作证</td>
+ <td>
+ <el-checkbox label="empCardStatus"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>相关证件</td>
+ <td>
+ <el-checkbox label="certificateList"><span /></el-checkbox>
+ </td>
+ <td>紧急联系电话</td>
+ <td>
+ <el-checkbox label="urgencyPhone"><span /></el-checkbox>
+ </td>
+ <td>员工手册</td>
+ <td>
+ <el-checkbox label="handbookStatusName"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>家庭成员及关系</td>
+ <td>
+ <el-checkbox label="family"><span /></el-checkbox>
+ </td>
+ <td />
+ <td />
+ <td />
+ <td />
+ </tr>
+ </el-checkbox-group>
+ </table>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="showDcyg(1)">取 消</el-button>
+ <el-button type="primary" @click="showDcyg(2)">确 定</el-button>
+ </div>
+ </el-dialog>
</div>
<div v-show="showArr[1].show">
@@ -1412,6 +1592,11 @@
},
data() {
return {
+ cityOptions: ['archivesNumb', 'deptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family'],
+ dialogShowDcyg: false,
+ isIndeterminate: false,
+ checkedCities: [],
+ checkAll: false,
total: 0, // 总数量
queryParams: {
vague: '',
@@ -1699,6 +1884,35 @@
this.isShow(false, 0)
},
methods: {
+ handleCheckedCitiesChange(value) {
+ const checkedCount = value.length
+ this.checkAll = checkedCount === this.cityOptions.length
+ this.isIndeterminate = checkedCount > 0 && checkedCount < this.cityOptions.length
+ },
+ handleCheckAllChange(val) {
+ this.checkedCities = val ? this.cityOptions : []
+ this.isIndeterminate = false
+ },
+ showDcyg(operate) {
+ switch (operate) {
+ case 0:
+ this.dialogShowDcyg = true
+ break
+ case 1:
+ this.dialogShowDcyg = false
+ break
+ case 2:
+ var params = this.queryParams
+ params.exportField = this.checkedCities.join(',')
+ this.$download('hr/empBaseInfo/exportWithField', { ...params }, '在职员工列表.xls').then(() => {
+ this.$message({
+ message: '下载成功!',
+ type: 'success'
+ })
+ })
+ break
+ }
+ },
resetSearch() {
this.queryParams = {
delFlag: 0,
@@ -2161,6 +2375,17 @@
}
</style>
<style lang="scss" scoped>
+#dcygTable {
+ border-collapse: collapse;
+}
+
+#dcygTable td {
+ width: 130px;
+ text-align: center;
+ border: 1px solid darkgray;
+ height: 30px;
+ font-size: 15px;
+}
.el-container {
height: 100%;
background-color: white;
--
Gitblit v1.8.0