From fc83232935536605518a417a1f3e8f36b93ba3e0 Mon Sep 17 00:00:00 2001
From: Kasi <zkfwls12@gmail.com>
Date: Wed, 4 Jun 2025 10:15:14 +0900
Subject: [PATCH 1/2] =?UTF-8?q?func=20:=20=EA=B2=B0=EC=9E=AC=ED=95=A8=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/app/ApprovalManagement.vue | 61 ++++++++++++++++++++++------
 src/pages/app/priceManagement.vue    |  3 +-
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/pages/app/ApprovalManagement.vue b/src/pages/app/ApprovalManagement.vue
index b332772..430cc8e 100644
--- a/src/pages/app/ApprovalManagement.vue
+++ b/src/pages/app/ApprovalManagement.vue
@@ -82,17 +82,32 @@ const params = reactive({
   rowData: [],
 })
 
+const searchParamsList = reactive({
+  cateCd : '', //분야코드
+  stCd : '', //등록상태
+  apprStat : '', //결재상태
+  regNm : '', //담당자
+  regSdt: '',//등록시작일
+  regEdt: '',//등록종료일
+})
+
 function formatRegDt(value) {
   return value ? value.substring(0, 16) : ''
 }
 
 async function getIntegratedPaymentList() {
+  const today = new Date()
+  searchParamsList.regSdt = new Date().setDate(today.getDate() - 30)
+
   const approvalParams = {
-    title: '',
-    page: '1',
-    row: '10',
+    title: params.title,
+    regSdt: formatDatefromString(params.regSdt),
+    regEdt: formatDatefromString(params.regEdt),
+    page: 1,
+    row: itemsPerPage,
     sabun: '17131303', // 김진형 17131303, 손원창 17131304
   }
+  
   const result = await getIntegratedApproval(approvalParams)
   params.approvalParams = result.content.map(item => ({
     ...item,
@@ -134,16 +149,35 @@ const gubunMap = {
   SVCM: '가격조사',
 }
 
-const searchApproval = async () => {
-  const searchParams = {
-    params: {
-      title: params.title,
-      page: '1',
-      row: '10',
-    },
+const searchApproval = async (item) => {
+
+  let itemPerChangePage;
+  if(item == totalPages.value){
+    const remain = totalPages.value % itemsPerPage
+    itemPerChangePage = remain === 0? itemsPerPage : remain
+  }else{
+    itemPerChangePage = itemsPerPage
   }
+
+  const searchParams = {
+      title: params.title,
+      // apprStat: searchParamsList.apprStat,
+      // regSdt: formatDatefromString(params.regSdt),//등록시작일
+      // regEdt: formatDatefromString(params.regEdt),//등록종료일
+      page: item,//페이지
+      row: itemPerChangePage, //아이템갯수
+      sabun: '17131303', // 김진형 17131303, 손원창 17131304
+  }
+
+  console.log('searchParams', searchParams)
+
   const result = await getIntegratedApproval(searchParams)
-  params.approvalParams = result.content
+  params.approvalParams = result.content.map(item => ({
+    ...item,
+    process: gubunMap[item.gubun] || '',
+  }))
+  totalItems.value = result.totalElements
+  totalPages.value = result.totalPages
   console.log(params.approvalParams)
 }
 
@@ -176,7 +210,10 @@ const onRowClick = async (row) => {
   }
 }
 
-
+watch(currentPage, (newParams) => {
+  currentPage.value =  newParams
+  searchApproval(currentPage.value)
+})
 </script>
 
 <template>
diff --git a/src/pages/app/priceManagement.vue b/src/pages/app/priceManagement.vue
index 359479c..5d9314d 100644
--- a/src/pages/app/priceManagement.vue
+++ b/src/pages/app/priceManagement.vue
@@ -62,7 +62,8 @@ const searchPrice = async (item) => {
 
   let itemPerChangePage;
   if(item == totalPages.value){
-    itemPerChangePage = totalItems.value / totalPages.value == 0? itemsPerPage : totalItems.value % itemsPerPage
+    const remain = totalPages.value % itemsPerPage
+    itemPerChangePage = remain === 0? itemsPerPage : remain
   }else{
     itemPerChangePage = itemsPerPage
   }

From 64e523ebc4d5381bbc5638a6c4826bc2df9fd4c1 Mon Sep 17 00:00:00 2001
From: Kasi <zkfwls12@gmail.com>
Date: Wed, 4 Jun 2025 13:50:44 +0900
Subject: [PATCH 2/2] =?UTF-8?q?func=20:=20=EA=B2=B0=EC=9E=AC=ED=95=A8=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20fix?=
 =?UTF-8?q?=20:=20=EB=B3=80=EC=88=98=EC=98=A4=EA=B8=B0=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/app/ApprovalManagement.vue | 28 ++++++++++++++++++----------
 src/pages/app/priceManagement.vue    |  2 +-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/pages/app/ApprovalManagement.vue b/src/pages/app/ApprovalManagement.vue
index 430cc8e..d1f081a 100644
--- a/src/pages/app/ApprovalManagement.vue
+++ b/src/pages/app/ApprovalManagement.vue
@@ -10,8 +10,11 @@ import {getContractList} from "/@src/service/contractApi.ts";
 
 
 onBeforeMount(async () => {
-  await getIntegratedPaymentList()
+  await getIntegratedApprovalList()
+  const userSession = useUserSession()
+  params.sessionUser = userSession.user.data
 })
+
 const isModalOpen = ref(false)
 const selectedRow = ref<any>(null)
 const prcsNo = ref<string>('')
@@ -63,6 +66,7 @@ const notyf = useNotyf()
 
 const params = reactive({
   title: '',
+  sessionUser: '',
   priceData: [],
   regSdt:'',
   regEdt:'',
@@ -95,7 +99,7 @@ function formatRegDt(value) {
   return value ? value.substring(0, 16) : ''
 }
 
-async function getIntegratedPaymentList() {
+async function getIntegratedApprovalList() {
   const today = new Date()
   searchParamsList.regSdt = new Date().setDate(today.getDate() - 30)
 
@@ -107,7 +111,7 @@ async function getIntegratedPaymentList() {
     row: itemsPerPage,
     sabun: '17131303', // 김진형 17131303, 손원창 17131304
   }
-  
+
   const result = await getIntegratedApproval(approvalParams)
   params.approvalParams = result.content.map(item => ({
     ...item,
@@ -153,7 +157,7 @@ const searchApproval = async (item) => {
 
   let itemPerChangePage;
   if(item == totalPages.value){
-    const remain = totalPages.value % itemsPerPage
+    const remain = totalItems.value % itemsPerPage
     itemPerChangePage = remain === 0? itemsPerPage : remain
   }else{
     itemPerChangePage = itemsPerPage
@@ -162,14 +166,15 @@ const searchApproval = async (item) => {
   const searchParams = {
       title: params.title,
       // apprStat: searchParamsList.apprStat,
-      // regSdt: formatDatefromString(params.regSdt),//등록시작일
-      // regEdt: formatDatefromString(params.regEdt),//등록종료일
+      regSdt: formatDatefromString(searchParamsList.regSdt),//등록시작일
+      regEdt: formatDatefromString(searchParamsList.regEdt),//등록종료일
       page: item,//페이지
       row: itemPerChangePage, //아이템갯수
       sabun: '17131303', // 김진형 17131303, 손원창 17131304
   }
 
-  console.log('searchParams', searchParams)
+  console.log('itemPerChangePage', itemPerChangePage)
+  console.log('itemsPerPage', itemsPerPage)
 
   const result = await getIntegratedApproval(searchParams)
   params.approvalParams = result.content.map(item => ({
@@ -179,6 +184,8 @@ const searchApproval = async (item) => {
   totalItems.value = result.totalElements
   totalPages.value = result.totalPages
   console.log(params.approvalParams)
+  console.log('itemPerChangePage', itemPerChangePage)
+  console.log('itemsPerPage', itemsPerPage)
 }
 
 type User = (typeof users)[0]
@@ -230,6 +237,7 @@ watch(currentPage, (newParams) => {
                 v-model="params.title"
                 class="input custom-text-filter"
                 placeholder="결재제목"
+                @keydown.enter="searchApproval(1)"
               >
             </VControl>
           </VField>
@@ -243,7 +251,7 @@ watch(currentPage, (newParams) => {
               <div class="columns">
                 <div class="column is-6">
                   <VDatePicker
-                    v-model.string="params.regSdt"
+                    v-model.string="searchParamsList.regSdt"
                     color="green"
                     :masks="masks"
                     trim-weeks
@@ -268,7 +276,7 @@ watch(currentPage, (newParams) => {
                 </div>
                 <div class="column is-6">
                   <VDatePicker
-                    v-model.string="params.regEdt"
+                    v-model.string="searchParamsList.regEdt"
                     color="green"
                     :masks="masks"
                     trim-weeks
@@ -299,7 +307,7 @@ watch(currentPage, (newParams) => {
                 color="primary"
                 elevated
                 icon="fas fa-search"
-                @click.stop="searchApproval"
+                @click.stop="searchApproval(1)"
               >
                 검색
               </VButton>
diff --git a/src/pages/app/priceManagement.vue b/src/pages/app/priceManagement.vue
index 5d9314d..6ef3922 100644
--- a/src/pages/app/priceManagement.vue
+++ b/src/pages/app/priceManagement.vue
@@ -62,7 +62,7 @@ const searchPrice = async (item) => {
 
   let itemPerChangePage;
   if(item == totalPages.value){
-    const remain = totalPages.value % itemsPerPage
+    const remain = totalItems.value % itemsPerPage
     itemPerChangePage = remain === 0? itemsPerPage : remain
   }else{
     itemPerChangePage = itemsPerPage