From 37b499550868ddd749f78adedc0cbf343d9aab67 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 13 十一月 2025 10:54:05 +0800
Subject: [PATCH] 复原
---
components/WorkOrderPrint.vue | 183 +++++++++++++++++++++++++++------------------
1 files changed, 111 insertions(+), 72 deletions(-)
diff --git a/components/WorkOrderPrint.vue b/components/WorkOrderPrint.vue
index 9f1567d..2450541 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>
@@ -88,31 +113,25 @@
<text>宸茬敓浜ф暟锛�</text>
<input v-model="calculatedTotalProduction" class="highlight" disabled />
</view>-->
- <view class="btn-group">
- <button class="refresh-btn-inline" @click="refresh">鍒锋柊</button>
- <button v-if="isGeneratingBarcode" class="reset-btn-inline" @click="resetGenerateState">閲嶇疆</button>
- </view>
</view>
<view class="flex-row gap-lg">
- <!-- 褰撳墠鎶ュ伐浜洪儴鍒嗙Щ鍒板乏杈� -->
- <view class="current-user-section fill-width">
+ <!-- 褰撳墠鎶ュ伐浜洪儴鍒� -->
+ <view class="current-user-section">
<text>褰撳墠鎶ュ伐浜猴細</text>
<text class="current-user-name">{{ staffDisplay || '鏈�夋嫨' }}</text>
<button class="select-user-btn" @click="isShowUserSelect = true">閫変汉</button>
</view>
- <!-- 涓嶈壇鏁伴噺閮ㄥ垎绉诲埌鍙宠竟 -->
- <view class="print-section flex-grow">
- <view class="barcode-info">
- <view class="user-select">
- <text>涓嶈壇鏁伴噺锛�</text>
- <input v-model="customAmount" class="inp bad-input" placeholder="璇疯緭鍏ユ暟閲�" />
- </view>
- <view class="user-select">
- <button class="details-btn" @click="confirmCustomAmount">纭鎻愪氦</button>
- </view>
- </view>
+ <!-- 涓嶈壇鏁伴噺閮ㄥ垎 -->
+ <view class="defective-section">
+ <text>涓嶈壇鏁伴噺锛�</text>
+ <input v-model="customAmount" class="inp bad-input" placeholder="璇疯緭鍏ユ暟閲�" />
+ </view>
+
+ <!-- 纭鎻愪氦鎸夐挳 -->
+ <view class="submit-section">
+ <button class="details-btn" @click="confirmCustomAmount">纭鎻愪氦</button>
</view>
</view>
@@ -129,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">
@@ -469,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;
@@ -481,7 +519,6 @@
font-size: 14px;
}
- /* 鏂板锛氭爣棰樿鏍峰紡 */
.report-header {
display: flex;
justify-content: space-between;
@@ -522,8 +559,6 @@
.reset-btn-header:hover {
background: #e94d4d;
}
-
- /* 鍏朵綑鏍峰紡淇濇寔涓嶅彉 */
.page {
padding: 1.2vh 2vw;
@@ -668,7 +703,7 @@
display: flex;
flex-wrap: wrap;
gap: 20px;
- align-items: flex-start;
+ align-items: stretch;
}
.flex-grow {
@@ -679,17 +714,16 @@
gap: 30px;
}
- .print-section {
- padding: 6px 0 14px;
- margin-bottom: 0;
- flex: 1;
+ .defective-section {
+ display: flex;
+ align-items: center;
+ gap: 14px;
+ font-size: 18px;
}
- .barcode-info {
+ .submit-section {
display: flex;
- flex-wrap: wrap;
- align-items: flex-start;
- gap: 30px;
+ align-items: center;
}
.inp {
@@ -732,10 +766,7 @@
padding: 14px 22px;
background: #fff;
gap: 14px;
- }
-
- .fill-width {
- flex: 0 1 380px;
+ flex: 0 0 auto;
}
.current-user-name {
@@ -792,7 +823,7 @@
display: flex;
flex-direction: column;
}
- /* 鎼滅储鏉℃牱寮� */
+
.user-search-bar {
display: flex;
align-items: center;
@@ -843,8 +874,8 @@
.user-list-grid {
display: grid;
- grid-template-columns: repeat(auto-fill,minmax(150px,1fr));
- gap: 24px 24px;
+ grid-template-columns: repeat(auto-fill,minmax(110px,1fr));
+ gap: 12px 12px;
}
.user-list-btn {
@@ -852,14 +883,14 @@
flex-direction: column;
justify-content: center;
align-items: center;
- gap: 6px;
- padding: 16px 10px;
- height: 120px;
- font-size: 18px;
+ gap: 4px;
+ padding: 10px 8px;
+ height: 75px;
+ font-size: 14px;
background: #00a2e9;
color: #fff;
border: none;
- border-radius: 10px;
+ border-radius: 8px;
cursor: pointer;
box-sizing: border-box;
word-break: break-word;
@@ -867,11 +898,11 @@
.user-list-btn .user-code {
font-weight: 600;
- font-size: 18px;
+ font-size: 14px;
}
.user-list-btn .user-name {
- font-size: 16px;
+ font-size: 13px;
}
.user-list-btn.selected {
@@ -975,10 +1006,18 @@
}
.user-list-btn {
- height: 110px;
- font-size: 16px;
+ height: 70px;
+ font-size: 13px;
}
+ .user-list-btn .user-code {
+ font-size: 13px;
+ }
+
+ .user-list-btn .user-name {
+ font-size: 12px;
+ }
+
.reason-btn {
font-size: 12px;
}
--
Gitblit v1.9.3