From 5d15164521a9343a5ff3860c97f36eae8386d674 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 24 十二月 2025 15:36:53 +0800
Subject: [PATCH] 调试
---
components/WorkOrderPrint.vue | 145 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 121 insertions(+), 24 deletions(-)
diff --git a/components/WorkOrderPrint.vue b/components/WorkOrderPrint.vue
index 3da39e1..7c66966 100644
--- a/components/WorkOrderPrint.vue
+++ b/components/WorkOrderPrint.vue
@@ -1,18 +1,15 @@
<template>
<view class="page wide-layout" :class="{'has-overlay': (isShowUserSelect || isShow || barcodeIsShow)}">
<view class="status-section">
- <!-- 鎶ュ伐璁板綍琛ㄩ儴鍒嗭紝鍦ㄦ爣棰樿娣诲姞鍒锋柊鎸夐挳 -->
+ <!-- 鎶ュ伐璁板綍琛ㄩ儴鍒� -->
<view class="report-table-wrapper">
- <view class="report-header">
- <view class="report-title">鎶ュ伐璁板綍琛�</view>
- <view class="header-buttons">
- <button class="refresh-btn-header" @click="refresh">鍒锋柊</button>
- <button v-if="isGeneratingBarcode" class="reset-btn-header" @click="resetGenerateState">閲嶇疆</button>
- </view>
- </view>
-
+ <!-- 绉婚櫎浜嗗師鏉ョ殑鍒锋柊鎸夐挳 -->
+
<!-- 鏁伴噰鎬讳骇閲� -->
- <view class="section-title">褰撳墠鏁伴噰浜ч噺鎶ュ伐璁板綍</view>
+ <view class="section-title-container">
+ <view class="section-title">褰撳墠鏁伴噰浜ч噺鎶ュ伐璁板綍</view>
+ <button class="refresh-btn-inline" @click="refresh">鍒锋柊</button>
+ </view>
<div class="table-scroll">
<table class="report-table">
<thead>
@@ -56,7 +53,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>
@@ -140,7 +137,10 @@
<!-- 纭鎻愪氦鍜岃皟鏈烘姤宸ユ寜閽� -->
<view class="submit-section">
<button class="details-btn" @click="confirmCustomAmount">纭鎻愪氦</button>
- <button class="details-btn" @click="confirmTiaojiBaogong">璋冩満鎶ュ伐</button>
+ <button class="details-btn" @click="confirmTiaojiBaogong">
+ 鎶ヨ瘯浜ф暟<br>
+ <span style="font-size:24px;">锛堜粠璋冩満寮�濮嬪埌寮�宸ュ墠鐨勮瘯浜ф暟閲忥級</span>
+ </button>
</view>
</view>
@@ -559,10 +559,21 @@
</script>
<style scoped>
- .section-title {
+/* .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;
+ }*/
+
+ .section-title {
+ font-size: 20px;
+ font-weight: normal; /* 宸插彇娑堝姞绮� */
+ margin: 0;
color: #fff;
background: #007aff;
padding: 8px 18px;
@@ -591,10 +602,29 @@
}
.report-header {
+ display: none; /* 闅愯棌鍘熸潵鐨勬姤鍛婂ご閮� */
+ }
+
+ .section-title-container {
display: flex;
justify-content: space-between;
align-items: center;
- margin-bottom: 8px;
+ margin: 18px 0 8px 0;
+ }
+
+ .refresh-btn-inline {
+ background: #00A2E9;
+ color: #fff;
+ border: none;
+ font-size: 22px;
+ border-radius: 8px;
+ padding: 8px 20px;
+ transition: background 0.15s;
+ margin-left: auto; /* 纭繚鎸夐挳闈犲彸 */
+ }
+
+ .refresh-btn-inline:hover {
+ background: #0086c0;
}
.header-buttons {
@@ -607,7 +637,7 @@
background: #00A2E9;
color: #fff;
border: none;
- font-size: 16px;
+ font-size: 22px;
border-radius: 8px;
padding: 8px 20px;
transition: background 0.15s;
@@ -621,7 +651,7 @@
background: #ff6b6b;
color: #fff;
border: none;
- font-size: 14px;
+ font-size: 22px;
border-radius: 8px;
padding: 8px 16px;
transition: background 0.15s;
@@ -632,7 +662,7 @@
}
.page {
- padding: 1.2vh 2vw;
+ padding: 0.5vh 2vw; /* 鍑忓皯椤堕儴鍐呰竟璺濆疄鐜伴〉闈笂绉� */
display: flex;
flex-direction: column;
box-sizing: border-box;
@@ -663,16 +693,32 @@
}
.report-title {
- font-size: 32px;
+ font-size: 22px;
font-weight: 600;
text-align: center;
margin: 0;
}
/* 2. 鍖哄潡鏍囬 */
- .section-title, .history-title {
+/* .section-title, .history-title {
font-size: 26px;
+ }*/
+ .section-title,
+ .history-title {
+ font-size: 22px; /* 涓庡唴瀹瑰尯涓�鑷� */
+ font-weight: normal;
+ 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;
+ }
+
/* 3. 琛ㄦ牸瀛椾綋 */
.report-table, .report-table th, .report-table td {
@@ -683,12 +729,12 @@
.current-user-section,
.defective-section,
.submit-section {
- font-size: 30px;
+ font-size: 22px;
}
/* 5. 杈撳叆妗嗗瓧浣� */
.inp, .bad-input {
- font-size: 28px;
+ font-size: 22px;
}
/* 6. 鎸夐挳瀛椾綋 */
@@ -851,6 +897,16 @@
}
/* 纭鎻愪氦鎸夐挳*/
+ /*.details-btn {
+ padding: 12px 34px;
+ background: #00a2e9;
+ color: #fff;
+ font-size: 32px;
+ border: none;
+ cursor: pointer;
+ border-radius: 12px;
+ }*/
+
.details-btn {
padding: 12px 34px;
background: #00a2e9;
@@ -859,6 +915,25 @@
border: none;
cursor: pointer;
border-radius: 12px;
+ height: 66px; /* 鍥哄畾楂樺害锛屽拰纭鎻愪氦涓�鏍� */
+ min-width: 180px; /* 鍙�夛紝淇濊瘉瀹藉害涓�鑷� */
+ display: flex; /* 璁╁唴瀹瑰瀭鐩村眳涓� */
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ line-height: 1.1; /* 绱у噾琛岄珮 */
+ box-sizing: border-box;
+ }
+
+ /* 纭繚鎶ヨ瘯浜ф暟鎸夐挳鍐呯殑鏂囧瓧姝ｇ‘灞呬腑 */
+ .details-btn br {
+ display: none;
+ }
+
+ .details-btn span {
+ font-size: 24px;
+ margin-top: 0px; /* 鍘绘帀澶氫綑闂磋窛 */
+ line-height: 1.1;
}
.details-btn:hover {
@@ -868,7 +943,7 @@
.current-user-section {
display: flex;
align-items: center;
- font-size: 32px;
+ font-size: 22px;
border: 1.5px solid #f00;
border-radius: 10px;
padding: 14px 22px;
@@ -879,7 +954,7 @@
.current-user-name {
font-weight: bold;
- font-size: 32px;
+ font-size: 22px;
}
/* 閫変汉鎸夐挳 - 钃濊壊涓婚 */
@@ -889,9 +964,14 @@
border: none; /* 绉婚櫎杈规 */
padding: 12px 22px; /* 璋冩暣鍐呰竟璺濅笌鎻愪氦鎸夐挳鍗忚皟 */
border-radius: 12px; /* 涓庢彁浜ゆ寜閽浉鍚岀殑鍦嗚 */
- font-size: 32px; /* 淇濇寔瀛椾綋澶у皬 */
+ font-size: 22px; /* 淇濇寔瀛椾綋澶у皬 */
cursor: pointer;
transition: background 0.15s; /* 娣诲姞杩囨浮鏁堟灉 */
+ height: 66px; /* 鍥哄畾楂樺害锛屼笌纭鎻愪氦鎸夐挳涓�鏍� */
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.select-user-btn:hover {
@@ -1119,6 +1199,23 @@
border-spacing: 3px;
}
+ .history-table-scroll {
+ max-height: 420px; /* 鍙牴鎹疄闄呴〉闈㈣皟鏁撮珮搴� */
+ overflow-y: scroll; /* 濮嬬粓鏄剧ず绾靛悜婊戞潯 */
+ overflow-x: auto;
+ border: 2px solid #d00;
+ background: #fff;
+ }
+
+ /* 琛ㄥご鍥哄畾 */
+ .history-table-scroll thead tr th {
+ position: sticky;
+ top: 0;
+ z-index: 2;
+ background: #fff;
+ box-shadow: 0 2px 6px rgba(0,0,0,0.04);
+ }
+
@media (max-width:1400px) {
input.highlight {
font-size: 16px;
--
Gitblit v1.9.3