Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729

This commit is contained in:
dev
2025-07-31 11:33:52 +09:00
51 changed files with 1048 additions and 1645 deletions

View File

@ -4,24 +4,27 @@
<v-row ref="searchFilter">
<v-col :cols="12">
<v-card class="searchFilter">
<v-row align="center" no-gutters>
<v-col :cols="2">
<v-row align="end" no-gutters>
<div></div>
<v-col :cols="2.5">
<InputText
:parentPrgmId="myPrgmId"
label="배치ID"
valueNm="batchId"
:searchOption="true"
customClass="input-large"
/>
</v-col>
<v-col :cols="2">
<v-col :cols="2.5">
<InputText
:parentPrgmId="myPrgmId"
label="배치명"
valueNm="batchNm"
:searchOption="true"
customClass="input-large"
/>
</v-col>
<v-col :cols="2">
<v-col :cols="2.5">
<component
:is="'selectCodeList'"
:parentPrgmId="myPrgmId"
@ -29,20 +32,21 @@
:dataKey="'execRsltCd'"
:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_RSLT', useFg: '1' }"
:addAll="true"
customClass="select-large"
/>
</v-col>
<v-col :cols="2">
<v-col :cols="2.5">
<component
:is="'Datepicker'"
:parentPrgmId="myPrgmId"
:label="'조회기간'"
customClass="datepicker-large"
/>
</v-col>
<v-spacer></v-spacer>
<v-col :cols="4" class="text-right">
<div class="text-right d-flex align-end justify-end pl-9" style="gap: 8px">
<BtnSearch />
<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" />
</v-col>
<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" size="large" />
</div>
</v-row>
</v-card>
</v-col>
@ -426,7 +430,4 @@ const myDetail = [
class: 'py-2',
},
];
</script>
<style lang="scss">
@import '@/assets/scss/common.scss';
</style>
</script>

View File

@ -11,7 +11,7 @@
</v-col>
<v-col cols="3">
<!-- <component :is="'SelectDateSolo'" :parentPrgmId="myPrgmId" /> -->
<DatePicker :parentPrgmId="myPrgmId" :label="'조회연월'" />
<DatePicker :parentPrgmId="myPrgmId" customClass="datepicker-large" :label="'조회연월'" />
</v-col>
<v-col cols="6" class="text-right">
<BtnSearch @click="search()" size="large" />

View File

@ -1,6 +1,6 @@
<template>
<div class="l-layout">
<PageTitle text="공통코드" />
<CommonPageTitle/>
<v-row ref="searchFilter">
<v-col :cols="12">
<v-card class="searchFilter">
@ -56,7 +56,7 @@
</v-col>
<v-col :cols="12" class="text-right">
<BtnSearch style="margin-top:20px" @click="search" />
<BtnSearch style="margin-top:20px" @click="search" size="large" />
</v-col>
</v-row>
<!-- <v-row align="center" no-gutters>
@ -363,7 +363,7 @@ export default {
gridKey: this.gridName,
value: newRes,
});
this.loadGrid = true;
this.loadGrid = true;
this.$nextTick(() => {
if (newRes.length > 0) {
this.$refs[this.gridName].focus({

View File

@ -16,7 +16,7 @@
customClass="select-large"
/>
</v-col>
<v-col :cols="4">
<v-col :cols="3">
<InputText
:parentPrgmId="myPrgmId"
label="프로그램명"
@ -50,17 +50,16 @@
/>
</div>
</div>
<div style="min-height: 60vh">
<div ref="gridParent" class="px-5 h100">
<component
:ref="gridName"
:is="loadGrid ? 'Grid' : null"
:parentPrgmId="myPrgmId"
:gridName="gridName"
@getRowsData="getRowData"
:dataPath="dataPathMock"
/>
</div>
<div ref="gridParent" style="height: 60vh">
<!-- <div ref="gridParent" class="px-5 h100">
</div> -->
<component
:ref="gridName"
:is="loadGrid ? 'Grid' : null"
:parentPrgmId="myPrgmId"
:gridName="gridName"
@getRowsData="getRowData"
/>
</div>
</v-card>
</v-col>
@ -262,8 +261,6 @@ export default {
});
// this.getRowGridData();
this.loadGrid = true;
},
async search() {
await this.getRowGridData();
@ -296,7 +293,8 @@ export default {
gridKey: this.gridName,
value: newRes,
});
this.loadGrid = true;
this.$nextTick(() => {
if (newRes.length > 0) {
this.$refs[this.gridName].focus({
@ -316,6 +314,12 @@ export default {
});
},
async getRowData(data, gridName) {
// console.log("-----------------------DEBUG--getRowData--------------", {
// gridKey: gridName,
// gridSelect: true,
// rowGridSelectKey: data.rowKey,
// rowGridSelectData: data,
// });
this.setGridSelectData({
gridKey: gridName,
gridSelect: true,
@ -327,6 +331,7 @@ export default {
rowGridSelectKey: data.rowKey,
rowGridSelectData: data,
});
},
compareData(type, newDt) {
if (this.selectedCommCdData[type] == newDt) {