From d213733931aa7565dc3bc4b7bf2ec506edfc5839 Mon Sep 17 00:00:00 2001 From: KG Date: Fri, 30 May 2025 01:23:31 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=98=A4=EA=B8=B0,=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/app-vuero/ComVFlexTable.vue | 29 ++++++-- .../app-vuero/VFlexTableCustomize.vue | 73 ++++++++++++++----- src/pages/app/ApprovalManagement.vue | 44 +++++------ src/pages/app/contractManagement.vue | 36 ++++++--- 4 files changed, 124 insertions(+), 58 deletions(-) diff --git a/src/components/app-vuero/ComVFlexTable.vue b/src/components/app-vuero/ComVFlexTable.vue index 7ab0153..e9f18dc 100644 --- a/src/components/app-vuero/ComVFlexTable.vue +++ b/src/components/app-vuero/ComVFlexTable.vue @@ -29,7 +29,7 @@ export interface VFlexTableProps { clickable?: boolean subtable?: boolean noHeader?: boolean - usePaymentHeader?: boolean + useApprovalHeader?: boolean } const emits = defineEmits<{ @@ -37,7 +37,7 @@ const emits = defineEmits<{ }>() const props = withDefaults(defineProps(), { columns: undefined, - usePaymentHeader: false, + useApprovalHeader: false, data: () => [], }) @@ -109,7 +109,7 @@ const columns = computed(() => { props.subtable && 'sub-table', ]" > - +
{ } } -.paymentColumn1 { +.approvalColumn1 { min-width: 20%; } -.paymentColumn2 { +.approvalColumn2 { min-width: 40%; } -.paymentColumn3 { +.approvalColumn3 { min-width: 10%; } -.paymentColumn4 { +.approvalColumn4 { min-width: 20%; } -.paymentColumn5 { +.approvalColumn5 { min-width: 10%; } + +.flex-table-cell.is-relative.approvalColumn5 { + justify-content: center; +} +.flex-table-cell.is-relative.approvalColumn1 { + justify-content: center; +} +.flex-table-cell.is-relative.approvalColumn3 { + justify-content: center; +} +.flex-table-cell.is-relative.approvalColumn4 { + justify-content: center; +} diff --git a/src/components/app-vuero/VFlexTableCustomize.vue b/src/components/app-vuero/VFlexTableCustomize.vue index 59e6cb2..69661af 100644 --- a/src/components/app-vuero/VFlexTableCustomize.vue +++ b/src/components/app-vuero/VFlexTableCustomize.vue @@ -29,7 +29,7 @@ export interface VFlexTableProps { clickable?: boolean subtable?: boolean noHeader?: boolean - usePaymentHeader?: boolean + useContractHeader?: boolean } const emits = defineEmits<{ @@ -37,7 +37,7 @@ const emits = defineEmits<{ }>() const props = withDefaults(defineProps(), { columns: undefined, - usePaymentHeader: false, + useContractHeader: false, data: () => [], }) @@ -109,7 +109,7 @@ const columns = computed(() => { props.subtable && 'sub-table', ]" > - +
{ } } -.paymentColumn1 { - min-width: 20%; -} -.paymentColumn2 { - min-width: 40%; -} -.paymentColumn3 { - min-width: 10%; -} -.paymentColumn4 { - min-width: 20%; -} -.paymentColumn5 { - min-width: 10%; -} +//.contractColumn1 { +// min-width: 5%; +//} +//.contractColumn2 { +// min-width: 20%; +// overflow: hidden; +// white-space: nowrap; +// text-overflow: ellipsis; +//} +//.contractColumn3 { +// min-width: 10%; +//} +//.contractColumn4 { +// min-width: 5%; +//} +//.contractColumn5 { +// min-width: 10%; +//} +//.contractColumn6 { +// min-width: 15%; +//} +//.contractColumn7 { +// min-width: 15%; +//} +//.contractColumn8 { +// min-width: 10%; +//} +//.contractColumn9 { +// min-width: 10%; +//} +// +//.flex-table-cell.is-relative.contractColumn1 { +// justify-content: center; +//} +//.flex-table-cell.is-relative.contractColumn3 { +// justify-content: center; +//} +//.flex-table-cell.is-relative.contractColumn4 { +// justify-content: center; +//} +//.flex-table-cell.is-relative.contractColumn5 { +// justify-content: flex-end; +//} +//.flex-table-cell.is-relative.contractColumn6 { +// justify-content: center; +//} +//.flex-table-cell.is-relative.contractColumn7 { +// justify-content: center; +//} +//.flex-table-cell.is-relative.contractColumn9 { +// justify-content: center; +//} diff --git a/src/pages/app/ApprovalManagement.vue b/src/pages/app/ApprovalManagement.vue index 3a51a46..65af256 100644 --- a/src/pages/app/ApprovalManagement.vue +++ b/src/pages/app/ApprovalManagement.vue @@ -64,15 +64,17 @@ const notyf = useNotyf() const params = reactive({ title: '', priceData: [], + regSdt:'', + regEdt:'', flexColumn: [ - { key: 'process', label: '구분', cellClass: 'paymentColumn5' }, - { key: 'apprNo', label: '결재번호', cellClass: 'paymentColumn1' }, - { key: 'title', label: '제목', cellClass: 'paymentColumn2' }, - { key: 'name', label: '작성자', cellClass: 'paymentColumn3' }, + { key: 'process', label: '구분', cellClass: 'approvalColumn5' }, + { key: 'apprNo', label: '결재번호', cellClass: 'approvalColumn1' }, + { key: 'title', label: '제목', cellClass: 'approvalColumn2' }, + { key: 'name', label: '작성자', cellClass: 'approvalColumn3' }, { key: 'regDt', label: '등록일', - cellClass: 'paymentColumn4', + cellClass: 'approvalColumn4', format: formatRegDt, }, ], @@ -85,13 +87,13 @@ function formatRegDt(value) { } async function getIntegratedPaymentList() { - const paymentParams = { + const approvalParams = { title: '', page: '1', row: '10', sabun: '17131303', // 김진형 17131303, 손원창 17131304 } - const result = await getIntegratedApproval(paymentParams) + const result = await getIntegratedApproval(approvalParams) params.approvalParams = result.content.map(item => ({ ...item, process: gubunMap[item.gubun] || '', @@ -102,27 +104,27 @@ async function getIntegratedPaymentList() { } async function updateIntegratedPaymentApprovalFunc() { - const paymentUpdateParams = { + const approvalUpdateParams = { apprNo: params.rowData.apprNo, apprOrd: params.rowData.apprOrd, sabun: params.rowData.sabun, apprStatCd: '0200', // 결재 상태변경 (결재승인 0200 결재회수 0300 결재반려 0400) reason: '', } - const result = await updateApprovalStatus(paymentUpdateParams) + const result = await updateApprovalStatus(approvalUpdateParams) notyf.primary("결재승인완료") window.location.reload() } async function updateIntegratedPaymentRejectionFunc() { - const paymentUpdateParams = { + const approvalUpdateParams = { apprNo: params.rowData.apprNo, apprOrd: params.rowData.apprOrd, sabun: params.rowData.sabun, apprStatCd: '0400', // 결재 상태변경 (결재승인 0200 결재회수 0300 결재반려 0400) reason: '', } - const result = await updateApprovalStatus(paymentUpdateParams) + const result = await updateApprovalStatus(approvalUpdateParams) notyf.primary("결재반려완료") window.location.reload() } @@ -196,7 +198,7 @@ const onRowClick = async (row) => {
- + 등록기간 @@ -224,8 +226,8 @@ const onRowClick = async (row) => {
-
- ~ +
+ ~
{ :separators="true" :clickable="true" :compact="true" - :use-payment-header="true" + :use-approval-header="true" @row-click="onRowClick" > -