From 2ae96b796658f5507326c48e4b25bbbe80b38dfe Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 30 一月 2023 17:03:59 +0800
Subject: [PATCH] 1.优化导航栏
---
src/views/jcsz/wldw.vue | 71 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 8d977d4..fe43054 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -18,9 +18,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;">
@@ -49,17 +49,25 @@
<el-input v-model="form.CreateUser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ />
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
border
+ class="tableFixed"
:height="tableHeight+'px'"
:row-class-name="tableRowClassName"
highlight-current-row
@@ -81,6 +89,7 @@
<el-table-column
prop="code"
label="鍗曚綅缂栫爜"
+ show-tooltip-when-overflow
sortable="custom"
min-width="110"
/>
@@ -89,9 +98,11 @@
label="鍗曚綅鍚嶇О"
sortable="custom"
min-width="160px"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鍗曚綅灞炴��"
+ show-tooltip-when-overflow
width="240"
>
<!-- sortable="custom"-->
@@ -134,6 +145,7 @@
prop="conttacts"
label="鑱旂郴浜�"
width="110"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -144,6 +156,7 @@
<el-table-column
prop="conttphone"
label="鑱旂郴鏂瑰紡"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
>
@@ -156,6 +169,7 @@
prop="addr"
min-width="160"
label="琛ュ厖鎻忚堪"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -167,6 +181,7 @@
prop="lm_user"
label="鍒涘缓浜哄憳"
width="110"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -174,6 +189,7 @@
label="鍒涘缓鏃堕棿"
sortable="custom"
width="160"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鎿嶄綔"
@@ -183,10 +199,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 :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
</template>
@@ -206,6 +222,7 @@
</div>
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
width="800px"
@@ -241,7 +258,12 @@
<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
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -259,25 +281,15 @@
} from '@/api/jcsz'
import { SeaveSearchPartner } from '@/api/ErpSyncMes'
import ImportPicker from '@/components/ImportPicker'
-
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
export default {
name: 'WLDW',
components: {
Pagination, ImportPicker
},
+ directives: { elDragDialog },
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
const validateMobile = (rule, value, callback) => {
if (!value) {
callback()
@@ -332,7 +344,7 @@
operation: '',
dialogFormRules: {
unitcode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
unitname: [
{ required: true, message: '璇疯緭鍏ヤ緵鏂瑰悕绉�', trigger: ['blur', 'change'] }
@@ -510,6 +522,7 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
let mtypecode = null // 澶栬喘缂栫爜
let btypecode = null // 澶栧崗缂栫爜
let htypecode = null // 瀹㈡埛缂栫爜
@@ -535,14 +548,16 @@
description: this.dialogForm.description,
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
- // console.log(data, 2)
+
AddUpdateCurrentUnit(data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getCurrentUnitSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ this.$store.state.app.buttonIsDisabled = false
}
})
}
@@ -552,10 +567,11 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 195
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
+ this.$refs.tableDataRef.doLayout()
})
},
@@ -663,7 +679,14 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
--
Gitblit v1.9.3