From 8e577a461e9a1840742a81f6fcd237ef34e5cdf1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 10 三月 2025 15:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/process/demand/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/process/demand/index.vue b/src/views/CNAS/process/demand/index.vue
index 05b483d..6ad7886 100644
--- a/src/views/CNAS/process/demand/index.vue
+++ b/src/views/CNAS/process/demand/index.vue
@@ -237,14 +237,14 @@
<p>璇曢獙椤圭洰</p>
<p class="en">Test item</p>
</td>
- <td>
+ <td colspan="2">
<p>妫�楠屼緷鎹�</p>
<p class="en">Test standard</p>
</td>
- <td>
+ <!-- <td>
<p>璇曢獙瑕佹眰</p>
<p class="en">Test standard</p>
- </td>
+ </td> -->
<td>
<p>澶囨敞</p>
<p class="en">Note</p>
@@ -258,8 +258,8 @@
<p>{{ item.model }}</p>
</td>
<td>{{ item.product }}</td>
- <td>{{ item.standardMethodList }}</td>
- <td>{{ item.groupConcatTell }}</td>
+ <td colspan="2">{{ item.standardMethodList }}</td>
+ <!-- <td>{{ item.groupConcatTell }}</td> -->
<td>{{ item.remark }}</td>
</tr>
<tr>
--
Gitblit v1.9.3