From 4e6b24f719a8a44eb8efd9c47e846cf86137e205 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 12 三月 2021 11:55:35 +0800
Subject: [PATCH] fix(bug修复): 添加员工时部门选择框提示要选择部门
---
src/views/user/Informationinput.vue | 379 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 226 insertions(+), 153 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 4e75487..9ad4b6d 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -64,6 +64,7 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -80,37 +81,37 @@
编辑
</span>
</template>
- </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-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="50" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="50" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
+ <!-- <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="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="50" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <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="50" :formatter="educationFormat" />
- <el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="80" />
+ <el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column
prop="insuranceType"
show-overflow-tooltip
@@ -118,8 +119,8 @@
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="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>
@@ -132,6 +133,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="100">
@@ -148,13 +150,13 @@
</span>
</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="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <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" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <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"
@@ -165,6 +167,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -182,13 +185,13 @@
</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="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="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 prop="hospital" show-overflow-tooltip label="体检医院" />
- <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <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="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column
show-overflow-tooltip
prop="physicalExamType"
@@ -199,8 +202,8 @@
<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
@@ -212,6 +215,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="100">
@@ -229,16 +233,16 @@
</span>
</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="empNumb" label="编号" width="100" 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="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" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="155" />
+ <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
+ <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="100" />
</el-table>
<el-table
v-show="showArr[4].show"
@@ -249,6 +253,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -261,11 +266,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="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="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="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <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" />
@@ -284,6 +289,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -295,16 +301,16 @@
</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="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="120" />
- <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="120" />
+ <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="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <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>
@@ -317,6 +323,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -328,12 +335,12 @@
</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="empName" label="员工姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" />
+ <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="100" />
+ <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="applayDate" label="辞职申请日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="150" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -347,6 +354,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -358,12 +366,12 @@
</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="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="失业金申请日期" width="150" />
+ <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="100" />
+ <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="150" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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" />
@@ -378,6 +386,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -389,17 +398,17 @@
</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="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="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="100" />
+ <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="120" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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
@@ -411,6 +420,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -422,13 +432,13 @@
</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="80" />
- <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="empNumb" label="编号" width="90" 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="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
- <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="injuredTime" label="受伤日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <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" />
@@ -457,6 +467,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -468,12 +479,12 @@
</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="80" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="90" 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="60" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="injuredTime" label="受伤日期" width="130" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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" />
@@ -504,6 +515,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -515,13 +527,12 @@
</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="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="arbitrationDate" label="仲裁日期" width="100" />
- <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
+ <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="280" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column
show-overflow-tooltip
prop="arbitrationType"
@@ -529,18 +540,18 @@
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="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"
@@ -551,6 +562,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="100">
@@ -567,13 +579,13 @@
</span>
</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="120" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" 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="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="badDate" label="不良记录日期" width="150" />
- <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
+ <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <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>
@@ -586,6 +598,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -597,12 +610,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" 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="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="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
</el-table>
<pagination
@@ -625,14 +638,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"
@@ -787,7 +800,7 @@
<el-form-item label="姓名" prop="empName">
<el-input v-model="empBaseInfoForm.empName" />
</el-form-item>
- <el-form-item label="部门(护卫点)" required message="请选择护卫点" prop="deptId">
+ <el-form-item label="部门(护卫点)" required message="请选择部门(护卫点)" prop="allDeptName">
<treeselect
v-model="empBaseInfoForm.deptId"
:multiple="false"
@@ -795,6 +808,7 @@
:clear-value-text="$t('common.clear')"
placeholder="请选择部门(护卫点)"
style="width:100%"
+ @select="DeptNameSelect"
/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
@@ -942,8 +956,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="workExperienceForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="workExperienceForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="workExperienceForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="workExperienceForm.jobName" />
@@ -1043,8 +1057,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="physicalExamForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="physicalExamForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="physicalExamForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="physicalExamForm.jobName" />
@@ -1156,8 +1170,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="contractInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="contractInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="contractInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="contractInfoForm.jobName" />
@@ -1237,8 +1251,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="dimissionAttendForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="dimissionAttendForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="dimissionAttendForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="dimissionAttendForm.jobName" />
@@ -1321,8 +1335,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="leaveInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="leaveInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="leaveInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="leaveInfoForm.jobName" />
@@ -1394,8 +1408,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="resignForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="resignForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="resignForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="resignForm.jobName" />
@@ -1463,8 +1477,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="unemploymentForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="unemploymentForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="unemploymentForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="unemploymentForm.jobName" />
@@ -1546,8 +1560,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="insuranceForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="insuranceForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="insuranceForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="insuranceForm.jobName" />
@@ -1621,8 +1635,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="accidentCasesForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="accidentCasesForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="accidentCasesForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="accidentCasesForm.jobName" />
@@ -1768,8 +1782,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="occupationalForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="occupationalForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="occupationalForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="occupationalForm.jobName" />
@@ -1969,8 +1983,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="laborTroubleForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="laborTroubleForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="laborTroubleForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="laborTroubleForm.jobName" />
@@ -2057,8 +2071,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="badRecordForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="badRecordForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="badRecordForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="badRecordForm.jobName" />
@@ -2123,8 +2137,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="remarkInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="remarkInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="remarkInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="remarkInfoForm.jobName" />
@@ -2163,6 +2177,8 @@
components: { Treeselect, Pagination },
data() {
return {
+ downloadEmpExcel: pages.downloadEmpExcel,
+ uploadEmpExcel: pages.uploadEmpExcel,
defaultImg: require('../../assets/avatar/20180414165936.jpg'),
baseicInformationForm: {},
dialogShowDryg: false,
@@ -2183,7 +2199,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' }],
@@ -2602,6 +2618,7 @@
JobId: '',
deptId: '',
deptName: '',
+ allDeptName: '',
jobName: '',
remarkContent: '',
remarkDate: '',
@@ -2623,6 +2640,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
arbitrationDate: '',
@@ -2651,6 +2669,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
injuredTime: '',
@@ -2699,6 +2718,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
injuredTime: '',
@@ -2738,6 +2758,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2765,6 +2786,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2790,6 +2812,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2814,6 +2837,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
beginTime: '',
@@ -2841,6 +2865,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
beginDate: '',
@@ -2867,6 +2892,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
certificateNumb: '',
@@ -2896,6 +2922,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
hospital: '',
@@ -2925,6 +2952,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
workUnit: '',
@@ -2944,8 +2972,9 @@
empId: '',
customerId: '',
archivesNumb: '',
- deptId: '1',
+ deptId: null,
deptName: '',
+ allDeptName: '',
empNumb: '',
empName: '',
sex: '1',
@@ -3001,6 +3030,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
badDate: '',
@@ -3117,6 +3147,7 @@
this.initDept()
this.thisShowIndex = 1
this.isShow(false, 0)
+ this.initJob()
},
methods: {
importHandleAvatarError() {
@@ -3126,7 +3157,7 @@
})
},
importHandleAvatarSuccess(res, file) {
- if (res.data === null) {
+ if (res.data === null || res.data.length === 0) {
this.$notify({
title: '成功',
message: '导入成功!',
@@ -3387,6 +3418,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) {
@@ -3617,7 +3653,7 @@
}
break
case 11:
- selected = this.$refs.occupationalTable.selection
+ selected = this.$refs.laborTroubleTable.selection
if (selected.length > 0) {
const delIds = []
selected.forEach((j) => {
@@ -4198,8 +4234,9 @@
this.empBaseInfoForm.empId = ''
this.empBaseInfoForm.customerId = ''
this.empBaseInfoForm.archivesNumb = ''
- this.empBaseInfoForm.deptId = ''
+ this.empBaseInfoForm.deptId = null
this.empBaseInfoForm.deptName = ''
+ this.empBaseInfoForm.allDeptName = ''
this.empBaseInfoForm.empNumb = ''
this.empBaseInfoForm.empName = ''
this.empBaseInfoForm.sex = ''
@@ -4252,6 +4289,7 @@
this.empBaseInfoForm.archivesNumb = row.archivesNumb
this.empBaseInfoForm.deptId = row.deptId
this.empBaseInfoForm.deptName = row.deptName
+ this.empBaseInfoForm.allDeptName = row.allDeptName
this.empBaseInfoForm.empNumb = row.empNumb
this.empBaseInfoForm.empName = row.empName
this.empBaseInfoForm.sex = row.sex
@@ -4400,6 +4438,7 @@
this.workExperienceForm.archivesNumb = ''
this.workExperienceForm.deptId = ''
this.workExperienceForm.deptName = ''
+ this.workExperienceForm.allDeptName = ''
this.workExperienceForm.empNumb = ''
this.workExperienceForm.empName = ''
this.workExperienceForm.sex = ''
@@ -4427,6 +4466,7 @@
this.workExperienceForm.sexName = row.sex
this.workExperienceForm.deptId = row.deptId
this.workExperienceForm.deptName = row.deptName
+ this.workExperienceForm.allDeptName = row.allDeptName
this.workExperienceForm.JobId = row.JobId
this.workExperienceForm.jobName = row.jobName
this.workExperienceForm.workUnit = row.workUnit
@@ -4497,6 +4537,7 @@
this.physicalExamForm.archivesNumb = ''
this.physicalExamForm.deptId = ''
this.physicalExamForm.deptName = ''
+ this.physicalExamForm.allDeptName = ''
this.physicalExamForm.empNumb = ''
this.physicalExamForm.empName = ''
this.physicalExamForm.sex = ''
@@ -4523,6 +4564,7 @@
this.physicalExamForm.sex = row.sex
this.physicalExamForm.deptId = row.deptId
this.physicalExamForm.deptName = row.deptName
+ this.physicalExamForm.allDeptName = row.allDeptName
this.physicalExamForm.JobId = row.JobId
this.physicalExamForm.jobName = row.jobName
this.physicalExamForm.hospital = row.hospital
@@ -4599,6 +4641,7 @@
this.contractInfoForm.archivesNumb = ''
this.contractInfoForm.deptId = ''
this.contractInfoForm.deptName = ''
+ this.contractInfoForm.allDeptName = ''
this.contractInfoForm.empNumb = ''
this.contractInfoForm.empName = ''
this.contractInfoForm.sex = ''
@@ -4631,6 +4674,7 @@
this.contractInfoForm.sex = row.sex
this.contractInfoForm.deptId = row.deptId
this.contractInfoForm.deptName = row.deptName
+ this.contractInfoForm.allDeptName = row.allDeptName
this.contractInfoForm.JobId = row.JobId
this.contractInfoForm.jobName = row.jobName
this.contractInfoForm.beginDate = row.beginDate
@@ -4705,6 +4749,7 @@
this.dimissionAttendForm.archivesNumb = ''
this.dimissionAttendForm.deptId = ''
this.dimissionAttendForm.deptName = ''
+ this.dimissionAttendForm.allDeptName = ''
this.dimissionAttendForm.empNumb = ''
this.dimissionAttendForm.empName = ''
this.dimissionAttendForm.sex = ''
@@ -4736,6 +4781,7 @@
this.dimissionAttendForm.certificateNumb = row.certificateNumb
this.dimissionAttendForm.deptId = row.deptId
this.dimissionAttendForm.deptName = row.deptName
+ this.dimissionAttendForm.allDeptName = row.allDeptName
this.dimissionAttendForm.JobId = row.JobId
this.dimissionAttendForm.jobName = row.jobName
this.dimissionAttendForm.attendMonth = row.attendMonth
@@ -4809,6 +4855,7 @@
this.leaveInfoForm.archivesNumb = ''
this.leaveInfoForm.deptId = ''
this.leaveInfoForm.deptName = ''
+ this.leaveInfoForm.allDeptName = ''
this.leaveInfoForm.empNumb = ''
this.leaveInfoForm.empName = ''
this.leaveInfoForm.sex = ''
@@ -4841,6 +4888,7 @@
this.leaveInfoForm.certificateNumb = row.certificateNumb
this.leaveInfoForm.deptId = row.deptId
this.leaveInfoForm.deptName = row.deptName
+ this.leaveInfoForm.allDeptName = row.allDeptName
this.leaveInfoForm.JobId = row.JobId
this.leaveInfoForm.jobName = row.jobName
this.leaveInfoForm.beginTime = row.beginTime
@@ -4915,6 +4963,7 @@
this.resignForm.archivesNumb = ''
this.resignForm.deptId = ''
this.resignForm.deptName = ''
+ this.resignForm.allDeptName = ''
this.resignForm.empNumb = ''
this.resignForm.empName = ''
this.resignForm.sex = ''
@@ -4944,6 +4993,7 @@
this.resignForm.certificateNumb = row.certificateNumb
this.resignForm.deptId = row.deptId
this.resignForm.deptName = row.deptName
+ this.resignForm.allDeptName = row.allDeptName
this.resignForm.JobId = row.JobId
this.resignForm.jobName = row.jobName
this.resignForm.applayDate = row.applayDate
@@ -5015,6 +5065,7 @@
this.unemploymentForm.archivesNumb = ''
this.unemploymentForm.deptId = ''
this.unemploymentForm.deptName = ''
+ this.unemploymentForm.allDeptName = ''
this.unemploymentForm.empNumb = ''
this.unemploymentForm.empName = ''
this.unemploymentForm.sex = ''
@@ -5045,6 +5096,7 @@
this.unemploymentForm.certificateNumb = row.certificateNumb
this.unemploymentForm.deptId = row.deptId
this.unemploymentForm.deptName = row.deptName
+ this.unemploymentForm.allDeptName = row.allDeptName
this.unemploymentForm.JobId = row.JobId
this.unemploymentForm.jobName = row.jobName
this.unemploymentForm.applayDate = row.applayDate
@@ -5117,6 +5169,7 @@
this.insuranceForm.archivesNumb = ''
this.insuranceForm.deptId = ''
this.insuranceForm.deptName = ''
+ this.insuranceForm.allDeptName = ''
this.insuranceForm.empNumb = ''
this.insuranceForm.empName = ''
this.insuranceForm.sex = ''
@@ -5149,6 +5202,7 @@
this.insuranceForm.certificateNumb = row.certificateNumb
this.insuranceForm.deptId = row.deptId
this.insuranceForm.deptName = row.deptName
+ this.insuranceForm.allDeptName = row.allDeptName
this.insuranceForm.JobId = row.JobId
this.insuranceForm.jobName = row.jobName
this.insuranceForm.applayDate = row.applayDate
@@ -5222,6 +5276,7 @@
this.accidentCasesForm.archivesNumb = ''
this.accidentCasesForm.deptId = ''
this.accidentCasesForm.deptName = ''
+ this.accidentCasesForm.allDeptName = ''
this.accidentCasesForm.empNumb = ''
this.accidentCasesForm.empName = ''
this.accidentCasesForm.sex = ''
@@ -5252,7 +5307,7 @@
this.accidentCasesForm.creator = ''
this.accidentCasesForm.modifyTime = ''
this.accidentCasesForm.modifier = ''
- this.accidentCasesForm.delFlag = ''
+ this.accidentCasesForm.delFlag = '2'
this.accidentCasesForm.version = ''
},
editAccidentCases(row) {
@@ -5266,6 +5321,7 @@
this.accidentCasesForm.certificateNumb = row.certificateNumb
this.accidentCasesForm.deptId = row.deptId
this.accidentCasesForm.deptName = row.deptName
+ this.accidentCasesForm.allDeptName = row.allDeptName
this.accidentCasesForm.JobId = row.JobId
this.accidentCasesForm.jobName = row.jobName
this.accidentCasesForm.injuredTime = row.injuredTime
@@ -5352,6 +5408,7 @@
this.occupationalForm.archivesNumb = ''
this.occupationalForm.deptId = ''
this.occupationalForm.deptName = ''
+ this.occupationalForm.allDeptName = ''
this.occupationalForm.empNumb = ''
this.occupationalForm.empName = ''
this.occupationalForm.sex = ''
@@ -5390,7 +5447,7 @@
this.occupationalForm.creator = ''
this.occupationalForm.modifyTime = ''
this.occupationalForm.modifier = ''
- this.occupationalForm.delFlag = ''
+ this.occupationalForm.delFlag = '2'
this.occupationalForm.version = ''
this.occupationalForm.remark = ''
},
@@ -5405,6 +5462,7 @@
this.occupationalForm.certificateNumb = row.certificateNumb
this.occupationalForm.deptId = row.deptId
this.occupationalForm.deptName = row.deptName
+ this.occupationalForm.allDeptName = row.allDeptName
this.occupationalForm.JobId = row.JobId
this.occupationalForm.jobName = row.jobName
this.occupationalForm.injuredTime = row.injuredTime
@@ -5502,6 +5560,7 @@
this.laborTroubleForm.archivesNumb = ''
this.laborTroubleForm.deptId = ''
this.laborTroubleForm.deptName = ''
+ this.laborTroubleForm.allDeptName = ''
this.laborTroubleForm.empNumb = ''
this.laborTroubleForm.empName = ''
this.laborTroubleForm.sex = ''
@@ -5520,7 +5579,7 @@
this.laborTroubleForm.creator = ''
this.laborTroubleForm.modifyTime = ''
this.laborTroubleForm.modifier = ''
- this.laborTroubleForm.delFlag = ''
+ this.laborTroubleForm.delFlag = '2'
this.laborTroubleForm.version = ''
this.laborTroubleForm.remark = ''
},
@@ -5534,6 +5593,7 @@
this.laborTroubleForm.certificateNumb = row.certificateNumb
this.laborTroubleForm.deptId = row.deptId
this.laborTroubleForm.deptName = row.deptName
+ this.laborTroubleForm.allDeptName = row.allDeptName
this.laborTroubleForm.JobId = row.JobId
this.laborTroubleForm.jobName = row.jobName
this.laborTroubleForm.arbitrationDate = row.arbitrationDate
@@ -5564,6 +5624,7 @@
this.badRecordForm.archivesNumb = ''
this.badRecordForm.deptId = ''
this.badRecordForm.deptName = ''
+ this.badRecordForm.allDeptName = ''
this.badRecordForm.empNumb = ''
this.badRecordForm.empName = ''
this.badRecordForm.sex = ''
@@ -5578,7 +5639,7 @@
this.badRecordForm.creator = ''
this.badRecordForm.modifyTime = ''
this.badRecordForm.modifier = ''
- this.badRecordForm.delFlag = ''
+ this.badRecordForm.delFlag = '2'
this.badRecordForm.version = ''
this.badRecordForm.remark = ''
},
@@ -5637,6 +5698,7 @@
this.badRecordForm.certificateNumb = row.certificateNumb
this.badRecordForm.deptId = row.deptId
this.badRecordForm.deptName = row.deptName
+ this.badRecordForm.allDeptName = row.allDeptName
this.badRecordForm.JobId = row.JobId
this.badRecordForm.jobName = row.jobName
this.badRecordForm.badDate = row.badDate
@@ -5707,6 +5769,7 @@
this.remarkInfoForm.archivesNumb = ''
this.remarkInfoForm.deptId = ''
this.remarkInfoForm.deptName = ''
+ this.remarkInfoForm.allDeptName = ''
this.remarkInfoForm.empNumb = ''
this.remarkInfoForm.empName = ''
this.remarkInfoForm.sex = ''
@@ -5720,7 +5783,7 @@
this.remarkInfoForm.creator = ''
this.remarkInfoForm.modifyTime = ''
this.remarkInfoForm.modifier = ''
- this.remarkInfoForm.delFlag = ''
+ this.remarkInfoForm.delFlag = '2'
this.remarkInfoForm.version = ''
},
editRemarkInfo(row) {
@@ -5734,6 +5797,7 @@
this.remarkInfoForm.JobId = row.JobId
this.remarkInfoForm.deptId = row.deptId
this.remarkInfoForm.deptName = row.deptName
+ this.remarkInfoForm.allDeptName = row.allDeptName
this.remarkInfoForm.jobName = row.jobName
this.remarkInfoForm.remarkContent = row.remarkContent
this.remarkInfoForm.remarkDate = row.remarkDate
@@ -5830,6 +5894,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)
@@ -5860,6 +5928,11 @@
case '5':
return '（非深户）四险一档'
}
+ },
+ changeSort(val) {
+ this.sort.field = val.prop
+ this.sort.order = val.order
+ this.search()
}
}
}
--
Gitblit v1.8.0