From 801663b7431d82086af6d9edd3a5aab1efae7c92 Mon Sep 17 00:00:00 2001 From: Yesol Choi Date: Fri, 30 May 2025 11:34:29 +0900 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=EA=B2=B0=EC=9E=AC=EC=84=A0=20?= =?UTF-8?q?=EB=A7=88=EC=A7=80=EB=A7=89=20=EC=B2=B4=ED=81=AC=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=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/priceUpdate.vue | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/pages/app/priceUpdate.vue b/src/pages/app/priceUpdate.vue index 58d8035..177f008 100644 --- a/src/pages/app/priceUpdate.vue +++ b/src/pages/app/priceUpdate.vue @@ -69,6 +69,7 @@ const params = reactive({ const pbAtts = ref(params.prcsAtts) function getDetailList(arg){ + console.log("arg res",arg) params.prcsNo = arg.prcsNo params.stCd = arg.stCd params.cateSelect = arg.cateCd @@ -83,6 +84,7 @@ function getDetailList(arg){ generalParams.regEdat = arg.regEdat apprLine.value = arg.apprMst.apprReqs.map(req => ({ gubunCd: req.gubunCd, + gubunNm: req.gubunNm, deptCd: req.deptCd, deptNm: req.deptNm, sabun: req.sabun, @@ -117,7 +119,7 @@ const validation = () => { } if(apprLine.value.length < 2){ - notyf.error("결재선은 두 명이상 입력해주세요.") + notyf.error("결재선은 본인 외 2명이상 필수입니다.") return false } const result = apprLine.value.filter((item)=> item.gubunCd === '0200' ) @@ -126,6 +128,11 @@ const validation = () => { notyf.error("결재는 한 명입니다.") return false } + const resultLastItem = apprLine.value[apprLine.value.length-1].gubunCd + if(resultLastItem != '0200'){ + notyf.error("결재선의 마지막은 결재자이어야 함") + return false + } return true } @@ -175,6 +182,7 @@ const updatePriceOne = async () => { })), //결재선 데이터 } res = await updatePrice(paramsPrice) + console.log("update res",res) notyf.dismissAll() if(res.request.status == '200'){ notyf.primary('수정 되었습니다.') @@ -614,7 +622,16 @@ const moveDown = (index: number) => { - 등록기간 + 등록기간*
From 71a6890657c656649ff7f65562d6698140571146 Mon Sep 17 00:00:00 2001 From: Yesol Choi Date: Fri, 30 May 2025 13:31:31 +0900 Subject: [PATCH 4/7] =?UTF-8?q?fix=20:=20=EB=93=B1=EB=A1=9D=EA=B8=B0?= =?UTF-8?q?=EA=B0=84=20=EA=B2=80=EC=83=89=20=EC=A2=85=EB=A3=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=97=86=EC=95=A0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/app/priceManagement.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/app/priceManagement.vue b/src/pages/app/priceManagement.vue index 399eae5..b81cfe9 100644 --- a/src/pages/app/priceManagement.vue +++ b/src/pages/app/priceManagement.vue @@ -40,17 +40,17 @@ const params = reactive({ async function getPriceListData(){ const today = new Date() searchParamsList.regSdt = new Date().setDate(today.getDate() - 30) - searchParamsList.regEdt = new Date().setDate(today.getDate()) const priceBase = { params:{ regSdt: formatDatefromString(searchParamsList.regSdt), regEdt: formatDatefromString(searchParamsList.regEdt), page: 1, - row: itemsPerPage + row: itemsPerPage //todo 혹시 1페이지가 8개 보다 갯수가 적을수 있다. 30일 동안 } } const result = await getPriceList(priceBase) + console.log("result.content",result.content) params.priceData = result.content console.log("result",result) //페이지 관련 값 설정 From 854c18e2e9394257ad0d1c0a90ae703e6732e6a4 Mon Sep 17 00:00:00 2001 From: Yesol Choi Date: Fri, 30 May 2025 15:17:05 +0900 Subject: [PATCH 5/7] =?UTF-8?q?fix=20:=20=EC=95=84=EC=9D=B4=EC=BD=98=20?= =?UTF-8?q?=EB=B6=99=EC=9D=B4=EA=B8=B0=20=EB=B0=8F=20pdf=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=EB=A7=8C=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95,=20=EB=8B=A4=EA=B1=B4?= =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=9D=BC?= =?UTF-8?q?=EC=8B=9C=20=ED=99=95=EC=9D=B8=20=ED=95=84=EC=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/app/PriceInsert.vue | 7 ++++++- src/pages/app/priceUpdate.vue | 15 +++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/pages/app/PriceInsert.vue b/src/pages/app/PriceInsert.vue index 4805829..80b34f0 100644 --- a/src/pages/app/PriceInsert.vue +++ b/src/pages/app/PriceInsert.vue @@ -196,7 +196,12 @@ const onFileChange = (e: any) => { size: file.size, data: result.split(',')[1], } - pbAtts.value.push(pbAtt) + notyf.dismissAll() + if(pbAtt.logiFnm.includes('.pdf')) { + pbAtts.value.push(pbAtt) + }else{ + notyf.error("pdf 파일만 업로드 가능합니다.") + } } reader.readAsDataURL(file) diff --git a/src/pages/app/priceUpdate.vue b/src/pages/app/priceUpdate.vue index 29a410c..e34dd19 100644 --- a/src/pages/app/priceUpdate.vue +++ b/src/pages/app/priceUpdate.vue @@ -111,9 +111,10 @@ const validation = () => { return false } - const resultGu = apprLine.value.filter((item)=> !item.gubunCd) + const resultGu = apprLine.value.filter((item,index)=> index != 0 && !item.gubunCd) if(resultGu.length > 0){ + console.log("resultGu",resultGu) notyf.error("결재선 구분값을 입력해주세요") return false } @@ -182,7 +183,6 @@ const updatePriceOne = async () => { })), //결재선 데이터 } res = await updatePrice(paramsPrice) - console.log("update res",res) notyf.dismissAll() if(res.request.status == '200'){ notyf.primary('수정 되었습니다.') @@ -266,7 +266,12 @@ const onFileChange = (e: any) => { size: file.size, data: result.split(',')[1], } - pbAtts.value.push(pbAtt) + notyf.dismissAll() + if(pbAtt.logiFnm.includes('.pdf')) { //todo 여러개 올릴 때 이슈 발생 확인 필요 + pbAtts.value.push(pbAtt) + }else{ + notyf.error("pdf 파일만 업로드 가능합니다.") + } } reader.readAsDataURL(file) @@ -590,8 +595,6 @@ const moveDown = (index: number) => {
- -
@@ -648,7 +651,7 @@ const moveDown = (index: number) => { - + {{"삭제"}} From 5769633a2c663d6803966a49389bed62b029b937 Mon Sep 17 00:00:00 2001 From: Yesol Choi Date: Fri, 30 May 2025 15:21:32 +0900 Subject: [PATCH 6/7] =?UTF-8?q?style=20:=20=EB=B2=84=ED=8A=BC=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EB=A7=9E=EC=B6=94=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/app/PriceInsert.vue | 2 +- src/pages/app/priceUpdate.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/app/PriceInsert.vue b/src/pages/app/PriceInsert.vue index 80b34f0..d5ca670 100644 --- a/src/pages/app/PriceInsert.vue +++ b/src/pages/app/PriceInsert.vue @@ -296,7 +296,7 @@ function onInput(row, column){ icon="fas fa-plus" elevated @click="showTable = !showTable" - style="width: 19%;" + style="width: 21.4%;" > 견적사 입력 diff --git a/src/pages/app/priceUpdate.vue b/src/pages/app/priceUpdate.vue index e34dd19..dad8022 100644 --- a/src/pages/app/priceUpdate.vue +++ b/src/pages/app/priceUpdate.vue @@ -393,7 +393,7 @@ const moveDown = (index: number) => { icon="fas fa-plus" elevated @click="showTable = !showTable" - style="width: 19%;" + style="width: 21.4%;" > 견적사 입력 From f5327c753746950cce3df077b363fae94d7c923c Mon Sep 17 00:00:00 2001 From: Yesol Choi Date: Fri, 30 May 2025 15:29:11 +0900 Subject: [PATCH 7/7] =?UTF-8?q?style=20:=20update=EC=99=80=20UI=20?= =?UTF-8?q?=EB=A7=9E=EC=B6=94=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/app/PriceInsert.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/app/PriceInsert.vue b/src/pages/app/PriceInsert.vue index d5ca670..6023d66 100644 --- a/src/pages/app/PriceInsert.vue +++ b/src/pages/app/PriceInsert.vue @@ -280,6 +280,7 @@ function onInput(row, column){