From e713b378b01d189f972cfb5b9eae749ee95a8b51 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 29 十月 2022 13:48:00 +0800
Subject: [PATCH] 1.解决两个账号登录，是否被挤掉的问题
---
src/views/jcsz/wldw.vue | 158 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 97 insertions(+), 61 deletions(-)
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index bf56201..31b1ed2 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -2,26 +2,28 @@
<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-refresh-right"
- @click="syncSeaveSearchPartner"
- >鍚屾寰�鏉ュ崟浣�
- </el-button>
- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ <div style="display: flex">
+ <el-button
+ icon="el-icon-refresh-right"
+ @click="syncSeaveSearchPartner"
+ >鍚屾寰�鏉ュ崟浣�
+ </el-button>
+ <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ </div>
</div>
<div class="bodyTopFormGroup">
<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.CuntUnitCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鍗曚綅鍚嶇О" style=" display: flex;">
@@ -47,17 +49,22 @@
<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?'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"
border
+ class="tableFixed"
:height="tableHeight+'px'"
:row-class-name="tableRowClassName"
highlight-current-row
@@ -87,59 +94,82 @@
label="鍗曚綅鍚嶇О"
sortable="custom"
min-width="160px"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鍗曚綅灞炴��"
width="240"
>
<!-- sortable="custom"-->
-
- <el-table-column
- prop="mtype"
- width="80"
- >
- <template slot-scope="{row}">
- <div v-if="row.mtype==='WG'">澶栬喘渚涙柟</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="btype"
- width="80"
- >
- <template slot-scope="{row}">
- <div v-if="row.btype==='WX'">澶栧崗渚涙柟</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="htype"
- width="80"
- >
- <template slot-scope="{row}">
+ <template slot-scope="{row}">
+ <div style="display: flex;justify-content: flex-start">
+ <div v-if="row.mtype==='WG'" style="margin-right: 15px">澶栬喘渚涙柟</div>
+ <div v-if="row.btype==='WX'" style="margin-right: 15px;">澶栧崗渚涙柟</div>
<div v-if="row.htype==='KH'">瀹㈡埛</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ </div>
+ </template>
+ <!-- <el-table-column-->
+ <!-- prop="mtype"-->
+ <!-- width="80"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.mtype==='WG'">澶栬喘渚涙柟</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="btype"-->
+ <!-- width="80"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.btype==='WX'">澶栧崗渚涙柟</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="htype"-->
+ <!-- width="80"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.htype==='KH'">瀹㈡埛</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table-column>
<el-table-column
prop="conttacts"
label="鑱旂郴浜�"
width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.conttacts">{{ row.conttacts }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="conttphone"
label="鑱旂郴鏂瑰紡"
width="160"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.conttphone">{{ row.conttphone }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="addr"
min-width="160"
label="琛ュ厖鎻忚堪"
+ show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.addr">{{ row.addr }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
@@ -172,12 +202,11 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="total>0"
:total="total"
: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="getCurrentUnitSearch"
/>
@@ -219,7 +248,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>
@@ -237,25 +271,13 @@
} from '@/api/jcsz'
import { SeaveSearchPartner } from '@/api/ErpSyncMes'
import ImportPicker from '@/components/ImportPicker'
-
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
+import { validateCode } from '@/utils/global'
export default {
name: 'WLDW',
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 validateMobile = (rule, value, callback) => {
if (!value) {
callback()
@@ -310,7 +332,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'] }
@@ -460,6 +482,9 @@
DeleteCurrentUnit({ unitcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getCurrentUnitSearch()
}
})
@@ -485,6 +510,7 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
let mtypecode = null // 澶栬喘缂栫爜
let btypecode = null // 澶栧崗缂栫爜
let htypecode = null // 瀹㈡埛缂栫爜
@@ -510,14 +536,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
}
})
}
@@ -527,10 +555,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()
})
},
@@ -638,7 +667,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