From 4f3d4cdf483850cc4a0557b3617dffd15591ece2 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 03 十二月 2025 17:02:31 +0800
Subject: [PATCH] 滑条
---
components/WorkOrderPrint.vue | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/components/WorkOrderPrint.vue b/components/WorkOrderPrint.vue
index d9222e4..ca9a885 100644
--- a/components/WorkOrderPrint.vue
+++ b/components/WorkOrderPrint.vue
@@ -22,13 +22,14 @@
<th>宸ュ崟鍙�</th>
<th>浜у搧鍚嶇О</th>
<th>璁″垝鐢熶骇鏁�</th>
- <th>鏈姤宸ユ暟閲�</th> <!-- 鏂板 -->
+ <th>鏈姤宸ユ暟閲�</th>
<th>鏈哄彴鍙�</th>
<th>鍒濆閲囬泦鏁�</th>
<th>鎶ュ伐鏃堕噰闆嗘暟</th>
<th>鍩轰簬鏁伴噰鐨勬姤宸ユ暟</th>
<th>涓嶈壇鏁�</th>
<th>鑹搧鏁帮紙璁＄畻锛�</th>
+ <th>鎶ュ伐绫诲瀷</th> <!-- 鏂板 -->
</tr>
</thead>
<tbody>
@@ -45,6 +46,9 @@
<td>{{ order.currentCjNum - order.initCjNum }}</td>
<td>{{ realTimeDefectiveCount }}</td>
<td>{{ realTimeOkCount }}</td>
+ <td>
+ {{ order.daa018 === '寮�宸�' ? '鐢熶骇鎶ュ伐' : '璋冩満鎶ュ伐' }}
+ </td>
</tr>
</tbody>
</table>
@@ -52,7 +56,7 @@
<!-- 鍘嗗彶鎶ュ伐璁板綍 -->
<view class="section-title history-title">鍘嗗彶鎶ュ伐璁板綍</view>
- <div class="table-scroll">
+ <div class="table-scroll history-table-scroll">
<table class="report-table">
<thead>
<tr>
@@ -67,6 +71,7 @@
<th>鎶ュ伐鏁帮紙璁＄畻锛�</th>
<th>涓嶈壇鏁�</th>
<th>鑹搧鏁帮紙璁＄畻锛�</th>
+ <th>鎶ュ伐绫诲瀷</th> <!-- 鏂板 -->
</tr>
</thead>
<tbody>
@@ -82,9 +87,10 @@
<td>{{ r.totalProduction }}</td>
<td>{{ r.BfQty }}</td>
<td>{{ r.OkQty }}</td>
+ <td>{{ r.reportType || '-' }}</td> <!-- 鏂板 -->
</tr>
<tr v-if="!reportingHistory.length">
- <td colspan="11" class="no-data">鏆傛棤鍘嗗彶鎶ュ伐璁板綍</td>
+ <td colspan="12" class="no-data">鏆傛棤鍘嗗彶鎶ュ伐璁板綍</td>
</tr>
</tbody>
</table>
@@ -399,7 +405,8 @@
productionCount: r.cjQty ?? 0,//鎶ュ伐鏃堕噰闆嗘暟
totalProduction: (r.cjQty - r.csQty) ?? 0,//鎶ュ伐鏁帮紙璁＄畻锛�
BfQty: r.bfQty,//涓嶈壇鏁�
- OkQty: r.okQty//鑹搧鏁帮紙璁＄畻锛�
+ OkQty: r.okQty,//鑹搧鏁帮紙璁＄畻锛�
+ reportType:r.remark //鎶ュ伐绫诲瀷
}
});
}).catch(() => { this.reportingHistory = []; });
@@ -703,7 +710,8 @@
border: 1px solid #555;
padding: 6px 8px;
text-align: center;
- white-space: nowrap;
+ white-space: normal; /*鍏佽鎹㈣*/
+ word-break: break-all; /*闀垮崟璇� /鏁板瓧涔熸崲琛�*/
}
.status-section {
@@ -1111,6 +1119,15 @@
border-spacing: 3px;
}
+ /* 鍘嗗彶鎶ュ伐璁板綍琛ㄥご鍥哄畾 */
+ .history-table-scroll {
+ max-height: 420px; /* 鍙牴鎹疄闄呴〉闈㈣皟鏁撮珮搴� */
+ overflow-y: scroll; /* 濮嬬粓鏄剧ず绾靛悜婊戞潯 */
+ overflow-x: scroll !important;
+ border: 2px solid #d00;
+ background: #fff;
+ }
+
@media (max-width:1400px) {
input.highlight {
font-size: 16px;
--
Gitblit v1.9.3