Merge branch 'featrue/0526-update'

src/pages/app/priceDetail.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {getDetailPrcs, updatePrcsNo, putSurveyPrcsNo} from '/src/service/priceApi'
 import { type Person } from '/@src/utils/types'
-import {formatDatefromString} from "/@src/utils/common/comfunc.ts";
+import {formatDatefromString, formatCurrency, formatDateHourMinutefromString} from "/@src/utils/common/comfunc.ts";
 
 
 const notyf = useNotyf()
@@ -55,7 +55,7 @@ const params = reactive({
     { key: 'name', label: '이름' },
     { key: 'attendNm', label: '비고' },
     { key: 'apprStat', label: '결재상태'},
-    { key: 'date', label: '승인일자'},
+    { key: 'apprDt', label: '승인일자'},
   ],
   priceData:[],
   prcsBizsColumn: [ //견적사 입력
@@ -89,7 +89,6 @@ function getDetailList(arg){
   generalParams.title = arg.title
   generalParams.content = arg.content
   params.prcsBizs = arg.prcsBizs
-  console.log(params.prcsBizs)
   params.dtlSpecs = arg.dtlSpecs
   generalParams.regSdat = formatDatefromString(arg.regSdat)
   generalParams.regEdat = formatDatefromString(arg.regEdat)
@@ -103,6 +102,7 @@ function getDetailList(arg){
     apprNo: req.apprNo,
     apprOrd: req.apprOrd,
     apprStat: req.apprStat,
+    apprDt: formatDateHourMinutefromString(req.apprDt),
     attendNm: req.attendNm
   }))  //비고 데이터 없음, 승인일자 없음 todo
   params.prcsAtts = arg.prcsAtts
@@ -309,9 +309,6 @@ const onPrcsFileDownload = async (prcsNo: string, fileOrd: number, logiFnm: stri
                     >
                       <div class="estimate-file-name">
                         {{ f.logiFnm }}{{" ("}}{{Math.ceil(f.size / 1024)}}kb{{")"}}
-                      </div>
-                      <div class="estimate-file-size">
-
                       </div>
                       <div>
                         <i class="fa fa-download estimate-file-download" @click="onPrcsFileDownload(f.prcsNo, f.fileOrd, f.logiFnm)" />
@@ -347,6 +344,11 @@ const onPrcsFileDownload = async (prcsNo: string, fileOrd: number, logiFnm: stri
                     :compact="true"
                     :separators="true"
                 >
+                  <template #body-cell-totAmt="{ value}">
+                    <div>
+                      {{formatCurrency(value) }}
+                    </div>
+                  </template>
                   <!-- sendYn 컬럼 커스텀 렌더링 -->
                   <template #body-cell-sendYn="{ row }">
                     <div>

src/utils/common/comfunc.ts

@@ -16,7 +16,13 @@ export function formatDatefromString(dateStr) {
     }).replace(/\./g, '-').replace(/\s/g, '').replace(/-$/,'')
 }
 
+export function formatDateHourMinutefromString(dateStr) {
+    if (!dateStr) return ''
+    return dateStr.substring(0,16)
+}
+
 export function formatBizNum(num){
+    console.log("num",num)
     if (!num) return ''
 
     const raw = num.replace(/\D/g, '') // 숫자만 남김
@@ -27,4 +33,11 @@ export function formatBizNum(num){
     if (raw.length <= 5) return raw.replace(/^(\d{3})(\d{0,2})$/, '$1-$2')
     // 1234567890 -> 123-45-67890
     return raw.replace(/^(\d{3})(\d{2})(\d{0,5})$/, '$1-$2-$3')
+}
+
+// 천단위 콤마 포맷 함수 추가
+export function formatCurrency(value) {
+    if (value === null || value === undefined || value === '') return ''
+    const num = Number(value.toString().replace(/[^0-9.]/g, ''))
+    return isNaN(num) ? '' : num.toLocaleString()
 }