From 0de6edd66b21331abbb2513ee5b0b8013fea03df Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 四月 2024 10:22:02 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a5-laboratory-qualifications.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/components/view/a5-laboratory-qualifications.vue b/src/components/view/a5-laboratory-qualifications.vue
index 9e3d802..21cca26 100644
--- a/src/components/view/a5-laboratory-qualifications.vue
+++ b/src/components/view/a5-laboratory-qualifications.vue
@@ -119,8 +119,9 @@
</div>
</el-image>
<div class="table-item-right" style="flex: 1;font-size: 12px;color: #666666;">
- <p style="line-height: 30px;">璧勮川鍚嶇О锛�<span style="color: #3A7BFA;">{{ m.name }}</span></p>
- <p style="line-height: 30px;">鏈夋晥鏃堕棿锛歿{m.expireTime}}</p>
+ <p style="line-height: 26px;">璧勮川鍚嶇О锛�<span style="color: #3A7BFA;">{{ m.name }}</span></p>
+ <p style="line-height: 26px;">棰佸彂鏃堕棿锛歿{m.recentlyTime}}</p>
+ <p style="line-height: 26px;">鍒版湡鏃堕棿锛歿{m.expireTime}}</p>
<p>
<span>鐘舵�侊細</span>
<el-tag :type="m.state==0?'danger':'success'" size="small">{{ m.state==0?'澶辨晥':'鏈夋晥' }}</el-tag>
@@ -278,10 +279,10 @@
itemParameterData: {
entity: {
name: null,
- orderBy: {
- field: 'id',
- order: 'asc'
- }
+ // orderBy: {
+ // field: 'id',
+ // order: 'asc'
+ // }
},
isIndex: false,
showSelect: true,
@@ -331,7 +332,7 @@
finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
entity:{
name: null,
- orderBy: {field: "id", order: "asc"}
+ // orderBy: {field: "id", order: "asc"}
},
currentPage: 1, // 褰撳墠椤�
pageSize: 16, // 涓�椤�16鏉�
--
Gitblit v1.9.3