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/sbgl/bybw.vue | 85 ++++++++++++++++++++++++------------------
1 files changed, 48 insertions(+), 37 deletions(-)
diff --git a/src/views/sbgl/bybw.vue b/src/views/sbgl/bybw.vue
index f6bb8d1..791e7c1 100644
--- a/src/views/sbgl/bybw.vue
+++ b/src/views/sbgl/bybw.vue
@@ -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-width="70px" label="閮ㄤ綅缂栫爜" style=" display: flex;">
<el-input v-model="form.maiitemcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="閮ㄤ綅鍚嶇О" style=" display: flex;">
@@ -36,18 +36,23 @@
</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"
:data="tableData"
:height="tableHeight+'px'"
border
+ class="tableFixed"
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
@@ -69,10 +74,12 @@
prop="code"
label="閮ㄤ綅缂栫爜"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="name"
label="閮ㄤ綅鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -89,15 +96,18 @@
<el-table-column
prop="isscan"
label="閫夋嫨鎵爜"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
<div v-if="row.isscan==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ <!-- <svg-icon icon-class="circleYes" style="margin-right: 2px" />-->
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
鏄�
</div>
<div v-if="row.isscan==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ <!-- <svg-icon icon-class="circleNo" style="margin-right: 2px" />-->
+ <i class="el-icon-info" style="margin-right: 2px" />
鍚�
</div>
</template>
@@ -105,12 +115,14 @@
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -121,10 +133,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>
@@ -137,7 +149,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDeviceMaiItemSearch"
/>
@@ -182,7 +194,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>
@@ -195,37 +212,20 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
-import { AddUpdateDeviceMaiItem, DeleteDeviceMaiItem, DeviceCheckItemSearch, DeviceMaiItemSearch } from '@/api/sbgl'
-import ImportPicker from '@/components/ImportPicker'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
+import { AddUpdateDeviceMaiItem, DeleteDeviceMaiItem, DeviceMaiItemSearch } from '@/api/sbgl'
+import ImportPicker from '@/components/ImportPicker'
+import { validateCode } from '@/utils/global'
+
export default {
name: 'Zzjg',
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()
- }
- }
- }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -257,7 +257,7 @@
operation: '',
dialogFormRules: {
maiitemcode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
maiitemname: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -265,7 +265,7 @@
},
title_value: '鏁版嵁瀵煎叆 / 淇濆吇閮ㄤ綅',
- code: '4',
+ code: '11',
shows: false
}
},
@@ -378,6 +378,7 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
const data = {
id: this.dialogForm.id,
maiitemcode: this.dialogForm.maiitemcode,
@@ -386,12 +387,12 @@
isqrcode: this.dialogForm.isqrcode,
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
- console.log(data)
AddUpdateDeviceMaiItem(data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getDeviceMaiItemSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
@@ -403,7 +404,8 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 195
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -509,6 +511,15 @@
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