From 338c1fc6a3de638d84b60a5da064dceef6f0d775 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 23 九月 2025 21:49:11 +0800
Subject: [PATCH] 员工管理界面(在职、离职和智搜的列表、档案、导出)增加了年假天数显示
---
src/views/user/archivesChange.vue | 8 ++
src/views/user/search.vue | 10 ++-
vue.config.js | 2
src/views/user/inemployees.vue | 104 +++++++++++++++++++++++++++-------
src/settings.js | 16 ++--
src/views/user/archivesEdit.vue | 8 ++
src/views/user/outemployess.vue | 13 ++++
7 files changed, 124 insertions(+), 37 deletions(-)
diff --git a/src/settings.js b/src/settings.js
index cc7036b..477da2d 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,23 +3,23 @@
// 获取令牌时，请求头信息(Basic Base64.encode(client_id:client_secret))
authorizationValue: 'Basic ZmViczoxMjM0NTY=',
// 社交登录后台地址
- socialLoginUrl: 'http://120.24.23.155:8301/auth/social/login',
+ socialLoginUrl: 'http://localhost:8301/auth/social/login',
// 请替换为您的实际地址
pages: {
// FEBS-Admin 控制台地址
- springBootAdminUrl: 'http://120.24.23.155:8401/login',
+ springBootAdminUrl: 'http://localhost:8401/login',
// kibana 控制台地址
- kibanaUrl: 'http://120.24.23.155:5601',
+ kibanaUrl: 'http://localhost:5601',
// nacos 控制台地址
- nacosUrl: 'http://120.24.23.155:8001/nacos',
+ nacosUrl: 'http://localhost:8001/nacos',
// skywalking地址
- skywalkingUrl: 'http://120.24.23.155:8080/',
+ skywalkingUrl: 'http://localhost:8080/',
// 文档中心
- docUrl: 'http://120.24.23.155:8301/doc.html',
+ docUrl: 'http://localhost:8301/doc.html',
// Granfana控制台
- grafanaUrl: 'http://120.24.23.155:8404/',
+ grafanaUrl: 'http://localhost:8404/',
// tx-manager控制台
- txUrl: 'http://120.24.23.155:8501/admin/index.html#/login',
+ txUrl: 'http://localhost:8501/admin/index.html#/login',
// 文件上传地址
filesUploadUrl: 'http://120.24.23.155:8301/hr/filesUpload',
// 个人文件上传地址
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index 8517a3b..3fbf3d9 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -518,6 +518,11 @@
<el-input v-model="empBaseInfoForm.certificateListName" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
+ <el-col :span="8">
+ <el-form-item label="年假天数" prop="annualLeave">
+ <el-input v-model="empBaseInfoForm.annualLeave" disabled />
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</div>
@@ -3429,7 +3434,8 @@
modifyTime: '',
modifier: '',
empStatus: 0,
- version: ''
+ version: '',
+ annualLeave: ''
},
fsnumShow: false,
badRecordForm: {
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index eaefa79..74d7a2c 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -596,6 +596,11 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="8">
+ <el-form-item label="年假天数" prop="annualLeave">
+ <el-input v-model="empBaseInfoForm.annualLeave" disabled />
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</div>
@@ -3720,7 +3725,8 @@
modifyTime: '',
modifier: '',
empStatus: 0,
- version: ''
+ version: '',
+ annualLeave: ''
},
fsnumShow: false,
badRecordForm: {
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 2b5514d..406a068 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -255,28 +255,84 @@
>编辑</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门（护卫点）" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="empNumb"
+ label="编号"
+ width="80"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
+ <el-table-column
+ show-overflow-tooltip
+ prop="allDeptName"
+ label="部门（护卫点）"
+ width="300"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="empName"
+ label="姓名"
+ width="100"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
<el-table-column show-overflow-tooltip prop="sex" label="性别" width="60" :formatter="sexFormat" />
- <el-table-column show-overflow-tooltip prop="age" label="年龄" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip prop="nativePlace" label="籍贯" width="70" :formatter="nativePlaceFormat" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="age"
+ label="年龄"
+ width="80"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
+ <el-table-column
+ show-overflow-tooltip
+ prop="education"
+ label="学历"
+ width="80"
+ :formatter="educationFormat"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
+ <el-table-column
+ show-overflow-tooltip
+ prop="nativePlace"
+ label="籍贯"
+ width="70"
+ :formatter="nativePlaceFormat"
+ />
<el-table-column show-overflow-tooltip prop="telePhone" label="联系电话" width="110" />
<el-table-column show-overflow-tooltip prop="empTypeName" label="员工类型" width="80" />
- <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="entryDate"
+ label="入职日期"
+ width="110"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
<el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="80">
<template slot-scope="{row}">
{{ transEmpStatus(row.empStatus) }}
</template>
</el-table-column>
- <el-table-column prop="entryType" label="入职类型" width="120" sortable="custom" :sort-orders="['ascending', 'descending']">
+ <el-table-column
+ prop="entryType"
+ label="入职类型"
+ width="120"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ >
<template slot-scope="{row}">
{{ transEntryType(row.entryType) }}
</template>
</el-table-column>
+ <el-table-column show-overflow-tooltip prop="annualLeave" label="年假天数" width="110" />
</el-table>
<pagination
v-show="total>0"
@@ -690,7 +746,9 @@
</div>
</el-dialog>
<el-dialog title="导出员工" :visible.sync="dialogShowDcyg" width="40%">
- <div style="font-size: 16px;font-weight: 400;height: 35px;margin-top: -30px;color: #409EFF;">请勾选需要导出的字段</div>
+ <div style="font-size: 16px;font-weight: 400;height: 35px;margin-top: -30px;color: #409EFF;">
+ 请勾选需要导出的字段
+ </div>
<table id="dcygTable" width="100%">
<tr>
<td colspan="6" style="text-align: left;">
@@ -881,16 +939,16 @@
<el-checkbox label="empNumb"><span /></el-checkbox>
</td>
</tr>
- <!-- <tr>-->
- <!-- <td>家庭成员及关系</td>-->
- <!-- <td>-->
- <!-- <el-checkbox label="family"><span /></el-checkbox>-->
- <!-- </td>-->
- <!-- <td />-->
- <!-- <td />-->
- <!-- <td />-->
- <!-- <td />-->
- <!-- </tr>-->
+ <tr>
+ <td>年假天数</td>
+ <td>
+ <el-checkbox label="annualLeave"><span /></el-checkbox>
+ </td>
+ <td />
+ <td />
+ <td />
+ <td />
+ </tr>
</el-checkbox-group>
</table>
<div slot="footer" class="dialog-footer">
@@ -1196,7 +1254,7 @@
exportUrl: '',
checkAll: false,
isIndeterminate: false,
- cityOptions: ['archivesNumb', 'allDeptName', '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', 'empCardStatusName', 'certificateListName', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb'],
+ cityOptions: ['archivesNumb', 'allDeptName', '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', 'empCardStatusName', 'certificateListName', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb', 'annualLeave'],
checkedCities: [],
tableData: [],
selectDimissionType: 1,
@@ -1226,7 +1284,7 @@
dimissionTypeOptions: [],
ageStrOptions: [],
sexOptions: [],
- openArchivesForm: { }
+ openArchivesForm: {}
}
},
mounted() {
@@ -2337,10 +2395,12 @@
#dcygTable {
border-collapse: collapse;
+
tr {
width: 100%;
border-bottom: 1px dashed #ccc;
- >td:nth-child(even) {
+
+ > td:nth-child(even) {
width: 100px;
text-align: left;
}
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index a0c32db..fbc3c5f 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -299,6 +299,7 @@
{{ transEntryType(row.dimissionType) }}
</template>
</el-table-column>
+ <el-table-column show-overflow-tooltip prop="annualLeave" label="年假天数" width="110" />
</el-table>
<pagination
v-show="total>0"
@@ -1233,6 +1234,16 @@
<el-checkbox label="empNumb"><span /></el-checkbox>
</td>
</tr>
+ <tr>
+ <td>年假天数</td>
+ <td>
+ <el-checkbox label="annualLeave"><span /></el-checkbox>
+ </td>
+ <td />
+ <td />
+ <td />
+ <td />
+ </tr>
</el-checkbox-group>
</table>
<div slot="footer" class="dialog-footer">
@@ -1312,7 +1323,7 @@
archivesStatusOptions: [],
sexOptions: [],
empTypeOptions: [],
- cityOptions: ['archivesNumb', 'allDeptName', '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', 'empCardStatusName', 'certificateListName', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb'],
+ cityOptions: ['archivesNumb', 'allDeptName', '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', 'empCardStatusName', 'certificateListName', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb', 'annualLeave'],
checkedCities: []
}
},
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 83bda1c..5d7f6a7 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -309,6 +309,7 @@
{{ transDimissionDate(row.dimissionDate) }}
</template>
</el-table-column>
+ <el-table-column show-overflow-tooltip prop="annualLeave" label="年假天数" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
</el-table>
<el-dialog title="导出员工" :visible.sync="dialogShowDcyg" width="40%" style="font-weight: 700;">
<div style="font-size: 16px;font-weight: 400;height: 35px;margin-top: -30px;color: #409EFF;">请勾选需要导出的字段</div>
@@ -500,6 +501,9 @@
<td>编号</td>
<td>
<el-checkbox label="empNumb"><span /></el-checkbox>
+ </td>
+ <td>
+ <el-checkbox label="annualLeave"><span /></el-checkbox>
</td>
</tr>
</el-checkbox-group>
@@ -2200,7 +2204,7 @@
},
data() {
return {
- cityOptions: ['archivesNumb', 'allDeptName', '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', 'empCardStatusName', 'certificateListName', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb'],
+ cityOptions: ['archivesNumb', 'allDeptName', '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', 'empCardStatusName', 'certificateListName', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb', 'annualLeave'],
dialogShowDcyg: false,
isIndeterminate: false,
checkedCities: [],
@@ -2727,7 +2731,7 @@
}
},
showDetailInfo(row, index) {
- switch (index){
+ switch (index) {
case 10:
this.occupationalForm.occupationalId = row.occupationalId
this.occupationalForm.empId = row.empId
@@ -2774,7 +2778,7 @@
this.occupationalForm.delFlag = row.delFlag
this.occupationalForm.version = row.version
this.occupationalForm.remark = row.remark
- break;
+ break
}
this.dialogshowArr[index].show = true
},
diff --git a/vue.config.js b/vue.config.js
index e8c710a..b69a6b0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,7 +38,7 @@
// change xxx-api/login => mock/login
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: 'http://120.24.23.155:8301/',
+ target: '127.0.0.1:8301/',
// target: 'http://120.24.23.155:8301/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.8.0