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

merge 2207

Browse Source
This commit is contained in:
Your Name
2025-07-22 12:24:07 +09:00
parent eedbf94d56
commit e2f7ab5113
12 changed files with 501 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pages/comm/auth/MenuMngPage.vue
View File

@ -23,7 +23,7 @@
</v-row>
<v-row ref="contents" class="mt-4">
<v-col :cols="6" class="h100">
<v-col :cols="6" class="h100 pr-2">
<v-card class="pb-5">
<div class="d-flex align-center justify-space-between pa-4">
<v-card-title class="pa-0">메뉴 리스트</v-card-title>
@ -39,7 +39,7 @@
</div>
</v-card>
</v-col>
<v-col :cols="6" class="h100">
<v-col :cols="6" class="h100 pl-3">
<v-card class="pb-5">
<div class="d-flex align-center justify-space-between pa-4">
<v-card-title class="pa-0">메뉴 상세</v-card-title>
@ -480,6 +480,7 @@ const myDetail = [
list: 'sysDivCdList',
itemText: 'commCdNm',
itemValue: 'commCd',
iconShow: true,
},
{
type: 'CheckBox',

14
pages/comm/base/BatchMngPage.vue
View File

@ -14,7 +14,7 @@
:customClass="'input-large'" />
</v-col>
<v-col :cols="2.5">
<!-- <component
<component
:is="'selectCodeList'"
:parentPrgmId="myPrgmId"
:label="'배치 실행 구분'"
@ -22,17 +22,17 @@
:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }"
:addAll="true"
:customClass="'select-large'"
/> -->
/>
</v-col>
<v-col :cols="2.5">
<!-- <component
<component
:is="'selectCodeList'"
:parentPrgmId="myPrgmId"
:label="'사용여부'"
:dataKey="'searchUseFg'"
:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
:customClass="'select-large'"
/> -->
/>
</v-col>
<BtnSearch size="large" />
@ -41,9 +41,9 @@
</v-col>
</v-row>
<v-row ref="contents">
<v-row ref="contents" class="mt-4">
<!-- 배치 리스트 -->
<v-col :cols="6" class="h100">
<v-col :cols="6" class="h100 pr-2">
<v-card class="pb-5">
<div class="d-flex align-center justify-space-between pa-4">
<!-- <v-card-title>
@ -64,7 +64,7 @@
</v-card>
</v-col>
<!-- 배치 상세 -->
<v-col :cols="6" class="h100">
<v-col :cols="6" class="h100 pl-3">
<v-card class="pd-y-20 h100">
<v-card-title class="d-flex justify-space-between align-end pa-4">
<span class="tit ft-size_20 ft-weight_600">배치 상세</span>

315
pages/comm/base/CalendarMngPage.vue
View File

@ -3,65 +3,45 @@
<v-row ref="searchFilter">
<v-col :cols="12">
<v-card class="searchFilter">
<v-row align="center" no-gutters>
<v-col cols="2">
<component
:is="'SelectBlocMstr'"
:parentPrgmId="myPrgmId"
:sendParam="{ comId }"
/>
<v-row align="end" no-gutters>
<v-col cols="3">
<component :is="'SelectBlocMstr'" :parentPrgmId="myPrgmId" :sendParam="{ comId }"
:labelCols="12" :textCols="12" :customClass="'select-large'" />
</v-col>
<v-col cols="3">
<!-- <component :is="'SelectDateSolo'" :parentPrgmId="myPrgmId" /> -->
<DatePicker :parentPrgmId="myPrgmId" :label="'조회연월'" />
</v-col>
<v-col cols="7" class="text-right">
<v-btn :ripple="false" @click="search()">조회</v-btn>
<v-col cols="6" class="text-right">
<BtnSearch @click="search()" size="large" />
</v-col>
</v-row>
</v-card>
</v-col>
</v-row>
<v-row ref="contents" id="CalendarMngContent">
<v-col cols="12" lg="4" class="h100">
<v-row ref="contents" id="CalendarMngContent" class="mt-4">
<v-col cols="12" lg="4" class="h100 pr-2">
<v-card class="w100">
<v-card-title class="d-flex justify-space-between align-center">
<span class="custom-title-4">캘린더 리스트</span>
<Buttons
:parentPrgmId="myPrgmId"
:bindingData="gridName"
:btnActionsFnc="btnActions"
/>
<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
</v-card-title>
<v-card-actions
class="pt-0 px-5 pb-5"
:style="{ height: 'calc(100% - 72.56px)' }"
>
<v-card-actions class="pt-0 px-5 pb-5" :style="{ height: 'calc(100% - 72.56px)' }">
<div ref="gridParent" class="w100 h100">
<component
class="w100"
:ref="gridName + myPrgmId"
:is="loadGrid ? 'Grid' : null"
:gridName="gridName"
:parentPrgmId="myPrgmId"
:editorGrid="true"
@getRowsData="getRowData"
/>
<component class="w100" :ref="gridName + myPrgmId" :is="loadGrid ? 'Grid' : null"
:gridName="gridName" :parentPrgmId="myPrgmId" :editorGrid="true"
@getRowsData="getRowData" :dataPath="dataPathExample" />
</div>
</v-card-actions>
</v-card>
</v-col>
<v-col cols="12" lg="8" class="h100">
<v-col cols="12" lg="8" class="h100 pl-3">
<v-card>
<v-card-title>
<span class="custom-title-4">캘린더 미리보기</span>
</v-card-title>
<v-card-actions class="px-5" :style="{ height: 'calc(100% - 62px)' }">
<Calendar
:parentPrgmId="myPrgmId"
:gridName="gridName"
:headerVisible="false"
/>
<v-card-actions class="px-5 d-block" :style="{ height: 'calc(100% - 62px)' }">
<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false" />
</v-card-actions>
</v-card>
</v-col>
@ -75,6 +55,7 @@ import { mapState, mapMutations, mapActions } from 'vuex';
import Utility from '~/plugins/utility';
import Grid from '~/components/common/Grid';
import Buttons from '~/components/common/button/Buttons';
import BtnSearch from '~/components/common/button/BtnSearch';
import SelectBlocMstr from '@/components/common/select/SelectBlocMstr';
// import SelectDateSolo from "@/components/common/select/SelectDateSolo";
import InputText from '@/components/common/input/InputText';
@ -107,12 +88,87 @@ export default {
InputText,
Calendar,
DatePicker,
BtnSearch
},
data() {
return {
myPrgmId: myPrgmId,
gridName: 'rowGrid',
loadGrid: false,
loadGrid: true,
dataPathExample: {
"rowGrid": {
data: [
{
"hldyFg": "평일",
"hldyNm": ""
},
{
"dt": "2025-07-23",
"dtNm": "수요일",
"dt": "2025-07-21",
"dtNm": "월요일",
"hldyFg": "평일",
"hldyNm": ""
},
{
"dt": "2025-07-22",
"dtNm": "화요일",
"hldyFg": "평일",
"hldyNm": ""
},
{
"dt": "2025-07-24",
"dtNm": "목요일",
"hldyFg": "평일",
"hldyNm": ""
},
{
"dt": "2025-07-25",
"dtNm": "금요일",
"hldyFg": "평일",
"hldyNm": ""
},
{
"dt": "2025-07-26",
"dtNm": "토요일",
"hldyFg": "주말",
"hldyNm": ""
},
{
"dt": "2025-07-27",
"dtNm": "일요일",
"hldyFg": "휴일",
"hldyNm": "정기휴일"
}
],
column: [
{
header: '일자',
name: 'dt',
align: 'center',
// formatter({ value }) {
// return value.split(' ')[0];
// },
},
{
header: '요일',
name: 'dtNm',
align: 'center',
// formatter({ value }) {
// return value + '요일';
// },
},
{
header: '구분',
name: 'hldyFg',
align: 'center',
essential: true,
},
{ header: '휴일명', name: 'hldyNm', editor: 'text' },
],
}
},
rowKey: null,
edtingFinishFlag: 'Y',
};
@ -165,8 +221,8 @@ export default {
defaultData: defaultData,
});
},
created() {},
mounted() {},
created() { },
mounted() { },
methods: {
...mapMutations({
setPageData: 'setPageData',
@ -185,16 +241,16 @@ export default {
await this.gridInit();
},
async search() {
await this.getRowGridData();
// await this.getRowGridData();
},
async gridInit() {
const gridHeight = this.$refs.gridParent.offsetHeight - 30;
this.setGridOption({
gridKey: this.gridName,
value: Object.assign(Utility.defaultGridOption(gridHeight), {
scrollX: false,
}),
});
// const gridHeight = this.$refs.gridParent.offsetHeight - 30;
// this.setGridOption({
// gridKey: this.gridName,
// value: Object.assign(Utility.defaultGridOption(gridHeight), {
// scrollX: false,
// }),
// });
// this.getRowGridData();
},
@ -229,7 +285,7 @@ export default {
document
.querySelector('#CalendarMngContent')
.addEventListener('click', function(event) {
.addEventListener('click', function (event) {
if (event.target.className == 'calendarOption') {
// el.size = 1;
}
@ -294,86 +350,86 @@ export default {
this.loadGrid = false;
let res = await this.postApiReturn({
apiKey: 'selectWorkCald',
resKey: 'workcaldData',
sendParam: {
blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
yymm: this.chkFromDt,
comId: this.comId,
},
});
// let res = await this.postApiReturn({
// apiKey: 'selectWorkCald',
// resKey: 'workcaldData',
// sendParam: {
// blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
// yymm: this.chkFromDt,
// comId: this.comId,
// },
// });
let res2 = await this.postApiReturn({
apiKey: 'selectWorkCaldDetl',
resKey: 'workcaldDetlData',
sendParam: {
blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
yymm: this.chkFromDt,
comId: this.comId,
},
});
// let res2 = await this.postApiReturn({
// apiKey: 'selectWorkCaldDetl',
// resKey: 'workcaldDetlData',
// sendParam: {
// blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
// yymm: this.chkFromDt,
// comId: this.comId,
// },
// });
for (var i = 0; i < res2.length; i++) {
if (
!(
res2[i].hldyNm == null ||
res2[i].hldyNm == '토요일' ||
res2[i].hldyNm == '일요일'
)
) {
for (var j = i + 1; j < res2.length; j++) {
if (res2[i].hldyNm == res2[j].hldyNm) {
res2[i].hldyNm = '';
}
}
}
}
// for (var i = 0; i < res2.length; i++) {
// if (
// !(
// res2[i].hldyNm == null ||
// res2[i].hldyNm == '토요일' ||
// res2[i].hldyNm == '일요일'
// )
// ) {
// for (var j = i + 1; j < res2.length; j++) {
// if (res2[i].hldyNm == res2[j].hldyNm) {
// res2[i].hldyNm = '';
// }
// }
// }
// }
res = res.map(item => {
const dt = this.$dayjs(item.dt.split(' ')[0]); // YYYY-MM-DD
const dtNm = dt.format('ddd'); // 요일
const newItem = {
...item,
dtNm: dtNm,
hldyNm: item.hldyNm ? item.hldyNm : '',
rowStat: null,
};
return newItem;
});
// res = res.map(item => {
// const dt = this.$dayjs(item.dt.split(' ')[0]); // YYYY-MM-DD
// const dtNm = dt.format('ddd'); // 요일
// const newItem = {
// ...item,
// dtNm: dtNm,
// hldyNm: item.hldyNm ? item.hldyNm : '',
// rowStat: null,
// };
// return newItem;
// });
this.loadGrid = true;
this.setPageData({ isFind: false });
// this.loadGrid = true;
// this.setPageData({ isFind: false });
this.setGridColumn({
gridKey: this.gridName,
value: myColumns,
});
// this.setGridColumn({
// gridKey: this.gridName,
// value: myColumns,
// });
this.setGridData({
gridKey: this.gridName,
value: res,
});
// this.setGridData({
// gridKey: this.gridName,
// value: res,
// });
this.setPageData({ planData: res2 });
// this.setPageData({ planData: res2 });
// 첫번째 row 선택상태
this.$nextTick(() => {
this.$refs[this.gridName + this.myPrgmId].focus({
//rowKey: 0,
rowKey:
this.pageData.rowGridSelectKey == '' ||
this.pageData.rowGridSelectKey == null
? 0
: this.pageData.rowGridSelectKey ==
this.$refs[this.gridName + this.myPrgmId].getData().length - 1
? this.pageData.rowGridSelectKey
: 0,
columnName: 'dt',
setScroll: true,
});
this.setPageData({ isFind: false });
});
// // 첫번째 row 선택상태
// this.$nextTick(() => {
// this.$refs[this.gridName + this.myPrgmId].focus({
// //rowKey: 0,
// rowKey:
// this.pageData.rowGridSelectKey == '' ||
// this.pageData.rowGridSelectKey == null
// ? 0
// : this.pageData.rowGridSelectKey ==
// this.$refs[this.gridName + this.myPrgmId].getData().length - 1
// ? this.pageData.rowGridSelectKey
// : 0,
// columnName: 'dt',
// setScroll: true,
// });
// this.setPageData({ isFind: false });
// });
},
async getRowData(data, gridName) {
this.setGridSelectData({
@ -488,6 +544,7 @@ const defaultData = {
.selectbox:focus {
outline: none;
}
.calendarOption {
box-sizing: border-box;
position: relative;
@ -501,20 +558,26 @@ select.selectbox {
box-sizing: border-box;
position: relative;
width: 100%;
height: 100%; /* 높이 초기화 */
height: 100%;
/* 높이 초기화 */
padding: 0;
margin: 0;
line-height: normal; /* line-height 초기화 */
font-family: inherit; /* 폰트 상속 */
line-height: normal;
/* line-height 초기화 */
font-family: inherit;
/* 폰트 상속 */
border: 0;
// opacity: 0; /* 숨기기 */
// filter:alpha(opacity=0); /* IE8 숨기기 */
// -webkit-appearance: none; /* 네이티브 외형 감추기 */
// -moz-appearance: none;
// appearance: none;
opacity: 1; /* 숨기기 */
filter: alpha(opacity=1); /* IE8 숨기기 */
-webkit-appearance: auto; /* 네이티브 외형 감추기 */
opacity: 1;
/* 숨기기 */
filter: alpha(opacity=1);
/* IE8 숨기기 */
-webkit-appearance: auto;
/* 네이티브 외형 감추기 */
-moz-appearance: auto;
appearance: auto;
}