From 36c84173ee2638aff47a3ed42cd22db8092ea133 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 03 六月 2021 19:11:52 +0800
Subject: [PATCH] feat(设备定义):
---
src/views/user/archivesEdit.vue | 242 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 194 insertions(+), 48 deletions(-)
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index ad1cf46..3c94347 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -464,8 +464,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"
@@ -588,7 +588,7 @@
:total="workExperienceDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initList"
+ @pagination="initList()"
/>
</div>
</div>
@@ -638,7 +638,7 @@
:total="physicalExamDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initphysicalExamData"
+ @pagination="initphysicalExamData()"
/>
</div>
</div>
@@ -678,13 +678,14 @@
<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"
:total="contractInfoDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initcontractInfoData"
+ @pagination="initcontractInfoData()"
/>
</div>
</div>
@@ -721,7 +722,7 @@
:total="jobChangeDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initjobChangeData"
+ @pagination="initjobChangeData()"
/>
</div>
</div>
@@ -769,7 +770,7 @@
:total="leaveInfoDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initleaveInfoData"
+ @pagination="initleaveInfoData()"
/>
</div>
</div>
@@ -814,7 +815,7 @@
:total="resignDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initresignData"
+ @pagination="initresignData()"
/>
</div>
</div>
@@ -863,7 +864,7 @@
:total="dimissionAttendDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initdimissionAttendData"
+ @pagination="initdimissionAttendData()"
/>
</div>
</div>
@@ -898,7 +899,7 @@
:total="dimissionLogDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initdimissionLogData"
+ @pagination="initdimissionLogData()"
/>
</div>
</div>
@@ -944,7 +945,7 @@
:total="unemploymentDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initunemploymentData"
+ @pagination="initunemploymentData()"
/>
</div>
</div>
@@ -975,7 +976,7 @@
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editInsurance(scope.row,8)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'oninsuranceDataselection')">删除</span>
+ <span class="table-button" @click="singleDelete(scope.row, 'insuranceDataselection')">删除</span>
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" show-overflow-tooltip prop="insuranceId" label="" />
@@ -992,7 +993,7 @@
:total="insuranceDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initinsuranceData"
+ @pagination="initinsuranceData()"
/>
</div>
</div>
@@ -1048,7 +1049,7 @@
:total="accidentCasesDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initaccidentCasesData"
+ @pagination="initaccidentCasesData()"
/>
</div>
</div>
@@ -1104,7 +1105,7 @@
:total="occupationalDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initoccupationalData"
+ @pagination="initoccupationalData()"
/>
</div>
</div>
@@ -1153,7 +1154,7 @@
:total="laborTroubleDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initlaborTroubleData"
+ @pagination="initlaborTroubleData()"
/>
</div>
</div>
@@ -1198,7 +1199,7 @@
:total="badRecordDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initbadRecordData"
+ @pagination="initbadRecordData()"
/>
</div>
</div>
@@ -1248,7 +1249,7 @@
:total="remarkInfoDatatotal"
:page.sync="pagination.num"
:limit.sync="pagination.size"
- @pagination="initremarkInfoData"
+ @pagination="initremarkInfoData()"
/>
</div>
</div>
@@ -2874,7 +2875,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' }],
@@ -2955,10 +2956,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: {
@@ -3328,7 +3329,6 @@
creator: '',
modifyTime: '',
modifier: '',
-
version: '',
empStatus: 0,
remark: ''
@@ -3690,7 +3690,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 => {
@@ -4127,23 +4127,169 @@
}
const remarks = ''
val.remark = remarks
+ this.readon = false
this.empBaseInfoForm = { ...val }
this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + this.empBaseInfoForm.empId
this.fileDate.empId = this.empBaseInfoForm.empId
this.labelfrom.empId = this.empBaseInfoForm.empId
- this.remarkInfoForm = { ...val }
- this.laborTroubleForm = { ...val }
- this.occupationalForm = { ...val }
- this.accidentCasesForm = { ...val }
- this.insuranceForm = { ...val }
- this.unemploymentForm = { ...val }
- this.resignForm = { ...val }
- this.leaveInfoForm = { ...val }
- this.contractInfoForm = { ...val }
- this.dimissionAttendForm = { ...val }
- this.physicalExamForm = { ...val }
- this.workExperienceForm = { ...val }
- this.badRecordForm = { ...val }
+
+ this.remarkInfoForm.allDeptName = val.allDeptName
+ this.remarkInfoForm.certificateNumb = val.certificateNumb
+ this.remarkInfoForm.empId = val.empId
+ this.remarkInfoForm.empName = val.empName
+ this.remarkInfoForm.empNumb = val.empNumb
+ this.remarkInfoForm.deptName = val.deptName
+ this.remarkInfoForm.deptId = val.deptId
+ this.remarkInfoForm.jobId = val.jobId
+ this.remarkInfoForm.jobName = val.jobName
+ this.remarkInfoForm.sex = val.sex
+ this.remarkInfoForm.delFlag = 0
+ this.$set(this.remarkInfoForm, 'delFlag', 0)
+
+ this.laborTroubleForm.allDeptName = val.allDeptName
+ this.laborTroubleForm.certificateNumb = val.certificateNumb
+ this.laborTroubleForm.empId = val.empId
+ this.laborTroubleForm.empName = val.empName
+ this.laborTroubleForm.empNumb = val.empNumb
+ this.laborTroubleForm.deptName = val.deptName
+ this.laborTroubleForm.deptId = val.deptId
+ this.laborTroubleForm.jobId = val.jobId
+ this.laborTroubleForm.jobName = val.jobName
+ this.laborTroubleForm.sex = val.sex
+ this.$set(this.laborTroubleForm, 'delFlag', 0)
+
+ this.occupationalForm.allDeptName = val.allDeptName
+ this.occupationalForm.certificateNumb = val.certificateNumb
+ this.occupationalForm.empId = val.empId
+ this.occupationalForm.empName = val.empName
+ this.occupationalForm.empNumb = val.empNumb
+ this.occupationalForm.deptName = val.deptName
+ this.occupationalForm.deptId = val.deptId
+ this.occupationalForm.jobId = val.jobId
+ this.occupationalForm.jobName = val.jobName
+ this.occupationalForm.sex = val.sex
+ this.$set(this.occupationalForm, 'delFlag', 0)
+
+ this.insuranceForm.allDeptName = val.allDeptName
+ this.insuranceForm.certificateNumb = val.certificateNumb
+ this.insuranceForm.empId = val.empId
+ this.insuranceForm.empName = val.empName
+ this.insuranceForm.empNumb = val.empNumb
+ this.insuranceForm.deptName = val.deptName
+ this.insuranceForm.deptId = val.deptId
+ this.insuranceForm.jobId = val.jobId
+ this.insuranceForm.jobName = val.jobName
+ this.insuranceForm.sex = val.sex
+ this.$set(this.insuranceForm, 'delFlag', 0)
+
+ this.unemploymentForm.allDeptName = val.allDeptName
+ this.unemploymentForm.certificateNumb = val.certificateNumb
+ this.unemploymentForm.empId = val.empId
+ this.unemploymentForm.empName = val.empName
+ this.unemploymentForm.empNumb = val.empNumb
+ this.unemploymentForm.deptName = val.deptName
+ this.unemploymentForm.deptId = val.deptId
+ this.unemploymentForm.jobId = val.jobId
+ this.unemploymentForm.jobName = val.jobName
+ this.unemploymentForm.sex = val.sex
+ this.$set(this.unemploymentForm, 'delFlag', 0)
+
+ this.resignForm.allDeptName = val.allDeptName
+ this.resignForm.certificateNumb = val.certificateNumb
+ this.resignForm.empId = val.empId
+ this.resignForm.empName = val.empName
+ this.resignForm.empNumb = val.empNumb
+ this.resignForm.deptName = val.deptName
+ this.resignForm.deptId = val.deptId
+ this.resignForm.jobId = val.jobId
+ this.resignForm.jobName = val.jobName
+ this.resignForm.sex = val.sex
+ this.$set(this.resignForm, 'delFlag', 0)
+
+ this.leaveInfoForm.allDeptName = val.allDeptName
+ this.leaveInfoForm.certificateNumb = val.certificateNumb
+ this.leaveInfoForm.empId = val.empId
+ this.leaveInfoForm.empName = val.empName
+ this.leaveInfoForm.empNumb = val.empNumb
+ this.leaveInfoForm.deptName = val.deptName
+ this.leaveInfoForm.deptId = val.deptId
+ this.leaveInfoForm.jobId = val.jobId
+ this.leaveInfoForm.jobName = val.jobName
+ this.leaveInfoForm.sex = val.sex
+ this.$set(this.leaveInfoForm, 'delFlag', 0)
+
+ this.contractInfoForm.allDeptName = val.allDeptName
+ this.contractInfoForm.certificateNumb = val.certificateNumb
+ this.contractInfoForm.empId = val.empId
+ this.contractInfoForm.empName = val.empName
+ this.contractInfoForm.empNumb = val.empNumb
+ this.contractInfoForm.deptName = val.deptName
+ this.contractInfoForm.deptId = val.deptId
+ this.contractInfoForm.jobId = val.jobId
+ this.contractInfoForm.jobName = val.jobName
+ this.contractInfoForm.sex = val.sex
+ this.$set(this.contractInfoForm, 'delFlag', 0)
+
+ this.dimissionAttendForm.allDeptName = val.allDeptName
+ this.dimissionAttendForm.certificateNumb = val.certificateNumb
+ this.dimissionAttendForm.empId = val.empId
+ this.dimissionAttendForm.empName = val.empName
+ this.dimissionAttendForm.empNumb = val.empNumb
+ this.dimissionAttendForm.deptName = val.deptName
+ this.dimissionAttendForm.deptId = val.deptId
+ this.dimissionAttendForm.jobId = val.jobId
+ this.dimissionAttendForm.jobName = val.jobName
+ this.dimissionAttendForm.sex = val.sex
+ this.$set(this.dimissionAttendForm, 'delFlag', 0)
+
+ this.physicalExamForm.allDeptName = val.allDeptName
+ this.physicalExamForm.certificateNumb = val.certificateNumb
+ this.physicalExamForm.empId = val.empId
+ this.physicalExamForm.empName = val.empName
+ this.physicalExamForm.empNumb = val.empNumb
+ this.physicalExamForm.deptName = val.deptName
+ this.physicalExamForm.deptId = val.deptId
+ this.physicalExamForm.jobId = val.jobId
+ this.physicalExamForm.jobName = val.jobName
+ this.physicalExamForm.sex = val.sex
+ this.$set(this.physicalExamForm, 'delFlag', 0)
+
+ this.workExperienceForm.allDeptName = val.allDeptName
+ this.workExperienceForm.certificateNumb = val.certificateNumb
+ this.workExperienceForm.empId = val.empId
+ this.workExperienceForm.empName = val.empName
+ this.workExperienceForm.empNumb = val.empNumb
+ this.workExperienceForm.deptName = val.deptName
+ this.workExperienceForm.deptId = val.deptId
+ this.workExperienceForm.jobId = val.jobId
+ this.workExperienceForm.jobName = val.jobName
+ this.workExperienceForm.sex = val.sex
+ this.$set(this.workExperienceForm, 'delFlag', 0)
+
+ this.badRecordForm.allDeptName = val.allDeptName
+ this.badRecordForm.certificateNumb = val.certificateNumb
+ this.badRecordForm.empId = val.empId
+ this.badRecordForm.empName = val.empName
+ this.badRecordForm.empNumb = val.empNumb
+ this.badRecordForm.deptName = val.deptName
+ this.badRecordForm.deptId = val.deptId
+ this.badRecordForm.jobId = val.jobId
+ this.badRecordForm.jobName = val.jobName
+ this.badRecordForm.sex = val.sex
+ this.$set(this.badRecordForm, 'delFlag', 0)
+
+ this.accidentCasesForm.allDeptName = val.allDeptName
+ this.accidentCasesForm.certificateNumb = val.certificateNumb
+ this.accidentCasesForm.empId = val.empId
+ this.accidentCasesForm.empName = val.empName
+ this.accidentCasesForm.empNumb = val.empNumb
+ this.accidentCasesForm.deptName = val.deptName
+ this.accidentCasesForm.deptId = val.deptId
+ this.accidentCasesForm.jobId = val.jobId
+ this.accidentCasesForm.jobName = val.jobName
+ this.accidentCasesForm.sex = val.sex
+ this.$set(this.accidentCasesForm, 'delFlag', 0)
+
this.initlabel()
this.initphysicalExamData()
this.initList() // 工作经历
@@ -5287,8 +5433,8 @@
this.insuranceForm.applayDate = row.applayDate
this.insuranceForm.proposer = row.proposer
this.insuranceForm.insuranceGaers = row.insuranceGaers
- this.insuranceForm.reportStatus = row.reportStatus
- this.insuranceForm.applayStatus = row.applayStatus
+ this.insuranceForm.reportStatus = row.reportStatus === 0 ? '' : '' + row.reportStatus
+ this.insuranceForm.applayStatus = row.applayStatus === 0 ? '' : '' + row.applayStatus
this.insuranceForm.auditor = row.auditor
this.insuranceForm.createTime = row.createTime
this.insuranceForm.creator = row.creator
@@ -5320,7 +5466,7 @@
this.accidentCasesForm.injuredDescribe = row.injuredDescribe
this.accidentCasesForm.hospitalName = row.hospitalName
this.accidentCasesForm.treatmentName = row.treatmentName
- this.accidentCasesForm.hospitalizatioFlag = row.hospitalizatioFlag
+ this.accidentCasesForm.hospitalizatioFlag = '' + row.hospitalizatioFlag
this.accidentCasesForm.bedNumb = row.bedNumb
this.accidentCasesForm.reprotTime = row.reprotTime
this.accidentCasesForm.submitTime = row.submitTime
@@ -5330,7 +5476,7 @@
this.accidentCasesForm.innsureFee = row.innsureFee
this.accidentCasesForm.hrDoDate = row.hrDoDate
this.accidentCasesForm.settleDate = row.settleDate
- this.accidentCasesForm.settleStatus = row.settleStatus
+ this.accidentCasesForm.settleStatus = '' + row.settleStatus
this.accidentCasesForm.remark = row.remark
this.accidentCasesForm.createTime = row.createTime
this.accidentCasesForm.creator = row.creator
@@ -5361,7 +5507,7 @@
this.occupationalForm.injuredDescribe = row.injuredDescribe
this.occupationalForm.hospitalName = row.hospitalName
this.occupationalForm.treatmentName = row.treatmentName
- this.occupationalForm.hospitalizatioFlag = row.hospitalizatioFlag
+ this.occupationalForm.hospitalizatioFlag = '' + row.hospitalizatioFlag
this.occupationalForm.bedNumb = row.bedNumb
this.occupationalForm.reportTime = row.reportTime
this.occupationalForm.submitTime = row.submitTime
@@ -5380,7 +5526,7 @@
this.occupationalForm.companySubsidy = row.companySubsidy
this.occupationalForm.companyCompensation = row.companyCompensation
this.occupationalForm.jobSubsidy = row.jobSubsidy
- this.occupationalForm.settleStatus = row.settleStatus
+ this.occupationalForm.settleStatus = '' + row.settleStatus
this.occupationalForm.createTime = row.createTime
this.occupationalForm.creator = row.creator
this.occupationalForm.modifyTime = row.modifyTime
@@ -5409,7 +5555,7 @@
this.laborTroubleForm.arbitrationReason = row.arbitrationReason
this.laborTroubleForm.reporter = row.reporter
this.laborTroubleForm.arbitrationPay = row.arbitrationPay
- this.laborTroubleForm.arbitrationStatus = row.arbitrationStatus
+ this.laborTroubleForm.arbitrationStatus = '' + row.arbitrationStatus
this.laborTroubleForm.settleDate = row.settleDate
this.laborTroubleForm.createTime = row.createTime
this.laborTroubleForm.creator = row.creator
@@ -5458,7 +5604,8 @@
this.remarkInfoForm.deptId = row.deptId
this.remarkInfoForm.deptName = row.deptName
this.remarkInfoForm.jobName = row.jobName
- this.$set(this.remarkInfoForm, 'remarkContent', row.remarkContent)
+ this.remarkInfoForm.remarkContent = row.remarkContent
+ // this.$set(this.remarkInfoForm, 'remarkContent', row.remarkContent)
this.remarkInfoForm.remarkDate = row.remarkDate
this.remarkInfoForm.createTime = row.createTime
this.remarkInfoForm.creator = row.creator
@@ -5470,7 +5617,6 @@
this.dialogshowArr[13].show = true
},
gzadd(index) {
- debugger
this.isAdd = true
this.thisShowIndex = index
this.dialogshowArr[index].show = true
@@ -5705,7 +5851,7 @@
if (names === 'remarkInfoDataselection') {
ids = row.remarkId
urls = 'empRemarkInfo'
- } else if (names === 'onbadRecordDataselection') {
+ } else if (names === 'badRecordDataselection') {
ids = row.badId
urls = 'empBadRecord'
} else if (names === 'laborTroubleDataselection') {
--
Gitblit v1.8.0