From 4748ff7a58d2825b98248a5a61c43cce7f9f18c3 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 18 Sep 2024 17:59:37 +0800
Subject: [PATCH] 20240918

---
 src/views/modules/quote/priceCheckProperties.vue | 8 ++++----
 src/views/modules/quote/requestForQuote.vue      | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/quote/priceCheckProperties.vue b/src/views/modules/quote/priceCheckProperties.vue
index 23462ea..a210fd5 100644
--- a/src/views/modules/quote/priceCheckProperties.vue
+++ b/src/views/modules/quote/priceCheckProperties.vue
@@ -26,7 +26,7 @@ export default {
       default: ()=>[],
     },
     height:{
-      type:Number,
+      type:[Number,String],
       default:200
     },
   },
@@ -319,9 +319,9 @@ export default {
       <el-button type="primary" :loading="loading" v-if="quotationNo" @click="saveBtnClick">新增</el-button>
       <el-button type="primary" @click="saveClick" v-if="quotationNo">{{ attributeDialog?'编辑':'保存' }}</el-button>
     </div>
-    <div class="rq" v-if="attributeDialog" style="height: 100%">
+    <div class="rq" v-if="attributeDialog">
       <el-table
-        :height="this.height - 280"
+        :height="height"
         :data="dataList"
         border
         style="width: 100%;margin-top: 5px">
@@ -349,7 +349,7 @@ export default {
     </div>
     <div class="rq" v-else style="height: 100%">
       <el-table
-        :height="this.height - 60"
+        :height="height"
         :data="copyAttributeList"
         border
         style="width: 100%;margin-top: 5px">
diff --git a/src/views/modules/quote/requestForQuote.vue b/src/views/modules/quote/requestForQuote.vue
index 3217ac3..305241e 100644
--- a/src/views/modules/quote/requestForQuote.vue
+++ b/src/views/modules/quote/requestForQuote.vue
@@ -97,7 +97,7 @@
 
     <!-- 询价列表 -->
     <el-table
-      :height="this.height - 300"
+      height="37vh"
       :data="dataList"
       border
       :row-style="rowStyle"
@@ -481,7 +481,7 @@
     </el-dialog>
 
     <!-- 页签 -->
-    <el-tabs style="margin-top: 0px; width: 100%; height: 100%;" v-model="activeTable" class="customer-tab" type="border-card" @tab-click="tabClick">
+    <el-tabs style="margin-top: 0px; width: 100%; height: 40vh;" v-model="activeTable" class="customer-tab" type="border-card" @tab-click="tabClick">
     <!-- 询价详细信息页签 -->
       <el-tab-pane label="询价详细信息" name="quotation_detail_information" style="" v-if="false">
         <el-form :inline="true" label-position="top" :model="quotationDetailData"
@@ -619,7 +619,7 @@
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="基本信息" name="priceCheck">
-        <price-check-properties ref="tabProperties" v-model:data-list="priceCheckPropertiesList"
+        <price-check-properties ref="tabProperties" height="33vh" v-model:data-list="priceCheckPropertiesList"
                                 :quotation-no="quotationCurrentRow.quotationNo"></price-check-properties>
       </el-tab-pane>
       <!-- 项目信息页签 -->