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/zlgl/gxjybz.vue | 252 ++++++++++++++++++++++++++++----------------------
1 files changed, 142 insertions(+), 110 deletions(-)
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index 60806ff..29c33dc 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.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.stanedcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
@@ -25,14 +25,19 @@
<el-input v-model="form.staneddescr" 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
@@ -90,9 +95,12 @@
>
<template slot-scope="{row}">
<div class="operationClass">
-
<el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
- <i class="el-icon-view" style="color: #42b983;cursor: pointer;margin-right: 15px;" @click="check('check',row)" />
+ <i
+ class="el-icon-view"
+ style="color: #42b983;cursor: pointer;margin-right: 15px;"
+ @click="check('check',row)"
+ />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
<i class="el-icon-edit-outline" @click="edit('edit',row)" />
@@ -124,8 +132,8 @@
:top="isIpad?'5vh':'15vh'"
:close-on-click-modal="false"
@closed="handleClose"
- @close="handleClose"
>
+ <!-- @close="handleClose"-->
<div style="margin-bottom: 10px">
<i class="el-icon-s-comment" style="color:#42b983;" /> 鏍囧噯淇℃伅锛�
</div>
@@ -144,14 +152,19 @@
<el-input v-model="dialogForm.name" :disabled="operation==='check'" style="width: 200px" />
</el-form-item>
<el-form-item label="鎻忚堪">
- <el-input v-model="dialogForm.description" :disabled="operation==='check'" type="textarea" style="width: 200px" />
+ <el-input
+ v-model="dialogForm.description"
+ :disabled="operation==='check'"
+ type="textarea"
+ style="width: 200px"
+ />
</el-form-item>
</el-form>
<div style="margin-bottom: 10px">
<i class="el-icon-s-comment" style="color:#42b983;" /> 妫�楠岄」淇℃伅锛�
</div>
<div style="margin-bottom: 10px">
- <el-button v-if="operation==='add'" type="primary" @click="JYadd">鏂板</el-button>
+ <el-button v-if="operation==='add'||operation==='edit'" type="primary" @click="JYadd">鏂板</el-button>
</div>
<div>
<el-table
@@ -173,56 +186,48 @@
/>
<el-table-column
prop="code"
- label="妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)"
+ label="妫�楠屾爣鍑嗙紪鐮�"
>
<template slot-scope="{row}">
- <div v-if="row.isVisible===0" style="display: flex;">
- <div>{{ row.code }}</div>
- <div style="margin-left: 10px">{{ row.name }}</div>
- </div>
-
+ <div v-if="row.isVisible===0">{{ row.code }}</div>
<el-select
v-if="row.isVisible===1"
v-model="row.code"
- filterable
- :popper-append-to-body="false"
- style="width: 400px;"
+ style="width: 200px;"
placeholder="璇烽�夋嫨"
- @change="val=>changeCode(val,row)"
+ @change="val=>changeName(val,row)"
+ >
+ <el-option
+ v-for="item in JYSelectArr"
+ :key="item.name"
+ :label="item.code"
+ :value="item.name"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="妫�楠屾爣鍑嗗悕绉�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.name }}</div>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.name"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>changeName(val,row)"
>
<el-option
v-for="item in JYSelectArr"
:key="item.code"
- :label="item.code+''+item.name"
+ :label="item.name"
:value="item.code"
/>
</el-select>
</template>
</el-table-column>
- <!-- <el-table-column-->
- <!-- prop="name"-->
- <!-- label="妫�楠屾爣鍑嗗悕绉�"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.isVisible===0">{{ row.name }}</div>-->
- <!-- <el-select-->
- <!-- v-if="row.isVisible===1"-->
- <!-- v-model="row.name"-->
- <!-- filterable-->
- <!-- :popper-append-to-body="false"-->
- <!-- style="width: 200px;"-->
- <!-- placeholder="璇烽�夋嫨"-->
- <!-- @change="val=>changeName(val,row)"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="item in JYSelectArr"-->
- <!-- :key="item.code"-->
- <!-- :label="item.name"-->
- <!-- :value="item.code"-->
- <!-- />-->
- <!-- </el-select>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
<el-table-column
prop="descr"
label="妫�楠屾弿杩版弿杩�"
@@ -235,6 +240,7 @@
<el-table-column
v-if="operation!=='check'"
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -252,7 +258,13 @@
<div class="footerButton">
<el-button v-if="operation==='check'" @click="dialogVisibleCancel">杩� 鍥�</el-button>
<el-button v-if="operation!=='check'" @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button v-if="operation!=='check'" type="primary" @click="dialogVisibleConfirm">鎻� 浜�</el-button>
+ <el-button
+ v-if="operation!=='check'"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鎻� 浜�</el-button>
</div>
</span>
</el-dialog>
@@ -267,32 +279,14 @@
StepCheckItemSelect,
StepCheckStanedSearch
} from '@/api/zlgl'
+import { validateCode } from '@/utils/global'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'ZJBZ',
components: {
Pagination
},
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 {
isIpad: false,
mainHeight: 0,
@@ -318,7 +312,7 @@
operation: '',
dialogFormRules: {
code: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
name: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -326,7 +320,7 @@
},
JYTableData: [], // 瀵硅瘽妗嗘楠屼俊鎭〃鏍�
JYSelectArr: [], // 妫�楠岄」鐩笅鎷夋暟缁�
- JYSelectedArr: [] // 宸查�夋楠岄」鐩暟缁�
+ JYIsCancel: true
}
},
created() {
@@ -413,11 +407,12 @@
item.isVisible = 0
item.descr = item.stepcheckitem_desc
item.number = number
- this.JYSelectedArr.push(item.code)
})
this.$nextTick(() => {
this.$refs.JYTableData.doLayout()
})
+
+ this.JYSelectArr = [...this.JYSelectArr].filter(x => [...this.JYTableData].every(y => y.code !== x.code))
},
// 鍒犻櫎鎸夐挳
async del(row) {
@@ -429,6 +424,9 @@
DeleteStepCheckStaned({ stanedcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getStepCheckStanedSearch()
}
})
@@ -443,7 +441,7 @@
this.dialogForm.enable = ''
this.dialogForm.description = ''
this.JYTableData = []
- this.JYSelectedArr = []
+ this.getStepCheckItemSelect()
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -454,7 +452,9 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
const tableData = []
+ this.JYTableData = this.JYTableData.filter(item => item.code !== '')
this.JYTableData.forEach((item, index) => {
tableData.push({
STEPCHECKITEM_SEQ: (index + 1),
@@ -471,9 +471,10 @@
}
AddUpdateStepCheckStaned(this.operation === 'add' ? 'Add' : 'Update', data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getStepCheckStanedSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
@@ -485,8 +486,9 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 195
this.isIpad = window.innerHeight < 769
+ this.$refs.tableDataRef.doLayout()
// if (window.innerHeight < 769) {
// this.tableHeight = this.tableHeight - 50
// }
@@ -497,16 +499,15 @@
const { data: res } = await StepCheckItemSelect()
this.JYSelectArr = res
},
- // 妫�楠屾爣鍑嗙紪鐮佸�兼敼鍙�
- changeCode(val, row) {
- row.name = this.JYSelectArr.find(it => it.code === val).name
- row.descr = this.JYSelectArr.find(it => it.code === val).descr
- },
// 妫�楠屾爣鍑嗗悕绉板�兼敼鍙�
- // changeName(val, row) {
- // row.code = this.JYSelectArr.find(it => it.code === val).code
- // row.descr = this.JYSelectArr.find(it => it.code === val).descr
- // },
+ changeName(val, row) {
+ const res = this.JYSelectArr.find(item => {
+ return item.code === val || item.name === val
+ })
+ row.code = res.code
+ row.name = res.name
+ row.descr = res.descr
+ },
// 妫�楠屾柊澧�
JYadd() {
if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
@@ -517,46 +518,64 @@
number = number === 0 ? (10 + Math.random()) : number
const data = { code: '', name: '', descr: '', isVisible: 1, number }
this.JYTableData.push(data)
+ this.JYIsCancel = false
},
JYedit(row) {
- this.JYSelectedArr.forEach((item, index) => {
- if (item === row.code) {
- this.JYSelectedArr.splice(index, 1)
+ let flag = false
+ this.JYTableData.forEach((item, index) => {
+ if (item.isVisible === 1) {
+ flag = true
}
+ })
+ if (flag) {
+ return this.$message.info('璇峰厛纭鎴栧彇娑堝叾瀹冭锛�')
+ }
+
+ this.JYIsCancel = false
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr
})
this.JYTableData.forEach((item, index) => {
- if (item.code === row.code) {
- item.isVisible = 1
+ if (item.code === row.code && item.number === row.number) {
+ this.JYTableData.splice(index, 1, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr,
+ isVisible: 1,
+ number: row.number
+ })
}
})
},
JYdel(row) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr
+ })
+
this.JYTableData.forEach((item, index) => {
if (item.number === row.number) {
this.JYTableData.splice(index, 1)
}
})
-
- this.JYSelectedArr.forEach((item, index) => {
- if (item === row.code) {
- this.JYSelectedArr.splice(index, 1)
- }
- })
},
JYsave(row) {
if (row.code === '') {
- return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘涓虹┖锛�')
+ return this.$message.info('妫�楠屾爣鍑嗙紪鐮佷笉鑳戒负绌猴紒')
}
- // if (row.name === '') {
- // return this.$message.info('妫�楠屾爣鍑嗗悕绉颁笉鑳戒负绌猴紒')
- // }
+ if (row.name === '') {
+ return this.$message.info('妫�楠屾爣鍑嗗悕绉颁笉鑳戒负绌猴紒')
+ }
- if (this.JYSelectedArr.find(item => item === row.code) !== undefined) {
- return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘閲嶅锛�')
- } else {
- this.JYSelectedArr.push(row.code)
- }
+ this.JYSelectArr.forEach((item, index) => {
+ if (item.code === row.code) {
+ this.JYSelectArr.splice(index, 1)
+ }
+ })
this.JYTableData.forEach((item, index) => {
if (item.number === row.number) {
@@ -577,12 +596,15 @@
this.JYTableData.splice(index, 1)
}
})
-
- this.JYSelectedArr.forEach((item, index) => {
- if (item === row.code) {
- this.JYSelectedArr.splice(index, 1)
- }
- })
+ console.log(this.JYIsCancel)
+ if (this.JYIsCancel && row.code.toString().length > 0) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr
+ })
+ }
+ this.JYIsCancel = true
}
}
}
@@ -591,21 +613,23 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-.el-button--text{
+.el-button--text {
font-size: 14px;
cursor: pointer;
}
+
::v-deep .el-select__caret {
display: flex;
align-items: center;
justify-content: center;
}
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
color: $main_color;
cursor: pointer;
}
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
margin-right: 15px;
}
@@ -666,8 +690,8 @@
background-color: #f8f8fa;
}
-::v-deep .el-table__body .el-table__row.hover-row td{
- background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
@@ -683,10 +707,18 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
.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