BPB预测添加机台工艺调整推荐

src/pages/bpb/index.vue

@@ -159,19 +159,62 @@
             <el-button @click="closeAllBomList">关闭</el-button>
         </div>
     </div>
-    <div class="abs bom_all" ref="result_list_all" :style="{'left':'auto !important','height':result_table_height+40+'px'}" v-if="allOrderResultShow">
+    <div class="abs bom_all" ref="result_list_all" :style="{'left':'auto !important','height':result_table_height+100+'px'}" v-if="allOrderResultShow">
         <div class="bom_triangle2"></div>
         <div class="bom_triangle"></div>
-        <el-table :data="order_result_data" :style="{'height': result_table_height+'px'}">
-            <el-table-column label="物料编号" align="center" prop="id" />
-            <el-table-column label="物料名称" align="center" prop="name"  width="240px"/>
-            <el-table-column label="物料规格" align="center" prop="bomSpec" width="120px"/>
-            <el-table-column label="预测结果" align="center" prop="neednum" >
-                <template #default="scope">
-                      <span :style="{'color':scope.row.isalarm?'red':''}" v-html="(scope.row.isalarm?'产能不足<br>差额 ':'产能充足<br>超额 ') + (scope.row.neednum/1000) +'T'"></span>
-                    </template>
-            </el-table-column>
-        </el-table>
+        <el-tabs v-model="result_tab_index"> 
+            <el-tab-pane label="预测结果" name="t1"> 
+                <el-table :data="order_result_data" :style="{'height': result_table_height+'px'}">
+                    <el-table-column label="物料编号" align="center" prop="id" />
+                    <el-table-column label="物料名称" align="center" prop="name"  width="240px"/>
+                    <el-table-column label="物料规格" align="center" prop="bomSpec" width="120px"/>
+                    <el-table-column label="预测结果" align="center" prop="neednum" >
+                        <template #default="scope">
+                            <span :style="{'color':scope.row.isalarm?'red':''}" v-html="(scope.row.isalarm?'产能不足<br>差额 ':'产能充足<br>超额 ') + (scope.row.neednum/1000) +'T'"></span>
+                            </template>
+                    </el-table-column>
+                </el-table>
+            </el-tab-pane>
+            <el-tab-pane label="机台工艺调整推荐" name="t2"> 
+                <el-table :data="order_result_alldata" :style="{'height': result_table_height+'px'}" :cell-style="getTable2CellStyle">
+                    <el-table-column label="机台号" align="center" prop="device" fixed="left" width="120px"/>
+                    
+                    <el-table-column label="库存(T)" align="center" prop="kcl"  fixed="left"  width="60px"/>
+                    <el-table-column label="需求(T)" align="center" prop="xql"  fixed="left" width="60px"/>                    
+                    <el-table-column label="预测(T)" align="center" prop="ycl"  fixed="left" width="60px"/>
+                    
+                    <el-table-column label="剩余(T)" align="center" prop="sy"  fixed="left" width="60px"/>
+                    <el-table-column label="纱线规格D" align="center">
+                        <el-table-column label="L1、L5" align="center" prop="formula_data_4"></el-table-column>
+                        <el-table-column label="L2、L4" align="center" prop="formula_data_5"></el-table-column>  
+                        <el-table-column label="L3" align="center" prop="formula_data_6" width="60px"></el-table-column>                        
+                    </el-table-column>
+                    <el-table-column label="成品" align="center">
+                        <el-table-column label="重" align="center" prop="formula_data_18" width="60px"/>
+                        <el-table-column label="长" align="center" prop="formula_data_16" width="60px"/>
+                        <el-table-column label="宽" align="center" prop="formula_data_17" width="60px"/>
+                    </el-table-column>                    
+                    <el-table-column label="平方米克重" align="center" prop="gramMass"></el-table-column>
+                    <el-table-column label="米克重" align="center" prop="formula_data_3"></el-table-column>
+                    <el-table-column label="毛高" align="center" prop="formula_data_15" width="60px"></el-table-column>
+                    <el-table-column label="配方号" align="center" prop="formula_data_1"></el-table-column>
+                    <el-table-column label="卷曲幅宽" align="center" prop="formula_data_13"></el-table-column> 
+                    <el-table-column label="下布长度" align="center" prop="formula_data_14"></el-table-column>
+                    <el-table-column label="牵拉密度" align="center" prop="formula_data_24"></el-table-column>
+                    <el-table-column label="卷曲张力系数" align="center" prop="formula_data_25"></el-table-column>
+                    <el-table-column label="纱线规格F" align="center" >
+                        <el-table-column label="L1、L5" align="center" prop="formula_data_7"></el-table-column>
+                        <el-table-column label="L2、L4" align="center" prop="formula_data_8"></el-table-column>  
+                        <el-table-column label="L3" align="center" prop="formula_data_9" width="60px"></el-table-column> 
+                    </el-table-column>
+                    <el-table-column label="盘头根数" align="center" >
+                        <el-table-column label="L1、L5" align="center" prop="formula_data_10"></el-table-column>
+                        <el-table-column label="L2、L4" align="center" prop="formula_data_11"></el-table-column>  
+                        <el-table-column label="L3" align="center" prop="formula_data_12" width="60px"></el-table-column>
+                    </el-table-column>
+                </el-table>
+            </el-tab-pane>
+        </el-tabs>
         <div style="line-height: 40px;text-align: center;">
             <el-button @click="closeAllResultList">关闭</el-button>
         </div>
@@ -239,10 +282,17 @@ export default {
         const order_result_line = ref(null);
         let order_result_data_Top5 = ref([]);
         let order_result_data = ref([]);
+        const result_tab_index = ref('t1');
+        const order_result_alldata=ref([]);
 
         function testData(){
 
-
+        }
+        function getTable2CellStyle({row, column, rowIndex, columnIndex}){
+                if (column.property == 'kcl' || column.property == 'ycl'||column.property == 'xql'||column.property == 'sy') {
+                    return {"background-color": "rgb(245 247 250)","color": "#000"};
+                }
+                return {};
         }
         function getOerderList(){
             orderQueryState.value=1;//开始查询订单
@@ -253,6 +303,7 @@ export default {
             };
             api.GetOrderList(v).then((response) => {
               let res = response.data;
+              order_result_alldata.value = response.list;
                 if(res==null){
                     return;
                 }
@@ -530,7 +581,7 @@ export default {
             allBomListShow.value=false;
             allOrderListShow.value=false;
             allOrderResultShow.value = true;
-            var t = parseInt(window.getComputedStyle(bpb_order_resultlist_title.value.parentElement).top)+bpb_order_resultlist_title.value.offsetTop-70;
+            var t = parseInt(window.getComputedStyle(bpb_order_resultlist_title.value.parentElement).top)+bpb_order_resultlist_title.value.offsetTop-240;
             if((724-t)<400 ){
                 result_table_height.value=200;
             }else{
@@ -538,7 +589,7 @@ export default {
             }
             setTimeout(() => {
                 result_list_all.value.style.top = t + 'px';
-                result_list_all.value.style.right = '160px';
+                result_list_all.value.style.right = '220px';
             }, 20);
         }
 
@@ -662,7 +713,18 @@ export default {
             okOrderWin,
             closeOrderWin,
             selectValues,
+            result_tab_index,
+            order_result_alldata,
+            getTable2CellStyle,
         }
     }
 }
 </script>
+<style scoped>
+    /deep/ .el-tabs__item{
+        color: #aaa0a0 !important;
+    }
+    /deep/ .el-tabs__item.is-active{
+        color: #fff !important;
+    }
+</style>

src/styles/bpb.css

@@ -369,7 +369,7 @@ input[type='text']{
     font-size: 14px;
 }
 .bom_all{
-    width: 600px;
+    width: 800px;
     height: 400px;
     border: 1px solid #008899;
     background: rgb(0 85 102 / 92%);
@@ -383,7 +383,7 @@ input[type='text']{
     width: 0;
     height: 0;
     position: absolute;
-    top: 50px;
+    top: 267px;
     right: -12px;
     border-width: 6px;
     border-style: solid;
@@ -394,7 +394,7 @@ input[type='text']{
     width: 0;
     height: 0;
     position: absolute;
-    top: 50px;
+    top: 267px;
     right: -13px;
     border-width: 6px;
     border-style: solid;