Merge branch 'featrue/0526-update'

This commit is contained in:
Yesol Choi
2025-05-29 09:58:48 +09:00
2 changed files with 21 additions and 6 deletions

View File

@@ -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>