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/jsqd.vue | 542 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 333 insertions(+), 209 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 9151a0f..8a26993 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -15,12 +15,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.RoleCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊鍚嶇О" style=" display: flex;">
@@ -47,16 +47,21 @@
<el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;">
+ <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"
+ class="tableFixed"
border
:row-class-name="tableRowClassName"
:height="tableHeight+'px'"
@@ -231,7 +236,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>
@@ -474,7 +484,12 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="userDialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="userDialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="userDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -509,6 +524,7 @@
<input
class="myCheckboxInput"
type="checkbox"
+ :disabled="rightFrom.usercode==='S001'"
:value="item.code"
:name="item.name"
:style="{color:item.isSelected2?'#42b983':'#fff'}"
@@ -551,7 +567,12 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="rightDialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="rightDialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="rightDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -792,6 +813,10 @@
},
// 淇敼鎸夐挳
edit(operation, row) {
+ if (row.role_code === 'S001') {
+ return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
+ }
+
this.operation = operation
this.dialogVisible = true
@@ -806,6 +831,9 @@
},
// 鍒犻櫎鎸夐挳
del(row) {
+ if (row.role_code === 'S001') {
+ return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
+ }
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -841,6 +869,7 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
const data = {
RoleId: this.dialogForm.RoleId,
RoleCode: this.dialogForm.RoleCode,
@@ -852,11 +881,13 @@
}
AddUpdateRole(data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getRoleSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ this.$store.state.app.buttonIsDisabled = false
}
})
}
@@ -865,12 +896,14 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
+ this.$refs.tableDataRef.doLayout()
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.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -948,14 +981,33 @@
},
/* 鍏宠仈鐢ㄦ埛妯″潡*/
- userClick(row) {
- this.userDialogVisible = true
+ async userClick(row) {
+ if (row.role_code === 'S001') {
+ return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
+ }
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
this.userForm.roleName = row.role_name
this.dialogFormUser.rolecode = row.role_code
- this.getRoleAssociationUser()
- this.$nextTick(() => {
- this.$refs.multipleTable.doLayout()
- })
+ const res = await this.getRoleAssociationUser()
+
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
+ this.userDialogVisible = true
+ this.$nextTick(() => {
+ this.$refs.multipleTable.doLayout()
+ })
+ }, 1000)
+ } else {
+ loading.close()
+ }
},
// 鑾峰彇瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛
async getRoleAssociationUser() {
@@ -969,6 +1021,7 @@
}
})
})
+ return { code: res.code }
},
// 澶勭悊澶氶��
handleSelectionChange(rows) {
@@ -1019,15 +1072,19 @@
},
// 鍏宠仈鐢ㄦ埛瀵硅瘽妗嗙‘璁�
async userDialogVisibleConfirm() {
+ this.$store.state.app.buttonIsDisabled = true
const userMultipleArr = []
this.userMultipleArr.forEach(item => {
userMultipleArr.push({ code: item.usercode, name: item.username })
})
const res = await SaveRoleAssoctUser(userMultipleArr, this.dialogFormUser.rolecode)
if (res.code === '200') {
+ this.userDialogVisible = false
this.$message.success('淇濆瓨鎴愬姛锛�')
await this.getRoleSearch()
- this.userDialogVisible = false
+ this.$store.state.app.buttonIsDisabled = false
+ } else {
+ this.$store.state.app.buttonIsDisabled = false
}
},
// 绾ц仈閫夋嫨鍣�
@@ -1047,7 +1104,15 @@
/* 瑙掕壊鍏宠仈鏉冮檺瀵硅瘽妗嗛儴鍒�*/
// 鍒嗛厤鏉冮檺鐐瑰嚮
async rightClick(row) {
- this.dialogVisibleRight = true
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
+ // this.dialogVisibleRight = true
this.rightFrom.usercode = row.role_code
this.rightFrom.username = row.role_name
@@ -1055,218 +1120,258 @@
rolecode: this.rightFrom.usercode,
type: ''
}
- const { data: res } = await RoleAssociationRight(data)// 鎺ュ彛鑾峰彇鏁版嵁
- // console.log(res, 111)
- this.dialogFormRight.rightPCArr = res[0][0].is_delete === '0' ? res[0] : []
- this.dialogFormRight.rightAPPArr = res[1][0].is_delete === '0' ? res[1] : []
+ RoleAssociationRight(data).then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
+ this.dialogVisibleRight = true
+ this.dialogFormRight.rightPCArr = res.data[0][0].is_delete === '0' ? res.data[0] : []
+ this.dialogFormRight.rightAPPArr = res.data[1][0].is_delete === '0' ? res.data[1] : []
- this.PCTrue = res[0][0].is_delete === '0'
- this.APPTrue = res[1][0].children.filter(item => item.is_delete === '0').length === 0 ? false : res[1][0].is_delete === '0'
+ this.PCTrue = res.data[0][0].is_delete === '0'
+ this.APPTrue = res.data[1][0].children.filter(item => item.is_delete === '0').length === 0 ? false : res.data[1][0].is_delete === '0'
- // '0'鏄剧ず '1' 涓嶆樉绀� 杩囨护鍑虹浉瀵瑰簲鐨勮彍鍗�
- if (this.PCTrue) {
- this.dialogFormRight.rightPCArr[0].children = this.dialogFormRight.rightPCArr[0].children.filter(item => item.is_delete === '0')
- this.dialogFormRight.rightPCArr[0].children.forEach(item => {
- item.children = item.children.filter(it => it.is_delete === '0')
- })
- }
+ // '0'鏄剧ず '1' 涓嶆樉绀� 杩囨护鍑虹浉瀵瑰簲鐨勮彍鍗�
+ if (this.PCTrue) {
+ this.dialogFormRight.rightPCArr[0].children = this.dialogFormRight.rightPCArr[0].children.filter(item => item.is_delete === '0')
+ this.dialogFormRight.rightPCArr[0].children.forEach(item => {
+ item.children = item.children.filter(it => it.is_delete === '0')
- if (this.APPTrue) {
- this.dialogFormRight.rightAPPArr[0].children = this.dialogFormRight.rightAPPArr[0].children.filter(item => item.is_delete === '0' || item.is_delete === null)
- this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
- item.children = item.children.filter(it => it.is_delete === '0' || it.is_delete === null)
- // item.children = item.children.filter(it => it.is_delete !== '1')
- })
- }
- // console.log(this.dialogFormRight.rightAPPArr[0], 234)
- // 鍒ゆ柇鍝釜鏄珮浜�
- let pcIsSelected1 = false
- let pcIsSelected2 = false
- let appIsSelected1 = false
- let appIsSelected2 = false
- let rightPCArrFlag
- let rightAPPArrFlag
-
- if (this.PCTrue) {
- rightPCArrFlag = this.dialogFormRight.rightPCArr[0].flag
- }
- if (this.APPTrue) {
- rightAPPArrFlag = this.dialogFormRight.rightAPPArr[0].flag
- }
-
- let waitFlag = false// 鍥炴樉绛夊緟鏄惁鏀捐
-
- if (this.PCTrue && this.APPTrue) {
- // 1.绗竴绉嶆儏鍐礟C鍜孉PP閮戒竴娆￠兘娌￠�変腑鏃� PC鏈�変腑锛孉PP鏈�変腑
- if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'N') {
- pcIsSelected1 = true
- this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
- }
- // 2.绗簩绉嶆儏鍐礟C宸查�変腑锛孉PP鏈�変腑
- if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'N') {
- pcIsSelected1 = true
- pcIsSelected2 = true
-
- const interval = setInterval(() => {
- if ($("input[name='PC']").length > 0) {
- waitFlag = true
- }
- if (waitFlag) {
- clearInterval(interval)
- this.$nextTick(() => {
- $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ if (this.rightFrom.usercode === 'S001') { // Admin绯荤粺绠＄悊鍛樿彍鍗曞仛鍒板彧澧炰笉鍑�
+ if (item.flag === 'Y') {
+ item.disabled = true
+ }
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ it.disabled = true
+ }
+ })
+ }
+ }
})
}
- }, 100)
- this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
- }
- // 3.绗笁绉嶆儏鍐礟C鏈�変腑锛孉PP宸查�変腑
- if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'Y') {
- appIsSelected1 = true
- appIsSelected2 = true
+ if (this.APPTrue) {
+ this.dialogFormRight.rightAPPArr[0].children = this.dialogFormRight.rightAPPArr[0].children.filter(item => item.is_delete === '0' || item.is_delete === null)
+ this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
+ item.children = item.children.filter(it => it.is_delete === '0' || it.is_delete === null)
+ // item.children = item.children.filter(it => it.is_delete !== '1')
- const interval = setInterval(() => {
- if ($("input[name='APP']").length > 0) {
- waitFlag = true
- }
- if (waitFlag) {
- clearInterval(interval)
- this.$nextTick(() => {
- $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ if (this.rightFrom.usercode === 'S001') { // Admin绯荤粺绠＄悊鍛樿彍鍗曞仛鍒板彧澧炰笉鍑�
+ if (item.flag === 'Y') {
+ item.disabled = true
+ }
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ it.disabled = true
+ }
+ })
+ }
+ }
})
}
- }, 100)
+ // console.log(this.dialogFormRight.rightAPPArr[0], 234)
+ // 鍒ゆ柇鍝釜鏄珮浜�
+ let pcIsSelected1 = false
+ let pcIsSelected2 = false
+ let appIsSelected1 = false
+ let appIsSelected2 = false
+ let rightPCArrFlag
+ let rightAPPArrFlag
- this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
- }
- // 4.绗洓绉嶆儏鍐礟C宸查�変腑锛孉PP宸查�変腑
- if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'Y') {
- pcIsSelected1 = true
- pcIsSelected2 = true
- appIsSelected1 = false
- appIsSelected2 = true
-
- const interval = setInterval(() => {
- if ($("input[name='PC']").length > 0) {
- waitFlag = true
+ if (this.PCTrue) {
+ rightPCArrFlag = this.dialogFormRight.rightPCArr[0].flag
}
- if (waitFlag) {
- clearInterval(interval)
- this.$nextTick(() => {
- $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
- $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ if (this.APPTrue) {
+ rightAPPArrFlag = this.dialogFormRight.rightAPPArr[0].flag
+ }
+
+ let waitFlag = false// 鍥炴樉绛夊緟鏄惁鏀捐
+
+ if (this.PCTrue && this.APPTrue) {
+ // 1.绗竴绉嶆儏鍐礟C鍜孉PP閮戒竴娆￠兘娌￠�変腑鏃� PC鏈�変腑锛孉PP鏈�変腑
+ if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'N') {
+ pcIsSelected1 = true
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+ }
+ // 2.绗簩绉嶆儏鍐礟C宸查�変腑锛孉PP鏈�変腑
+ if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'N') {
+ pcIsSelected1 = true
+ pcIsSelected2 = true
+
+ const interval = setInterval(() => {
+ if ($("input[name='PC']").length > 0) {
+ waitFlag = true
+ }
+ if (waitFlag) {
+ clearInterval(interval)
+ this.$nextTick(() => {
+ $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ }, 100)
+
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+ }
+ // 3.绗笁绉嶆儏鍐礟C鏈�変腑锛孉PP宸查�変腑
+ if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'Y') {
+ appIsSelected1 = true
+ appIsSelected2 = true
+
+ const interval = setInterval(() => {
+ if ($("input[name='APP']").length > 0) {
+ waitFlag = true
+ }
+ if (waitFlag) {
+ clearInterval(interval)
+ this.$nextTick(() => {
+ $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ }, 100)
+
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
+ }
+ // 4.绗洓绉嶆儏鍐礟C宸查�変腑锛孉PP宸查�変腑
+ if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'Y') {
+ pcIsSelected1 = true
+ pcIsSelected2 = true
+ appIsSelected1 = false
+ appIsSelected2 = true
+
+ const interval = setInterval(() => {
+ if ($("input[name='PC']").length > 0) {
+ waitFlag = true
+ }
+ if (waitFlag) {
+ clearInterval(interval)
+ this.$nextTick(() => {
+ $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ }, 100)
+
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+ }
+ }
+
+ // 鐩墠涓�鏈熻偗瀹氭槸杩欎釜
+ if (this.PCTrue && !this.APPTrue) {
+ // pcIsSelected1 = true
+ if (rightPCArrFlag === 'Y') {
+ pcIsSelected1 = true
+ pcIsSelected2 = true
+
+ const interval = setInterval(() => {
+ if ($("input[name='PC']").length > 0) {
+ waitFlag = true
+ }
+ if (waitFlag) {
+ clearInterval(interval)
+ this.$nextTick(() => {
+ $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ }, 100)
+
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+ }
+ // this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+ }
+
+ if (!this.PCTrue && this.APPTrue) {
+ if (rightAPPArrFlag === 'Y') {
+ appIsSelected1 = true
+ appIsSelected2 = true
+
+ const interval = setInterval(() => {
+ if ($("input[name='APP']").length > 0) {
+ waitFlag = true
+ }
+ if (waitFlag) {
+ clearInterval(interval)
+ this.$nextTick(() => {
+ $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ }, 100)
+
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
+ }
+ }
+
+ if (this.PCTrue) {
+ this.dialogFormRight.rightOperationArr.push({
+ isSelected1: pcIsSelected1,
+ isSelected2: pcIsSelected2,
+ code: this.dialogFormRight.rightPCArr[0].code,
+ flag: rightPCArrFlag,
+ name: this.dialogFormRight.rightPCArr[0].name
})
}
- }, 100)
-
- this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
- }
- }
-
- // 鐩墠涓�鏈熻偗瀹氭槸杩欎釜
- if (this.PCTrue && !this.APPTrue) {
- // pcIsSelected1 = true
- if (rightPCArrFlag === 'Y') {
- pcIsSelected1 = true
- pcIsSelected2 = true
-
- const interval = setInterval(() => {
- if ($("input[name='PC']").length > 0) {
- waitFlag = true
- }
- if (waitFlag) {
- clearInterval(interval)
- this.$nextTick(() => {
- $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ if (this.APPTrue) {
+ this.dialogFormRight.rightOperationArr.push({
+ isSelected1: appIsSelected1,
+ isSelected2: appIsSelected2,
+ code: this.dialogFormRight.rightAPPArr[0].code,
+ flag: rightAPPArrFlag,
+ name: this.dialogFormRight.rightAPPArr[0].name
})
}
- }, 100)
-
- this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
- }
- // this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
- }
-
- if (!this.PCTrue && this.APPTrue) {
- if (rightAPPArrFlag === 'Y') {
- appIsSelected1 = true
- appIsSelected2 = true
-
- const interval = setInterval(() => {
- if ($("input[name='APP']").length > 0) {
- waitFlag = true
+ if (this.PCTrue) {
+ this.dialogFormRight.rightPCArr[0].name = '鍏ㄩ儴'
+ if (this.rightFrom.usercode === 'S001') { // Admin绯荤粺绠＄悊鍛樿彍鍗曞仛鍒板彧澧炰笉鍑�
+ this.dialogFormRight.rightPCArr[0].disabled = true
+ }
}
- if (waitFlag) {
- clearInterval(interval)
- this.$nextTick(() => {
- $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ if (this.APPTrue) {
+ this.dialogFormRight.rightAPPArr[0].name = '鍏ㄩ儴'
+ if (this.rightFrom.usercode === 'S001') { // Admin绯荤粺绠＄悊鍛樿彍鍗曞仛鍒板彧澧炰笉鍑�
+ this.dialogFormRight.rightAPPArr[0].disabled = true
+ }
+ }
+
+ // 鏍戝舰鍥炴樉閮ㄥ垎
+ if (this.PCTrue) {
+ this.dialogFormRight.rightPCArr[0].children.forEach(item => {
+ if (item.children && item.children.length > 0 && item.flag === 'Y') {
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ this.dialogFormRight.rightPCArrSelected.push(it.code)
+ }
+ })
+ } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
+ this.dialogFormRight.rightPCArrSelected.push(item.code)
+ }
})
}
- }, 100)
-
- this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
- }
- }
-
- if (this.PCTrue) {
- this.dialogFormRight.rightOperationArr.push({
- isSelected1: pcIsSelected1,
- isSelected2: pcIsSelected2,
- code: this.dialogFormRight.rightPCArr[0].code,
- flag: rightPCArrFlag,
- name: this.dialogFormRight.rightPCArr[0].name
- })
- }
- if (this.APPTrue) {
- this.dialogFormRight.rightOperationArr.push({
- isSelected1: appIsSelected1,
- isSelected2: appIsSelected2,
- code: this.dialogFormRight.rightAPPArr[0].code,
- flag: rightAPPArrFlag,
- name: this.dialogFormRight.rightAPPArr[0].name
- })
- }
- if (this.PCTrue) {
- this.dialogFormRight.rightPCArr[0].name = '鍏ㄩ儴'
- }
- if (this.APPTrue) {
- this.dialogFormRight.rightAPPArr[0].name = '鍏ㄩ儴'
- }
-
- // 鏍戝舰鍥炴樉閮ㄥ垎
- if (this.PCTrue) {
- this.dialogFormRight.rightPCArr[0].children.forEach(item => {
- if (item.children && item.children.length > 0 && item.flag === 'Y') {
- item.children.forEach(it => {
- if (it.flag === 'Y') {
- this.dialogFormRight.rightPCArrSelected.push(it.code)
+ if (this.APPTrue) {
+ this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
+ if (item.children && item.children.length > 0 && item.flag === 'Y') {
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ this.dialogFormRight.rightAPPArrSelected.push(it.code)
+ }
+ })
+ } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
+ this.dialogFormRight.rightAPPArrSelected.push(item.code)
+ }
+ })
+ }
+ this.$nextTick(() => {
+ if (this.$refs.rightPCRef) {
+ this.$refs.rightPCRef.setCheckedKeys(this.dialogFormRight.rightPCArrSelected)
+ }
+ if (this.$refs.rightAPPRef) {
+ this.$refs.rightAPPRef.setCheckedKeys(this.dialogFormRight.rightAPPArrSelected)
}
})
- } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
- this.dialogFormRight.rightPCArrSelected.push(item.code)
- }
- })
- }
- if (this.APPTrue) {
- this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
- if (item.children && item.children.length > 0 && item.flag === 'Y') {
- item.children.forEach(it => {
- if (it.flag === 'Y') {
- this.dialogFormRight.rightAPPArrSelected.push(it.code)
- }
- })
- } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
- this.dialogFormRight.rightAPPArrSelected.push(item.code)
- }
- })
- }
- this.$nextTick(() => {
- if (this.$refs.rightPCRef) {
- this.$refs.rightPCRef.setCheckedKeys(this.dialogFormRight.rightPCArrSelected)
- }
- if (this.$refs.rightAPPRef) {
- this.$refs.rightAPPRef.setCheckedKeys(this.dialogFormRight.rightAPPArrSelected)
+ }, 1000)
+ } else {
+ loading.close()
}
})
},
@@ -1292,6 +1397,8 @@
},
// 鏉冮檺瀵硅瘽妗嗙‘璁や簨浠�
async rightDialogVisibleConfirm() {
+ this.$store.state.app.buttonIsDisabled = true
+
const rightPCArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 PC
const rightAPPArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 APP
if (this.PCTrue) {
@@ -1365,8 +1472,11 @@
const res = await SaveUserAssoctRight(rightSubmit, rolecode, usercode)
if (res.code === '200') {
this.$message.success('淇濆瓨鎴愬姛锛�')
- await this.getRoleSearch()
this.dialogVisibleRight = false
+ await this.getRoleSearch()
+ this.$store.state.app.buttonIsDisabled = false
+ } else {
+ this.$store.state.app.buttonIsDisabled = false
}
},
// 澶х洅瀛愮偣鍑讳簨浠�
@@ -1693,9 +1803,23 @@
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