Merge remote-tracking branch 'origin/main'

src/pages/app/ContractInsert.vue

@@ -138,6 +138,10 @@ const contractPeriod = computed(() => {
 
 
 function handlePriceRowClick(row) {
+  if(priceSearchCheckBoxStatus.value) {
+    resetForm()
+  }
+
   completedPriceDataParams.prcsNo = row.prcsNo || ''
   completedPriceDataParams.cateCd = row.cateCd || ''
   completedPriceDataParams.cateNm = row.cateNm || ''
@@ -170,9 +174,12 @@ function handlePriceRowClick(row) {
 
   registerFormOpen.value = false
   completedPriceDataParams.estimates = row.estimates
-  // priceSearchCheckBoxStatus.value = "false"
+  priceSearchCheckBoxStatus.value = "false"
-  console.log(row)
+
-  console.log(completedPriceDataParams.estimates)
+}
+
+function onCheckboxChange (e) {
+    resetForm()
 }
 
 const showFileInputs = ref(false)
@@ -231,6 +238,19 @@ console.log(selectedContractCompCode)
   }
 }
 
+function resetForm() {
+  completedPriceDataParams.prcsNo = ''
+  completedPriceDataParams.bizNo = ''
+  completedPriceDataParams.compNm = ''
+  completedPriceDataParams.title = ''
+  completedPriceDataParams.contSdat = ''
+  completedPriceDataParams.contEdat = ''
+  completedPriceDataParams.contAmt = ''
+  completedPriceDataParams.reason = ''
+  selectedCode.value = ''
+  pbAtts.value = []
+  // 기타 입력값도 여기에 추가
+}
 const pbAtts = ref<iPbAtt[]>(params.contAtts)
 
 const onFileChange = (e, idx) => {
@@ -253,25 +273,6 @@ const onFileChange = (e, idx) => {
   reader.readAsDataURL(file)
 }
 
-function resetForm() {
-  completedPriceDataParams.prcsNo = ''
-  completedPriceDataParams.bizNo = ''
-  completedPriceDataParams.compNm = ''
-  completedPriceDataParams.title = ''
-  completedPriceDataParams.contSdat = ''
-  completedPriceDataParams.contEdat = ''
-  completedPriceDataParams.contAmt = ''
-  completedPriceDataParams.reason = ''
-  selectedCode.value = ''
-  pbAtts.value = []
-  // 기타 입력값도 여기에 추가
-}
-
-watch(
-    () => priceSearchCheckBoxStatus.value,
-    () => {resetForm()}
-)
-
 function routerMove() {
   router.push({path: '/app/contractManagement'})
 }
@@ -359,30 +360,35 @@ function onBizNoChange() {
                   </template>
                 </VModal>
               </td>
-              <td>
+              <td colspan="4">
-                <VField class="is-flex">
+                <div class="columns">
-                  <VControl raw subcontrol>
+                  <div class="column is-2 is-flex is-align-items-center is-justify-content-end">
-                    <VCheckbox
+                    <VField class="is-flex">
-                      label="예외"
+                      <VControl raw subcontrol>
-                      color="info"
+                        <VCheckbox
-                      v-model="priceSearchCheckBoxStatus"
+                            label="예외"
-                    />
+                            color="info"
-                  </VControl>
+                            v-model="priceSearchCheckBoxStatus"
-                </VField>
+                            @change="onCheckboxChange($event.target.checked)"
-              </td>
+                        />
-              <td colspan="3">
+                      </VControl>
-                <div class="column is-fullhd">
+                    </VField>
-                  <VField>
+                  </div>
-                    <VControl>
+                  <div class="column is-1 is-flex is-align-items-center is-justify-content-end">
-                    <span class="">사유:</span>
+                    사유
-                      <input
+                  </div>
-                        v-model="completedPriceDataParams.reason"
+                  <div class="column is-fullhd">
-                        class="input custom-text-filter "
+                    <VField>
-                        placeholder="가격조사 안했을 시 예외 사유 입력(필수)"
+                      <VControl>
-                        :class="{ 'danger-placeholder': showReasonError }"
+                        <input
-                      >
+                          v-model="completedPriceDataParams.reason"
-                    </VControl>
+                          class="input custom-text-filter "
-                  </VField>
+                          placeholder="가격조사 안했을 시 예외 사유 입력(필수)"
+                          :class="{ 'danger-placeholder': showReasonError }"
+                        >
+                      </VControl>
+                    </VField>
+                  </div>
                 </div>
               </td>
             </tr>
@@ -407,6 +413,7 @@ function onBizNoChange() {
                 <VField>
                   <VControl>
                     <VSelect
+                        v-if="!priceSearchCheckBoxStatus"
                         v-model="completedPriceDataParams.bizNo"
                         class="input custom-text-filter"
                         @change="onBizNoChange"
@@ -421,6 +428,12 @@ function onBizNoChange() {
                         {{ option.text }}
                       </option>
                     </VSelect>
+                    <VInput
+                      v-else
+                      v-model="completedPriceDataParams.bizNo"
+                      class="input custom-text-filter"
+                      placeholder="사업자번호"
+                      />
                   </VControl>
                 </VField>
               </td>
@@ -685,4 +698,6 @@ function onBizNoChange() {
   padding: 4px 12px;
   border-radius: 4px;
 }
+
+
 </style>

src/pages/app/priceUpdate.vue

@@ -659,7 +659,7 @@ const moveDown = (index: number) => {
   </div>
 </template>
 
-<style lang="scss">
+<style scoped lang="scss">
 /*css 추가 start*/
 .flex-table {
   .flex-table-header {