From 7369fd5866a78cde7ecbb4721d9decdfa181fd39 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 15:34:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/yunpan/fujian.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/views/yunpan/fujian.vue b/src/views/yunpan/fujian.vue
index d6ad297..2a83fe6 100644
--- a/src/views/yunpan/fujian.vue
+++ b/src/views/yunpan/fujian.vue
@@ -321,7 +321,7 @@
</el-col>
</el-row>
- <el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" width="80%" class="fjgl-class" top="10px" @close="closeDialog()">
+ <el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" height="100vh" fullscreen="true" class="fjgl-class" @close="closeDialog()">
<uploadfj v-if="dialogShowUploadfj" :rowitem="rowitem" />
</el-dialog>
<el-row>
@@ -361,8 +361,6 @@
<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="empName" label="姓名" width="70px" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号" width="120px" />
<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">
@@ -370,6 +368,7 @@
</template>
</el-table-column>
</template>
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="70px" />
</el-table>
<pagination
v-show="total>0"
@@ -808,8 +807,24 @@
}
}
.fjgl-class{
- height: 90%;
overflow: auto;
+ .el-dialog__body {
+ padding: 0 20px;
+ }
+ 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;
+ }
+ }
}
.add-lable {
text-align: initial;
--
Gitblit v1.8.0