Merge branch 'main' into featrue/0526-update

src/pages/app/ApprovalManagement.vue

@@ -196,7 +196,7 @@ const onRowClick2 = (row: any) => {
             </VControl>
           </VField>
         </div>
-        <div class="column is-5">
+        <div class="column is-8">
           <VField class="pr-2">
             <VLabel class="has-fullwidth">
               등록기간
@@ -254,9 +254,9 @@ const onRowClick2 = (row: any) => {
             </VControl>
           </VField>
         </div>
-        <div class="column is-1">
+        <div class="column is-2">
-          <div style="padding-top:20px;float:right;">
+          <div style="margin-top: 1.8rem">
-            <VButtons>
+            <VButtons class="buttons is-right">
               <VButton
                 color="primary"
                 elevated

src/pages/app/contractManagement.vue

@@ -49,6 +49,7 @@ const params = reactive({
     { key: 'contAmt', label: '계약금액', format: formatCurrency },
     { key: 'contNo', label: '계약번호' },
     { key: 'signDt', label: '계약체결일' },
+    { key: 'charge', label: '대금청구' },
     { key: 'contStat', label: '계약상태' },
   ],
 })
@@ -165,8 +166,8 @@ function getContractDetail(){
             </VControl>
           </VField>
         </div>
-        <div class="column is-1" style="position:relative;">
+        <div class="column is-2" style="position:relative;">
-          <div style="padding-top:20px;float:right;">
+          <div style="margin-top: 1.8rem">
             <VButtons>
               <VButton
                 color="primary"

src/pages/app/priceDetail.vue

@@ -133,12 +133,12 @@ const onChangeFinal = async () => {
   try {
     loading.value = true
     res = await putSurveyPrcsNo(params.prcsNo)
-    notyf.dismissAll()
     if (res.request.status === 200) {
       notyf.primary('가격조사 완료 되었습니다.')
       router.push({path: '/app/contractManagement'})
     }
   } catch (e) {
+    console.log('error')
     notyf.error(e.message)
   } finally {
     loading.value = false
@@ -294,7 +294,7 @@ const onPrcsFileDownload = async (prcsNo: string, fileOrd: number, logiFnm: stri
           </tr>
           <tr>
             <td>첨부파일</td>
-            <td colspan="4">
+            <td colspan="9">
               <div class="column is-12">
                 <VField>
                   <VLabel>첨부파일</VLabel>
@@ -320,11 +320,12 @@ const onPrcsFileDownload = async (prcsNo: string, fileOrd: number, logiFnm: stri
             </td>
           </tr>
           <tr>
-            <td>견적요청</td>
+            <td>견적서확인</td>
             <td colspan="9">
-              <slot name="status" v-if="!params.svyYn">
+              <slot name="status"
+                    v-if="!params.svyYn"
+              >
               <div style="display: flex; justify-content: flex-end; gap: 8px;">
-
               <VButton
                   color="primary"
                   icon="fas fa-circle"

src/service/priceApi.ts

@@ -230,8 +230,8 @@ export async function updatePrcsNo(param) {
  */
 export async function putSurveyPrcsNo(params = {}) {
     try {
-        const result = await axios.put(`/api/prcs/survey${params}`)
+        const result = await axios.put(`/api/prcs/survey/${params}`)
-        return result.data
+        return result
     } catch (e) {
         const serverError = e.response?.data;