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/yhqd.vue | 253 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 172 insertions(+), 81 deletions(-)
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 043fc47..20a2285 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -1,22 +1,26 @@
<template>
<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-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+
+ <div style="display: flex">
+ <el-button icon="el-icon-menu" @click="workingTramClick">鐢熶骇鐝粍</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.UserCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢ㄦ埛鍚嶇О" style=" display: flex;">
@@ -50,7 +54,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鍦ㄨ亴鐘舵��" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label-width="70px" label="鍦ㄨ亴鐘舵��" style=" display: flex;">
<el-select
v-model="form.Enable"
:popper-append-to-body="false"
@@ -67,19 +71,38 @@
</el-select>
</el-form-item>
</div>
- <div style="display: flex;align-items: flex-start;margin-top: 3px">
+ <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"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
- :height="tableHeight+'px'"
+ class="tableFixed"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
highlight-current-row
- :style="{width: 100+'%',height:tableHeight+'px'}"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
:header-cell-style="this.$headerCellStyle"
:row-class-name="tableRowClassName"
:cell-style="this.$cellStyle"
@@ -119,13 +142,23 @@
label="鎵�灞炵粍缁�"
min-width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.org_name">{{ row.org_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="group_name"
label="鐢熶骇鐝粍"
min-width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.group_name">{{ row.group_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="wagetype"
label="宸ヨ祫绫诲瀷"
@@ -323,7 +356,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>
@@ -382,7 +420,7 @@
show-checkbox
node-key="code"
default-expand-all
- style="height: 300px"
+ style="height: 300px;overflow-y: scroll"
:props="defaultPropsOfRoleTree"
@check="checkBoxClick"
/>
@@ -392,7 +430,12 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="rolesDialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="rolesDialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="rolesDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -444,7 +487,12 @@
sortable="custom"
>
<template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />
+ <el-input
+ v-if="row.isVisible===1"
+ v-model="row.group_code"
+ oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
+ placeholder="璇疯緭鍏�"
+ />
<div v-else> {{ row.group_code }}</div>
</template>
</el-table-column>
@@ -498,7 +546,14 @@
</el-dialog>
<!--瀵煎叆缁勪欢-->
- <import-picker ref="importPickerFunc" class="importPickerClass" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+ <import-picker
+ ref="importPickerFunc"
+ class="importPickerClass"
+ :shows.sync="shows"
+ :title="title_value"
+ :colos="colos"
+ :code="code"
+ />
</div>
</template>
@@ -520,27 +575,15 @@
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
-import clearAllChildren from '@/utils/global'
+import clearAllChildren, { validateCode } from '@/utils/global'
import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'YYQD',
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()
@@ -570,8 +613,9 @@
}
}
}
-
return {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
isIpad: false,
mainHeight: 0,
tableHeight: 0,
@@ -623,7 +667,7 @@
operation: '',
dialogFormRules: {
UserCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
UserName: [
{ required: true, message: '璇疯緭鍏ョ敤鎴峰悕绉�', trigger: ['blur', 'change'] }
@@ -808,6 +852,9 @@
DeleteUser({ Userid: id }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getUserSearch()
}
})
@@ -838,6 +885,7 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
const data = {
id: this.dialogForm.id,
UserCode: this.dialogForm.UserCode,
@@ -855,11 +903,13 @@
}
AddUpdateUser(data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getUserSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ this.$store.state.app.buttonIsDisabled = false
}
})
}
@@ -870,63 +920,80 @@
this.$nextTick(() => {
// this.mainHeight = window.innerHeight - 250
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 255
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
// 鍏宠仈瑙掕壊鐐瑰嚮浜嬩欢
- async roleClick({ row }) {
+ roleClick({ row }) {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
this.dialogFormRoles.rolesArrSelectedArr = []
this.dialogFormRoles.rolesArr = []
this.dialogFormRoles.roleTreeSelectedArr = []
- this.dialogVisibleRoles = true
+
this.dialogFormRoles.username = row.username
this.dialogFormRoles.usercode = row.usercode
- const { data: res } = await UserAssociationRole({ usercode: row.usercode })
- this.rolesAll = res
+ UserAssociationRole({ usercode: row.usercode }).then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
- const nodeKey = []// 鏍戝舰鍥炴樉key
- res.forEach((item, index) => {
- this.dialogFormRoles.rolesArr.push({
- code: item.code,
- name: item.name,
- flag: item.flag,
- isSelected1: false,
- isSelected2: false
- })
- if (item.flag === 'Y') {
- this.dialogFormRoles.rolesArr[index].isSelected2 = true
- this.$nextTick(() => {
- // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
- $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
- })
- this.dialogFormRoles.rolesArrSelectedArr.push(item.name)
- if (item.children && item.children.length > 0) {
- const Data = []
- item.children.forEach(it => {
- if (it.flag === 'Y') {
- nodeKey.push(it.code)
- Data.push(it.code)
+ this.dialogVisibleRoles = true
+ this.rolesAll = res.data.filter(item => item.children.length !== 0)
+
+ const nodeKey = []// 鏍戝舰鍥炴樉key
+ this.rolesAll.forEach((item, index) => {
+ this.dialogFormRoles.rolesArr.push({
+ code: item.code,
+ name: item.name,
+ flag: item.flag,
+ isSelected1: false,
+ isSelected2: false
+ })
+ if (item.flag === 'Y') {
+ this.dialogFormRoles.rolesArr[index].isSelected2 = true
+ this.$nextTick(() => {
+ // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ this.dialogFormRoles.rolesArrSelectedArr.push(item.name)
+ if (item.children && item.children.length > 0) {
+ const Data = []
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ nodeKey.push(it.code)
+ Data.push(it.code)
+ }
+ })
+ this.dialogFormRoles.roleTreeSelectedArr.push({ Code: item.code, Name: item.name, Data: Data })
+ }
}
})
- this.dialogFormRoles.roleTreeSelectedArr.push({ Code: item.code, Name: item.name, Data: Data })
- }
+
+ this.dialogFormRoles.rolesArr[0].isSelected1 = true// 榛樿閫変腑绗竴涓�
+
+ this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.code === this.dialogFormRoles.rolesArr[0].code)
+ this.dialogFormRoles.roleTree[0].name = '鍏ㄩ儴'
+
+ this.$nextTick(() => {
+ this.$refs.roleTree.setCheckedKeys(nodeKey)
+ })
+ }, 1000)
+ } else {
+ loading.close()
}
})
- console.log(this.dialogFormRoles.roleTreeSelectedArr, 11)
- console.log(this.dialogFormRoles.rolesArr, 888)
-
- this.dialogFormRoles.rolesArr[0].isSelected1 = true// 榛樿閫変腑绗竴涓�
- // this.dialogFormRoles.rolesArr[0].name = '鍏ㄩ儴'
-
- this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.code === this.dialogFormRoles.rolesArr[0].code)
- this.dialogFormRoles.roleTree[0].name = '鍏ㄩ儴'
- // this.dialogFormRoles.rolesArr
- console.log(nodeKey, 1)
- this.$refs.roleTree.setCheckedKeys(nodeKey)
},
// 澶勭悊鐢ㄦ埛鍏宠仈瀵硅瘽妗嗗叧闂簨浠�
handleCloseRoles() {
@@ -939,12 +1006,15 @@
},
// 鐢ㄦ埛鍏宠仈瀵硅瘽妗嗙‘璁や簨浠�
async rolesDialogVisibleConfirm() {
- console.log(this.dialogFormRoles.roleTreeSelectedArr, 333337)
+ this.$store.state.app.buttonIsDisabled = true
const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode)
if (res.code === '200') {
+ this.dialogVisibleRoles = false
this.$message.success('淇濆瓨鎴愬姛锛�')
await this.getUserSearch()
- this.dialogVisibleRoles = false
+ this.$store.state.app.buttonIsDisabled = false
+ } else {
+ this.$store.state.app.buttonIsDisabled = false
}
},
// 鏍戝舰澶嶉�夋鐐瑰嚮浜嬩欢
@@ -1220,6 +1290,9 @@
UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.formWorking.page > 1 && this.workingTableData.length === 1) {
+ this.formWorking.page--
+ }
this.getUserGroupSearch()
}
})
@@ -1341,15 +1414,17 @@
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-button--text{
- font-size: 14px ;
- cursor: pointer ;
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
}
-.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;
}
@@ -1410,8 +1485,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 {
@@ -1428,9 +1503,25 @@
margin-bottom: 0;
}
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
+
</style>
<style>
+.osloading{
+ font-size: 26px !important;
+}
+.el-loading-text{
+ font-size: 26px !important;
+}
.el-table .custom-row {
background: #f8f8fa;
}
--
Gitblit v1.9.3