From 9d81bcda287b576069266642d69cd126532e36b5 Mon Sep 17 00:00:00 2001
From: 楚江漓i <85093541@qq.com>
Date: 星期五, 12 三月 2021 18:21:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/archivesChange.vue | 364 +++++++++++++++++----------
src/views/user/selectuser.vue | 4
vue.config.js | 4
src/views/yunpan/fujian.vue | 34 ++
src/views/user/inemployees.vue | 8
src/views/user/archivesEdit.vue | 53 ++--
src/views/user/outemployess.vue | 8
src/views/user/Informationinput.vue | 242 +++++++++++------
src/views/yunpan/uploadfj.vue | 11
9 files changed, 449 insertions(+), 279 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index a0b87c0..4a14776 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">
@@ -99,10 +100,10 @@
<!-- />-->
<!-- </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="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="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="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" />
@@ -110,7 +111,7 @@
<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
@@ -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,11 +150,11 @@
</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="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" />
+ <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>
@@ -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="allDeptName" label="部门(护卫点)" width="300" />
+ <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" />
+ <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="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"
@@ -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,15 +233,15 @@
</span>
</template>
</el-table-column>
- <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="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 prop="empName" label="姓名" width="100" />
+ <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="120" />
- <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="120" />
+ <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="80" />
+ <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
@@ -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,10 +266,10 @@
</span>
</template>
</el-table-column>
- <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="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" />
+ <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" />
@@ -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,12 +301,12 @@
</span>
</template>
</el-table-column>
- <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="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" />
+ <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="110" />
+ <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" />
@@ -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="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <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" />
+ <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" />
+ <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="allDeptName" label="部门(护卫点)" width="300" />
+ <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" />
+ <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" />
+ <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,12 +398,12 @@
</span>
</template>
</el-table-column>
- <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="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" />
+ <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="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" width="80" />
<el-table-column prop="reportStatus " label="是否已报告" width="100" :formatter="reportStatusFormat" />
@@ -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,12 +432,12 @@
</span>
</template>
</el-table-column>
- <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="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="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="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" />
@@ -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="70" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <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,12 +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="allDeptName" label="部门(护卫点)" width="280" />
+ <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" />
+ <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="100" />
+ <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"
@@ -550,6 +562,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="100">
@@ -566,12 +579,12 @@
</span>
</template>
</el-table-column>
- <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="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="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" />
+ <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="备注" />
@@ -585,6 +598,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -596,12 +610,12 @@
</span>
</template>
</el-table-column>
- <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="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="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" />
+ <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
@@ -786,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"
@@ -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" />
@@ -2604,6 +2618,7 @@
JobId: '',
deptId: '',
deptName: '',
+ allDeptName: '',
jobName: '',
remarkContent: '',
remarkDate: '',
@@ -2625,6 +2640,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
arbitrationDate: '',
@@ -2653,6 +2669,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
injuredTime: '',
@@ -2701,6 +2718,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
injuredTime: '',
@@ -2740,6 +2758,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2767,6 +2786,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2792,6 +2812,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2816,6 +2837,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
beginTime: '',
@@ -2843,6 +2865,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
beginDate: '',
@@ -2869,6 +2892,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
certificateNumb: '',
@@ -2898,6 +2922,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
hospital: '',
@@ -2927,6 +2952,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
workUnit: '',
@@ -2946,8 +2972,9 @@
empId: '',
customerId: '',
archivesNumb: '',
- deptId: '1',
+ deptId: null,
deptName: '',
+ allDeptName: '',
empNumb: '',
empName: '',
sex: '1',
@@ -3003,6 +3030,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
badDate: '',
@@ -4206,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 = ''
@@ -4260,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
@@ -4408,6 +4438,7 @@
this.workExperienceForm.archivesNumb = ''
this.workExperienceForm.deptId = ''
this.workExperienceForm.deptName = ''
+ this.workExperienceForm.allDeptName = ''
this.workExperienceForm.empNumb = ''
this.workExperienceForm.empName = ''
this.workExperienceForm.sex = ''
@@ -4435,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
@@ -4505,6 +4537,7 @@
this.physicalExamForm.archivesNumb = ''
this.physicalExamForm.deptId = ''
this.physicalExamForm.deptName = ''
+ this.physicalExamForm.allDeptName = ''
this.physicalExamForm.empNumb = ''
this.physicalExamForm.empName = ''
this.physicalExamForm.sex = ''
@@ -4531,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
@@ -4607,6 +4641,7 @@
this.contractInfoForm.archivesNumb = ''
this.contractInfoForm.deptId = ''
this.contractInfoForm.deptName = ''
+ this.contractInfoForm.allDeptName = ''
this.contractInfoForm.empNumb = ''
this.contractInfoForm.empName = ''
this.contractInfoForm.sex = ''
@@ -4639,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
@@ -4713,6 +4749,7 @@
this.dimissionAttendForm.archivesNumb = ''
this.dimissionAttendForm.deptId = ''
this.dimissionAttendForm.deptName = ''
+ this.dimissionAttendForm.allDeptName = ''
this.dimissionAttendForm.empNumb = ''
this.dimissionAttendForm.empName = ''
this.dimissionAttendForm.sex = ''
@@ -4744,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
@@ -4817,6 +4855,7 @@
this.leaveInfoForm.archivesNumb = ''
this.leaveInfoForm.deptId = ''
this.leaveInfoForm.deptName = ''
+ this.leaveInfoForm.allDeptName = ''
this.leaveInfoForm.empNumb = ''
this.leaveInfoForm.empName = ''
this.leaveInfoForm.sex = ''
@@ -4849,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
@@ -4923,6 +4963,7 @@
this.resignForm.archivesNumb = ''
this.resignForm.deptId = ''
this.resignForm.deptName = ''
+ this.resignForm.allDeptName = ''
this.resignForm.empNumb = ''
this.resignForm.empName = ''
this.resignForm.sex = ''
@@ -4952,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
@@ -5023,6 +5065,7 @@
this.unemploymentForm.archivesNumb = ''
this.unemploymentForm.deptId = ''
this.unemploymentForm.deptName = ''
+ this.unemploymentForm.allDeptName = ''
this.unemploymentForm.empNumb = ''
this.unemploymentForm.empName = ''
this.unemploymentForm.sex = ''
@@ -5053,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
@@ -5125,6 +5169,7 @@
this.insuranceForm.archivesNumb = ''
this.insuranceForm.deptId = ''
this.insuranceForm.deptName = ''
+ this.insuranceForm.allDeptName = ''
this.insuranceForm.empNumb = ''
this.insuranceForm.empName = ''
this.insuranceForm.sex = ''
@@ -5157,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
@@ -5230,6 +5276,7 @@
this.accidentCasesForm.archivesNumb = ''
this.accidentCasesForm.deptId = ''
this.accidentCasesForm.deptName = ''
+ this.accidentCasesForm.allDeptName = ''
this.accidentCasesForm.empNumb = ''
this.accidentCasesForm.empName = ''
this.accidentCasesForm.sex = ''
@@ -5260,7 +5307,7 @@
this.accidentCasesForm.creator = ''
this.accidentCasesForm.modifyTime = ''
this.accidentCasesForm.modifier = ''
- this.accidentCasesForm.delFlag = ''
+ this.accidentCasesForm.delFlag = '2'
this.accidentCasesForm.version = ''
},
editAccidentCases(row) {
@@ -5274,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
@@ -5360,6 +5408,7 @@
this.occupationalForm.archivesNumb = ''
this.occupationalForm.deptId = ''
this.occupationalForm.deptName = ''
+ this.occupationalForm.allDeptName = ''
this.occupationalForm.empNumb = ''
this.occupationalForm.empName = ''
this.occupationalForm.sex = ''
@@ -5398,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 = ''
},
@@ -5413,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
@@ -5510,6 +5560,7 @@
this.laborTroubleForm.archivesNumb = ''
this.laborTroubleForm.deptId = ''
this.laborTroubleForm.deptName = ''
+ this.laborTroubleForm.allDeptName = ''
this.laborTroubleForm.empNumb = ''
this.laborTroubleForm.empName = ''
this.laborTroubleForm.sex = ''
@@ -5528,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 = ''
},
@@ -5542,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
@@ -5572,6 +5624,7 @@
this.badRecordForm.archivesNumb = ''
this.badRecordForm.deptId = ''
this.badRecordForm.deptName = ''
+ this.badRecordForm.allDeptName = ''
this.badRecordForm.empNumb = ''
this.badRecordForm.empName = ''
this.badRecordForm.sex = ''
@@ -5586,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 = ''
},
@@ -5645,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
@@ -5715,6 +5769,7 @@
this.remarkInfoForm.archivesNumb = ''
this.remarkInfoForm.deptId = ''
this.remarkInfoForm.deptName = ''
+ this.remarkInfoForm.allDeptName = ''
this.remarkInfoForm.empNumb = ''
this.remarkInfoForm.empName = ''
this.remarkInfoForm.sex = ''
@@ -5728,7 +5783,7 @@
this.remarkInfoForm.creator = ''
this.remarkInfoForm.modifyTime = ''
this.remarkInfoForm.modifier = ''
- this.remarkInfoForm.delFlag = ''
+ this.remarkInfoForm.delFlag = '2'
this.remarkInfoForm.version = ''
},
editRemarkInfo(row) {
@@ -5742,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
@@ -5810,6 +5866,7 @@
this[this.inputForName].certificateNumb = data.certificateNumb
this[this.inputForName].deptId = data.deptId
this[this.inputForName].deptName = data.deptName
+ this[this.inputForName].allDeptName = data.allDeptName
this[this.inputForName].JobId = data.jobId
this[this.inputForName].jobName = data.jobName
this[this.inputForName].sex = data.sex === '1' ? '男' : '女'
@@ -5872,6 +5929,11 @@
case '5':
return '（非深户）四险一档'
}
+ },
+ changeSort(val) {
+ this.sort.field = val.prop
+ this.sort.order = val.order
+ this.search()
}
}
}
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index a2cfad0..738039d 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -191,7 +191,7 @@
<div class="jbxxTitle">
基本信息
<el-button
- style="position:absolute;right: 40px"
+ style="position:absolute;right: 20px"
class="filter-item"
type="primary"
@click="ExportSavePdf"
@@ -213,6 +213,18 @@
<el-input v-model="empBaseInfoForm.empName" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
+
+ <el-col :span="8">
+ <el-form-item label="身份证号码" prop="certificateNumb">
+ <el-input
+ v-model="empBaseInfoForm.certificateNumb"
+ :disabled="readon ? false : true"
+ @input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
<el-col :span="8">
<el-form-item label="性别" prop="sex">
<el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="readon ? false : true">
@@ -225,8 +237,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="8">
<el-form-item label="部门(护卫点)" prop="deptId">
<treeselect
@@ -252,6 +262,9 @@
/>
</el-form-item>
</el-col>
+
+ </el-row>
+ <el-row>
<el-col :span="8">
<el-form-item label="员工类别" prop="empType">
<el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="readon ? false : true">
@@ -264,8 +277,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="8">
<el-form-item label="民族" prop="nation">
<el-select v-model="empBaseInfoForm.nation" filterable placeholder="请选择民族" :disabled="readon ? false : true">
@@ -283,6 +294,9 @@
<el-input v-model="empBaseInfoForm.age" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
+
+ </el-row>
+ <el-row>
<el-col :span="8">
<el-form-item label="婚姻状态" prop="marriage">
<el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="readon ? false : true">
@@ -295,8 +309,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="8">
<el-form-item label="身份证有效期" prop="certificateValidity">
<el-date-picker
@@ -313,6 +325,9 @@
<el-input v-model="empBaseInfoForm.stature" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
+
+ </el-row>
+ <el-row>
<el-col :span="8">
<el-form-item label="政治面貌" prop="politics">
<el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="readon ? false : true">
@@ -325,8 +340,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="8">
<el-form-item label="出生日期" prop="birthdate">
<el-date-picker
@@ -350,6 +363,9 @@
</el-select>
</el-form-item>
</el-col>
+
+ </el-row>
+ <el-row>
<el-col :span="8">
<el-form-item label="籍贯" prop="nativePlaceName">
<el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择最高学历" :disabled="readon ? false : true">
@@ -362,8 +378,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="8">
<el-form-item label="户籍地址" prop="censusAddress">
<el-input v-model="empBaseInfoForm.censusAddress" :disabled="readon ? false : true" />
@@ -374,13 +388,14 @@
<el-input v-model="empBaseInfoForm.currentAddress" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
+
+ </el-row>
+ <el-row>
<el-col :span="8">
<el-form-item label="保安员回执" prop="returnReceipt">
<el-input v-model="empBaseInfoForm.returnReceipt" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="8">
<el-form-item label="保安员证号" prop="guardNumb">
<el-input v-model="empBaseInfoForm.guardNumb" :disabled="readon ? false : true" />
@@ -398,13 +413,14 @@
</el-select>
</el-form-item>
</el-col>
+
+ </el-row>
+ <el-row>
<el-col :span="8">
<el-form-item label="银行名称" prop="bankName">
<el-input v-model="empBaseInfoForm.bankName" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="8">
<el-form-item label="银行账号" prop="bankNumb">
<el-input v-model="empBaseInfoForm.bankNumb" :disabled="readon ? false : true" />
@@ -415,6 +431,9 @@
<el-input v-model="empBaseInfoForm.telePhone" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
+
+ </el-row>
+ <el-row>
<el-col :span="8">
<el-form-item label="入职日期" prop="entryDate">
<el-date-picker
@@ -427,8 +446,6 @@
/>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="8">
<el-form-item label="保险类型" prop="insuranceType">
<el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型" :disabled="readon ? false : true">
@@ -446,13 +463,14 @@
<el-input v-model="empBaseInfoForm.socialNumb" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
+
+ </el-row>
+ <el-row>
<el-col :span="8">
<el-form-item label="招聘介绍人" prop="introducer">
<el-input v-model="empBaseInfoForm.introducer" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="8">
<el-form-item label="入司工龄" prop="seniority">
<el-input v-model="empBaseInfoForm.seniority" :disabled="readon ? false : true" />
@@ -470,13 +488,14 @@
</el-select>
</el-form-item>
</el-col>
+
+ </el-row>
+ <el-row>
<el-col :span="8">
<el-form-item label="家庭成员及关系" prop="family">
<el-input v-model="empBaseInfoForm.family" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="8">
<el-form-item label="紧急联系电话" prop="urgencyPhone">
<el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="readon ? false : true" />
@@ -504,15 +523,6 @@
:value="dict.dicItemCode"
/>
</el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="身份证号码" prop="certificateNumb">
- <el-input
- v-model="empBaseInfoForm.certificateNumb"
- :disabled="readon ? false : true"
- @input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
- />
</el-form-item>
</el-col>
</el-row>
@@ -660,6 +670,7 @@
<el-table-column show-overflow-tooltip="true" prop="oldJobName" label="原岗位" />
<el-table-column show-overflow-tooltip="true" prop="changeDate" label="调岗日期" />
<el-table-column show-overflow-tooltip="true" prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
+ <el-table-column show-overflow-tooltip="true" prop="changeReason" label="调岗理由" />
</el-table>
<pagination
v-show="jobChangeDatatotal>0"
@@ -918,20 +929,21 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="accidentId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="injuredTime" label="受伤日期" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" />
+ <el-table-column show-overflow-tooltip="true" prop="injuredTime" label="受伤日期" width="100" />
+ <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" width="100" />
+ <el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="80" />
+ <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" width="120" />
<el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="意外险诊断" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="100" :formatter="hospitalizatioFlagFormat" />
+ <el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" width="100" />
+ <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" width="100" />
+ <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
<el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="reprotTime" label="报案时间" width="120" />
+ <el-table-column show-overflow-tooltip="true" prop="reprotTime" label="报案时间" width="100" />
<el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" width="120" />
<el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="120" />
+ <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="100" />
<el-table-column show-overflow-tooltip="true" prop="innsureFee" label="保险赔付费用" width="120" />
+ <el-table-column show-overflow-tooltip="true" prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
</el-table>
<pagination
v-show="accidentCasesDatatotal>0"
@@ -965,19 +977,20 @@
</el-table-column>
<el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="occupationalId" label="" />
<el-table-column show-overflow-tooltip="true" prop="injuredTime" label="受伤日期" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" width="120" />
+ <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" width="100" />
<el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="工伤诊断" width="100" />
+ <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" width="140" />
+ <el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="工伤诊断" width="80" />
<el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="100" :formatter="hospitalizatioFlagFormat" />
- <el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="reportTime" label="报案时间" width="120" />
+ <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" width="100" />
+ <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
+ <el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="80" />
+ <el-table-column show-overflow-tooltip="true" prop="reportTime" label="报案时间" width="100" />
<el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="120" />
+ <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="80" />
+ <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="100" />
<el-table-column show-overflow-tooltip="true" prop="compensated" label="已赔付医药费用" width="120" />
+ <el-table-column show-overflow-tooltip="true" prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
</el-table>
<pagination
v-show="occupationalDatatotal>0"
@@ -1016,7 +1029,7 @@
<el-table-column show-overflow-tooltip="true" prop="reporter" label="报备人" width="100" />
<el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
<el-table-column show-overflow-tooltip="true" prop="arbitrationPay" label="仲裁赔付（元）" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationStatus" label="状态" width="100" :formatter="arbitrationStatusFormat" />
+ <el-table-column show-overflow-tooltip="true" prop="arbitrationStatus" label="是否结案" width="100" :formatter="arbitrationStatusFormat" />
<el-table-column show-overflow-tooltip="true" prop="settleDate" label="案结日期" width="100" />
</el-table>
<pagination
@@ -1128,7 +1141,7 @@
<!-- </el-row>-->
<el-container style="background-color: #fff;">
<el-aside width="210px" style="background-color: #fff;text-align: center;padding-top: 0">
- <h4>{{ empBaseInfoForm.empName }}：{{ empBaseInfoForm.deptName }}</h4>
+ <h4 style="margin-top: 0">{{ empBaseInfoForm.empName }}：{{ empBaseInfoForm.deptName }}</h4>
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activities"
@@ -1149,6 +1162,14 @@
</el-aside>
<el-container>
<el-header class="text-header">
+ <el-row>
+ <el-col :span="24">
+ <i
+ class="el-icon-bell"
+ style=" color: #a32c30; margin-right: 10px;"
+ />提示：文件不要超过10个，单个文件大小不超过50M，单击或者拖动文件到下面区域，支持单个或批量文件的上传。
+ </el-col>
+ </el-row>
<el-row style="background-color: rgba(0,0,0,0.2);">
<el-col :span="16">
<el-checkbox
@@ -1167,6 +1188,16 @@
@click="download()"
>下载
</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="delFile()"
+ >删除
+ </el-button>
+ <el-popconfirm title="是否移动附件？" @onConfirm="mvdialogFormVisible = true">
+ <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
+ </el-popconfirm>
</el-col>
</el-row>
</el-header>
@@ -1225,6 +1256,25 @@
</el-tooltip>
</el-card>
</el-col>
+ <el-col v-if="node.isUpload" :key="node.filesid" :span="3">
+ <el-card shadow="never">
+ <el-upload
+ class="avatar-uploader"
+ :action="uploadSinglePath"
+ :show-file-list="false"
+ :before-upload="beforeAvatarUpload"
+ :headers="headers()"
+ :data="fileDate"
+ :on-success="handleAvatarSuccess"
+ :on-error="handleAvatarError"
+ :multiple="true"
+ :limit="10"
+ drag
+ >
+ <i class="el-icon-upload" />
+ </el-upload>
+ </el-card>
+ </el-col>
</template>
</el-row>
</el-main>
@@ -1269,8 +1319,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" />
@@ -1316,7 +1366,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putWorkExperience('workExperienceForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="体检信息" append-to-body :visible.sync="dialogshowArr[2].show" width="50%">
@@ -1371,8 +1421,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" />
@@ -1420,7 +1470,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putPhysicalExam('physicalExamForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="合同信息" append-to-body :visible.sync="dialogshowArr[3].show" width="50%">
@@ -1480,8 +1530,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" />
@@ -1509,7 +1559,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putContractInfo('contractInfoForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="离职当月考勤" append-to-body :visible.sync="dialogshowArr[4].show" width="50%">
@@ -1562,8 +1612,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" />
@@ -1591,7 +1641,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putDimissionAttend('dimissionAttendForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="请假记录" append-to-body :visible.sync="dialogshowArr[5].show" width="50%">
@@ -1651,8 +1701,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" />
@@ -1692,7 +1742,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putLeaveInfo('leaveInfoForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="辞职申请" append-to-body :visible.sync="dialogshowArr[6].show" width="50%">
@@ -1730,8 +1780,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" />
@@ -1758,7 +1808,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putResign('resignForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="失业金领取" append-to-body :visible.sync="dialogshowArr[7].show" width="50%">
@@ -1805,8 +1855,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" />
@@ -1830,7 +1880,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putUnemployment('unemploymentForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="社保申请" append-to-body :visible.sync="dialogshowArr[8].show" width="50%">
@@ -1894,8 +1944,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" />
@@ -1928,7 +1978,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putInsurance('insuranceForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="意外险案件" append-to-body :visible.sync="dialogshowArr[9].show" width="50%">
@@ -1975,8 +2025,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" />
@@ -2080,7 +2130,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putAccidentCases('accidentCasesForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="工伤案件" append-to-body :visible.sync="dialogshowArr[10].show" width="50%">
@@ -2127,8 +2177,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" />
@@ -2277,7 +2327,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putOccupational('occupationalForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="劳资案件" append-to-body :visible.sync="dialogshowArr[11].show" width="50%">
@@ -2319,7 +2369,7 @@
<el-form-item label="汇报人" prop="reporter">
<el-input v-model="laborTroubleForm.reporter" />
</el-form-item>
- <el-form-item label="状态" prop="arbitrationStatus">
+ <el-form-item label="是否结案" prop="arbitrationStatus">
<el-select v-model="laborTroubleForm.arbitrationStatus" placeholder="">
<el-option
v-for="dict in settleStatusOptions"
@@ -2334,8 +2384,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" />
@@ -2384,7 +2434,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putLaborTrouble('laborTroubleForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="不良记录" append-to-body :visible.sync="dialogshowArr[12].show" width="50%">
@@ -2428,8 +2478,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" />
@@ -2456,7 +2506,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putBadRecord('badRecordForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="备注信息" append-to-body :visible.sync="dialogshowArr[13].show" width="50%">
@@ -2500,8 +2550,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" />
@@ -2518,7 +2568,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putRemarkInfo('remarkInfoForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
</el-dialog>
@@ -2533,7 +2583,7 @@
import { pages } from '@/settings'
export default {
- name: 'ArchivesChange',
+ name: 'ArchivesEdit',
components: { Treeselect, Pagination },
props: {
dialogVisible: {
@@ -3553,6 +3603,9 @@
arbitrationStatusFormat(row, column) {
return this.selectDictLabel(this.settleStatusOptions, row.arbitrationStatus)
},
+ settleStatusFormat(row, column) {
+ return this.selectDictLabel(this.settleStatusOptions, row.settleStatus)
+ },
beforeAvatarUpload(file) {
this.fileDate.labelid = this.activities[this.beforeIndex].id
const isLt50M = file.size / 1024 / 1024 < 50
@@ -3998,6 +4051,10 @@
this.readon = true
},
gzupdate1() {
+ const empBaseInfoForm = this.empBaseInfoForm
+ if (empBaseInfoForm.imagePath.indexOf('data:image/jpeg') === -1) {
+ this.empBaseInfoForm.imagePath = ''
+ }
this.$put('hr/empBaseInfo', { ...this.empBaseInfoForm }).then(() => {
this.$message({
message: this.$t('tips.updateSuccess'),
@@ -4006,13 +4063,23 @@
})
},
ExportSavePdf(params = {}) {
- params.pageSize = this.pagination.size
- params.pageNum = this.pagination.num
- params.certificateNumb = this.empBaseInfoForm.certificateNumb
-
- this.$download('hr/pdf/contract', {
- ...params
- }, `${this.empBaseInfoForm.empName}.pdf`)
+ this.$confirm('是否确定要导出档案,请耐心等待?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ params.pageSize = this.pagination.size
+ params.pageNum = this.pagination.num
+ params.certificateNumb = this.empBaseInfoForm.certificateNumb
+ this.$download('hr/pdf/contract', {
+ ...params
+ }, `${this.empBaseInfoForm.empName}.pdf`)
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消'
+ })
+ })
},
initleaveInfoData(params = {}) {
params.pageSize = this.pagination.size
@@ -4782,6 +4849,7 @@
this.remarkInfoForm.version = ''
},
dialogIsShow() {
+ debugger
this.workExperienceModal = false
this.isAdd = true
this.dialogshowArr[this.thisShowIndex].show = !this.dialogshowArr[this.thisShowIndex]
@@ -4859,6 +4927,7 @@
this.workExperienceForm.modifier = row.modifier
this.workExperienceForm.delFlag = row.delFlag
this.workExperienceForm.version = row.version
+ this.thisShowIndex = 1
this.dialogshowArr[1].show = true
},
editPhysicalExam(row) {
@@ -4888,7 +4957,7 @@
this.physicalExamForm.modifier = row.modifier
this.physicalExamForm.delFlag = row.delFlag
this.physicalExamForm.version = row.version
-
+ this.thisShowIndex = 2
this.dialogshowArr[2].show = true
},
editContractInfo(row) {
@@ -4917,7 +4986,7 @@
this.contractInfoForm.modifier = row.modifier
this.contractInfoForm.delFlag = row.delFlag
this.contractInfoForm.version = row.version
-
+ this.thisShowIndex = 3
this.dialogshowArr[3].show = true
},
editDimissionAttend(row) {
@@ -4945,6 +5014,7 @@
this.dimissionAttendForm.delFlag = row.delFlag
this.dimissionAttendForm.version = row.version
this.dimissionAttendForm.remark = row.remark
+ this.thisShowIndex = 4
this.dialogshowArr[4].show = true
},
editLeaveInfo(row) {
@@ -4973,7 +5043,7 @@
this.leaveInfoForm.delFlag = row.delFlag
this.leaveInfoForm.version = row.version
this.leaveInfoForm.remark = row.remark
-
+ this.thisShowIndex = 5
this.dialogshowArr[5].show = true
},
editResign(row) {
@@ -4999,7 +5069,7 @@
this.resignForm.delFlag = row.delFlag
this.resignForm.version = row.version
this.resignForm.remark = row.remark
-
+ this.thisShowIndex = 6
this.dialogshowArr[6].show = true
},
editUnemployment(row) {
@@ -5026,7 +5096,7 @@
this.unemploymentForm.modifier = row.modifier
this.unemploymentForm.delFlag = row.delFlag
this.unemploymentForm.version = row.version
-
+ this.thisShowIndex = 7
this.dialogshowArr[7].show = true
},
editInsurance(row) {
@@ -5054,7 +5124,7 @@
this.insuranceForm.delFlag = row.delFlag
this.insuranceForm.version = row.version
this.insuranceForm.remark = row.remark
-
+ this.thisShowIndex = 8
this.dialogshowArr[8].show = true
},
editAccidentCases(row) {
@@ -5095,7 +5165,7 @@
this.accidentCasesForm.modifier = row.modifier
this.accidentCasesForm.delFlag = row.delFlag
this.accidentCasesForm.version = row.version
-
+ this.thisShowIndex = 9
this.dialogshowArr[9].show = true
},
editOccupational(row) {
@@ -5145,7 +5215,7 @@
this.occupationalForm.delFlag = row.delFlag
this.occupationalForm.version = row.version
this.occupationalForm.remark = row.remark
-
+ this.thisShowIndex = 10
this.dialogshowArr[10].show = true
},
editLaborTrouble(row) {
@@ -5175,7 +5245,7 @@
this.laborTroubleForm.delFlag = row.delFlag
this.laborTroubleForm.version = row.version
this.laborTroubleForm.remark = row.remark
-
+ this.thisShowIndex = 11
this.dialogshowArr[11].show = true
},
editBadRecord(row) {
@@ -5200,6 +5270,7 @@
this.badRecordForm.delFlag = row.delFlag
this.badRecordForm.version = row.version
this.badRecordForm.remark = row.remark
+ this.thisShowIndex = 12
this.dialogshowArr[12].show = true
},
editRemarkInfo(row) {
@@ -5222,7 +5293,7 @@
this.remarkInfoForm.modifier = row.modifier
this.remarkInfoForm.delFlag = row.delFlag
this.remarkInfoForm.version = row.version
-
+ this.thisShowIndex = 13
this.dialogshowArr[13].show = true
},
gzadd(index) {
@@ -5598,6 +5669,7 @@
}
.jbxxTitle::after {
+
content: '';
position: absolute;
left: 100px;
@@ -5724,9 +5796,10 @@
}
.uploading-image {
- width: 100%;
- height: 100%;
+ width: 70%;
+ height: 70%;
display: block;
+ margin: 0 auto;
}
}
@@ -5760,6 +5833,13 @@
/* 设置鼠标经过对勾框，对勾框边框的颜色 */
.myRedCheckBox .el-checkbox__inner:hover {
border-color: #a32c30;
+ }
+
+ .myRedCheckBox .el-checkbox__label {
+ width: 90%;
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
}
.avatar-uploader .el-upload {
@@ -5802,7 +5882,7 @@
.table-button {
color: #a00515;
display: inline-block;
- width: 50%;
+ width: 45%;
cursor: pointer;
}
@@ -5878,40 +5958,40 @@
</style>
<style lang="scss">
-.da-dialog {
- button.el-dialog__headerbtn {
- height: 30px;
- width: 30px;
- background-color: #a00515;
- opacity: 0.8;
- line-height: 30px;
- border-radius: 50%;
- i {
- color: #fff !important;
+ .da-dialog {
+ button.el-dialog__headerbtn {
+ height: 30px;
+ width: 30px;
+ background-color: #a00515;
+ opacity: 0.8;
+ line-height: 30px;
+ border-radius: 50%;
+ i {
+ color: #fff !important;
+ }
+ &:hover {
+ opacity: 0.5;
+ }
}
- &:hover {
- opacity: 0.5;
+ .el-pagination {
+ width: 98%;
+ text-align: right;
+ }
+ .el-aside {
+ height: 750px;
+ overflow: hidden;
+ }
+ li.el-timeline-item {
+ padding-bottom: 1px;
+ height: 35px;
+ }
+ .el-dialog__title {
+ font-weight: 700;
+ }
+ .el-dialog__body {
+ padding: 10px 20px;
}
}
- .el-pagination {
- width: 98%;
- text-align: right;
- }
- .el-aside {
- height: 750px;
- overflow: hidden;
- }
- li.el-timeline-item {
- padding-bottom: 1px;
- height: 35px;
- }
- .el-dialog__title {
- font-weight: 700;
- }
- .el-dialog__body {
- padding: 10px 20px;
- }
-}
.el-dialog.is-fullscreen {
overflow: hidden;
}
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index cc5eacd..72880f1 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -714,6 +714,7 @@
<el-table-column show-overflow-tooltip="true" prop="oldJobName" label="原岗位" />
<el-table-column show-overflow-tooltip="true" prop="changeDate" label="调岗日期" />
<el-table-column show-overflow-tooltip="true" prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
+ <el-table-column show-overflow-tooltip="true" prop="changeReason" label="调岗理由" />
</el-table>
<pagination
v-show="jobChangeDatatotal>0"
@@ -1459,8 +1460,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" />
@@ -1561,8 +1562,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" />
@@ -1670,8 +1671,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" />
@@ -1752,8 +1753,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" />
@@ -1841,8 +1842,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" />
@@ -1920,8 +1921,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" />
@@ -1995,8 +1996,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" />
@@ -2084,8 +2085,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" />
@@ -2165,8 +2166,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" />
@@ -2317,8 +2318,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" />
@@ -2524,8 +2525,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" />
@@ -2618,8 +2619,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" />
@@ -2690,8 +2691,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" />
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index aa82dd7..719dda3 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -632,9 +632,9 @@
<el-radio-group v-model="gbdaForm.dimissionType" @change="changeDimissionType">
<el-radio :label="1">正常离职</el-radio>
<el-radio :label="2">自动离职</el-radio>
- <el-radio :label="3">公司劝退</el-radio>
- <el-radio :label="4">公司辞退</el-radio>
- <el-radio :label="5">试用期内</el-radio>
+ <!-- <el-radio :label="3">公司劝退</el-radio>-->
+ <el-radio :label="3">公司辞退</el-radio>
+ <!-- <el-radio :label="5">试用期内</el-radio>-->
</el-radio-group>
</el-form-item>
</el-col>
@@ -931,7 +931,7 @@
empId: '',
customerId: '',
archivesNumb: '',
- deptId: '',
+ deptId: null,
deptName: '',
empNumb: '',
allDeptName: '',
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index a60d6f1..6f93420 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -1400,11 +1400,11 @@
case '2':
return '自动离职'
case '3':
- return '公司劝退'
- case '4':
return '公司辞退'
- case '5':
- return '试用期内'
+ // case '4':
+ // return '公司辞退'
+ // case '5':
+ // return '试用期内'
}
},
advancedQueryShowMethods() {
diff --git a/src/views/user/selectuser.vue b/src/views/user/selectuser.vue
index 8c4dec3..d6d934b 100644
--- a/src/views/user/selectuser.vue
+++ b/src/views/user/selectuser.vue
@@ -46,9 +46,9 @@
<el-table-column v-if="show" show-overflow-tooltip prop="empId" label="员工Id" />
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="110" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
<el-table-column v-if="show" show-overflow-tooltip prop="deptId" label="部门Id" width="60" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="400" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="400" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column v-if="show" show-overflow-tooltip prop="jobId" label="岗位Id" width="80" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="empTypeName" label="员工类别" width="80" />
diff --git a/src/views/yunpan/fujian.vue b/src/views/yunpan/fujian.vue
index 2a83fe6..9a05a26 100644
--- a/src/views/yunpan/fujian.vue
+++ b/src/views/yunpan/fujian.vue
@@ -97,7 +97,7 @@
<td class="td">年龄：</td>
<td class="td-group">
<el-checkbox-group v-model="queryform.age" class="fj-checkbox">
- <el-checkbox label="" @change="selectAllage">全部</el-checkbox>
+ <el-checkbox label="" @change="selectAllAgeStr">全部</el-checkbox>
<el-checkbox
v-for="data in ageStrOptions"
:key="data.dicItemName"
@@ -321,8 +321,8 @@
</el-col>
</el-row>
- <el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" height="100vh" fullscreen="true" class="fjgl-class" @close="closeDialog()">
- <uploadfj v-if="dialogShowUploadfj" :rowitem="rowitem" />
+ <el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" height="100vh" fullscreen class="fjgl-class" @close="closeDialog()">
+ <uploadfj v-if="dialogShowUploadfj" :rowitem="rowitem" :tableindex="tableindex" />
</el-dialog>
<el-row>
<el-col :span="21" style="line-height: 50px;">
@@ -361,14 +361,15 @@
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80px" />
<el-table-column show-overflow-tooltip prop="deptName" label="护卫点(部门)" width="120px" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="70px" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="70px" />
<template v-for="(col) in labelData">
<el-table-column :key="col.labelid" show-overflow-tooltip :prop="col.labelcode" :label="col.labelname">
<template slot-scope="scope">
- <el-link type="primary"> {{ scope.row[col.labelcode] }}</el-link>
+ <el-link type="primary" @click.native="dialogShow(scope.$index, scope.row, scope.column.property)"> {{ scope.row[col.labelcode] }}</el-link>
</template>
</el-table-column>
</template>
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="70px" />
</el-table>
<pagination
v-show="total>0"
@@ -486,6 +487,7 @@
children: 'children',
label: 'label'
},
+ tableindex: 0,
rowitem: {},
sexOptions: [],
insuranceTypeOptions: [],
@@ -609,8 +611,15 @@
}
})
},
- dialogShow(index, tableData) {
- this.rowitem = tableData
+ dialogShow(index, tableData, property) {
+ var this_ = this
+ this_.rowitem = tableData
+ this_.labelData.forEach((j) => {
+ if (j.labelcode === property) {
+ this_.tableindex = this_.labelData.indexOf(j)
+ }
+ })
+
this.dialogShowUploadfj = true
},
skipuploadfj() {
@@ -757,6 +766,13 @@
this.queryParams.entryType = []
}
},
+ selectAllEmpStatus(val) {
+ if (val) {
+ this.queryParams.empStatus = ['0', '1', '2', '3']
+ } else {
+ this.queryParams.empStatus = []
+ }
+ },
// dic列表转为数组
dicListToArr(dicList) {
var arr = []
@@ -770,6 +786,7 @@
}
</script>
<style lang="scss" scoped>
+
.el-main {
margin-top: 10px;
}
@@ -797,6 +814,9 @@
</style>
<style lang="scss">
+.el-image-viewer__btn{
+ color: #a00515;
+}
.fj-checkbox{
.el-checkbox__input.is-checked .el-checkbox__inner {
border-color: #a32c30;;
diff --git a/src/views/yunpan/uploadfj.vue b/src/views/yunpan/uploadfj.vue
index 66bdf6d..d14afbd 100644
--- a/src/views/yunpan/uploadfj.vue
+++ b/src/views/yunpan/uploadfj.vue
@@ -32,7 +32,7 @@
>
<span
style="position: relative; top: -5px;"
- @click="clickTimeline(index, activity.id)"
+ @click="clickTimeline(index)"
>
{{ activity.timestamp }}</span>
</el-timeline-item>
@@ -174,6 +174,10 @@
rowitem: {
type: Object,
required: true
+ },
+ tableindex: {
+ type: Number,
+ required: true
}
},
data() {
@@ -213,6 +217,9 @@
},
mounted() {
this.initlabel()
+ setTimeout(() => {
+ this.clickTimeline(this.tableindex)
+ }, 1000)
},
methods: {
clickImg(node) {
@@ -327,7 +334,7 @@
}
})
},
- clickTimeline(index, id) {
+ clickTimeline(index) {
// 不这样操作的不会响应式更新
// 赋值到新的列表
var list = this.activities
diff --git a/vue.config.js b/vue.config.js
index 225fd0b..9023db1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,8 +36,8 @@
// change xxx-api/login => mock/login
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: 'http://120.24.23.155:8301/',
- // target: 'http://127.0.0.1:8301/',
+ // target: 'http://120.24.23.155:7301/',
+ target: 'http://127.0.0.1:8301/',
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.8.0