Merge pull request 'xuxiaoming 完善客户预测需求评审' (#23) from xuxiaoming into develop

Reviewed-on: #23

src/server/productionPlanning/customerForecastDemandReview.js

@@ -1,5 +1,6 @@
 import {
 	get,
+	post,
 	postForm
 } from "../api";
 // 工厂列表
@@ -26,12 +27,28 @@ export const getMpsPlan = (params) => postForm("/admin/ap/balance/getmpsplan", p
 // 计划调整
 export const changeMpsPlan = (params) => postForm("/admin/ap/balance/mpsplan", params);
 
+// 保存计划
 export const saveMpsPlan = (params) => postForm("/admin/ap/balance/savempsplan", params);
 
-
+// 获得资源负载
 export const getResourceCapacity = (params) => get("/admin/ap/balance/getresourcecapacityanddemand",params)
 
+// 获得版本列表
 export const getVersionList = () => get("/admin/ap/custdemandverhead/selectversionlist")
 
+// 获得客户需求
+export const getCustomerDemand = (params) => get('/admin/ap/custdemandverhead/selectversioncustomerlist', params);
+
+// 数据重载
+export const reloadData = () => get('/admin/ap/balance/refreshdata')
+
+
+// 刷新数据
+export const refreshData = (data) => post('/admin/ap/balance/refreshcustomerarticledemand',data)
+
+// 客户主要资源查询
+export const searchResource = (artId) => get(`/admin/ap/articleresource/search/${artId}`);
+
+// 保存客户需求
+export const saveDemand = (data) => post('/admin/ap/balance/savecustomerarticledemand', data)
 
-export const getCustomerDemand = (params) => get('/admin/ap/custdemandverhead/selectversioncustomerlist', params);

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleChar/index.vue

@@ -153,9 +153,8 @@ export default {
 </script>
 
 <style lang="less" scoped>
- 
 .wrapper{
- 
+    // margin-top: 10px;
 
     display:flex;
     .wrapper-button{
@@ -166,7 +165,6 @@ export default {
         display:flex;
         flex-direction:column;
         justify-content:center;
-    
         .toggle-char-btn{
             display:block;
             height:56px;

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue

@@ -1,8 +1,46 @@
 <template>
 	<div class="articleDemand-wrapper" :style="{width: Width}">
 		<div class="content-table-wrap" ref="topTableRef">
+			<div class="tool_list">
+				<div class="search">
+					<div style="padding:8px">
+					模式选择
+					</div>
+					<div>
+					<el-select
+						v-model="mode"
+						placeholder="请选择"
+					>
+					<el-option
+						v-for="item in mpsPlanMode"
+						:key="item['Stdef-StdefTyp']"
+						:label="item['Stdef-Bez']"
+						:value="item['Stdef-StdefTyp']"
+						/>
+					</el-select>
+					</div>
+					<div style="margin-left:15px">
+					<el-button
+						class="add-button-style mps-button"
+						@click="calcHandle"
+						><div class="icon-upload"></div>  MPS计算</el-button>
+					</div>
+				</div>
+				<div class="button_list">
+					<img class="image_button" :src="outsourcingDemandImageUrl" @click="editField = '外购需求'" title="外购需求">
+					<div class="button_split"></div>
+					<img class="image_button" :src="independentDemandImageUrl" @click="editField = '独立需求'" title="独立需求">
+					<div class="button_split"></div>
+					<img class="image_button" :src="netProductionImageUrl" @click="editField = '净生产量'" title="净生产量">
+					<div class="button_split"></div>
+					<img class="image_button" :src="refreshImageUrl" @click="refreshData" title="刷新数据">
+					<div class="button_split"></div>
+					<img class="image_button" :src="saveImageUrl"  @click="saveDemandData" title="保存">
+					<div class="button_split"></div>
+					<img class="image_button" :src="reloadImageUrl" @click="reloadData"  title="数据重载">
+				</div>
+			</div>
 			<el-table 
-		 
 			class="articleDemand-table"
 			:data="TableData"
 			:height="Height"
@@ -12,13 +50,28 @@
 					:key="index"
 					:prop="item.prop"
 					:label="item.label" >
+					<template #default="scope">
+						<el-input size='mini'  v-if="scope.row['-'] ==  editField && index != 0 "  
+						v-model.number="scope.row[item.prop]"></el-input>
+						<span v-else>{{scope.row[item.prop]}}</span>
+					</template>
 				</el-table-column>
+
 			</el-table>
 		</div>
 	</div>
 </template>
 <script>
 
+import independentDemandImageUrl from '@/assets/icon/independent_demand.png'
+import outsourcingDemandImageUrl from '@/assets/icon/outsourcing_demand.png'
+import netProductionImageUrl from '@/assets/icon/net_production.png'
+import reloadImageUrl from '@/assets/icon/reload.png'
+import refreshImageUrl from '@/assets/icon/refresh.png'
+import saveImageUrl from '@/assets/icon/save.png'
+import { reloadData} from "@/server/productionPlanning/customerForecastDemandReview";
+
+
 export default {
 	props: {
         Width:{
@@ -37,6 +90,27 @@ export default {
 			type:String
 		}
     },
+	data(){
+		return {
+			mode:"",
+			tableHeight:0,
+			mpsPlanMode:[],
+			independentDemandImageUrl:independentDemandImageUrl,
+			outsourcingDemandImageUrl:outsourcingDemandImageUrl,
+			netProductionImageUrl:netProductionImageUrl,
+			reloadImageUrl:reloadImageUrl,
+			refreshImageUrl:refreshImageUrl,
+			saveImageUrl:saveImageUrl,
+
+			editField:"",
+
+		}
+	},
+	created () {
+		this.getStanderOne({ statid: `MpsPlanMode` }).then(({ data = [] }) => {
+			this.mpsPlanMode = data;
+		});
+	},
 	mounted() {
 		this.$nextTick(()=>{
 			this.tableHeight = this.calculationTableHeight(
@@ -46,24 +120,126 @@ export default {
 			this.$emit('calculateTableHeight', this.tableHeight)
 		})
 	},
-	data(){
-		return {
-			tableHeight:0
-		}
+	methods: {
+		refreshData(){
+			let data = []
+			this.TableData.forEach(item => {
+				if(item['-'] == this.editField){
+					data = item
+				}
+			})
+			this.$emit("refreshData",data)
+		},
+		reloadData(){
+			reloadData().then( ({msg}) => {
+				this.$message({
+					type:"success",
+					message: msg
+				})
+			}).catch(()=> {
+				this.$message({
+					type:"error",
+					message: "访问失败"
+				})
+			})
+		},
+		saveDemandData(){
+			if(!this.editField) {
+				this.$message({
+					type:"error",
+					message: "请先编辑数据"
+				})
+				return false
+			}
+			this.TableData.forEach(item => {
+				if(item['-'] == this.editField){
+					this.$emit("saveDemandData",item)
+					this.editField = ""
+				}
+			})
+		},
+
+		calcHandle() {
+			let data = []
+			this.TableData.forEach(item => {
+				if(item['-'] == this.editField){
+					data = item
+				}
+			})
+			this.$emit("calcHandle",{
+				data:data,
+				mode:this.mode
+			})
+		},
 	},
 }
 </script>
 <style lang="less" scoped>
 .articleDemand-wrapper {
 	height: 100%;
+	background-color: #F1F1F1;
 
 	.content-table-wrap {
 		width: 100%;
 		height: 100%;
+		.tool_list{
+			width: 100%;
+			height: 30px;
+			padding-top:12px;
+			display: flex;
+			justify-content: space-between;
+			.search{
+				width: 500px;
+				display: flex;
+				.mps-button{
+				width: 98px;
+				height: 32px;
+				background: linear-gradient(180deg, #3C8F87 0%, #28A89E 43%, #24645E 100%);
+				box-shadow: 1px 1px 1px 0px #FFFFFF;
+				border-radius: 2px;
+				border: 1px solid #073A35;
+				line-height: 20px;
+				.icon-upload{
+					width: 18px;
+					height: 18px;
+					background: url("../../../../../assets/icon/mps_button_icon.png");
+					float: left;
+					margin-left: 5px;
+				}
+				}
+			}
+			.button_list {
+				width: 220px;
+				height: 32px;
+				display: flex;
+				align-items: center;
+				.image_button {
+					margin: 2px 5px;
+					width: 24px;
+					height: 24px;
+					box-shadow: 2px 2px 0px 0px #DADADA;
+					border: 1px solid #FFFFFF;
+				}
+				.image_button:hover {
+					background: #DFDFDF;
+					box-shadow: 2px 2px 0px 0px #FFFFFF;
+					border-radius: 1px;
+					border: 1px solid #DADADA;
+				}
+				.button_split {
+					width: 1px;
+					height: 30px;
+					background: #DFDFDF;
+					box-shadow: 1px 0px 0px 0px #FFFFFF;
+					border-radius: 1px;
+				}
+			}
+			}
+			.articleDemand-table {
+				margin-top: 10px;
+				width: 100%;
+			}
 	}
-	.articleDemand-table {
-		margin-top: 10px;
-		width: 100%;
-	}
+	
 }
 </style>

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue

@@ -12,21 +12,25 @@
           :Headers="headers"
           :Height="tableHeight+'px'"
           :TableData="tableData"
+          @saveDemandData="saveDemandData"
+          @refreshData="refreshData"
+          @calcHandle="calcHandle"
           @calculateTableHeight="calculateTableHeight"
         />
         <ArticleChar
           :Width="charWidth"
-          :Height="tableHeight+'px'"
+          :Height="charTableHeight+'px'"
           @toggleChar="toggleChar"
           :XAxis="XAxis"
           :YAxis="YAxis"
         />
+
       </el-tab-pane>
     </el-tabs>
   </ContentContainer>
 </template>
 <script>
-import { getCustomerArticleDemand } from "@/server/productionPlanning/customerForecastDemandReview";
+import { getCustomerArticleDemand,saveDemand,refreshData,changeMpsPlan } from "@/server/productionPlanning/customerForecastDemandReview";
 // 物料需求表
 import ArticleDemand from "./articleDemand";
 // 物料需求图
@@ -52,6 +56,11 @@ export default {
       type: String,
       default: "",
     },
+    // 资源ID
+    resourceId:{
+			type: String,
+			default:""
+		},
   },
   data() {
     return {
@@ -65,24 +74,94 @@ export default {
       // Y轴数据
       YAxis: [],
       showChar: true,
-
+      mode:"",
       tableHeight: 0,
+      charTableHeight:0,
       activeName: "demandPlanning",
       demandWidth: "calc(100% - 15px)",
       charWidth: "15px",
+      mpsPlanMode:[],
+      apiData:[],
+      keyLabelMap:{
+        "外购需求":"AP_ArticleDemand-OutSourcingQty",
+        "独立需求":"AP_ArticleDemand-IndependentDemandQty",
+        "净生产量":"AP_ArticleDemand-NetDemandQty",
+      }
     };
   },
-  created() {},
+  created() {
+    this.getStanderOne({ statid: `MpsPlanMode` }).then(({ data = [] }) => {
+      this.mpsPlanMode = data;
+    });
+  },
   methods: {
+    refreshData(data) {
+      if(data) {
+        this.apiData.forEach(item => {
+          let key = "WK" + item['AP_ArticleDemand-DemandWeek'] 
+          item[this.keyLabelMap[data['-']]] = data[key]
+        })
+      }
+      refreshData(this.apiData).then( ( {data = []} )=> {
+        this.tableData = [];
+        this.headers = [];
+        this.dealData(data);
+        this.$message({
+					type:"success",
+					message: "刷新成功"
+				})
+      }).catch(() => {
+        this.$message({
+					type:"error",
+					message: "刷新失败"
+				})
+      })
+    },
+    calcHandle(obj){
+      console.log('%cindex.vue line:121 obj', 'color: #007acc;', obj);
+      let data = obj.data
+      if(data) {
+        this.apiData.forEach(item => {
+          let key = "WK" + item['AP_ArticleDemand-DemandWeek'] 
+          item[this.keyLabelMap[data['-']]] = data[key]
+        })
+      }
+      this.$emit("calcHandle",{
+        mpstype : obj.mode,
+        demandlistdata : JSON.stringify({"ArticleDemandLst":this.apiData})
+      })
+       
+
+
+    },
+    saveDemandData(data){
+      this.apiData.forEach(item => {
+        let key = "WK" + item['AP_ArticleDemand-DemandWeek'] 
+        item[this.keyLabelMap[data['-']]] = data[key]
+      })
+      saveDemand(this.apiData).then( ()=> {
+        this.$message({
+					type:"success",
+					message: "保存成功"
+				})
+      }).catch(() => {
+        this.$message({
+					type:"error",
+					message: "保存失败"
+				})
+      })
+    },
+    handlePublic(){
+
+    },
     calculateTableHeight(data) {
-      this.tableHeight = (data -10)+"";
+      this.tableHeight = (data -40)+"";
+      this.charTableHeight = (data + 10)+"";
     },
     // 获取获得数据
     getDataList(customerId, artId) {
       this.loading = true;
-      // 用于测试数据
-      // customerId = 3;
-      // artId = "CAADQ00001A";
+
       this.articleLoading = true;
       getCustomerArticleDemand(customerId, artId)
         .then(({ data = [] }) => {
@@ -93,6 +172,7 @@ export default {
           this.tableData = [];
           this.headers = [];
           if (data.length != 0) {
+            this.apiData = data
             this.dealData(data);
           } else {
             this.$message({
@@ -128,8 +208,7 @@ export default {
         forecastDemandQty[key] = item["AP_ArticleDemand-ForecastDemandQty"];
         orderQty[key] = item["AP_ArticleDemand-OrderQty"];
         outSourcingQty[key] = item["AP_ArticleDemand-OutSourcingQty"];
-        independentDemandQty[key] =
-          item["AP_ArticleDemand-IndependentDemandQty"];
+        independentDemandQty[key] = item["AP_ArticleDemand-IndependentDemandQty"];
         wipQty[key] = item["AP_ArticleDemand-WipQty"];
         openingInventory[key] = item["AP_ArticleDemand-OpeningInventory"];
         targetInventory[key] = item["AP_ArticleDemand-TargetInventory"];
@@ -189,7 +268,12 @@ export default {
   height: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  padding: 0;
+  padding: 0 !important;
+  .tool-list{
+    width: 100%;
+    height: 46px;
+    background: #F1F1F1;
+  }
   .el-tabs {
     .el-tabs__header {
       margin: 0;
@@ -201,6 +285,7 @@ export default {
     .need_card {
       display: flex;
     }
+  
   }
 }
 </style>

src/views/productionPlanning/customerForecastDemandReview/index.vue

@@ -25,7 +25,12 @@
       </div>
       <!-- 右侧 需求计划 -->
       <div class="homepage-top-right-wrap">
-        <DemandPlanning :customerId="customerId" :artId="artId" />
+        <DemandPlanning 
+        :customerId="customerId" 
+        :artId="artId" 
+        :resourceId="resourceId" 
+        @calcHandle="calcHandle"
+        />
       </div>
     </div>
     <!-- 下面模块  -->
@@ -49,9 +54,10 @@
       </div>
       <!-- 右侧 资源负荷、资源产能评估 -->
       <div class="homepage-bottom-right-wrap">
-        <ResourceContent 
-        :resourceId="resourceId" 
-        :resourceType="resourceType" 
+        <ResourceContent
+        :changeMpsPlanParam="changeMpsPlanParam"
+        :resourceId="resourceId"
+        :resourceType="resourceType"
         @handleCancelResource="handleCancelResource"/>
       </div>
     </div>
@@ -64,7 +70,12 @@ import DemandPlanning from "./demandPlanning";
 // 资源内容
 import ResourceContent from "./resourceContent";
 // api
-import { getMainResourceList,getSecondaryResourceList,custartSearch} from "@/server/productionPlanning/customerForecastDemandReview";
+import {
+      getMainResourceList,
+      getSecondaryResourceList,
+      custartSearch,
+      searchResource
+      } from "@/server/productionPlanning/customerForecastDemandReview";
 
 export default {
   components: {
@@ -98,7 +109,9 @@ export default {
       // 资源类型
       resourceType: "",
       // 筛选客户
-      filterCustomer: ""
+      filterCustomer: "",
+
+      changeMpsPlanParam:{},
     };
   },
   created() {
@@ -114,6 +127,14 @@ export default {
     },
   },
   methods: {
+    calcHandle(param){
+      param.resouceid = this.resourceId
+      this.changeMpsPlanParam = param
+      // changeMpsPlan(param).then( ({ data = []}) => {
+      //   this.calcData = data['ArticleResourceMpsGroupLst']
+       
+      // })
+    },
     // 取消资源筛选 用于 资源负载 取消资源按钮
     handleCancelResource(){
       this.changeTreeNodeStatus(this.$refs.resourceTree.store.root,false);
@@ -146,6 +167,10 @@ export default {
         // 点击的是最低级别的子节点
         this.customerId = data.CustomerId;
         this.artId = data.ArtId;
+        searchResource(this.artId).then(({data = []}) => {
+          this.resourceId = data['AP_ArticleResource-ResourceId']
+          this.resourceType = "1"
+        } )
       }
     },
     // 初始化资源树数据
@@ -256,6 +281,7 @@ export default {
       border: 2px solid #919191;
       border-right: none;
       .customer-tree-wrapper {
+        
         height: calc(100% - 50px);
         .customer-tree-wrapper-tree {
           padding-left: 10px;

src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/char.vue

@@ -17,7 +17,7 @@ export default {
         },
         Height:{
 			type:String,
-            default:() => "200px"
+            default:() => "90%"
 		},
         Opacity:{
 			type:Number,
@@ -26,6 +26,7 @@ export default {
     },
     data(){
         return {
+      
             weeksList:[],
             resourceWorkTime:[],
             legendList:[],
@@ -33,12 +34,14 @@ export default {
             customeLegend:"资源每周产能上限"
         }
     },
+ 
     mounted () {
         this.clearData()
         this.initData(this.DataList);
     },
     methods: {
         clearData(){
+        
             this.weeksList = []
             this.resourceWorkTime = []
             this.legendList = []
@@ -47,6 +50,7 @@ export default {
 
        // 初始化数据
         initData(DataList){
+            console.log('%cchar.vue line:50 DataList', 'color: #007acc;', DataList);
             this.legendList.push(this.customeLegend)
             DataList.forEach((item) => {
                 this.weeksList.push("WK" + item.DemandKey.slice(5));
@@ -85,7 +89,7 @@ export default {
         // 初始化图形
         initChart() {
             let option = {
-                tooltip:    { trigger: "axis", axisPointer: { type: "shadow" } },
+                tooltip:    { trigger: 'axis', axisPointer: { type: 'shadow' } },
                 legend:     { data: this.legendList,top:'%1' },
                 grid:       { top: '13%', left: "3%", right: "3%", bottom: "1%", containLabel: true },
                 xAxis:      [{ type: "category", data: this.weeksList }],

src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/index.vue

@@ -1,31 +1,38 @@
 <template>
-  <div class="wrapper" v-if="evaluationDataNew.length != 0">
-    <el-row>
-      <el-col :span="3">
-        <el-select
-          v-model="mode"
-          placeholder="请选择模式"
-          @change="handleModeChange"
-        >
-        <el-option
-            v-for="item in mpsPlanMode"
-            :key="item['Stdef-StdefTyp']"
-            :label="item['Stdef-Bez']"
-            :value="item['Stdef-StdefTyp']"
-          />
-        </el-select>
-      </el-col>
-      <el-col :span="3">
-        <el-button
-          icon="el-icon-plus"
-          class="add-button-style"
-          @click="handlePublic"
-          >发布</el-button
-        >
-      </el-col>
-    </el-row>
-      <Char v-if="evaluationDataOld.length" :DataList="evaluationDataOld" Height="calc(50% - 20px)"></Char>
-      <Char v-if="evaluationDataNew.length" :DataList="evaluationDataNew" Height="calc(50% - 20px)" :Opacity=0.8></Char>
+  <div class="wrapper">
+      <div class="tool_list">
+				<div class="search">
+					<div style="padding:8px">
+					模式选择
+					</div>
+					<div>
+					<el-select
+						v-model="mode"
+						placeholder="请选择"
+						@change="handleModeChange"
+					>
+					<el-option
+						v-for="item in mpsPlanMode"
+						:key="item['Stdef-StdefTyp']"
+						:label="item['Stdef-Bez']"
+						:value="item['Stdef-StdefTyp']"
+						/>
+					</el-select>
+					</div>
+					<div style="margin-left:15px">
+					<el-button
+						class="add-button-style mps-button"
+						@click="handlePublic"
+						> 发布</el-button>
+					</div>
+				</div>
+			</div>
+        <div class="char_box" style="" v-loading='evaluationOldLoading'>
+          <Char v-if="evaluationDataOld.length" :DataList="evaluationDataOld" ></Char>
+        </div>
+        <div class="char_box" v-loading='evaluationNewLoading'>
+          <Char v-if="evaluationDataNew.length" :DataList="evaluationDataNew" :Opacity=0.8></Char>
+        </div>
   </div>
 </template>
 <script>
@@ -35,6 +42,14 @@ export default {
     Char,
   },
   props: {
+    evaluationNewLoading: {
+      type: Boolean,
+      default: () => false 
+    },
+    evaluationOldLoading: {
+      type: Boolean,
+      default: () => false 
+    },
     evaluationDataNew: {
       type: Array,
       default: [],
@@ -76,6 +91,32 @@ export default {
   width: 100%;
   display: flex;
   flex-direction: column;
-  justify-content: space-around;
+  justify-content: space-between;
+
+
+  .tool_list{
+			width: 100%;
+			height: 30px;
+			display: flex;
+			justify-content: space-between;
+			.search{
+				width: 500px;
+				display: flex;
+				.mps-button{
+          width: 98px;
+          height: 32px;
+          background: linear-gradient(180deg, #3C8F87 0%, #28A89E 43%, #24645E 100%);
+          box-shadow: 1px 1px 1px 0px #FFFFFF;
+          border-radius: 2px;
+          border: 1px solid #073A35;
+          line-height: 20px;
+				}
+			}
+	}
+  .char_box{
+    width:100%; height: calc( 50% - 20px)
+
+  }
+  
 }
 </style>

src/views/productionPlanning/customerForecastDemandReview/resourceContent/index.vue

@@ -1,9 +1,10 @@
 <template>
 	<ContentContainer class="homepage-beta-wrapper">
 		<el-tabs v-model="activeName" type="card" >
-			<el-tab-pane label="资源负荷" name="evaluation" v-loading="evaluationLoading">
+			<el-tab-pane label="资源负荷" name="evaluation">
 				<Evaluation
-					v-if="evaluationDataOld.length != 0"
+					:evaluationNewLoading="evaluationNewLoading"
+					:evaluationOldLoading="evaluationOldLoading"
 					:evaluationDataNew="evaluationDataNew"
 					:evaluationDataOld="evaluationDataOld"
 					@handleModeChange="handleModeChange"
@@ -14,7 +15,7 @@
 					ref="resourceLoadComponents"
 					:resourceId="resourceId"
 					:resourceType="resourceType"
-					:Height="tableHeight+'px'"
+					:Height="tableHeight"
 					@calculateTableHeight="calculateTableHeight"
 					@handleCancelResource="handleCancelResource" />
 			</el-tab-pane>
@@ -43,20 +44,25 @@ export default {
 			type: String,
 			default:""
 		},
+		changeMpsPlanParam:{
+			type: Object,
+			default: ()=> {}
+		},
 	},
 	data() {
 		return {
-			tableHeight:0,
-			evaluationLoading:false,
+			tableHeight:"100%",
+			evaluationNewLoading:false,
+			evaluationOldLoading:false,
 			evaluationDataNew: [],
 			evaluationDataOld: [],
-			activeName: 'resourceLoad'
+			activeName: 'evaluation'
 		}
 	},
 	methods: {
 		calculateTableHeight(height) {
-			console.log('%cindex.vue line:58 height', 'color: #007acc;', height);
-			this.tableHeight = (height -10)+"";
+		 
+			this.tableHeight = (height -10)+"px";
 		},
 		// 发布数据
 		handlePublic(param){
@@ -72,12 +78,21 @@ export default {
 		handleModeChange(param){
 			// param.resouceid = "0102" // 模拟临时数据
 			param.data = JSON.stringify(param.data);
+			if(this.resourceType == 1) {
+				param.resouceid = this.resourceId
+			}
 			if(this.resourceType == 2) {
-				param.secondresourceid = param.resouceid
+				param.secondresourceid = this.resourceId
 			}
+			this.evaluationNewLoading = true
+			this.evaluationDataNew = []
 			changeMpsPlan(param).then( ({ data = []}) => {
+				this.evaluationNewLoading = false
 				this.evaluationDataNew = data['ArticleResourceMpsGroupLst']
-			} )
+				console.log('%cindex.vue line:87 this.evaluationDataNew', 'color: #007acc;', this.evaluationDataNew);
+			} ).catch(()=> {
+				this.evaluationNewLoading = false
+			})
 		},
 		// 取消资源ID
 		handleCancelResource(){
@@ -86,11 +101,23 @@ export default {
 		}
 	},
 	watch: {
+		changeMpsPlanParam:function(param) {
+			this.evaluationNewLoading = true
+			this.evaluationDataNew = []
+			changeMpsPlan(param).then( ({ data = []}) => {
+				this.evaluationNewLoading = false
+				this.evaluationDataNew = data['ArticleResourceMpsGroupLst']
+				console.log('%cindex.vue line:87 this.evaluationDataNew', 'color: #007acc;', this.evaluationDataNew);
+			} ).catch(()=> {
+				this.evaluationNewLoading = false
+			})
+		},
 		resourceId:function(value) {
 			this.evaluationDataOld = this.evaluationDataNew = []
 			this.$refs.resourceLoadComponents.isCancelResource = false
 			if(this.activeName == "evaluation") {
-				this.evaluationLoading = true
+				this.evaluationNewLoading = true
+				this.evaluationOldLoading = true
 				let queryParam = {}
 				if(this.resourceType == 1) {
 					queryParam.resouceid = value
@@ -99,7 +126,8 @@ export default {
 				}
 				getMpsPlan(queryParam).then( ({data = [] }) => {
 					this.evaluationDataOld = this.evaluationDataNew = data?data:[]
-					this.evaluationLoading = false
+					this.evaluationNewLoading = false
+					this.evaluationOldLoading = false
 					if(this.evaluationDataOld.length == 0) {
 						this.$message({
 							type:"error",
@@ -107,7 +135,8 @@ export default {
 						})
 					}
 				}).catch(() => {
-					this.evaluationLoading = false
+						this.evaluationNewLoading = false
+					this.evaluationOldLoading = false
 				})
 			}
 		}
@@ -119,14 +148,14 @@ export default {
 	height: 100%;
 	overflow-y: auto;
 	overflow-x: hidden;
-	padding: 0;
+	padding: 0 !important;
 	.el-tabs {
 		el-tabs__header{
 			margin:0;
 		}
 		.el-tabs__content {
 			overflow: inherit;
-			height: 100%;
+			height: calc(100% - 60px) !important;
 		}
 	}
 }

src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/index.vue

@@ -121,7 +121,8 @@ export default {
 			default:""
 		},
 		Height:{
-			type:String
+			type:String,
+			default:"100%"
 		}
 	},
 	data(){