From 0075304648af0582196ba32d54701644e74d8b88 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 14 十一月 2025 14:51:05 +0800
Subject: [PATCH] Revert "改为获取手机MAC地址"
---
components/WorkOrderPrint.vue | 186 ++++++++++++++++++++++++++++++++-------------
1 files changed, 131 insertions(+), 55 deletions(-)
diff --git a/components/WorkOrderPrint.vue b/components/WorkOrderPrint.vue
index c877043..ff9cc40 100644
--- a/components/WorkOrderPrint.vue
+++ b/components/WorkOrderPrint.vue
@@ -10,6 +10,46 @@
<button v-if="isGeneratingBarcode" class="reset-btn-header" @click="resetGenerateState">閲嶇疆</button>
</view>
</view>
+
+ <!-- 鏁伴噰鎬讳骇閲� -->
+ <view class="section-title">褰撳墠鏁伴噰浜ч噺鎶ュ伐璁板綍</view>
+ <div class="table-scroll">
+ <table class="report-table">
+ <thead>
+ <tr>
+ <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>
+ <tr class="summary-row highlight-row">
+ <td>{{ nowTime }}</td>
+ <td>{{ staffDisplay || '-' }}</td>
+ <td>{{ orderNo || '-' }}</td>
+ <td>{{ order.daa003 || '-' }}</td>
+ <td>{{ planQtyDisplay }}</td>
+ <td>{{ machineNo || '-' }}</td>
+ <td>{{ order.initCjNum }}</td>
+ <td>{{ order.currentCjNum }}</td>
+ <td>{{ order.currentCjNum - order.initCjNum }}</td>
+ <td>{{ realTimeDefectiveCount }}</td>
+ <td>{{ realTimeOkCount }}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <!-- 鍘嗗彶鎶ュ伐璁板綍 -->
+ <view class="section-title history-title">鍘嗗彶鎶ュ伐璁板綍</view>
<div class="table-scroll">
<table class="report-table">
<thead>
@@ -28,33 +68,18 @@
</tr>
</thead>
<tbody>
- <!-- 褰撳墠瀹炴椂缁熻(淇濇寔鍘熸潵鍗曡) -->
- <tr class="summary-row">
- <td>{{ nowTime }}</td>
- <td>{{ staffDisplay || '-' }}</td>
- <td>{{ orderNo || '-' }}</td>
+ <tr v-for="(r, idx) in reportingHistory" :key="idx">
+ <td>{{ r.bgDate }}</td>
+ <td>{{ r.staff || '-' }}</td>
+ <td>{{ r.orderNo || '-' }}</td>
<td>{{ order.daa003 || '-' }}</td>
<td>{{ planQtyDisplay }}</td>
- <td>{{ machineNo || '-' }}</td>
- <td>{{ order.initCjNum }}</td><!--鍒濆閲囬泦鏁�-->
- <td>{{ order.currentCjNum }}</td><!--鎶ュ伐鏃堕噰闆嗘暟-->
- <td>{{ order.currentCjNum - order.initCjNum }}</td><!--鎶ュ伐鏁帮紙璁＄畻锛�-->
- <td>{{ realTimeDefectiveCount }}</td><!--涓嶈壇鏁�-->
- <td>{{ realTimeOkCount }}</td><!--鑹搧鏁帮紙璁＄畻锛�-->
- </tr>
- <!-- 鍘嗗彶鎶ュ伐璁板綍琛� -->
- <tr v-for="(r, idx) in reportingHistory" :key="idx">
- <td>{{ r.bgDate }}</td><!--鏃堕棿-->
- <td>{{ r.staff || '-' }}</td><!--鎶ュ伐浜�-->
- <td>{{ r.orderNo || '-' }}</td><!--宸ュ崟鍙�-->
- <td>{{ order.daa003 || '-' }}</td><!--浜у搧鍚嶇О-->
- <td>{{ planQtyDisplay }}</td><!--璁″垝鐢熶骇鏁�-->
- <td>{{ r.machineNo || '-' }}</td><!--鏈哄彴鍙�-->
- <td>{{ r.initialValue }}</td><!--鍒濆閲囬泦鏁�-->
- <td>{{ r.productionCount }}</td><!--鎶ュ伐鏃堕噰闆嗘暟-->
- <td>{{ r.totalProduction }}</td><!--鎶ュ伐鏁帮紙璁＄畻锛�-->
- <td>{{ r.BfQty }}</td><!--涓嶈壇鏁�-->
- <td>{{ r.OkQty }}</td><!--鑹搧鏁帮紙璁＄畻锛�-->
+ <td>{{ r.machineNo || '-' }}</td>
+ <td>{{ r.initialValue }}</td>
+ <td>{{ r.productionCount }}</td>
+ <td>{{ r.totalProduction }}</td>
+ <td>{{ r.BfQty }}</td>
+ <td>{{ r.OkQty }}</td>
</tr>
<tr v-if="!reportingHistory.length">
<td colspan="11" class="no-data">鏆傛棤鍘嗗彶鎶ュ伐璁板綍</td>
@@ -123,7 +148,7 @@
<button v-if="userSearch" class="user-search-clear" @click="userSearch=''">娓呯┖</button>
<view class="user-search-info">
鍖归厤锛歿{ filteredUsers.length }} / {{ users.length }}
- </view>
+ </view>
</view>
<view class="user-list-scroll">
<template v-if="filteredUsers.length">
@@ -463,7 +488,26 @@
</script>
<style scoped>
- /* 鍘熸牱寮忎繚鎸侊紝鏂板鍑犺杈呭姪鏍峰紡 */
+ .section-title {
+ font-size: 20px;
+ font-weight: bold;
+ margin: 18px 0 8px 0;
+ color: #fff;
+ background: #007aff;
+ padding: 8px 18px;
+ border-radius: 8px 8px 0 0;
+ display: inline-block;
+ }
+
+ .history-title {
+ background: #555;
+ }
+
+ .highlight-row {
+ background: #ffe9b3 !important;
+ font-weight: bold;
+ }
+
.report-table .summary-row {
background: #f0f8ff;
font-weight: 600;
@@ -475,7 +519,6 @@
font-size: 14px;
}
- /* 鏂板锛氭爣棰樿鏍峰紡 */
.report-header {
display: flex;
justify-content: space-between;
@@ -517,8 +560,6 @@
background: #e94d4d;
}
- /* 鍏朵綑鏍峰紡淇濇寔涓嶅彉 */
-
.page {
padding: 1.2vh 2vw;
display: flex;
@@ -526,10 +567,10 @@
box-sizing: border-box;
}
- .wide-layout {
- max-width: 1600px;
- margin: 0 auto;
- }
+ .wide-layout {
+ max-width: none;
+ width: 100%;
+ }
.page.has-overlay .status-section > :not(.overlay) {
pointer-events: none;
@@ -539,28 +580,63 @@
pointer-events: auto;
}
- .report-table-wrapper {
- margin-bottom: 12px;
- }
+ .report-table-wrapper {
+ width: 100%;
+ max-width: none;
+ }
- .table-scroll {
- overflow-x: auto;
- }
+ .table-scroll {
+ width: 100%;
+ overflow-x: scroll !important;
+ /* 淇濊瘉楂樺害鏈夌┖闂存樉绀烘粴鍔ㄦ潯 */
+ /* 鍙�夛細璁剧疆鏈�灏忛珮搴︼紝閬垮厤鍐呭澶皯鏃舵粴鍔ㄦ潯涓嶆樉绀� */
+ min-height: 40px;
+ }
.report-title {
- font-size: 24px;
+ font-size: 32px;
font-weight: 600;
text-align: center;
margin: 0;
}
- .report-table {
- min-width: 1080px;
- width: 100%;
- border-collapse: collapse;
- font-size: 14px;
- background: #fff;
- }
+ /* 2. 鍖哄潡鏍囬 */
+ .section-title, .history-title {
+ font-size: 26px;
+ }
+
+ /* 3. 琛ㄦ牸瀛椾綋 */
+ .report-table, .report-table th, .report-table td {
+ font-size: 22px;
+ }
+
+ /* 4. 褰撳墠鎶ュ伐浜恒�佷笉鑹暟閲忕瓑杈撳叆鍖� */
+ .current-user-section,
+ .defective-section,
+ .submit-section {
+ font-size: 22px;
+ }
+
+ /* 5. 杈撳叆妗嗗瓧浣� */
+ .inp, .bad-input {
+ font-size: 28px;
+ }
+
+ /* 6. 鎸夐挳瀛椾綋 */
+ .details-btn,
+ .select-user-btn,
+ .refresh-btn-header,
+ .reset-btn-header {
+ font-size: 22px;
+ }
+
+ .report-table {
+ width: 100%;
+ min-width: 1800px;
+ /*min-width: unset;*/ /* 鍙栨秷鏈�灏忓搴﹂檺鍒� */
+ border-collapse: collapse;
+ background: #fff;
+ }
.report-table th, .report-table td {
border: 1px solid #555;
@@ -782,7 +858,7 @@
display: flex;
flex-direction: column;
}
- /* 鎼滅储鏉℃牱寮� */
+
.user-search-bar {
display: flex;
align-items: center;
@@ -969,13 +1045,13 @@
font-size: 13px;
}
- .user-list-btn .user-code {
- font-size: 13px;
- }
+ .user-list-btn .user-code {
+ font-size: 13px;
+ }
- .user-list-btn .user-name {
- font-size: 12px;
- }
+ .user-list-btn .user-name {
+ font-size: 12px;
+ }
.reason-btn {
font-size: 12px;
--
Gitblit v1.9.3