From 8e75a78f55d60565eb48b25eafd4eb07939ce2cc Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:05 +0800
Subject: [PATCH] Merge branch 'master' into develop
---
src/views/eam/InspectionCycleList.vue | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/views/eam/InspectionCycleList.vue b/src/views/eam/InspectionCycleList.vue
index 4eae0d2..4fa75de 100644
--- a/src/views/eam/InspectionCycleList.vue
+++ b/src/views/eam/InspectionCycleList.vue
@@ -69,6 +69,7 @@
@click="handleAdd"
type="primary"
icon="plus"
+ v-has="'inspectionCycle:add'"
>鏂板</a-button>
<a-button
@@ -121,7 +122,7 @@
<a-table
ref="table"
size="middle"
- :scroll="{ x: 'calc(1500px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(2000px + 50%)', y: 900 }"
bordered
rowKey="id"
:columns="columns"
@@ -139,22 +140,26 @@
<a
v-if="record.versionStatus == '2'"
@click="handleRevise(record)"
+ v-has="'inspectionCycle:revise'"
>鍗囩増</a>
<a-divider type="vertical" />
<a
v-if="record.versionStatus == '1'"
@click="handleTakeEffect(record)"
+ v-has="'inspectionCycle:takeEffect'"
>鐢熸晥</a>
<a-divider type="vertical" />
<a
v-if="record.versionStatus == '1'"
@click="handleEdit(record)"
+ v-has="'inspectionCycle:edit'"
>缂栬緫</a>
<a-divider type="vertical" />
<a-popconfirm
v-if="record.versionStatus == '1'"
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
+ v-has="'inspectionCycle:delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
@@ -282,6 +287,26 @@
dataIndex: 'accordingCalendarName',
},
{
+ title: '鐢熸晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'takeEffectTime',
+ },
+ {
+ title: '澶辨晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'loseEfficacyTime',
+ },
+ {
+ title: '鍒涘缓浜�',
+ align: 'center',
+ dataIndex: 'createBy',
+ },
+ {
+ title: '鍒涘缓鏃ユ湡',
+ align: 'center',
+ dataIndex: 'createTime',
+ },
+ {
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
--
Gitblit v1.9.3