From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/a7-nonconforming-item/qualityInfo.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/components/do/a7-nonconforming-item/qualityInfo.vue b/src/components/do/a7-nonconforming-item/qualityInfo.vue
index d1e2453..bb334b7 100644
--- a/src/components/do/a7-nonconforming-item/qualityInfo.vue
+++ b/src/components/do/a7-nonconforming-item/qualityInfo.vue
@@ -4,7 +4,7 @@
:visible.sync="formDia"
title="涓嶇鍚堝伐浣滄帶鍒跺崟"
width="80%" @close="closeProcessingDia">
- <div style="height: 660px; overflow-y: auto">
+ <div style="height: 85vh; overflow-y: auto">
<table border="1" cellspacing="10" class="tables">
<tr>
<td class="first-title" rowspan="8">
--
Gitblit v1.9.3