Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-luannv24-s2s17s15-fixbug
This commit is contained in:
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
@ -15,25 +15,15 @@
|
||||
:customClass="'input-large'" />
|
||||
</v-col>
|
||||
<v-col :cols="2.5">
|
||||
<component
|
||||
:is="'selectCodeList'"
|
||||
:parentPrgmId="myPrgmId"
|
||||
:label="'배치 실행 구분'"
|
||||
<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'배치 실행 구분'"
|
||||
:dataKey="'searchBatchExecTp'"
|
||||
:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }"
|
||||
:addAll="true"
|
||||
:customClass="'select-large'"
|
||||
/>
|
||||
:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }" :addAll="true"
|
||||
:customClass="'select-large'" />
|
||||
</v-col>
|
||||
<v-col :cols="2.5" class="pr-4">
|
||||
<component
|
||||
:is="'selectCodeList'"
|
||||
:parentPrgmId="myPrgmId"
|
||||
:label="'사용여부'"
|
||||
:dataKey="'searchUseFg'"
|
||||
:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
|
||||
:customClass="'select-large'"
|
||||
/>
|
||||
<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'사용여부'"
|
||||
:dataKey="'searchUseFg'" :sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
|
||||
:customClass="'select-large'" />
|
||||
</v-col>
|
||||
<BtnSearch size="large" class="mr-2" />
|
||||
|
||||
@ -42,9 +32,9 @@
|
||||
</v-col>
|
||||
</v-row>
|
||||
|
||||
<v-row ref="contents" class="mt-4">
|
||||
<v-row ref="contents" class="mt-4 h100">
|
||||
<!-- 배치 리스트 -->
|
||||
<v-col :cols="6" class="h100 pr-2">
|
||||
<v-col :cols="6" class="pr-2">
|
||||
<v-card class="pb-5">
|
||||
<div class="d-flex align-center justify-space-between pa-4">
|
||||
<!-- <v-card-title>
|
||||
@ -56,7 +46,7 @@
|
||||
:btnActionsFnc="btnActions" />
|
||||
</div>
|
||||
<div class="px-4">
|
||||
<div ref="gridParent" class="h100 w100">
|
||||
<div ref="gridParent" class="h100 w100" style="height:calc(100% - 70px)">
|
||||
<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
|
||||
:gridName="gridName" @getRowsData="getRowData" />
|
||||
</div>
|
||||
@ -65,7 +55,7 @@
|
||||
</v-card>
|
||||
</v-col>
|
||||
<!-- 배치 상세 -->
|
||||
<v-col :cols="6" class="h100 pl-3">
|
||||
<v-col :cols="6" class="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>
|
||||
@ -82,14 +72,17 @@
|
||||
<v-card style="height: 100%">
|
||||
<v-card-title class="v-card__title d-flex align-center justify-space-between">
|
||||
<span class="custom-title-4">DB 프로시져 파라메터 설정</span>
|
||||
<div>
|
||||
<Buttons :parentPrgmId="myPrgmId" :bindingData="gridNameParam"
|
||||
:btnActionsFnc="btnActionsParam" />
|
||||
</div>
|
||||
<a-button icon="close" type="text" @click="dialog = false"></a-button>
|
||||
|
||||
</v-card-title>
|
||||
<div class="pa-5">
|
||||
<v-row align="center" no-gutters>
|
||||
<v-col cols="12" class="text-right"> </v-col>
|
||||
<v-row align="end" no-gutters>
|
||||
<v-col cols="12" class="d-flex justify-end">
|
||||
|
||||
<Buttons :parentPrgmId="myPrgmId" :bindingData="gridNameParam"
|
||||
:btnActionsFnc="btnActionsParam" />
|
||||
|
||||
</v-col>
|
||||
</v-row>
|
||||
</div>
|
||||
<v-card-text style="height: 300px;">
|
||||
@ -101,10 +94,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</v-card-text>
|
||||
<v-card-actions>
|
||||
<v-spacer></v-spacer>
|
||||
<v-btn color="primary" dark @click="setParamChangeData()">확인</v-btn>
|
||||
<v-btn color="primary" dark @click="dialog = false">닫기</v-btn>
|
||||
<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
|
||||
<a-button :ripple="false" @click="dialog = false" class="mr-2">닫기</a-button>
|
||||
<a-button :ripple="false" type="primary" @click="setParamChangeData()">확인</a-button>
|
||||
</v-card-actions>
|
||||
</v-card>
|
||||
</v-dialog>
|
||||
@ -156,7 +148,7 @@ export default {
|
||||
myPrgmId: myPrgmId,
|
||||
loadGrid: false,
|
||||
gridName: 'rowGrid',
|
||||
|
||||
|
||||
// rowGridOrigin: [],
|
||||
detailList: myDetail,
|
||||
|
||||
@ -261,7 +253,7 @@ export default {
|
||||
|
||||
const _this = this;
|
||||
const myColumns = [
|
||||
{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
|
||||
{ header: '배치ID', name: 'batchId', align: 'right', width: 100 },
|
||||
{ header: '배치명', name: 'batchNm', minWidth: 200 },
|
||||
{
|
||||
header: '배치 실행 구분',
|
||||
@ -283,7 +275,6 @@ export default {
|
||||
{
|
||||
header: '사용여부',
|
||||
name: 'useFg',
|
||||
align: 'center',
|
||||
width: 145,
|
||||
formatter({ value }) {
|
||||
let retVal = '';
|
||||
@ -556,7 +547,7 @@ export default {
|
||||
}
|
||||
},
|
||||
gridParamInit() {
|
||||
|
||||
|
||||
const gridHeight = this.$refs.gridParent.offsetHeight - 36;
|
||||
const myOptions = {
|
||||
columnOptions: {
|
||||
@ -567,6 +558,10 @@ export default {
|
||||
selectionUnit: 'row',
|
||||
editingEvent: 'click',
|
||||
scrollX: false,
|
||||
header: {
|
||||
height: 37,
|
||||
},
|
||||
rowHeight: 37,
|
||||
};
|
||||
this.setGridOption({
|
||||
gridKey: this.gridNameParam,
|
||||
@ -592,7 +587,6 @@ export default {
|
||||
{
|
||||
header: 'MODE',
|
||||
name: 'mode',
|
||||
align: 'center',
|
||||
formatter({ value }) {
|
||||
return value == ('OUT' || 'out') ? 'OUT' : 'IN';
|
||||
},
|
||||
@ -642,7 +636,7 @@ export default {
|
||||
},
|
||||
getRowParamData() {
|
||||
this.paramLoadGrid = false;
|
||||
// let res = [];
|
||||
let res = [];
|
||||
|
||||
// /* this.pageData.paramStrData 처리 */
|
||||
// // console.log("this.pageData.paramStrData : ", JSON.parse(this.pageData.paramStrData));
|
||||
@ -717,7 +711,6 @@ export default {
|
||||
},
|
||||
inputClick(event, item, valueNm) {
|
||||
if (valueNm == 'refVal1') {
|
||||
this.dialog = true;
|
||||
const rowIdxKey = this.$refs[this.gridName].gridInstance.invoke(
|
||||
'getFocusedCell',
|
||||
).rowKey;
|
||||
|
||||
Reference in New Issue
Block a user