From fcd6de629c4f6b8d9e610da854f15ef40115b058 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 07 五月 2024 17:03:49 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/Report.vue | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue b/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
index 7c657bd..16e9974 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
@@ -33,19 +33,14 @@
<template>
<div id="main">
<div id="div-title">
-<!-- <el-breadcrumb :separator-icon="ArrowRight">-->
-<!-- <el-breadcrumb-item :to="{ path: '/main/Replenish/SelectReplenish' }">绠＄悊</el-breadcrumb-item>-->
-<!-- <el-breadcrumb-item :to="{ path: '/main/Replenish/AddReplenish' }">琛ョ墖鏂板</el-breadcrumb-item>-->
-<!-- <el-breadcrumb-item :to="{ path: '/main/Replenish/PrintReplenishFlowCard' }">琛ョ墖鎵撳嵃</el-breadcrumb-item>-->
-<!-- <el-breadcrumb-item :to="{ path: '/main/processCard/SelectPrintFlowCard' }" style="display: none">鎵撳嵃</el-breadcrumb-item>-->
-<!-- </el-breadcrumb>-->
<el-menu
class="el-menu-demo"
mode="horizontal"
:default-active="$route.path"
router
- background-color="#545c64"
- text-color="white"
+ background-color="#5CADFE"
+ text-color="#000000"
+ active-text-color="#ffffff"
>
@@ -54,20 +49,26 @@
<el-menu-item index="/main/report/WorkInProgress">鍦ㄥ埗鍝佹姤琛�</el-menu-item>
<el-menu-item index="/main/report/ProcessToBeCompleted">宸ュ簭寰呭畬鎴�</el-menu-item>
<el-menu-item index="/main/report/ProductionSchedule">鐢熶骇鍙戣揣杩涘害</el-menu-item>
+ <el-menu-item index="/main/report/ProcessCardProgress">娴佺▼鍗¤繘搴�</el-menu-item>
<el-menu-item index="/main/report/OrderPlanDecomposition">璁㈠崟璁″垝鍒嗚В</el-menu-item>
</el-sub-menu>
- <el-sub-menu index="2" popper-class="test">
- <template #title>浜ч噺鎶ヨ〃</template>
- <el-menu-item index="/main/report/TeamOutput">鐝粍浜ч噺</el-menu-item>
- <el-menu-item index="/main/report/EquipmentOutput">璁惧浜ч噺</el-menu-item>
+<!-- <el-sub-menu index="2" popper-class="test">-->
+<!-- <template #title>浜ч噺鎶ヨ〃</template>-->
+<!-- <el-menu-item index="/main/report/TeamOutput">鐝粍浜ч噺</el-menu-item>-->
+<!-- <el-menu-item index="/main/report/EquipmentOutput">璁惧浜ч噺</el-menu-item>-->
+<!-- </el-sub-menu>-->
+ <el-sub-menu index="3" popper-class="test">
+ <template #title>娆＄牬鎶ヨ〃</template>
+ <el-menu-item index="/main/report/DamageReport">娆＄牬鎶ヨ〃</el-menu-item>
+ <el-menu-item index="/main/report/CrossProcessBreaking">璺ㄥ伐搴忔鐮�</el-menu-item>
</el-sub-menu>
- <el-menu-item index="/main/report/DamageReport">娆＄牬鎶ヨ〃</el-menu-item>
+
<el-menu-item index="/main/report/SplittingDetailsOutside">鍒嗘灦鏄庣粏</el-menu-item>
<el-menu-item index="/main/report/TaskCompletionStatus">浠诲姟瀹屾垚鎯呭喌</el-menu-item>
<el-menu-item index="/main/report/RawMaterialRequisition">鍘熺墖棰嗘枡</el-menu-item>
<el-menu-item index="/main/report/QualityReport">鍝佽川鎶ヨ〃</el-menu-item>
<el-menu-item index="/main/report/Yield">鎴愬搧鐜囨姤琛�</el-menu-item>
- <el-menu-item index="/main/report/OrderBOMOutside">BOM鎶ヨ〃</el-menu-item>
+<!-- <el-menu-item index="/main/report/OrderBOMOutside">BOM鎶ヨ〃</el-menu-item>-->
</el-menu>
</div>
@@ -95,6 +96,7 @@
#div-title{
height: 5%;
width: 100%;
+ //color: #ffd04b;
}
--
Gitblit v1.8.0