From e61f42350c92d9d397a44cc0af8a5e2fa23e71d0 Mon Sep 17 00:00:00 2001 From: Kasi Date: Thu, 5 Jun 2025 10:47:26 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fix=20:=20=EA=B3=84=EC=95=BD=EA=B4=80?= =?UTF-8?q?=EB=A6=AC,=20=EA=B2=B0=EC=9E=AC=ED=95=A8=20=EB=A9=94=EB=89=B4?= =?UTF-8?q?=20=EB=93=B1=EB=A1=9D=EA=B8=B0=EA=B0=84=20=EC=8B=9C=EC=9E=91?= =?UTF-8?q?=EC=9D=BC=20=EA=B8=B0=EB=B3=B8=EA=B0=92=20=EC=A3=BC=EC=84=9D?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20fix=20:=20=EA=B3=84=EC=95=BD=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=8C=80=EA=B8=88=EC=B2=AD=EA=B5=AC=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=83=89=20=EB=B3=80=EA=B2=BD=20fix=20:=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=BC=EB=AA=85=20=EB=B3=80=EA=B2=BD=20(=EB=B9=84?= =?UTF-8?q?=EA=B3=A0=20->=20=EA=B7=BC=ED=83=9C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/app/ApprovalManagement.vue | 4 ++-- src/pages/app/contractManagement.vue | 16 ++++++++++++---- src/pages/app/priceDetail.vue | 4 ++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/pages/app/ApprovalManagement.vue b/src/pages/app/ApprovalManagement.vue index 9896096..71d65e7 100644 --- a/src/pages/app/ApprovalManagement.vue +++ b/src/pages/app/ApprovalManagement.vue @@ -69,8 +69,8 @@ function formatRegDt(value) { } async function getIntegratedApprovalList() { - const today = new Date() - searchParamsList.regSdt = new Date().setDate(today.getDate() - 30) + // const today = new Date() + // searchParamsList.regSdt = new Date().setDate(today.getDate() - 30) const approvalParams = { title: params.title, diff --git a/src/pages/app/contractManagement.vue b/src/pages/app/contractManagement.vue index 16b04fe..24289cd 100644 --- a/src/pages/app/contractManagement.vue +++ b/src/pages/app/contractManagement.vue @@ -24,8 +24,8 @@ onBeforeMount(async () => { }) async function getContractListView() { - const today = new Date() - params.signSdt = new Date().setDate(today.getDate() - 30) + // const today = new Date() + // params.signSdt = new Date().setDate(today.getDate() - 30) const contractParams = { params:{ @@ -124,6 +124,14 @@ function getBilling(row){ } //detail로 수정하기 현재 : 대금지급전 } +const isBizNoEditable = ref(false) + +function openEditForm(arg) { + // 수정폼 오픈 시 + isBizNoEditable.value = false + // ...데이터 매핑 등 +} + watch(currentPage, (newParams) => { currentPage.value = newParams searchContract(currentPage.value) @@ -277,7 +285,7 @@ watch(currentPage, (newParams) => {
@@ -285,7 +293,7 @@ watch(currentPage, (newParams) => { diff --git a/src/pages/app/priceDetail.vue b/src/pages/app/priceDetail.vue index 5d28091..d455e31 100644 --- a/src/pages/app/priceDetail.vue +++ b/src/pages/app/priceDetail.vue @@ -54,7 +54,7 @@ const params = reactive({ { key: 'deptNm', label: '부서' }, { key: 'sabun', label: '사번' }, { key: 'name', label: '이름' }, - { key: 'attendNm', label: '비고' }, + { key: 'attendNm', label: '근태' }, { key: 'apprStat', label: '결재상태'}, { key: 'apprDt', label: '승인일자'}, ], @@ -425,7 +425,7 @@ function minAmtCalc (est) { 최소견적서
-
사업자명 : {{params.minAmtComp.join(',')}}
+
사업자명 : {{params.minAmtComp.join(', ')}}
견적 금액 : {{formatCurrency(params.minAmt)}}원
From 068bab4e0f8f772ba40a6a509f133d9f3e1a21b9 Mon Sep 17 00:00:00 2001 From: Kasi Date: Thu, 5 Jun 2025 14:21:29 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=ED=83=9C=EA=B7=B8=EB=B3=80=EA=B2=BD=20(in?= =?UTF-8?q?put=20->=20span)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/app/documentManagementDetail.vue | 171 ++++----------------- 1 file changed, 32 insertions(+), 139 deletions(-) diff --git a/src/pages/app/documentManagementDetail.vue b/src/pages/app/documentManagementDetail.vue index cf636fa..01eae45 100644 --- a/src/pages/app/documentManagementDetail.vue +++ b/src/pages/app/documentManagementDetail.vue @@ -129,10 +129,7 @@ const addTabFromRow = (row,index) => { 소속 - - + {{affiliationCode}} @@ -141,47 +138,30 @@ const addTabFromRow = (row,index) => { 계약명 - - - + {{params.title}} 계약상대자 - + - - - + {{params.regNm}} - - - + 업체명 : {{params.place}} - - + + + 구매처 확인 - + 정상 @@ -191,14 +171,7 @@ const addTabFromRow = (row,index) => { 공급가액 - - - + {{formattedNumber}} (부가세 별도) @@ -207,121 +180,61 @@ const addTabFromRow = (row,index) => { - - - + {{taxCode}} 통화 - - - + {{currencyCode}} 증빙일 -
- - - -
+ + {{ params.regSdt }} + 전기일 - -
- - - -
+ + + {{ params.regSdt2 }} + 계좌관리 - - - + {{params.bankl}} - - - + {{params.bankn}} - - + + 계좌조회 - + 정상 - 세금계산서 - - + {{taxInvoiceCode}} @@ -331,36 +244,24 @@ const addTabFromRow = (row,index) => { G/L계정// 설정필요 - - + {{accountSubjectCode}} - - - + 코스트센터/WBS{{selectCostCode}} - - - + 코스트센터/WBS코드예정 @@ -427,9 +328,6 @@ const addTabFromRow = (row,index) => { text-align: center; } - tr:nth-child(3) { - text-align: center; - } tr td button{ width: 100%; @@ -462,13 +360,8 @@ button:nth-child(3) { .field { margin: 0px 0px; } - - - .disabled-button { - //opacity: 0.5; - background-color: #ccc; - cursor: not-allowed; - //transition: all 0.2s; - } +.button[disabled], fieldset[disabled] .button { + opacity: 1.0; +} From 37ec33d8652c9fee4751a1dbb8a1543aee31b321 Mon Sep 17 00:00:00 2001 From: Kasi Date: Thu, 5 Jun 2025 14:24:34 +0900 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20UI=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC=20=EB=B0=8F=20=EB=B6=88?= =?UTF-8?q?=ED=95=84=EC=9A=94=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/app/contractDetail.vue | 106 ++++++++++++--------------- src/pages/app/contractManagement.vue | 9 --- 2 files changed, 45 insertions(+), 70 deletions(-) diff --git a/src/pages/app/contractDetail.vue b/src/pages/app/contractDetail.vue index 1cbc728..e174090 100644 --- a/src/pages/app/contractDetail.vue +++ b/src/pages/app/contractDetail.vue @@ -275,56 +275,56 @@ const onPrcsFileDownload = async (contNo: string, fileOrd: number, logiFnm: stri - - 가격조사 가져오기 - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + +
- - - - - + + + + + + + + + +
@@ -410,22 +410,6 @@ const onPrcsFileDownload = async (contNo: string, fileOrd: number, logiFnm: stri > 계 약 금 액
- - - - diff --git a/src/pages/app/contractManagement.vue b/src/pages/app/contractManagement.vue index 24289cd..423a12a 100644 --- a/src/pages/app/contractManagement.vue +++ b/src/pages/app/contractManagement.vue @@ -37,7 +37,6 @@ async function getContractListView() { } const result = await getContractList(contractParams) data.contractData = result.content - console.log('result', data.contractData) //페이지 관련 값 설정 totalItems.value = result.totalElements totalPages.value = result.totalPages @@ -124,14 +123,6 @@ function getBilling(row){ } //detail로 수정하기 현재 : 대금지급전 } -const isBizNoEditable = ref(false) - -function openEditForm(arg) { - // 수정폼 오픈 시 - isBizNoEditable.value = false - // ...데이터 매핑 등 -} - watch(currentPage, (newParams) => { currentPage.value = newParams searchContract(currentPage.value) From 6cb781a26c34ee8b607e20159f4901449e04d684 Mon Sep 17 00:00:00 2001 From: Kasi Date: Thu, 5 Jun 2025 14:26:19 +0900 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=EC=82=AC=EC=97=85=EC=9E=90=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B8=B0=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EB=B3=B4=EA=B0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/app/contractUpdate.vue | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/pages/app/contractUpdate.vue b/src/pages/app/contractUpdate.vue index c525c2c..8f10af6 100644 --- a/src/pages/app/contractUpdate.vue +++ b/src/pages/app/contractUpdate.vue @@ -305,12 +305,20 @@ const showReasonError = computed(() => (!completedPriceDataParams.reason || !completedPriceDataParams.reason.trim()) ) -const estimateBizNoOptions = computed(() => - completedPriceDataParams.estimates.map(est => ({ - value: est.bizNo, - text: est.bizNo - })) -) + +const estimateBizNoOptions = computed(() => { + if (completedPriceDataParams.compNm) { + return [{ + value: completedPriceDataParams.bizNo, + text: completedPriceDataParams.bizNo + }] + } + + return completedPriceDataParams.estimates.map(est => ({ + value: est.bizNo, + text: est.bizNo + })) +}) function onBizNoChange() { const selected = completedPriceDataParams.estimates.find(est => est.bizNo === completedPriceDataParams.bizNo) From 937b1fb3db797c6d4b43077c24c838bafc61a1d9 Mon Sep 17 00:00:00 2001 From: Kasi Date: Thu, 5 Jun 2025 14:32:17 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix=20:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/app/ApprovalManagement.vue | 2 -- src/pages/app/contractManagement.vue | 2 -- src/pages/app/priceManagement.vue | 3 --- 3 files changed, 7 deletions(-) diff --git a/src/pages/app/ApprovalManagement.vue b/src/pages/app/ApprovalManagement.vue index 71d65e7..a11cf18 100644 --- a/src/pages/app/ApprovalManagement.vue +++ b/src/pages/app/ApprovalManagement.vue @@ -69,8 +69,6 @@ function formatRegDt(value) { } async function getIntegratedApprovalList() { - // const today = new Date() - // searchParamsList.regSdt = new Date().setDate(today.getDate() - 30) const approvalParams = { title: params.title, diff --git a/src/pages/app/contractManagement.vue b/src/pages/app/contractManagement.vue index 423a12a..949aa7a 100644 --- a/src/pages/app/contractManagement.vue +++ b/src/pages/app/contractManagement.vue @@ -24,8 +24,6 @@ onBeforeMount(async () => { }) async function getContractListView() { - // const today = new Date() - // params.signSdt = new Date().setDate(today.getDate() - 30) const contractParams = { params:{ diff --git a/src/pages/app/priceManagement.vue b/src/pages/app/priceManagement.vue index 6ef3922..b379887 100644 --- a/src/pages/app/priceManagement.vue +++ b/src/pages/app/priceManagement.vue @@ -38,9 +38,6 @@ const params = reactive({ }) async function getPriceListData(){ - const today = new Date() - searchParamsList.regSdt = new Date().setDate(today.getDate() - 30) - const priceBase = { params:{ regSdt: formatDatefromString(searchParamsList.regSdt), From 800b5c7434ee27ba9f94a9a957ced311057dff56 Mon Sep 17 00:00:00 2001 From: Kasi Date: Thu, 5 Jun 2025 16:12:12 +0900 Subject: [PATCH 6/6] =?UTF-8?q?func=20:=20=EA=B2=B0=EC=9E=AC=ED=95=A8=20-?= =?UTF-8?q?=20SAP=20=EB=A1=9C=EC=9A=B0=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/app/ApprovalManagement.vue | 20 ++++++++++------- src/pages/app/documentManagementDetail.vue | 7 ++++-- src/service/sapApprovalApi.ts | 26 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 src/service/sapApprovalApi.ts diff --git a/src/pages/app/ApprovalManagement.vue b/src/pages/app/ApprovalManagement.vue index a11cf18..1a5916a 100644 --- a/src/pages/app/ApprovalManagement.vue +++ b/src/pages/app/ApprovalManagement.vue @@ -1,6 +1,5 @@