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 | 99 ++++++++++++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 43 deletions(-)
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index 2151155..3fbf3d9 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -153,7 +153,7 @@
<div class="item-node" />
<div>
<a href="javascript:void(0)" :class="item=='lzaj'?'light':''" @click="goAnchor('lzaj')">
- 劳资案件
+ 仲裁案件
</a>
</div>
</li>
@@ -447,8 +447,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="保险类型" prop="insuranceType">
- <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型" :disabled="readon ? false : true">
+ <el-form-item label="社保档位" prop="insuranceType">
+ <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择社保档位" :disabled="readon ? false : true">
<el-option
v-for="dict in insuranceTypeOptions"
:key="dict.dicItemCode"
@@ -492,12 +492,12 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="家庭成员及关系" prop="family">
+ <el-form-item label="家庭成员及关系1" prop="family">
<el-input v-model="empBaseInfoForm.family" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="紧急联系电话" prop="urgencyPhone">
+ <el-form-item label="家庭成员及关系2" prop="urgencyPhone">
<el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
@@ -514,15 +514,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="相关证件" prop="certificateList">
- <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="readon ? false : true">
- <el-option
- v-for="dict in certificateListOptions"
- :key="dict.dicItemCode"
- :label="dict.dicItemName"
- :value="dict.dicItemCode"
- />
- </el-select>
+ <el-form-item label="相关证件" prop="certificateListName">
+ <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>
@@ -634,6 +632,7 @@
<el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" />
<el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" />
<el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="contractInfoDatatotal>0"
@@ -663,7 +662,7 @@
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="newDeptName" label="现部门" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="现部门" />
<el-table-column show-overflow-tooltip prop="newJobName" label="现岗位" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" />
<el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门" />
@@ -815,6 +814,7 @@
<span v-text="getIndex(scope.$index)" />
</template>EmpLeaveInfo
</el-table-column>
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门/护卫点" />
<el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" />
<el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" />
<el-table-column show-overflow-tooltip prop="dimissionType" label="离职类型" :formatter="dimissionTypeFormat" />
@@ -929,18 +929,22 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" show-overflow-tooltip prop="accidentId" label="" />
- <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
- <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="110">
+ <template slot-scope="scope">
+ <span class="table-button" @click="editAccidentCases(scope.row,9)">{{ scope.row.injuredTime }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="200" />
<el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
- <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
- <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="100" />
- <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="100" />
- <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="100" />
+ <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="300" />
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="150" />
+ <!-- <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="100" />-->
+ <!-- <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="100" />-->
<el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
- <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
+ <!-- <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />-->
<el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="100" />
- <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
- <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="100" />
+ <!-- <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />-->
+ <!-- <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="100" />-->
<el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
<el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="120" />
<el-table-column show-overflow-tooltip prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
@@ -976,7 +980,11 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" show-overflow-tooltip prop="occupationalId" label="" />
- <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="110">
+ <template slot-scope="scope">
+ <span class="table-button" @click="editOccupational(scope.row)">{{ scope.row.injuredTime }}</span>
+ </template>
+ </el-table-column>
<el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
<el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="100" />
<el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="140" />
@@ -1003,7 +1011,7 @@
</div>
<div ref="lzaj" class="lzaj">
<div class="jbxxTitle">
- 劳资案件
+ 仲裁案件
</div>
<div class="jbxxCon">
@@ -1999,7 +2007,6 @@
<el-form
ref="accidentCasesForm"
:model="accidentCasesForm"
- :rules="accidentCasesRules"
label-position="right"
label-width="120px"
>
@@ -2139,19 +2146,20 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="备注">
+ <el-input v-model="accidentCasesForm.remark" />
+ </el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="putAccidentCases('accidentCasesForm')">保 存</el-button>
-
+ <el-button v-if="dialogshowArr[9].read" type="primary" @click="putAccidentCases('accidentCasesForm')">保 存</el-button>
</div>
</el-dialog>
<el-dialog title="工伤案件" append-to-body :visible.sync="dialogshowArr[10].show" width="50%">
<el-form
ref="occupationalForm"
:model="occupationalForm"
- :rules="occupationalRules"
label-position="right"
label-width="140px"
>
@@ -2340,11 +2348,11 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="putOccupational('occupationalForm')">保 存</el-button>
+ <el-button v-if="dialogshowArr[10].read" type="primary" @click="putOccupational('occupationalForm')">保 存</el-button>
</div>
</el-dialog>
- <el-dialog title="劳资案件" append-to-body :visible.sync="dialogshowArr[11].show" width="50%">
+ <el-dialog title="仲裁案件" append-to-body :visible.sync="dialogshowArr[11].show" width="50%">
<el-form
ref="laborTroubleForm"
:model="laborTroubleForm"
@@ -2676,10 +2684,12 @@
show: false
},
{
- show: false
+ show: false,
+ read: false
},
{
- show: false
+ show: false,
+ read: false
},
{
show: false
@@ -2713,7 +2723,7 @@
message: '长度不超过36个字符',
trigger: 'blur'
}],
- insuranceType: [{ required: true, message: '请选择保险类型', trigger: 'change' }],
+ insuranceType: [{ required: true, message: '请选择社保档位', trigger: 'change' }],
entryDate: [{ required: true, message: '请选择入职日期', trigger: 'change' }],
seniority: [{ required: true, message: '请输入入司工龄', trigger: 'blur' }],
archivesStatus: [{ required: true, message: '请选择档案情况', trigger: 'change' }],
@@ -2794,10 +2804,10 @@
pattern: /^\d{1,2}(\.\d{1,1})?$/,
message: '出勤天数精确到1位小数'
}],
- overtimeDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
- overtimeHour: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
- leaveDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
- absenteeism: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
+ overtimeDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
+ overtimeHour: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
+ leaveDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
+ absenteeism: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
leaveInfoRules: {
@@ -3170,7 +3180,6 @@
creator: '',
modifyTime: '',
modifier: '',
-
empStatus: 0,
version: ''
},
@@ -3425,7 +3434,8 @@
modifyTime: '',
modifier: '',
empStatus: 0,
- version: ''
+ version: '',
+ annualLeave: ''
},
fsnumShow: false,
badRecordForm: {
@@ -3557,7 +3567,7 @@
this.getDicts('LEAVETYPE').then(response => {
this.leaveTypeOptions = response.data
})
- this.getDicts('insuranceGaers').then(response => {
+ this.getDicts('INSURANCETYPE').then(response => {
this.insuranceGaersOptions = response.data
})
this.getDicts('applayStatus').then(response => {
@@ -3987,6 +3997,7 @@
})
},
setArchives(val) {
+ debugger
let certificateList = []
if (val.certificateList && typeof val.certificateList === 'string') {
certificateList = val.certificateList.split(',')
@@ -4020,7 +4031,7 @@
this.initunemploymentData() // 失业金领取
this.initinsuranceData() // 社保申请
this.initremarkInfoData() // 备注
- this.initlaborTroubleData() // 劳资案件
+ this.initlaborTroubleData() // 仲裁案件
this.initoccupationalData() // 工伤案件
this.initbadRecordData() // 不良记录
this.initaccidentCasesData() // 意外险案件
@@ -5206,6 +5217,7 @@
this.accidentCasesForm.version = row.version
this.thisShowIndex = 9
this.dialogshowArr[9].show = true
+ this.dialogshowArr[9].read = false
},
editOccupational(row) {
this.isAdd = false
@@ -5256,6 +5268,7 @@
this.occupationalForm.remark = row.remark
this.thisShowIndex = 10
this.dialogshowArr[10].show = true
+ this.dialogshowArr[10].read = false
},
editLaborTrouble(row) {
this.isAdd = false
--
Gitblit v1.8.0