From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/jcsz/jsqd.vue | 748 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 475 insertions(+), 273 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index d8aa604..ea8b5c2 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -3,11 +3,13 @@
<div class="body" :style="{height:mainHeight+'px'}">
<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 v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<div style="display: flex">
- <el-button icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ <el-tooltip class="item" effect="dark" content="瑙掕壊绫诲瀷鏁版嵁缁存姢" placement="top">
+ <el-button v-waves icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
+ </el-tooltip>
+ <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
</div>
</div>
@@ -15,9 +17,9 @@
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
<el-form-item label="瑙掕壊缂栫爜" style=" display: flex;">
@@ -47,16 +49,24 @@
<el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;">
- <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
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves 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'"
@@ -81,18 +91,21 @@
prop="role_code"
label="瑙掕壊缂栫爜"
sortable="custom"
+ show-tooltip-when-overflow
min-width="110"
/>
<el-table-column
prop="role_name"
label="瑙掕壊鍚嶇О"
sortable="custom"
+ show-tooltip-when-overflow
min-width="110"
/>
<el-table-column
prop="roletype_name"
label="瑙掕壊绫诲瀷"
sortable="custom"
+ show-tooltip-when-overflow
min-width="110"
/>
<el-table-column
@@ -112,6 +125,7 @@
label="鍒涘缓浜哄憳"
sortable="custom"
width="110"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.lm_user===null">/</div>
@@ -121,12 +135,14 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
<el-table-column
prop="is_user"
label="鍏宠仈鐢ㄦ埛"
+ show-tooltip-when-overflow
width="120"
sortable="custom"
>
@@ -134,7 +150,8 @@
<i
v-if="row.is_user==='Y'"
class="el-icon-user-solid"
- style="color:#42b983;cursor: pointer"
+ style=" cursor: pointer"
+ :style="{color:styleObject}"
@click="userClick(row)"
/>
<i
@@ -149,10 +166,16 @@
prop="is_right"
label="鍒嗛厤鏉冮檺"
sortable="custom"
+ show-tooltip-when-overflow
width="120"
>
<template slot-scope="{row}">
- <i v-if="row.is_right==='Y'" class="el-icon-share" @click="rightClick(row)" />
+ <i
+ v-if="row.is_right==='Y'"
+ :style="{color:styleObject}"
+ class="el-icon-share"
+ @click="rightClick(row)"
+ />
<i
v-if="row.is_right==='N'"
class="el-icon-share"
@@ -169,9 +192,20 @@
<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
+ class="el-icon-edit-outline"
+ :style="{color:styleObject}"
+ @click="edit('edit',row)"
+ />
</el-tooltip>
- <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <el-tooltip
+ v-del-tab-index
+ class="item"
+ :style="{color:styleObject}"
+ effect="dark"
+ content="鍒犻櫎"
+ placement="top"
+ >
<i class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
@@ -193,6 +227,7 @@
<!-- 鏂板淇敼瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
width="800px"
@@ -230,13 +265,20 @@
</el-form>
<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 v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
<!-- 璁剧疆鎸夐挳瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
title="璁剧疆"
:visible.sync="settingDialogVisible"
width="800px"
@@ -246,8 +288,8 @@
@close="handleCloseSetting"
>
<div style="margin-bottom: 20px;display: flex">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addSetting">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addSetting">鏂板</el-button>
+ <!-- <el-button v-waves type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
</div>
<el-table
ref="RoleTypeCodeArr"
@@ -274,16 +316,23 @@
<el-table-column
prop="roletype_code"
label="绫诲瀷缂栫爜"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.roletype_code" placeholder="璇疯緭鍏�" />
+ <el-input
+ v-if="row.isVisible===1"
+ v-model="row.roletype_code"
+ oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
+ placeholder="璇疯緭鍏�"
+ />
<div v-else> {{ row.roletype_code }}</div>
</template>
</el-table-column>
<el-table-column
prop="roletype_name"
label="绫诲瀷鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -294,9 +343,9 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="delSetting(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="formSettingSave(row)">淇濆瓨</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="formSettingCancel(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="delSetting(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="formSettingSave(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="formSettingCancel(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
@@ -314,13 +363,14 @@
/>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="settingDialogVisibleCancel">杩斿洖</el-button>
- <!-- <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="settingDialogVisibleCancel">杩斿洖</el-button>
+ <!-- <el-button v-waves type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
<!-- 鍏宠仈鐢ㄦ埛瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
title="瑙掕壊鍏宠仈鐢ㄦ埛"
:visible.sync="userDialogVisible"
width="900px"
@@ -332,11 +382,11 @@
@close="handleCloseUser"
>
<div>
- <i class="el-icon-s-comment" style="color:#42b983;" /> 瑙掕壊鍚嶇О锛歿{ userForm.roleName }}
+ <i class="el-icon-s-comment" :style="{color:styleObject}" /> 瑙掕壊鍚嶇О锛歿{ userForm.roleName }}
</div>
<el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 鐢ㄦ埛鍒楄〃
+ <i class="el-icon-s-operation" :style="{color:styleObject}" /> 鐢ㄦ埛鍒楄〃
</div>
<div style="display: flex;min-height: 50px;margin-bottom: 10px">
<el-form ref="dialogFormUser" inline :model="dialogFormUser" label-width="80px">
@@ -385,6 +435,7 @@
</el-form-item>
</el-form>
<el-button
+ v-waves
type="primary"
icon="el-icon-search"
style="margin-top: 5px;margin-left: 30px"
@@ -392,6 +443,7 @@
>鏌ヨ
</el-button>
<el-button
+ v-waves
type="info"
icon="el-icon-refresh"
style="margin-top: 5px;margin-left: 10px"
@@ -448,11 +500,13 @@
>
<template slot-scope="{row}">
<div v-if="row.flag==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ <i class="el-icon-success" :style="{color:styleObject}" style="margin-right: 2px" />
+ <!-- <svg-icon icon-class="circleYes" :style="{color:styleObject}" style="margin-right: 2px" />-->
鏄�
</div>
<div v-if="row.flag==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ <i class="el-icon-info" style="margin-right: 2px" />
+ <!-- <svg-icon icon-class="circleNo" style="margin-right: 2px" />-->
鍚�
</div>
</template>
@@ -473,13 +527,20 @@
<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 v-waves @click="userDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="userDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
<!-- 鍒嗛厤鏉冮檺瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
title="瑙掕壊鍏宠仈鏉冮檺"
:visible.sync="dialogVisibleRight"
width="800px"
@@ -491,36 +552,53 @@
@close="handleCloseRight"
>
<div>
- <i class="el-icon-s-comment" style="color:#42b983;" /> 瑙掕壊鍚嶇О锛歿{ rightFrom.username }}
+ <i class="el-icon-s-comment" :style="{color:styleObject}" /> 瑙掕壊鍚嶇О锛歿{ rightFrom.username }}
</div>
<el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 鏉冮檺鎿嶄綔绔�
+ <i class="el-icon-s-operation" :style="{color:styleObject}" /> 鏉冮檺鎿嶄綔绔�
</div>
<div class="myCheckboxGroup">
<div
v-for="item in dialogFormRight.rightOperationArr"
:key="item.code"
- :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+ :style="{border:item.isSelected1?'1px solid '+ styleObject :'1px solid #eee'}"
class="myCheckbox"
@click="myCheckboxClick(item)"
>
- <input
- class="myCheckboxInput"
- type="checkbox"
- :value="item.code"
- :name="item.name"
- :style="{color:item.isSelected2?'#42b983':'#fff'}"
- @click="myCheckboxInputClick(item)"
- >{{ item.name }}
+
+ <!-- <input-->
+ <!-- class="myCheckboxInput"-->
+ <!-- type="checkbox"-->
+ <!-- :disabled="rightFrom.usercode==='S001'"-->
+ <!-- :value="item.code"-->
+ <!-- :name="item.name"-->
+ <!-- :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+ <!-- @click="myCheckboxInputClick(item)"-->
+ <!-- >{{ item.name }}-->
+
<!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
<!-- onClick="event.cancelBubble = true"-->
+ <!--鏄庡ぉ鍐嶇湅涓�涓媔nput鍜宔l-checkbox涔嬮棿鐨勫尯鍒�-->
+
+ <el-checkbox
+ :key="item.code"
+ v-model="item.isSelected2"
+ class="myCheckboxInput"
+ :value="item.code"
+ :name="item.name"
+ :disabled="rightFrom.usercode==='S001'"
+ :checked="item.isSelected2"
+ :label="item.name"
+ @change="myCheckboxInputClick(item)"
+ />
+ <div class="myCheckboxInputLabel">{{ item.name }}</div>
</div>
</div>
<el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 鍔熻兘鏉冮檺
+ <i class="el-icon-s-operation" :style="{color:styleObject}" /> 鍔熻兘鏉冮檺
</div>
<div style="height: 393px;overflow-y: scroll">
<el-tree
@@ -550,8 +628,14 @@
</div>
<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 v-waves @click="rightDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="rightDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -581,26 +665,17 @@
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
-import clearAllChildren from '@/utils/global'
+import clearAllChildren, { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'JSQD',
components: {
Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
return {
isIpad: false,
mainHeight: 0,
@@ -637,7 +712,7 @@
operation: '',
dialogFormRules: {
RoleCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
RoleName: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -703,6 +778,11 @@
title_value: '鏁版嵁瀵煎叆 / 瑙掕壊娓呭崟',
code: '1',
shows: false
+ }
+ },
+ computed: {
+ styleObject() {
+ return this.$store.state.settings.theme
}
},
watch: {
@@ -804,6 +884,10 @@
},
// 淇敼鎸夐挳
edit(operation, row) {
+ if (row.role_code === 'S001') {
+ return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
+ }
+
this.operation = operation
this.dialogVisible = true
@@ -818,6 +902,9 @@
},
// 鍒犻櫎鎸夐挳
del(row) {
+ if (row.role_code === 'S001') {
+ return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
+ }
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -826,6 +913,9 @@
DeleteRole({ RoleCode: row.role_code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getRoleSearch()
}
})
@@ -850,6 +940,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,
@@ -861,11 +952,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
}
})
}
@@ -874,12 +967,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 }) {
@@ -904,6 +999,10 @@
},
// 娣诲姞鎸夐挳
addSetting() {
+ if (this.RoleTypeCodeArr.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨涓婁竴琛岃褰曪紒')
+ }
+
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
const data = { roletype_code: '', roletype_name: '', isVisible: 1, number: number }
@@ -919,6 +1018,9 @@
RoleTypeDelete({ RoleTypeCode: row.roletype_code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.formSetting.page > 1 && this.RoleTypeCodeArr.length === 1) {
+ this.formSetting.page--
+ }
this.getRoleTypeSearch()
}
})
@@ -954,14 +1056,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() {
@@ -975,6 +1096,7 @@
}
})
})
+ return { code: res.code }
},
// 澶勭悊澶氶��
handleSelectionChange(rows) {
@@ -1025,15 +1147,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
}
},
// 绾ц仈閫夋嫨鍣�
@@ -1053,7 +1179,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
@@ -1061,217 +1195,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].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')
- })
- }
+ 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'
- if (this.APPTrue) {
- this.dialogFormRight.rightAPPArr[0].children = this.dialogFormRight.rightAPPArr[0].children.filter(item => item.is_delete === '0' || it.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
+ // '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.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()
}
})
},
@@ -1297,6 +1472,8 @@
},
// 鏉冮檺瀵硅瘽妗嗙‘璁や簨浠�
async rightDialogVisibleConfirm() {
+ this.$store.state.app.buttonIsDisabled = true
+
const rightPCArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 PC
const rightAPPArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 APP
if (this.PCTrue) {
@@ -1370,8 +1547,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
}
},
// 澶х洅瀛愮偣鍑讳簨浠�
@@ -1393,8 +1573,8 @@
},
// 灏忕洅瀛愮偣鍑讳簨浠�
myCheckboxInputClick(val) {
- // console.log(val)
- val.isSelected2 = !val.isSelected2
+ val.isSelected2 = !!val.isSelected2
+
this.dialogFormRight.rightCurrentCode = val.code
// 1.绗竴绉嶆儏鍐� 灏忕洅瀛愪粠娌￠�変腑鍒伴�変腑
@@ -1445,10 +1625,10 @@
this.$nextTick(() => {
if (item.name === 'PC') {
- $("input[name='PC']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'PC\']').eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
}
if (item.name === 'APP') {
- $("input[name='APP']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'APP\']').eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
}
// $("input[name='APP']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
// $('input:checkbox').eq(index).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
@@ -1471,10 +1651,10 @@
item.isSelected2 = true
this.$nextTick(() => {
if (item.name === 'PC') {
- $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'PC\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
}
if (item.name === 'APP') {
- $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'APP\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
}
// $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
@@ -1497,10 +1677,10 @@
item.isSelected2 = true
this.$nextTick(() => {
if (item.name === 'PC') {
- $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'PC\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
}
if (item.name === 'APP') {
- $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'APP\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
}
// $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
@@ -1555,17 +1735,22 @@
margin: 10px 30px 0 0;
border-radius: 5px;
cursor: default;
+ position: relative;
.myCheckboxInput {
margin: 1px 5px 0 0;
cursor: pointer;
}
- }
+ .myCheckboxInputLabel {
+ position: absolute;
+ left: 29px;
+ padding: 5px;
+ top: 6px;
+ color: transparent;
+ }
- //.myCheckbox{
- // border: 1px solid $main_color;
- //}
+ }
input[type=checkbox] {
cursor: pointer;
@@ -1606,10 +1791,11 @@
<!--鍏叡椤甸潰鏍峰紡-->
<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 {
color: $main_color;
cursor: pointer;
@@ -1698,8 +1884,24 @@
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