From 28189102d735bfc2c41720d1ef292bd9024b49f2 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 18 四月 2024 11:21:01 +0800
Subject: [PATCH] 1、首页 （1）设备级看板单击设备效率统计仪表盘图标跳转至统计分析页面并根据唯一编号筛选页面对应数据 （2）设备级看板点击设备班次按钮跳转至工作日历页面并根据设备编号筛选页面对应数据 （3）增加所有层级看板图表数据加载动画 （4）公司级以及分厂级看板利用率胶囊以及上月OEE车间单柱图表轴线刻度最大值采用动态设置方式而非固定100% （5）工段级看板上月OEE单柱图表轴线刻度最大值采用动态设置方式而非固定100% （6）工段级看板单击前7天利用率图表跳转至统计分析页面并根据唯一编号筛选页面对应数据 （7）工段级看板单击上月OEE图表跳转至设备综合效率分析页面并根据唯一编号筛选页面对应数据 2、调整全局导航栏页签间距，以便能在不超出导航栏的情况下同时放置更多页面页签

---
 src/views/eam/EquipmentDisposalList.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/eam/EquipmentDisposalList.vue b/src/views/eam/EquipmentDisposalList.vue
index 74be0df..9c6c8e9 100644
--- a/src/views/eam/EquipmentDisposalList.vue
+++ b/src/views/eam/EquipmentDisposalList.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered="false" title="璁惧澶勭疆">
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -111,7 +111,7 @@
           slot-scope="text, record"
         >
         <a-popconfirm
-                  v-if="record.auditStatus == 'notSubmitted'"
+                  v-if="record.auditStatus == 'notSubmitted'||record.auditStatus =='Rejected'"
                   title="纭鎻愪氦鍚�?"
                   @confirm="() =>handleCommit(record,'commit')"
                 >
@@ -126,16 +126,16 @@
                 </a-popconfirm>
 
           <a-divider
-            v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'"
+            v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'||record.auditStatus =='Rejected'"
             type="vertical"
           />
           <a
-            v-if="record.auditStatus == 'notSubmitted' "
+            v-if="record.auditStatus == 'notSubmitted'||record.auditStatus =='Rejected' "
             @click="handleEdit(record)"
           >缂栬緫</a>
           <a v-if="record.auditStatus == 'pendingApproval'" @click="handleApprove(record)">瀹℃壒</a>
           <a-divider
-            v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'"
+            v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'||record.auditStatus =='Rejected'"
             type="vertical"
           />
           <a-dropdown>

--
Gitblit v1.9.3