From 2558bbd5004cbc938762eb40991adf4e7e106aaa Mon Sep 17 00:00:00 2001
From: 楚江漓i <85093541@qq.com>
Date: 星期三, 10 三月 2021 23:38:02 +0800
Subject: [PATCH] 项目表格样式调整
---
src/views/user/Informationinput.vue | 80 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index a4d29f5..972e5ec 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -100,13 +100,13 @@
<!-- </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-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="50" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<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" />
@@ -118,8 +118,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>
@@ -149,7 +149,7 @@
</template>
</el-table-column>
<el-table-column prop="empNumb" label="编号" width="100" />
- <el-table-column prop="empName" 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" />
@@ -183,11 +183,11 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
- <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" width="100" />
<el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
<el-table-column
show-overflow-tooltip
@@ -230,10 +230,10 @@
</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="deptName" label="部门(护卫点)" width="150" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<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="合同期限(年)" />
@@ -262,10 +262,10 @@
</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="deptName" label="部门(护卫点)" width="120" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="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" />
@@ -296,9 +296,9 @@
</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="deptName" label="部门(护卫点)" width="120" />
+ <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" />
@@ -328,10 +328,10 @@
</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="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" />
+ <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="reason" label="辞职事由" width="150" />
@@ -359,15 +359,15 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" />
+ <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="applayReason" label="申报事由" />
+ <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" width="120" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
<el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="100" />
- <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" width="120" />
</el-table>
<el-table
v-show="showArr[8].show"
@@ -390,8 +390,8 @@
</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="deptName" label="部门(护卫点)" width="120" />
+ <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="社保申请日期" />
@@ -423,8 +423,8 @@
</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="deptName" label="部门(护卫点)" width="120" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
<el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
@@ -469,7 +469,7 @@
</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="deptName" label="部门(护卫点)" width="120" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
@@ -516,7 +516,7 @@
</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="deptName" label="部门(护卫点)" width="120" />
<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="身份证号码" />
@@ -568,7 +568,7 @@
</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="deptName" label="部门(护卫点)" width="120" />
<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="身份证号码" />
@@ -597,8 +597,8 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="180" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" />
<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="身份证号码" />
@@ -2185,7 +2185,7 @@
message: this.$t('rules.noMoreThan20'),
trigger: 'blur'
}],
- empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
+ empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
{ min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
empNumb: [{ required: true, message: '请输入编号', trigger: 'blur' },
{ min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
@@ -3119,6 +3119,7 @@
this.initDept()
this.thisShowIndex = 1
this.isShow(false, 0)
+ this.initJob()
},
methods: {
importHandleAvatarError() {
@@ -3389,6 +3390,11 @@
resetDeptTree() {
this.$refs.deptTree.setCheckedKeys([])
},
+ initJob() {
+ this.$get('system/position/dicJob').then((r) => {
+ this.restaurJob = r.data.data
+ })
+ },
butDelete() {
let selected
switch (this.thisShowIndex) {
--
Gitblit v1.8.0