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/DailyInspectionStandardList.vue | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/views/eam/DailyInspectionStandardList.vue b/src/views/eam/DailyInspectionStandardList.vue
index 1f7cf59..dcd9b00 100644
--- a/src/views/eam/DailyInspectionStandardList.vue
+++ b/src/views/eam/DailyInspectionStandardList.vue
@@ -1,6 +1,6 @@
<template>
<a-card
- title="鏃ュ父鐐规"
+ title="鑷富缁存姢鐐规鏍囧噯"
:bordered='false'
>
<div class='table-page-search-wrapper'>
@@ -216,23 +216,14 @@
return parseInt(index) + 1
}
},
- {
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- },
- {
- title: '鐗堟湰鐘舵��',
- align: 'center',
- dataIndex: 'versionStatusName',
- },
+
{
title: '鏍囧噯缂栫爜',
align: 'center',
dataIndex: 'num',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'useDepartName',
},
@@ -261,15 +252,25 @@
align: 'center',
dataIndex: 'assignModeName',
},
+ // {
+ // title: '鐢熸晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'takeEffectTime',
+ // },
+ // {
+ // title: '澶辨晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'loseEfficacyTime',
+ // },
{
- title: '鐢熸晥鏃堕棿',
+ title: '鐗堟湰',
align: 'center',
- dataIndex: 'takeEffectTime',
+ dataIndex: 'version',
},
{
- title: '澶辨晥鏃堕棿',
+ title: '鐗堟湰鐘舵��',
align: 'center',
- dataIndex: 'loseEfficacyTime',
+ dataIndex: 'versionStatusName',
},
{
title: '鍒涘缓浜�',
--
Gitblit v1.9.3