From 4e93a3fab91b42560336647ea1051a8f9ad554fd Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 23 四月 2025 13:36:32 +0800
Subject: [PATCH] 优化检验任务模板样式
---
src/views/business/inspectionTask/inspection.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index aef7565..deb64f8 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -156,18 +156,18 @@
<table v-for="(item, index) in tableList" :key="index + currentTable + currentSample.id" border="1"
cellpadding="10" class="tables" id="myTable">
<tbody>
- <tr style="white-space: nowrap">
- 濮旀墭缂栧彿锛歿{
- insOrder.entrustCode
- }}
+ <tr>
+ <th :colspan="50" style="text-align: left !important;">
+ 濮旀墭缂栧彿锛歿{
+ insOrder.entrustCode
+ }}
+ </th>
</tr>
<tr v-for="(m, i) in item.arr" :key="i">
<td v-for="(n, j) in m" v-if="n.v.mc == undefined || Object.keys(n.v.mc).length === 4"
:id="item.templateId + '-' + n.i + '-' + n.r + '-' + n.c" :key="j"
:colspan="n.v.mc && n.v.mc.cs ? n.v.mc.cs : 1" :rowspan="n.v.mc && n.v.mc.rs ? n.v.mc.rs : 1" :style="`background:${n.v.bg ? n.v.bg : ''};color:${n.v.fc
- };font-size:${n.v.fs}px;width:${handleWidth(
- n
- )}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl ? 'bold' : ''
+ };font-size:${n.v.fs}px;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl ? 'bold' : ''
};`">
<div :class="`content-h-${n.v.ht} content-v-${n.v.vt}`" :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]
}px;`" class="content">
@@ -2277,6 +2277,9 @@
// 瀹氫箟涓�涓嚱鏁版潵楠岃瘉鍒嗘暟鏄惁鏈夋晥
if (typeof n.v.v == "string") {
function isValidFraction(fraction) {
+ if (typeof fraction == 'number') {
+ return true
+ }
const [numerator, denominator] = fraction.split("/"); // 鍒嗗瓙鍜屽垎姣�
return !(!denominator || !numerator);
}
--
Gitblit v1.9.3