Merge remote-tracking branch 'origin/main'

src/pages/app/PriceInsert.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {deletePrcsFile, getPrcsFileDown, savePrice} from '/src/service/priceApi'
 import {type iPbAtt, Person} from '/@src/utils/types'
-import {formatBizNum,formatDate} from "/@src/utils/common/comfunc.ts";
+import {formatBizNum,formatDatefromString} from "/@src/utils/common/comfunc.ts";
 
 const notyf = useNotyf()
 const showTable = ref(false)
@@ -106,8 +106,8 @@ const savePriceOne = async () => {
       cateCd : params.cateSelect,
       title: generalParams.title,
       content: generalParams.content,
-      regSdat: formatDate(generalParams.regSdat),
-      regEdat: formatDate(generalParams.regEdat),
+      regSdat: formatDatefromString(generalParams.regSdat),
+      regEdat: formatDatefromString(generalParams.regEdat),
       prvYn: true,
       prvRsn : "",
       prvPwd : "",
@@ -266,7 +266,7 @@ function onInput(row, column){
           </tr>
           <tr>
             <td>내용</td>
-            <td colspan="9">
+            <td colspan="10">
               <div class="column is-fullhd">
                 <VField class="pr-2">
                   <VControl>
@@ -304,14 +304,16 @@ function onInput(row, column){
                 >
                   <template #body-cell="{ row, column, index, value }">
                     <div>
-                      <!-- 다른 editable 컬럼은 input -->
+                      <VField class="pr-3" v-if="column.editable">
+                        <VControl>
                       <input
-                          v-if="column.editable"
                           v-model="row[column.key]"
                           class="editable-input"
                           ref="prcsBizsRef"
                           @blur="onInput(row, column)"
                       />
+                        </VControl>
+                      </VField>
                       <span v-else-if="column.key=='num'">{{index + 1}}</span>
                       <!-- readonly 출력 -->
                       <span v-else class="lnil lnil-close"
@@ -384,15 +386,15 @@ function onInput(row, column){
                     </VButton>
                   </div>
                 </template>
-                <template #action>
-                  <VButton color="primary">
+                <template #action="{ close }">
+                  <VButton color="primary" @click="close">
                     등록
                   </VButton>
                 </template>
               </VModal>
             </td>
             <td>등록기간</td>
-            <td colspan="5">
+            <td colspan="6">
               <div class="columns">
                 <div class="column is-5">
                   <VDatePicker
@@ -445,7 +447,7 @@ function onInput(row, column){
               <td>첨부파일</td>
               <td colspan="3">
                 <VField>
-                  <div class="column is-6">
+                  <div class="form-label">
                     <div class="file has-name is-fullwidth">
                     <input
                         class="file-input hide"
@@ -458,6 +460,8 @@ function onInput(row, column){
                         <span>파일업로드</span>
                       </VButton>
                     </VLabel>
+                    </div>
+                  </div>
                     <VControl>
                       <div
                           v-for="(f, i) in pbAtts"
@@ -465,18 +469,13 @@ function onInput(row, column){
                           class="content estimate-file-wrapper"
                       >
                         <div class="estimate-file-name">
-                          {{ f.logiFnm }}
-                        </div>
-                        <div class="estimate-file-size">
-                          {{ Math.ceil(f.size / 1024) }}kb
+                          {{ f.logiFnm }}{{" ("}}{{Math.ceil(f.size / 1024)}}kb{{")"}}
                         </div>
                         <div>
                           <i class="fa fa-trash estimate-file-delete" @click="onFilDelete( i, f.fileOrd)" />
                         </div>
                       </div>
                     </VControl>
-                    </div>
-                  </div>
                 </VField>
             </td>
           </tr>

src/pages/app/priceDetail.vue

@@ -40,6 +40,7 @@ const params = reactive({
   cateSelect: '',
   prcsNo: '', // 키값
   stCdFalg: false, // 버튼 컴포넌트화
+  svyYn: false,
   stCd:'',//결재상태 코드{ 등록중:0100[회수버튼],
           // 회수: 0300, 반려: 0400, 등록 완료: 0200 }
   prcsAttsColumn:[ //첨부파일 입력
@@ -76,6 +77,7 @@ const params = reactive({
 })
 
 function getDetailList(arg){
+  console.log("arg",arg)//svy_yn
   if(!props.prcsNo){
     params.stCdFalg = true
   }
@@ -103,6 +105,7 @@ function getDetailList(arg){
     attendNm: req.attendNm
   }))  //비고 데이터 없음, 승인일자 없음 todo
   params.prcsAtts = arg.prcsAtts
+  params.svyYn = arg.svyYn
 }
 
 const updateState = async () => {
@@ -354,6 +357,7 @@ const onPrcsFileDownload = async (prcsNo: string, fileOrd: number, logiFnm: stri
           <tr>
             <td>견적요청</td>
             <td colspan="6">
+              <slot name="status" v-if="!params.svyYn">
               <div style="display: flex; justify-content: flex-end; gap: 8px;">
 <!--              <VButton-->
 <!--                  color="primary"-->
@@ -372,6 +376,7 @@ const onPrcsFileDownload = async (prcsNo: string, fileOrd: number, logiFnm: stri
                 가격조사 완료
               </VButton>
               </div>
+              </slot>
               <div class="mt-2">
                 <ComVFlexTable
                     :key="params.prcsBizs.length"

src/pages/app/priceUpdate.vue

@@ -470,9 +470,9 @@ const onPrcsFileDownload = async (prcsNo: string, fileOrd: number, logiFnm: stri
           </tr>
           <tr>
             <td>첨부파일</td>
-            <td colspan="4">
+            <td colspan="3">
               <VField>
-                <div class="column is-6 form-label">
+                <div class="form-label">
                   <div class="file has-name is-fullwidth">
                   <input
                       class="file-input hide"
@@ -494,10 +494,7 @@ const onPrcsFileDownload = async (prcsNo: string, fileOrd: number, logiFnm: stri
                         class="content estimate-file-wrapper"
                     >
                       <div class="estimate-file-name">
-                        {{ f.logiFnm }}
-                      </div>
-                      <div class="estimate-file-size">
-                        {{ Math.ceil(f.size / 1024) }}kb
+                        {{ f.logiFnm }}{{" ("}}{{Math.ceil(f.size / 1024)}}kb{{")"}}
                       </div>
                       <div>
                         <i class="fa fa-trash estimate-file-delete" @click="onFilDelete(f.bizNo, i, f.fileOrd)" />
@@ -514,14 +511,8 @@ const onPrcsFileDownload = async (prcsNo: string, fileOrd: number, logiFnm: stri
                         :key="f.logiFnm"
                         class="content estimate-file-wrapper"
                     >
-                      <div>
-                        <i class="fa fa-file-pdf estimate-file-img" style="font-size:40px;" />
-                      </div>
                       <div class="estimate-file-name">
-                        {{ f.logiFnm }}
-                      </div>
-                      <div class="estimate-file-size">
-                        {{ Math.ceil(f.size / 1024) }}kb
+                        {{ f.logiFnm }}{{" ("}}{{Math.ceil(f.size / 1024)}}kb{{")"}}
                       </div>
                       <div>
                         <i class="fa fa-download estimate-file-download" @click="onPrcsFileDownload(f.prcsNo, f.fileOrd, f.logiFnm)" />