Merge branch 'main' into feature/contract/250526

src/pages/app/PriceInsert.vue

@@ -495,6 +495,7 @@ function onInput(row, column){
           </template>
         </ComVFlexTable>
       </div>
+      <div style="display: flex; justify-content: flex-end; gap: 8px; margin-top: 10px;">
       <VButton
           color="primary"
           @click.stop="savePriceOne"
@@ -503,6 +504,7 @@ function onInput(row, column){
       </VButton>
       </div>
     </div>
+  </div>
 </template>
 
 <style scoped lang="scss">

src/pages/app/priceDetail.vue

@@ -213,7 +213,7 @@ const onChangeFinal = async () => {
             <td colspan="2">
               <VButton
                   color='success'
-                  icon="fas fa-plus"
+                  icon="fas"
                   elevated
                   @click="detailActionsOpen = true"
               >
@@ -344,24 +344,24 @@ const onChangeFinal = async () => {
             <td>견적요청</td>
             <td colspan="6">
               <div style="display: flex; justify-content: flex-end; gap: 8px;">
+<!--              <VButton-->
+<!--                  color="primary"-->
+<!--                  icon="fas"-->
+<!--                  elevated-->
+<!--                  @click="showTable = !showTable"-->
+<!--              >-->
+<!--                견적사 확인-->
+<!--              </VButton>-->
               <VButton
                   color="primary"
-                  icon="fas fa-plus"
-                  elevated
-                  @click="showTable = !showTable"
-              >
-                견적사 확인
-              </VButton>
-              <VButton
-                  color="primary"
-                  icon="fas fa-plus"
+                  icon="fas fa-circle"
                   elevated
                   @click="onChangeFinal"
               >
                 가격조사 완료
               </VButton>
               </div>
-              <div v-if="showTable" class="mt-2">
+              <div class="mt-2">
                 <ComVFlexTable
                     :key="params.prcsBizs.length"
                     :data="params.prcsBizs"
@@ -372,14 +372,7 @@ const onChangeFinal = async () => {
                 >
                   <template #body-cell="{ row, column, index, value }">
                     <div>
-                      <!-- 다른 editable 컬럼은 input -->
-                      <input
-                          :readonly=true
-                          v-if="column.editable"
-                          v-model="row[column.key]"
-                          class="editable-input"
-                      />
-                      <span v-else-if="column.key=='num'">{{index + 1}}</span>
+                      <span v-if="column.key=='num'">{{index + 1}}</span>
                       <!-- readonly 출력 -->
                       <span v-else>{{ value }}</span>
                     </div>

src/pages/app/priceUpdate.vue

@@ -42,7 +42,7 @@ const params = reactive({
     { key: 'name', label: '이름' },
     { key: 'attendCd', label: '비고' },
     { key: 'apprStat', label: '결재상태'},
-    { key: 'date', label: '승인일자'},
+    { key: 'apprDt', label: '승인일자'},
   ],
   priceData:[],
   prcsBizsColumn: [ //견적사 입력
@@ -498,6 +498,7 @@ function onInput(row, column){
           </template>
         </ComVFlexTable>
       </div>
+      <div style="display: flex; justify-content: flex-end; gap: 8px; margin-top: 10px;">
       <VButton
           color="primary"
           @click.stop="updatePriceOne"
@@ -513,6 +514,7 @@ function onInput(row, column){
       </VButton>
       </div>
     </div>
+  </div>
 </template>
 
 <style scoped lang="scss">