gitadmin/sk_fems_ui
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

resolve confict

Browse Source
This commit is contained in:
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-08-06 09:26:53 +07:00
parent 8cadade514 ca27167d3d
commit 4a7077336d
27 changed files with 358 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pages/comm/auth/MenuRoleMngPage.vue
View File

@ -303,7 +303,7 @@ export default {
//---------------------gridOption 설정 끝----------------------------
//---------------------gridName3의 체크박스 설정 시작----------------------------
class CustumChecbox {
class CustomCheckbox {
constructor(props) {
const el = document.createElement('input');
const { grid, rowKey, columnInfo } = props;
@ -398,7 +398,7 @@ export default {
name: 'useFg',
align: 'center',
renderer: {
type: CustumChecbox,
type: CustomCheckbox,
},
},
{
@ -406,7 +406,7 @@ export default {
name: 'authCd1',
align: 'center',
renderer: {
type: CustumChecbox,
type: CustomCheckbox,
},
},
{
@ -414,7 +414,7 @@ export default {
name: 'authCd2',
align: 'center',
renderer: {
type: CustumChecbox,
type: CustomCheckbox,
},
},
{
@ -422,7 +422,7 @@ export default {
name: 'authCd3',
align: 'center',
renderer: {
type: CustumChecbox,
type: CustomCheckbox,
},
},
{
@ -430,7 +430,7 @@ export default {
name: 'authCd4',
align: 'center',
renderer: {
type: CustumChecbox,
type: CustomCheckbox,
},
},
{
@ -438,7 +438,7 @@ export default {
name: 'authCd5',
align: 'center',
renderer: {
type: CustumChecbox,
type: CustomCheckbox,
},
},
{
@ -446,7 +446,7 @@ export default {
name: 'authCd6',
align: 'center',
renderer: {
type: CustumChecbox,
type: CustomCheckbox,
},
},
];

11
pages/comm/auth/UserRoleMngPage.vue
View File

@ -151,6 +151,7 @@
:leftGridName="gridName2"
:rightGridName="gridName3"
:btnActionsFnc="dualGridBtnActions"
directionBtn="vertically"
/>
</v-col>
<v-col :cols="12" class="h100">
@ -981,7 +982,7 @@ const myDetail = blocCdList => {
cols: 6,
labelCols: 12,
textCols: 12,
class: 'py-2 pr-4',
class: 'py-2 pl-4',
iconShow: true,
required: true,
},
@ -1005,7 +1006,7 @@ const myDetail = blocCdList => {
cols: 6,
labelCols: 12,
textCols: 12,
class: 'py-2 pr-4',
class: 'py-2 pl-4',
iconShow: true,
required: true,
},
@ -1031,7 +1032,7 @@ const myDetail = blocCdList => {
cols: 6,
labelCols: 12,
textCols: 12,
class: 'py-2 pr-4',
class: 'py-2 pl-4',
iconShow: true,
},
{
@ -1054,7 +1055,7 @@ const myDetail = blocCdList => {
cols: 6,
labelCols: 12,
textCols: 12,
class: 'py-2 pr-4',
class: 'py-2 pl-4',
iconShow: true,
placeholder: '시스템 자동입력',
},
@ -1078,7 +1079,7 @@ const myDetail = blocCdList => {
cols: 6,
labelCols: 12,
textCols: 12,
class: 'py-2 pr-4',
class: 'py-2 pl-4',
iconShow: true,
placeholder: '시스템 자동입력',
},