From 086765836d22b11cf42f7dc2e9843a64d3d7da1c Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 16 三月 2023 08:57:21 +0800
Subject: [PATCH] 1.看板样式更新迭代
---
src/views/xtsz/bmgz.vue | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index 7f78051..02a125a 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -5,9 +5,9 @@
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
<el-form-item label="缂栫爜鍚嶇О" style=" display: flex;">
@@ -29,15 +29,18 @@
<!-- </el-form-item>-->
</div>
<div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
- <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ />
</div>
<div style="margin-left: 10px;display: flex">
- <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ <!-- <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
+ <!-- <el-button v-waves type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<!-- <el-divider />-->
<div class="elTableDiv">
@@ -65,6 +68,7 @@
fixed
/>
<el-table-column
+ show-tooltip-when-overflow
prop="right_code"
label="缂栫爜"
sortable="custom"
@@ -72,11 +76,19 @@
<el-table-column
prop="right_name"
label="缂栫爜鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
+ />
+ <el-table-column
+ prop="Type"
+ label="绫诲瀷"
+ sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="prefix"
label="鍥哄畾瀛楃"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -86,7 +98,8 @@
</el-table-column>
<el-table-column
prop="filingdate"
- label="鎻愪氦鏃ユ湡"
+ label="缂栫爜鏍煎紡"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -96,6 +109,7 @@
</el-table-column>
<el-table-column
prop="incbit"
+ show-tooltip-when-overflow
label="鑷浣嶆暟"
sortable="custom"
>
@@ -112,10 +126,10 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i class="el-icon-edit-outline" :style="{color:$store.state.settings.theme}" @click="edit('edit',row)" />
</el-tooltip>
- <!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
- <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ <!-- <el-button v-waves type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
+ <!-- <el-button v-waves type="text" @click="del(row)">鍒犻櫎</el-button>-->
</div>
</template>
</el-table-column>
@@ -134,7 +148,8 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'缂栫爜鏍煎紡'"
+ v-el-drag-dialog
+ :title="operation==='add'?'鏂板':'缂栬緫鏍煎紡'"
:visible.sync="dialogVisible"
width="50%"
top="15vh"
@@ -147,7 +162,7 @@
<el-form-item label="鍥哄畾瀛楃" prop="prefix">
<el-input v-model="dialogForm.prefix" style="width: 220px" />
</el-form-item>
- <el-form-item prop="filingdate" label="鎻愪氦鏃ユ湡">
+ <el-form-item prop="filingdate" label="缂栫爜鏍煎紡">
<el-select
v-model="dialogForm.filingdate"
style="width: 220px"
@@ -180,8 +195,8 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -191,6 +206,8 @@
<script>
import Pagination from '@/components/Pagination'
import { EncodingRules, SaveEncodingRules } from '@/api/xtsz'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -198,6 +215,7 @@
components: {
Pagination
},
+ directives: { elDragDialog, waves },
data() {
const validateName = (rule, value, callback) => {
if (!value) {
@@ -234,7 +252,7 @@
rightcode: '', // 鍔熻兘缂栫爜
rightname: '', // 鍔熻兘鍚嶇О
prefix: '', // 鍥哄畾瀛楃
- filingdate: '', // 鎻愪氦鏃ユ湡
+ filingdate: '', // 缂栫爜鏍煎紡
incbit: '' // 鑷浣嶆暟
},
operation: '',
@@ -388,7 +406,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 140
+ this.tableHeight = this.mainHeight - 135
this.$refs.tableDataRef.doLayout()
})
}
--
Gitblit v1.9.3