From 88ffcddcf36a3543e899438f5480e5a797bcfe57 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 15 三月 2021 23:19:06 +0800
Subject: [PATCH] 修改bug
---
src/views/user/search.vue | 1 +
src/views/yunpan/fujian.vue | 39 ++++++++++++++++++++++-----------------
src/layout/components/Navbar.vue | 8 --------
3 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fd1ece1..43a4550 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -30,14 +30,6 @@
<el-dropdown-item>
<span style="display:block;" @click="setting">{{ $t('navbar.setting') }}</span>
</el-dropdown-item>
- <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Cloud">
- <el-dropdown-item>
- {{ $t('navbar.github') }}
- </el-dropdown-item>
- </a>
- <a target="_blank" href="https://www.kancloud.cn/mrbird/spring-cloud/1263679">
- <el-dropdown-item>{{ $t('navbar.docs') }}</el-dropdown-item>
- </a>
<el-dropdown-item divided>
<span style="display:block;" @click="deleteCache">{{ $t('navbar.deleteCache') }}</span>
</el-dropdown-item>
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index f898ba2..67cadc7 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -288,6 +288,7 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="dimissionTypeName" label="离职类型" width="100" />
+ <el-table-column show-overflow-tooltip prop="entryTypeName" label="入职日期" width="120" />
<el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
</el-table>
diff --git a/src/views/yunpan/fujian.vue b/src/views/yunpan/fujian.vue
index c1f7729..3ff20ef 100644
--- a/src/views/yunpan/fujian.vue
+++ b/src/views/yunpan/fujian.vue
@@ -343,6 +343,7 @@
:cell-style="{padding:'4.8px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;color: #000;"
+ @sort-change="changeSort"
>
<el-table-column
type="selection"
@@ -350,29 +351,21 @@
/>
<el-table-column label="操作" width="80">
<template slot-scope="scope">
- <!-- <el-button-->
- <!-- type="text"-->
- <!-- size="small"-->
- <!-- @click.native.prevent="dialogShow(scope.$index, scope.row)"-->
- <!-- >-->
- <!-- 上传-->
- <!-- </el-button>-->
-
<span
style="color: #a00515;display: inline-block;width: 50%;cursor: pointer"
@click="dialogShow(scope.$index, scope.row)"
>上传</span>
</template>
</el-table-column>
- <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" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="90px" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点(部门)" width="140px" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="90px" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180px" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="90px" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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" @click.native="dialogShow(scope.$index, scope.row, scope.column.property)"> {{ scope.row[col.labelcode] }}</el-link>
+ <el-link type="primary" :class="{ number: scope.row[col.labelcode] !== 0}" @click.native="dialogShow(scope.$index, scope.row, scope.column.property)"> {{ scope.row[col.labelcode] }}</el-link>
</template>
</el-table-column>
</template>
@@ -399,6 +392,7 @@
},
data() {
return {
+ sort: {}, // 排序
queryCheckAll: {
sexcheckAll: false,
sexisIndeterminate: true
@@ -539,6 +533,11 @@
})
},
methods: {
+ changeSort(val) {
+ this.sort.field = val.prop
+ this.sort.order = val.order
+ this.search()
+ },
closeDialog() {
this.search()
},
@@ -664,12 +663,14 @@
search() {
if (this.basic === '') {
this.fetch({
- ...this.queryform
+ ...this.queryform,
+ ...this.sort
})
} else {
var params = { basic: this.basic }
this.fetch({
- ...params
+ ...params,
+ ...this.sort
})
}
},
@@ -794,7 +795,11 @@
}
</script>
<style lang="scss" scoped>
-
+.number{
+ color: #5CB87A;
+ font-size: 16px;
+ font-weight: 600;
+}
.el-main {
margin-top: 10px;
}
--
Gitblit v1.8.0