From 706672829b43ac55837bfcb34132550fb97f41ef Mon Sep 17 00:00:00 2001
From: 楚江漓i <85093541@qq.com>
Date: 星期五, 12 三月 2021 00:04:39 +0800
Subject: [PATCH] 信息录入调整
---
src/views/user/Informationinput.vue | 355 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 208 insertions(+), 147 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 82adc7f..a0b87c0 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -60,7 +60,9 @@
ref="empBaseInfoTable"
:data="basicInformationData"
stripe
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ border
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -78,23 +80,36 @@
编辑
</span>
</template>
- </el-table-column>
- <el-table-column label="照片" width="80">
- <template slot-scope="scope" width="90">
- <img :src="scope.row.imagePath">
- </template>
- </el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
+ </el-table-column>-->
+ <!-- <el-table-column label="照片" width="60">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <!– <img :src="scope.row.imagePath">–>-->
+ <!-- <el-image-->
+ <!-- v-if="scope.row.imagePath && scope.row.imagePath != ''"-->
+ <!-- style="width: 30px; height: 30px"-->
+ <!-- :src="scope.row.imagePath"-->
+ <!-- fit="cover"-->
+ <!-- />-->
+
+ <!-- <el-image-->
+ <!-- v-else-->
+ <!-- style="width: 30px; height: 30px"-->
+ <!-- :src="defaultImg"-->
+ <!-- fit="cover"-->
+ <!-- />-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column show-overflow-tooltip prop="empType" label="员工类别" width="80" :formatter="empTypeFormat" />
<el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
<el-table-column show-overflow-tooltip prop="nation" label="民族" width="50" :formatter="nationFormat" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="marriage" label="婚姻状况" width="80" :formatter="marriageFormat" />
<el-table-column show-overflow-tooltip prop="politics" label="政治面貌" width="80" :formatter="politicsFormat" />
- <el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" />
+ <el-table-column show-overflow-tooltip prop="education" label="学历" width="50" :formatter="educationFormat" />
<el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="80" />
<el-table-column
prop="insuranceType"
@@ -103,17 +118,19 @@
width="80"
:formatter="insuranceTypeFormat"
/>
- <el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" />
- <el-table-column prop="guardNumb" show-overflow-tooltip label="保安员证号" />
- <el-table-column prop="archivesNumb" show-overflow-tooltip label="档案编号" />
+ <el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" width="100" />
+ <el-table-column prop="guardNumb" show-overflow-tooltip label="保安员证号" width="100" />
+ <el-table-column prop="archivesNumb" show-overflow-tooltip label="档案编号" width="80" />
<el-table-column prop="archivesStatusName" show-overflow-tooltip label="档案情况" />
</el-table>
<el-table
v-show="showArr[1].show"
ref="workExperienceTable"
:data="workExperienceData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="55" />
@@ -132,19 +149,21 @@
</template>
</el-table-column>
<el-table-column prop="empNumb" label="编号" width="100" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
- <el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" />
- <el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" />
- <el-table-column prop="beginDate" label="开始日期" width="120" />
- <el-table-column prop="endDate" label="结束日期" width="120" />
- <el-table-column prop="jobContent" show-overflow-tooltip label="主要工作内容" />
+ <el-table-column prop="empName" label="姓名" width="100" />
+ <el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" width="180" />
+ <el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" width="160" />
+ <el-table-column prop="beginDate" label="开始日期" width="140" />
+ <el-table-column prop="endDate" label="结束日期" width="140" />
+ <el-table-column prop="jobContent" show-overflow-tooltip label="主要工作内容" min-width="120" />
</el-table>
<el-table
v-show="showArr[2].show"
ref="physicalExamTable"
:data="physicalExamData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -164,11 +183,11 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
- <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
+ <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" min-width="100" />
<el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
<el-table-column
show-overflow-tooltip
@@ -180,16 +199,18 @@
<el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="60" />
<el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="80" />
<el-table-column prop="ecg" show-overflow-tooltip label="心电图" width="80" :formatter="ecgNameFormat" />
- <el-table-column prop="conclusion" show-overflow-tooltip label="体检结论" />
- <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查记录" />
+ <el-table-column prop="conclusion" show-overflow-tooltip label="体检结论" min-width="100" />
+ <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查日期" min-width="100" />
<el-table-column prop="remark" show-overflow-tooltip label="备注" />
</el-table>
<el-table
v-show="showArr[3].show"
ref="contractInfoTable"
:data="contractInfoData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="55" />
@@ -209,22 +230,24 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="150" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
- <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" />
- <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 prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="155" />
+ <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
+ <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" width="80" />
+ <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="100" />
</el-table>
<el-table
v-show="showArr[4].show"
ref="dimissionAttendTable"
:data="dimissionAttendData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -239,15 +262,15 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="100" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="120" />
<el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="100" />
<el-table-column show-overflow-tooltip prop="overtimeDay" label="加班（天）" width="100" />
- <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）" width="80" />
- <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="80" />
+ <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）" width="120" />
+ <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="120" />
<el-table-column show-overflow-tooltip prop="leaveDay" label="请假（天）" width="100" />
<el-table-column show-overflow-tooltip prop="absenteeism" label="旷工（天）" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -256,8 +279,10 @@
v-show="showArr[5].show"
ref="leaveInfoTable"
:data="leaveInfoData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -270,16 +295,16 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="150" />
- <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="110" />
+ <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="110" />
<el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="80" />
<el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="80" :formatter="leaveTypeFormat" />
- <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="returnDate" label="返岗时间" width="110" />
<el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
@@ -287,8 +312,10 @@
v-show="showArr[6].show"
ref="resignTable"
:data="resignData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -301,11 +328,11 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名" width="100" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
<el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" />
<el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="150" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
@@ -315,8 +342,10 @@
v-show="showArr[7].show"
ref="unemploymentTable"
:data="unemploymentData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -329,13 +358,13 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" />
<el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="150" />
- <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" width="100" />
+ <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
<el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -344,8 +373,10 @@
v-show="showArr[8].show"
ref="insuranceTable"
:data="insuranceData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -358,25 +389,27 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="120" />
<el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="80" />
- <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" />
+ <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" width="80" />
<el-table-column prop="reportStatus " label="是否已报告" width="100" :formatter="reportStatusFormat" />
- <el-table-column prop="applayStatus" label="状态" width="100" :formatter="applayStatusFormat" />
- <el-table-column prop="auditor" label="审核人" width="100" />
+ <el-table-column prop="applayStatus" label="状态" width="80" :formatter="applayStatusFormat" />
+ <el-table-column prop="auditor" label="审核人" width="80" />
<el-table-column prop="remark" label="备注" />
</el-table>
<el-table
v-show="showArr[9].show"
ref="accidentCasesTable"
:data="accidentCasesData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -389,38 +422,40 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="60" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="70" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
- <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" />
- <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="60" />
- <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" />
- <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" />
- <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" />
- <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="80" />
+ <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="120" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="80" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="80" />
<el-table-column
show-overflow-tooltip
prop="hospitalizatioFlag"
label="是否住院"
- width="60"
+ width="80"
:formatter="hospitalizatioFlagFormat"
/>
- <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="40" />
- <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="60" />
- <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" />
- <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="60" />
- <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="60" />
- <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="60" />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
+ <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="80" />
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="80" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
+ <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="120" />
</el-table>
<el-table
v-show="showArr[10].show"
ref="occupationalTable"
:data="occupationalData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -433,39 +468,41 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="70" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
- <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" />
- <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="60" />
- <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" />
- <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" />
- <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" />
- <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <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="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="80" />
+ <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="50"
+ width="80"
:formatter="hospitalizatioFlagFormat"
/>
- <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="40" />
- <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="60" />
- <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" />
- <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="60" />
- <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="60" />
- <el-table-column show-overflow-tooltip prop="compensated" label="已赔付医药费用" width="60" />
- <el-table-column show-overflow-tooltip prop="settleStatusName" label="是否结案" width="60" />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
+ <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="100" />
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="80" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
+ <el-table-column show-overflow-tooltip prop="compensated" label="已赔付医药费用" width="120" />
+ <el-table-column show-overflow-tooltip prop="settleStatusName" label="是否结案" width="80" />
</el-table>
<el-table
v-show="showArr[11].show"
ref="laborTroubleTable"
:data="laborTroubleData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -478,12 +515,11 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="70" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="280" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
<el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
<el-table-column
show-overflow-tooltip
@@ -492,25 +528,27 @@
width="100"
:formatter="arbitrationTypeFormat"
/>
- <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" />
- <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
+ <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" min-width="100" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="70" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
- <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="100" />
+ <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="120" />
<el-table-column
show-overflow-tooltip
prop="arbitrationStatus"
label="状态"
- width="80"
+ width="50"
:formatter="arbitrationStatusFormat"
/>
- <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="100" />
</el-table>
<el-table
v-show="showArr[12].show"
ref="badRecordTable"
:data="badRecordData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="55" />
@@ -528,13 +566,13 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
<el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="150" />
- <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
+ <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" min-width="120" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="120" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
@@ -542,8 +580,10 @@
v-show="showArr[13].show"
ref="remarkInfoTable"
:data="remarkInfoData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -556,12 +596,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="180" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="150" />
<el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
</el-table>
<pagination
@@ -584,14 +624,14 @@
<el-row>
<el-col span="24">
<el-form-item label="员工模板下载" prop="region">
- <a href="http://120.24.23.155:8000/员工信息.xls" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
+ <a :href="downloadEmpExcel" 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="uploadEmpExcel"
accept=".xls, .xlsx, .excel"
:headers="headers()"
:on-success="importHandleAvatarSuccess"
@@ -659,7 +699,7 @@
</el-select>
</el-form-item>
<el-form-item label="民族" prop="nation">
- <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族">
+ <el-select v-model="empBaseInfoForm.nation" filterable placeholder="请选择民族">
<el-option
v-for="dict in nationOptions"
:key="dict.dicItemCode"
@@ -754,6 +794,7 @@
:clear-value-text="$t('common.clear')"
placeholder="请选择部门(护卫点)"
style="width:100%"
+ @select="DeptNameSelect"
/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
@@ -1036,8 +1077,13 @@
<el-form-item label="体检结论" prop="conclusion">
<el-input v-model="physicalExamForm.conclusion" />
</el-form-item>
- <el-form-item label="复查记录" prop="reviewRecord">
- <el-input v-model="physicalExamForm.reviewRecord" />
+ <el-form-item label="复查日期" prop="reviewRecord">
+ <el-date-picker
+ v-model="physicalExamForm.reviewRecord"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="选择复查日期"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -1295,12 +1341,12 @@
<el-input v-model="leaveInfoForm.leaveDay" />
</el-form-item>
- <el-form-item label="到岗时间" prop="returnDate">
+ <el-form-item label="返岗时间" prop="returnDate">
<el-date-picker
v-model="leaveInfoForm.returnDate"
value-format="yyyy-MM-dd"
type="date"
- placeholder="选择到岗时间"
+ placeholder="选择返岗时间"
/>
</el-form-item>
@@ -2117,6 +2163,9 @@
components: { Treeselect, Pagination },
data() {
return {
+ downloadEmpExcel: pages.downloadEmpExcel,
+ uploadEmpExcel: pages.uploadEmpExcel,
+ defaultImg: require('../../assets/avatar/20180414165936.jpg'),
baseicInformationForm: {},
dialogShowDryg: false,
empBaseInfoImageUrl: '',
@@ -2136,7 +2185,7 @@
message: this.$t('rules.noMoreThan20'),
trigger: 'blur'
}],
- empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
+ empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
{ min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
empNumb: [{ required: true, message: '请输入编号', trigger: 'blur' },
{ min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
@@ -2240,7 +2289,7 @@
beginTime: [{ required: true, validator: this.startDate }],
leaveType: [{ required: true, message: '请选择请假类型', trigger: 'change' }],
endTime: [{ required: true, validator: this.endDate }],
- returnDate: [{ required: true, message: '请选择到岗时间', trigger: 'change' }],
+ returnDate: [{ required: true, message: '请选择返岗时间', trigger: 'change' }],
reporter: [{ required: true, message: '请输入报备人', trigger: 'blur' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
@@ -3070,6 +3119,7 @@
this.initDept()
this.thisShowIndex = 1
this.isShow(false, 0)
+ this.initJob()
},
methods: {
importHandleAvatarError() {
@@ -3079,7 +3129,7 @@
})
},
importHandleAvatarSuccess(res, file) {
- if (res.data === null) {
+ if (res.data === null || res.data.length === 0) {
this.$notify({
title: '成功',
message: '导入成功!',
@@ -3340,6 +3390,11 @@
resetDeptTree() {
this.$refs.deptTree.setCheckedKeys([])
},
+ initJob() {
+ this.$get('system/position/dicJob').then((r) => {
+ this.restaurJob = r.data.data
+ })
+ },
butDelete() {
let selected
switch (this.thisShowIndex) {
@@ -3570,7 +3625,7 @@
}
break
case 11:
- selected = this.$refs.occupationalTable.selection
+ selected = this.$refs.laborTroubleTable.selection
if (selected.length > 0) {
const delIds = []
selected.forEach((j) => {
@@ -4305,6 +4360,7 @@
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.isAdd) {
+ this.workExperienceForm.delFlag = '2'
this.$post('hr/empWorkExperience', { ...this.workExperienceForm }).then(() => {
this.buttonLoading = false
this.$message({
@@ -4333,6 +4389,7 @@
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.isAdd) {
+ this.workExperienceForm.delFlag = '2'
this.$post('hr/empWorkExperience', { ...this.workExperienceForm }).then(() => {
this.buttonLoading = false
this.$message({
@@ -4375,7 +4432,7 @@
this.workExperienceForm.empNumb = row.empNumb
this.workExperienceForm.empName = row.empName
this.workExperienceForm.certificateNumb = row.certificateNumb
- this.workExperienceForm.sex = row.sex
+ this.workExperienceForm.sexName = row.sex
this.workExperienceForm.deptId = row.deptId
this.workExperienceForm.deptName = row.deptName
this.workExperienceForm.JobId = row.JobId
@@ -5781,6 +5838,10 @@
}, jobNameSelect(item) {
this.empBaseInfoForm.jobName = item.value
this.empBaseInfoForm.JobId = item.code
+ }, DeptNameSelect(val) {
+ this.empBaseInfoForm.deptId = val.deptId
+ this.empBaseInfoForm.deptName = val.label
+ this.empBaseInfoForm.allDeptName = val.allDeptName
},
generateUserInfo(index, val) {
var userinfo = toCardGetUserInfo(val)
--
Gitblit v1.8.0