From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/DailyMaintenanceStandardList.vue | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/views/eam/DailyMaintenanceStandardList.vue b/src/views/eam/DailyMaintenanceStandardList.vue
index f61a8d7..6a743f4 100644
--- a/src/views/eam/DailyMaintenanceStandardList.vue
+++ b/src/views/eam/DailyMaintenanceStandardList.vue
@@ -1,6 +1,6 @@
<template>
<a-card
- title="鏃ュ父淇濆吇鏍囧噯"
+ title="鍛ㄦ湡鎬т繚鍏绘爣鍑�"
:bordered='false'
>
<div class='table-page-search-wrapper'>
@@ -89,6 +89,7 @@
@click='handleAdd'
type='primary'
icon='plus'
+ v-has="'dailyMaintenanceStandard:add'"
>鏂板</a-button>
<a-button
type='primary'
@@ -121,7 +122,7 @@
size='middle'
bordered
rowKey='id'
- :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(1600px + 50%)', y: 900 }"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -160,21 +161,25 @@
<a
v-if="record.versionStatus == '2'"
@click="handleRevise(record)"
+ v-has="'dailyMaintenanceStandard:revise'"
>鍗囩増</a>
<a
v-if="record.versionStatus == '1'"
@click="handleTakeEffect(record)"
+ v-has="'dailyMaintenanceStandard:takeEffect'"
>鐢熸晥</a>
<a-divider type="vertical" />
<a
v-if="record.versionStatus == '1'"
@click="handleEdit(record)"
+ v-has="'dailyMaintenanceStandard:edit'"
>缂栬緫</a>
<a-divider type="vertical" />
<a-popconfirm
v-if="record.versionStatus == '1'"
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
+ v-has="'dailyMaintenanceStandard:delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
@@ -276,23 +281,13 @@
}
},
{
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- },
- {
- title: '鐗堟湰鐘舵��',
- align: 'center',
- dataIndex: 'versionStatusName',
- },
- {
title: '鏍囧噯缂栫爜',
align: 'center',
dataIndex: 'num',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
},
@@ -307,7 +302,7 @@
dataIndex: 'equipmentModel',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'useDepartName',
},
@@ -326,6 +321,26 @@
align: 'center',
dataIndex: 'specificEquipment',
},
+ // {
+ // title: '鐢熸晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'takeEffectTime',
+ // },
+ // {
+ // title: '澶辨晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'loseEfficacyTime',
+ // },
+ {
+ title: '鐗堟湰',
+ align: 'center',
+ dataIndex: 'version',
+ },
+ {
+ title: '鐗堟湰鐘舵��',
+ align: 'center',
+ dataIndex: 'versionStatusName',
+ },
{
title: '鍒涘缓浜�',
align: 'center',
--
Gitblit v1.9.3