Merge pull request 'dev-luannv24-s32s17s2' (#30) from dev-luannv24-s32s17 into dev
Reviewed-on: #30
This commit is contained in:
@ -127,13 +127,13 @@
|
||||
|
||||
<!-- 역할수정 -->
|
||||
<template v-else-if="item.id == 'AsgnRoleByUser'">
|
||||
<v-col :cols="3" class="h100">
|
||||
<v-col :cols="12" class="overflow-y-scroll grid-toggle-section">
|
||||
<v-card-title
|
||||
class="pa-0 custom-subtitle-tab"
|
||||
style="min-height:36px;"
|
||||
>역할리스트</v-card-title
|
||||
>
|
||||
<div style="height:calc(100% - 36px)" class="py-5">
|
||||
<div class="py-5">
|
||||
<component
|
||||
class="w100"
|
||||
:is="loadGridTab2 ? 'Grid' : null"
|
||||
@ -145,7 +145,7 @@
|
||||
/>
|
||||
</div>
|
||||
</v-col>
|
||||
<v-col :cols="1" class="d-flex justify-center">
|
||||
<v-col :cols="12" class="d-flex justify-center">
|
||||
<ActionButtons
|
||||
:parentPrgmId="myPrgmId"
|
||||
:leftGridName="gridName2"
|
||||
@ -153,7 +153,7 @@
|
||||
:btnActionsFnc="dualGridBtnActions"
|
||||
/>
|
||||
</v-col>
|
||||
<v-col :cols="8" class="h100">
|
||||
<v-col :cols="12" class="h100">
|
||||
<div class="d-flex align-center justify-space-between">
|
||||
<v-card-title class="pa-0 custom-subtitle-tab">
|
||||
사용자 역할</v-card-title
|
||||
@ -894,6 +894,7 @@ const defaultData = {
|
||||
};
|
||||
|
||||
const myColumns = [
|
||||
|
||||
{ header: '사용자No', name: 'userNo', align: 'center', hidden: true },
|
||||
{ header: '사용자명', name: 'userNm' },
|
||||
{ header: '사용자ID', name: 'userLoginId' },
|
||||
@ -909,6 +910,17 @@ const myColumns = [
|
||||
];
|
||||
|
||||
const unAsgnRoleByUserColumns = [
|
||||
{
|
||||
header: '',
|
||||
name: '',
|
||||
align: 'center',
|
||||
width: 50,
|
||||
formatter: (props) => {
|
||||
return `<label class="custom-radio">
|
||||
<span class="radio-mark"></span>
|
||||
</label>`;
|
||||
}
|
||||
},
|
||||
{ header: '역할ID', name: 'roleId', align: 'center' },
|
||||
{ header: '역할명', name: 'roleNm' },
|
||||
{ header: '적용시작일', name: 'aplyStartDt', hidden: true },
|
||||
@ -918,6 +930,7 @@ const unAsgnRoleByUserColumns = [
|
||||
];
|
||||
|
||||
const asgnRoleByUserColumns = [
|
||||
|
||||
{ header: '역할ID', name: 'roleId', align: 'center' },
|
||||
{ header: '역할명', name: 'roleNm' },
|
||||
{
|
||||
@ -931,7 +944,19 @@ const asgnRoleByUserColumns = [
|
||||
{ header: 'comId', name: 'comId', hidden: true },
|
||||
];
|
||||
|
||||
const asgnMenuByUserColumns = [{ header: '메뉴명', name: 'menuNm' }];
|
||||
const asgnMenuByUserColumns = [
|
||||
{
|
||||
header: '',
|
||||
name: '',
|
||||
align: 'center',
|
||||
width: 50,
|
||||
formatter: (props) => {
|
||||
return `<label class="custom-radio">
|
||||
<span class="radio-mark"></span>
|
||||
</label>`;
|
||||
}
|
||||
},
|
||||
{ header: '메뉴명', name: 'menuNm' }];
|
||||
|
||||
const myDetail = blocCdList => {
|
||||
return [
|
||||
|
Reference in New Issue
Block a user