From e081f232138b318338ffca07e7c9fcd941ac20b4 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 12 四月 2024 09:54:17 +0800
Subject: [PATCH] 1、设备综合效率分析以及设备加工工件报表页面表格高度设置为页面进入时即可拖动水平滚动条的高度 2、首页 （1）OEE标题增加月份展示，利用率等效率标题增加日期展示 （2）公司及车间级看板单击OEE车间图表跳转至设备综合效率分析页面并根据唯一编号筛选页面对应数据 （3）工段级看板单击设备效率统计仪表盘图标跳转至统计分析页面并根据唯一编号筛选页面对应数据 （4）调整折线图数据展示维度，通过当前工段下各个设备前7天的利用率、开动率和开机率轮播展示
---
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