From 4c4c84dbe1a13e90e2e0b232b2db87049ce2d57c Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 2 Jul 2024 14:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=8A=A5=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/dailyReportNew/index.vue | 17 +++++++++++++-
 src/views/plan/order/index.vue         | 32 +++++++++++++-------------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue
index bcc1ea98..8c350f0b 100644
--- a/src/views/mes/dailyReportNew/index.vue
+++ b/src/views/mes/dailyReportNew/index.vue
@@ -53,7 +53,17 @@
 					v-hasPermi="['mes:dailyReportNew:export']"
 				>导出</el-button>
 			</el-col>
-      <el-col :span="20">
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExportBP"
+					v-hasPermi="['mes:dailyReportNew:exportBP']"
+				>白坯参考导出</el-button>
+			</el-col>
+       <el-col :span="20">
       <div style="color:firebrick;font-size: small; text-align: center;">产量=规格*实际产量，订单完成率=实际产量/计划产量，标准工时=产量*规格/产线标准效率，产线效率=标准工时/实际工时，
 		总工时=实际用人*实际工时，<br/>标准人均效率=实际产量/标准用人/标准工时，实际人均效率=实际产量/总工时，人均效率达成率=实际人均效率/标准人均效率</div>
       </el-col>
@@ -245,6 +255,11 @@ export default {
 				...this.queryParams
 			}, `dailyReport_${new Date().getTime()}.xlsx`)
 		},
+		handleExportBP() {
+			this.download('mes/reportWork/getDailyReportNewBPExport', {
+				...this.queryParams
+			}, `dailyReport_BP_${new Date().getTime()}.xlsx`)
+		},
 		getSummaries(param) {
 			const { columns, data } = param;
 			const sums = [];
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index a81502b2..72d53850 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -115,14 +115,14 @@
         >导出
         </el-button>
       </el-col>
-
+      <!--
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-guide" size="mini" 
+        <el-button type="primary" plain icon="el-icon-guide" size="mini"
         @click="handleAutoSplit"
         :disabled="single"
         v-hasPermi="['mes:pro:order:edit']">辅助排产
         </el-button>
-      </el-col>
+      </el-col>-->
 
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -519,8 +519,8 @@
                   </el-date-picker>
               </el-form-item>
             </el-col>
-          </el-row>  
-          <el-row>   
+          </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label="生产工艺" label-width="100px">
                  <el-select v-model="autoSplitform1.routeCode" placeholder="请选择工艺" style="width: 100%;">
@@ -530,15 +530,15 @@
                   </el-select>
               </el-form-item>
             </el-col>
-          </el-row>  
-          <el-row>  
+          </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label="工单排序" label-width="100px">
                 <el-input v-model="autoSplitform1.sortNo" type="Number" style="width: 100%;"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
-        </div>  
+        </div>
       </el-form>
 
       <!--第二步-->
@@ -556,7 +556,7 @@
               </el-checkbox>
             </el-checkbox-group>
           </el-form-item>
-        </div> 
+        </div>
       </el-form>
 
       <!--第三步-->
@@ -1377,7 +1377,7 @@ export default {
       this.reset();
       this.openAutoSplit = false;
       this.activeSplit = 0;
-       autoSplitOrderCancel(Object.assign({},this.autoSplitList[0])).then(response => {}); 
+       autoSplitOrderCancel(Object.assign({},this.autoSplitList[0])).then(response => {});
     },
     // 判空、空串
     checkNull(entity) {
@@ -1508,7 +1508,7 @@ export default {
       getProRoutes(this.autoSplitList[0].prodCode).then(response => {
         this.routes = response.data;
         this.autoSplitform1.routeCode = response.data[0].routeCode;
-        
+
       })
       //var ymd = moment(this.autoSplitform1.productDate).format('YYYY-MM-DD')
       // 获取工单生产顺序
@@ -1562,7 +1562,7 @@ export default {
     },
      next() {
         if (this.activeSplit++ > 2) this.activeSplit = 0;
-        //选完线体后的下一步，会进行模拟拆分 
+        //选完线体后的下一步，会进行模拟拆分
         if(this.activeSplit == 2){
           autoSplitOrder(Object.assign({},this.autoSplitList[0],this.autoSplitform1,this.autoSplitform2)).then(response => {
             this.workerLoading = true // 设置加载状态为true，表示正在加载
@@ -1578,15 +1578,15 @@ export default {
                 this.workerLoading = false // 设置加载状态为false，表示加载完成
               })
             })
-          }); 
+          });
         }
       },
       prev(){
         if (this.activeSplit-- > 2) this.activeSplit = 2;
-        //会进行模拟拆分的取消 
+        //会进行模拟拆分的取消
         if(this.activeSplit == 1){
           autoSplitOrderCancel(Object.assign({},this.autoSplitList[0])).then(response => {
-          }); 
+          });
         }
       },
       autoSplitCommit(){
@@ -1595,7 +1595,7 @@ export default {
            this.getList();
           this.openAutoSplit = false;
           this.activeSplit = 0;
-        }); 
+        });
       }
   }