From d9a34e63b00162452c5439b5c409aee53b76bb25 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期三, 18 十月 2023 15:45:23 +0800
Subject: [PATCH] Merge branch 'develop' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/DailyInspectionStandardList.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/DailyInspectionStandardList.vue b/src/views/eam/DailyInspectionStandardList.vue
index 15245f8..0cb2c33 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'>
@@ -99,7 +99,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'
@@ -262,6 +262,16 @@
dataIndex: 'assignModeName',
},
{
+ title: '鐢熸晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'takeEffectTime',
+ },
+ {
+ title: '澶辨晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'loseEfficacyTime',
+ },
+ {
title: '鍒涘缓浜�',
align: 'center',
dataIndex: 'createBy',
--
Gitblit v1.9.3