From b012ab3a1e5495be068c543eb8f0482124db13b5 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 31 十二月 2022 16:48:22 +0800
Subject: [PATCH] 1.登录页文字跟随系统变化
---
src/views/zlgl/qxdy.vue | 63 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index 719934d..764afcb 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -2,7 +2,7 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
</div>
@@ -10,12 +10,12 @@
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label="缂洪櫡浠ｇ爜" style=" display: flex;">
+ <el-form-item label="缂洪櫡浠ｇ爜" label-width="70px" style=" display: flex;">
<el-input v-model="form.defectcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="缂洪櫡鍚嶇О" style=" display: flex;">
@@ -26,14 +26,19 @@
<el-input v-model="form.defectdescr" 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?'5%':'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"
+ class="tableFixed"
:data="tableData"
:height="tableHeight+'px'"
border
@@ -57,15 +62,18 @@
<el-table-column
prop="code"
label="缂洪櫡浠ｇ爜"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="name"
label="缂洪櫡鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="descr"
+ show-tooltip-when-overflow
label="缂洪櫡鎻忚堪"
sortable="custom"
>
@@ -78,9 +86,11 @@
prop="lm_user"
label="鍒涘缓浜哄憳"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="lm_date"
+ show-tooltip-when-overflow
label="鍒涘缓鏃堕棿"
sortable="custom"
/>
@@ -92,10 +102,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>
@@ -138,7 +148,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>
@@ -153,25 +168,14 @@
import Pagination from '@/components/Pagination'
import { AddUpdateDedect, DedectSearch, DeleteDedect } from '@/api/zlgl'
import ImportPicker from '@/components/ImportPicker'
+import { validateCode } from '@/utils/global'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'QXDY',
components: {
Pagination, ImportPicker
},
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ己闄蜂唬鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('浠ｇ爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
return {
mainHeight: 0,
tableHeight: 0,
@@ -195,7 +199,7 @@
operation: '',
dialogFormRules: {
defectcode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
defectname: [
{ required: true, message: '璇疯緭鍏ョ己闄峰悕绉�', trigger: ['blur', 'change'] }
@@ -284,6 +288,9 @@
DeleteDedect({ defectcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDedectSearch()
}
})
@@ -306,6 +313,7 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
const data = {
defectcode: this.dialogForm.defectcode,
defectname: this.dialogForm.defectname,
@@ -314,9 +322,10 @@
}
AddUpdateDedect(data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getDedectSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
@@ -328,7 +337,8 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 195
+ this.$refs.tableDataRef.doLayout()
// if (window.innerHeight < 769) {
// this.tableHeight = this.tableHeight - 50
// }
@@ -429,7 +439,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