From a179f948685965eddba98845b273e574140aba04 Mon Sep 17 00:00:00 2001
From: xuxiaoming <xiaoming.xu@le-it.com.cn>
Date: Tue, 23 Nov 2021 09:51:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E8=AF=A2?=
 =?UTF-8?q?=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceContent/index.vue                             | 8 +++++++-
 .../resourceContent/resourceLoad/detail.vue               | 1 +
 .../resourceContent/resourceLoad/index.vue                | 5 ++++-
 src/views/productionPlanning/customerInquiry/index.vue    | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/productionPlanning/customerForecastDemandReview/resourceContent/index.vue b/src/views/productionPlanning/customerForecastDemandReview/resourceContent/index.vue
index 1f4fe6c..3d4b7e7 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/resourceContent/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/resourceContent/index.vue
@@ -14,6 +14,7 @@
 					ref="resourceLoadComponents"
 					:resourceId="resourceId"
 					:resourceType="resourceType"
+					:Height="tableHeight+'px'"
 					@calculateTableHeight="calculateTableHeight"
 					@handleCancelResource="handleCancelResource" />
 			</el-tab-pane>
@@ -45,13 +46,18 @@ export default {
 	},
 	data() {
 		return {
+			tableHeight:0,
 			evaluationLoading:false,
 			evaluationDataNew: [],
 			evaluationDataOld: [],
-			activeName: 'evaluation'
+			activeName: 'resourceLoad'
 		}
 	},
 	methods: {
+		calculateTableHeight(height) {
+			console.log('%cindex.vue line:58 height', 'color: #007acc;', height);
+			this.tableHeight = (height -10)+"";
+		},
 		// 发布数据
 		handlePublic(param){
 			param.data = JSON.stringify(param.data);
diff --git a/src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/detail.vue b/src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/detail.vue
index a4fb5ed..2f788a2 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/detail.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/detail.vue
@@ -8,6 +8,7 @@
     <div class="cl" ref="topTableRef">
       <el-table
         :data="dataList"
+        height="500px"
         border size="mini" >
           <el-table-column
             v-for="item in headers"
diff --git a/src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/index.vue b/src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/index.vue
index 2256f1c..0489a99 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/index.vue
@@ -59,7 +59,7 @@
 			v-loading="articleDemandLoading"
 			class="articleDemand-table"
 			:data="tableData"
-			:height="tableHeight"
+			:height="Height"
 			:cell-class-name="cellStyle"
 			border size="mini" >
 				<el-table-column
@@ -120,6 +120,9 @@ export default {
 			type: String,
 			default:""
 		},
+		Height:{
+			type:String
+		}
 	},
 	data(){
 		return {
diff --git a/src/views/productionPlanning/customerInquiry/index.vue b/src/views/productionPlanning/customerInquiry/index.vue
index 4b3dc8e..5a44ea0 100644
--- a/src/views/productionPlanning/customerInquiry/index.vue
+++ b/src/views/productionPlanning/customerInquiry/index.vue
@@ -114,7 +114,7 @@
 import Add from "./add.vue";
 import Upload from "./upload.vue";
 import { ListMixin } from "@/mixins/newListMixin";
-import { getCustomerList ,customerorderreviewlist,exportExcel } from "@/server/plan/workbench/customerInquiry";
+import { getCustomerList ,customerorderreviewlist,exportExcel } from "@/server/productionPlanning/customerInquiry";
 export default {
     components: {
         Add,