From 5643bf0fae622573052122836b8edfba72157438 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期二, 04 十一月 2025 18:20:09 +0800
Subject: [PATCH] 样式调整1
---
components/WorkOrderPrint.vue | 1123 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 713 insertions(+), 410 deletions(-)
diff --git a/components/WorkOrderPrint.vue b/components/WorkOrderPrint.vue
index 24cfc2b..c877043 100644
--- a/components/WorkOrderPrint.vue
+++ b/components/WorkOrderPrint.vue
@@ -1,23 +1,72 @@
<template>
- <view class="page">
+ <view class="page wide-layout" :class="{'has-overlay': (isShowUserSelect || isShow || barcodeIsShow)}">
<view class="status-section">
- <!-- 澶撮儴 -->
- <view class="header-container">
- <view class="header-title">
- <text>鐢熶骇鏁版嵁缁熻</text>
- </view>
- <view class="header-right">
- <view class="version-info-top">
- <text>v1.0.6</text>
+ <!-- 鎶ュ伐璁板綍琛ㄩ儴鍒嗭紝鍦ㄦ爣棰樿娣诲姞鍒锋柊鎸夐挳 -->
+ <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>
- <button class="refresh-btn" @click="refresh">鍒锋柊</button>
- <button v-if="isGeneratingBarcode" class="reset-btn" @click="resetGenerateState">閲嶇疆</button>
</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">
+ <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>
+ <!-- 鍘嗗彶鎶ュ伐璁板綍琛� -->
+ <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><!--鑹搧鏁帮紙璁＄畻锛�-->
+ </tr>
+ <tr v-if="!reportingHistory.length">
+ <td colspan="11" class="no-data">鏆傛棤鍘嗗彶鎶ュ伐璁板綍</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</view>
- <!-- 绗竴琛岋細淇濈暀 -->
+ <!-- 绉婚櫎浜嗗師鏉ョ殑鐘舵�佽涓殑鎸夐挳缁� -->
<view class="status-row">
- <view class="status-box">
+ <!--<view class="status-box">
<text>鏈哄彴闈㈡澘鏁帮細</text>
<input v-model="productionCount" class="highlight" disabled />
</view>
@@ -38,82 +87,72 @@
<view class="status-box result-box">
<text>宸茬敓浜ф暟锛�</text>
<input v-model="calculatedTotalProduction" class="highlight" disabled />
+ </view>-->
+ </view>
+
+ <view class="flex-row gap-lg">
+ <!-- 褰撳墠鎶ュ伐浜洪儴鍒� -->
+ <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="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>
- <!-- 鍒犻櫎锛氱浜岃(鎵嬫姤涓嶈壇鏁�/鏈墦鍗版潯鐮佹暟) 宸叉寜闇�姹傚幓鎺� -->
- <!-- <view class="status-row">...</view> -->
- <!-- 鍩虹淇℃伅 -->
- <view>
- <view style="display:flex;flex-direction:column;">
- <view class="form-row">
- <view class="form-item">
- <label>浜у搧缂栫爜:</label>
- <input class="inp" type="text" v-model="order.daa002" disabled />
- </view>
- <view class="form-item">
- <label>浜у搧鍚嶇О:</label>
- <superwei-combox :candidates="DAA003List" v-model="order.daa003"
- @select="onDaa003Change" class="inp"></superwei-combox>
- </view>
- <view class="form-item">
- <label>浜у搧瑙勬牸:</label>
- <input class="inp" type="text" v-model="order.daa004" disabled />
+ <!-- 閫変汉寮圭獥 -->
+ <view v-if="isShowUserSelect" class="overlay">
+ <view class="popup user-select-popup">
+ <!-- 鎼滅储鏍� -->
+ <view class="user-search-bar">
+ <input v-model.trim="userSearch"
+ type="text"
+ class="user-search-input"
+ placeholder="杈撳叆宸ュ彿鎴栧鍚嶆悳绱�"
+ @keydown.enter.prevent />
+ <button v-if="userSearch" class="user-search-clear" @click="userSearch=''">娓呯┖</button>
+ <view class="user-search-info">
+ 鍖归厤锛歿{ filteredUsers.length }} / {{ users.length }}
</view>
</view>
- <view class="form-row">
- <view class="form-item">
- <label>鍥� 鍙�:</label>
- <input class="inp" type="text" v-model="order.engineeringNo" disabled />
+ <view class="user-list-scroll">
+ <template v-if="filteredUsers.length">
+ <view class="user-list-grid">
+ <button v-for="(u, index) in filteredUsers"
+ :key="index"
+ :class="['user-list-btn', {'selected': u===staffNo}]"
+ @click="selectUser(u)">
+ <span class="user-code">{{ u.split(':')[0] }}</span>
+ <span class="user-name">{{ u.split(':')[1] }}</span>
+ </button>
+ </view>
+ </template>
+ <view v-else class="no-user-result">
+ 鏈壘鍒板尮閰嶄汉鍛�
</view>
- <view class="form-item">
- <label>鏉� 璐�:</label>
- <input class="inp" type="text" v-model="order.material" disabled />
- </view>
- <view class="form-item">
- <label>棰� 鑹�:</label>
- <input class="inp" type="text" v-model="order.colorName" disabled />
- </view>
+ </view>
+ <view class="user-popup-footer">
+ <button class="clean-btn wide-btn" @click="isShowUserSelect = false">鍏抽棴</button>
</view>
</view>
</view>
- <!-- 鍒犻櫎锛氭墦鍗版潯鐮佸尯鍩� -->
- <!-- (鍘� 鎵撳嵃鏉＄爜寮犳暟 / 姣忓紶鏉＄爜鏁伴噺 / 鎵撳嵃鎸夐挳 / 鏄庣粏鎸夐挳 ) -->
- <!-- 淇濈暀锛氫笉鑹暟閲忚緭鍏� -->
- <view class="print-section" style="margin-top:20px;">
- <view class="barcode-info">
- <view class="user-select">
- <text style="display:inline-block;float:left;margin-left:-11px;">涓嶈壇鏁伴噺锛�</text>
- <input v-model="customAmount" class="inp"
- style="width:55%;height:70px;border:3px solid #808080;font-size:40px;text-align:center;margin-top:5px;"
- placeholder="璇疯緭鍏ユ暟閲�" />
- </view>
- <view class="user-select" style="margin-left:30px;">
- <button class="details-btn" @click="confirmCustomAmount">纭鎻愪氦</button>
- </view>
- </view>
- </view>
-
- <!-- 鎶ュ伐浜洪�夋嫨锛堟浛鎹㈠師涓嶈壇澶囨敞鎸夐挳鍖猴級 -->
- <view>
- <view class="reason-section" style="margin-bottom:-16px">
- <text>鎶ュ伐浜猴細</text>
- <view class="reason-buttons" style="font-size:23px;">
- <button v-for="(u,index) in users" :key="index"
- :class="{'reason-btn':true,'selected': staffNo===u}"
- @click="toggleUser(u)" v-text="u"></button>
- </view>
- </view>
- </view>
-
- <!-- 搴曢儴鎸夐挳锛堜粛淇濈暀锛宻ave 宸查噸鍐欙紝浠呮牎楠屾槸鍚﹂�変汉锛� -->
- <view class="bottom-section">
+ <!-- 绂佺敤鎸夐挳锛氣�樹繚瀛樺苟鐢熸晥'銆佲�樺彇娑堚�� -->
+ <!--<view class="bottom-section">
<button class="save-btn" @click="save">淇濆瓨骞剁敓鏁�</button>
<button class="cancel-btn" @click="cancel">鍙栨秷</button>
- </view>
-
- <!-- (淇濈暀鍘熷脊绐椾笌鏉＄爜鏄庣粏寮圭獥鐨� DOM 锛屽褰诲簳涓嶇敤鍙悗缁垹闄�) -->
+ </view>-->
+ <!-- 淇濈暀鏃у脊绐� -->
<view v-if="isShow" class="overlay">
<view class="popup">
<view class="bottom-section1">
@@ -124,7 +163,9 @@
<view class="reason-buttons">
<button v-for="(u,index) in users" :key="index"
:class="{'reason-btn':true,'selected': user===u}"
- @click="toggleUser(u)" v-text="u"></button>
+ @click="toggleUser(u)">
+ {{ formatUser(u) }}
+ </button>
</view>
</view>
</view>
@@ -140,23 +181,13 @@
<uni-th align="center" style="font-size:40px;">鎶ュ伐鏁伴噺</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in reportingList" :key="index">
- <uni-td align="center">
- <input type="text" v-model="item.bgDate" style="width:26vh;" />
- </uni-td>
- <uni-td align="center">
- <input v-model="item.itemNoCade" style="width:40vh;" />
- </uni-td>
- <uni-td align="center">
- <input v-model="item.staffName" />
- </uni-td>
- <uni-td align="center">
- <input v-model="item.okQty" />
- </uni-td>
+ <uni-td align="center"><input type="text" v-model="item.bgDate" style="width:26vh;" /></uni-td>
+ <uni-td align="center"><input v-model="item.itemNoCade" style="width:40vh;" /></uni-td>
+ <uni-td align="center"><input v-model="item.staffName" /></uni-td>
+ <uni-td align="center"><input v-model="item.okQty" /></uni-td>
</uni-tr>
</uni-table>
- <view>
- <button class="clean-btn" type="warn" @click="barcodeIsShow=false">鍏抽棴</button>
- </view>
+ <view><button class="clean-btn" type="warn" @click="barcodeIsShow=false">鍏抽棴</button></view>
</view>
</view>
</view>
@@ -167,232 +198,223 @@
import { printTemplate3 } from "../utils/printTemplate";
export default {
- props: {
- orderNo: String,
- orderId: Number,
- machineNo: String
- },
+ props: { orderNo: String, orderId: Number, machineNo: String },
data() {
return {
+ isShowUserSelect: false,
currentUser: '',
barcodeAmount: '',
- users: [],
- userForm: [],
- staff: [],
- user: {},
- // 鍒犻櫎涓嶈壇鍘熷洜鐩稿叧鏁版嵁
- productionCount: 0,
- printedCount: 0,
- defectiveCount: 0,
- order: {},
- icount: 1,
- bqty: 0,
- sQuantity: 0,
- kgQty: 0,
- initialValue: 0,
- qqty: 0,
- ngStaid: 0,
- bufferData: '',
- dataToPrint: [],
- isLoading: false,
- but: false,
- DAA003List: [],
- lineList: [],
- isShow: false,
- barcodeIsShow: false,
- barcodeList: [],
- staffNo: '',
- printStr: '',
- printMac: '',
- bluetoothSocket: {},
- device: '',
- uuid: '',
- printNum: 1,
- reportingList: [],
- printLoading: false,
- customAmount: '',
- isGeneratingBarcode: false,
- lastGenerateTime: 0,
- generateRequestId: null
- };
- },
- computed: {
- calculatedCurrentCount() {
- const production = this.productionCount || 0;
- const initial = this.initialValue || 0;
- return production - initial;
- },
- calculatedTotalProduction() {
- const kgQty = this.kgQty || 0;
- const currentCount = this.calculatedCurrentCount;
- return kgQty + currentCount;
- },
- calculatedDefectiveCount() {
- const totalProduction = this.calculatedTotalProduction;
- const goodCount = this.sQuantity || 0;
- return totalProduction - goodCount;
+ users: [], userForm: [], staff: [], user: {},
+ productionCount: 0, printedCount: 0, defectiveCount: 0, order: {},
+ icount: 1, bqty: 0, sQuantity: 0, kgQty: 0, initialValue: 0, qqty: 0,
+ ngStaid: 0, bufferData: '', dataToPrint: [], isLoading: false, but: false,
+ DAA003List: [], lineList: [], isShow: false, barcodeIsShow: false, barcodeList: [],
+ staffNo: '', printStr: '', printMac: '', bluetoothSocket: {}, device: '', uuid: '',
+ printNum: 1, reportingList: [], printLoading: false, customAmount: '',
+ isGeneratingBarcode: false, lastGenerateTime: 0, generateRequestId: null,
+ nowTimeTimer: null, nowTime: '',
+ userSearch: '',
+ /* 鏂板锛氬巻鍙叉姤宸ヨ褰曟暟缁� */
+ reportingHistory: []
}
},
- mounted() { },
+ computed: {
+ //鑹搧鏁板疄鏃惰绠�
+ realTimeDefectiveCount() {
+ // 浼樺厛鐢ㄨ緭鍏ユ鐨勫�硷紝鍚﹀垯鐢ㄦ帴鍙ｆ暟鎹�
+ const val = Number(this.customAmount);
+ if (!isNaN(val) && this.customAmount !== '') return val;
+ return this.calculatedDefectiveCount;
+ },
+ realTimeOkCount() {
+ // 鑹搧鏁� = 鎶ュ伐鏁帮紙璁＄畻锛� - 涓嶈壇鏁�
+ const total = (this.order.currentCjNum || 0) - (this.order.initCjNum || 0);
+ return total - this.realTimeDefectiveCount;
+ },
+ calculatedCurrentCount() { return (this.productionCount || 0) - (this.initialValue || 0); },
+ calculatedTotalProduction() { return (this.kgQty || 0); }, // 鑻ラ渶鎭㈠鏃ч�昏緫鍙敤 (this.kgQty||0)+this.calculatedCurrentCount
+ calculatedDefectiveCount() { return this.calculatedTotalProduction - (this.sQuantity || 0); },
+ planQtyDisplay() { return this.order.planQty || this.order.planQuantity || this.order.daa008 || 0; },
+ staffDisplay() {
+ if (!this.staffNo) return '';
+ const segs = this.staffNo.split(':');
+ return segs.length > 1 ? `${segs[0]} ${segs[1]}` : this.staffNo;
+ },
+ filteredUsers() {
+ if (!this.userSearch) return this.users;
+ const kw = this.userSearch.trim().toLowerCase();
+ return this.users.filter(u => u.toLowerCase().includes(kw));
+ }
+ },
created() {
this.initializeData();
this.fetchData(true);
this.init();
- // 鐩存帴鍔犺浇浜哄憳渚涢�夋嫨
this.getXS0101();
+ this.updateNowTime();
+ // 绉掔骇鍒锋柊锛涘涓嶉渶鍔ㄦ�佽烦绉掑彲鏀逛负 60000
+ this.nowTimeTimer = setInterval(this.updateNowTime, 1000);
},
+ beforeDestroy() { if (this.nowTimeTimer) clearInterval(this.nowTimeTimer); },
methods: {
+ formatUser(u) {
+ if (!u) return '';
+ const segs = u.split(':');
+ return segs.length > 1 ? `${segs[0]} ${segs[1]}` : u;
+ },
+ selectUser(u) { this.staffNo = u; this.isShowUserSelect = false; this.userSearch = ''; },
+ /* 淇敼锛氬鍔犵 */
+ updateNowTime() {
+ const d = new Date(), p = n => n.toString().padStart(2, '0');
+ this.nowTime = `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
+ },
initializeData() {
- this.productionCount = 0;
- this.printedCount = 0;
- this.defectiveCount = 0;
- this.icount = 1;
- this.bqty = 0;
- this.sQuantity = 0;
- this.kgQty = 0;
- this.initialValue = 0;
- this.qqty = 0;
- this.isGeneratingBarcode = false;
- this.lastGenerateTime = 0;
- this.generateRequestId = null;
+ this.productionCount = this.printedCount = this.defectiveCount = 0;
+ this.icount = 1; this.bqty = 0; this.sQuantity = 0; this.kgQty = 0;
+ this.initialValue = 0; this.qqty = 0;
+ this.isGeneratingBarcode = false; this.lastGenerateTime = 0; this.generateRequestId = null;
},
resetGenerateState() {
- this.isGeneratingBarcode = false;
- this.generateRequestId = null;
- this.lastGenerateTime = 0;
+ this.isGeneratingBarcode = false; this.generateRequestId = null; this.lastGenerateTime = 0;
this.$showMessage("宸查噸缃潯鐮佺敓鎴愮姸鎬�");
},
refresh() {
this.$sendPostRequest({
- url: "http://192.168.0.94:9095/Numerical/RefreshDev",
+ url: "http://192.168.0.94:9095/Numerical/RefreshDevBycl",
data: { machineNo: this.order.machineNo },
contentType: "application/json"
- }).then(res1 => {
- if (res1.code == 200) {
- this.fetchData(true);
- } else {
- this.$showMessage("鍚屾澶辫触");
- }
- });
+ }).then(r => { r.code == 200 ? this.fetchData(true) : this.$showMessage("鍚屾澶辫触"); });
},
- onDaa003Change(event) {
- let orde = this.lineList[this.DAA003List.indexOf(event)];
- this.orderId = orde.id;
- this.orderNo = orde.daa001;
+ onDaa003Change(v) {
+ let o = this.lineList[this.DAA003List.indexOf(v)];
+ this.orderId = o.id; this.orderNo = o.daa001;
uni.setStorageSync('machine', this.machineNo);
uni.setStorageSync('orderId', this.orderId);
uni.setStorageSync('orderNo', this.orderNo);
- uni.setStorageSync('engineeringNo', this.order.engineeringNo);
this.fetchData(false);
},
fetchData(flag) {
if (!this.orderId && !this.orderNo) return;
this.getOrderById();
this.getWomdaaPrintById();
+ this.getReportingHistory(); // 鏂板锛氭瘡娆″埛鏂板悓姝ュ巻鍙�
if (flag) {
- this.$post({
- url: "/Womdaa/GetWomdaasByShow",
- data: { machineNo: this.machineNo }
- }).then(res => {
- this.lineList = res.data.tbBillList;
- this.DAA003List = res.data.tbBillList.map(item => item.daa003);
- });
+ this.$post({ url: "/Womdaa/GetWomdaasByShow", data: { machineNo: this.machineNo } })
+ .then(res => {
+ this.lineList = res.data.tbBillList;
+ this.DAA003List = res.data.tbBillList.map(i => i.daa003);
+ });
}
},
- toggleUser(user) {
- if (!user) return;
- this.user = this.user === user ? null : user;
+ /* 鏂板锛氳幏鍙栧巻鍙叉姤宸ヨ褰� */
+ /* 淇敼锛氳鑼冨巻鍙叉椂闂村埌绉� */
+ getReportingHistory() {
+ if (!this.orderNo) { this.reportingHistory = []; return; }
+ const fmtSec = v => {
+ if (!v) return '';
+ // 鍏煎鍚庣鍙兘杩斿洖鐨勪笉鍚屾牸寮�
+ const d = new Date(typeof v === 'string' ? v.replace(/-/g, '/') : v);
+ if (isNaN(d.getTime())) return v; // 鏃犳硶瑙ｆ瀽鍒欏師鏍疯繑鍥�
+ const p = n => n.toString().padStart(2, '0');
+ return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
+ };
+ this.$post({
+ url: "/Womdaa/GetByBillNoBG",
+ data: { billNo: this.orderNo, machineNo: this.machineNo || null }
+ }).then(res => {
+ const list = res?.data?.tbBillList || res?.data || [];
+ this.reportingHistory = list.map(r => {
+ // 渚濇嵁浣犳暟鎹簱瀛楁鍋氭槧灏勶紙涓嬮潰瀛楁鍚嶆寜甯歌鍛藉悕涓句緥锛岄渶瑕佹寜瀹為檯鏀癸級
+ return {
+ bgDate: r.bgDate || '', // 鎶ュ伐鏃堕棿
+ staff: (r.staffNo ? (r.staffNo + ' ' + (r.staffName || '')) : (r.staffName || '')),//鎶ュ伐浜�
+ orderNo: r.billNo,//宸ュ崟鍙�
+ machineNo: r.machineNo,//鏈哄彴鍙�
+ initialValue: r.csQty ?? 0,//鍒濆閲囬泦鏁�
+ productionCount: r.cjQty ?? 0,//鎶ュ伐鏃堕噰闆嗘暟
+ totalProduction: (r.cjQty - r.csQty) ?? 0,//鎶ュ伐鏁帮紙璁＄畻锛�
+ BfQty: r.bfQty,//涓嶈壇鏁�
+ OkQty: r.okQty//鑹搧鏁帮紙璁＄畻锛�
+ }
+ });
+ }).catch(() => { this.reportingHistory = []; });
+ },
+ toggleUser(u) {
+ if (!u) return;
+ this.user = this.user === u ? null : u;
this.staffNo = this.user;
},
+ //閫夋嫨鎶ュ伐浜�
confirmCustomAmount() {
- if (!this.customAmount || isNaN(Number(this.customAmount))) {
- this.$showMessage('璇疯緭鍏ユ湁鏁堢殑鏁伴噺');
- return;
- }
- let amount = Number(this.customAmount);
+ if (!this.customAmount || isNaN(Number(this.customAmount))) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑鏁伴噺'); return; }
+ if (!this.staffNo) { this.$showMessage('璇烽�夋嫨鎶ュ伐浜�'); return; }
+ const staffNo = this.staffNo.split(':')[0];
+ const amount = Number(this.customAmount);
this.$post({
url: "/MesInvItemBarcodes/AddBFToBarcodes",
data: {
orderNo: this.orderNo,
orderId: this.orderId,
- bf: amount
+ bf: amount,
+ staffNo: staffNo,
+ initCjNum: this.order.initCjNum, // 鍒濆閲囬泦鏁�
+ currentCjNum: this.order.currentCjNum // 鎶ュ伐鏃堕噰闆嗘暟
}
}).then(res => {
- if (res.status == 1) {
- this.$showMessage(res.message);
- return;
- }
+ if (res.status == 1) { this.$showMessage(res.message); return; }
this.$showMessage('鎶ュ簾鏁伴噺濉啓鎴愬姛');
- this.fetchData(true);
+ this.fetchData(true); // 鑷姩鍒锋柊鍘嗗彶
this.customAmount = '';
- }).catch(() => {
- this.$showMessage('鎶ュ簾鏁伴噺濉啓澶辫触锛岃閲嶈瘯');
- });
+ }).catch(() => this.$showMessage('鎶ュ簾鏁伴噺濉啓澶辫触锛岃閲嶈瘯'));
},
- // 淇濆瓨鎸夐挳鐜板湪浠呮牎楠屾姤宸ヤ汉锛堝彲鏍规嵁涓氬姟鏀规垚鎻愪氦鎺ュ彛锛�
save() {
- if (!this.staffNo) {
- this.$showMessage('璇烽�夋嫨鎶ュ伐浜�');
- return;
- }
+ if (!this.staffNo) { this.$showMessage('璇烽�夋嫨鎶ュ伐浜�'); return; }
uni.showToast({ title: '淇濆瓨鎴愬姛', icon: 'success' });
+ this.getReportingHistory(); // 淇濆瓨鍚庝篃鍙埛鏂�
},
- cancel() {
- uni.showToast({ title: '鍙栨秷鎿嶄綔', icon: 'none' });
- },
+ cancel() { uni.showToast({ title: '鍙栨秷鎿嶄綔', icon: 'none' }); },
getOrderById() {
- this.$post({
- url: "/Womdaa/GetWomdaaById",
- data: { orderId: this.orderId, orderNo: this.orderNo }
- }).then(res => {
- this.order = res.data.tbBillList;
- this.printedCount = res.data.tbBillList.bgqty;
- this.defectiveCount = res.data.tbBillList.blQty;
- this.productionCount = this.order.todayOutput || 0;
- this.defectiveCount = this.defectiveCount || 0;
- this.printedCount = this.printedCount || 0;
- });
+ this.$post({ url: "/Womdaa/GetWomdaaById", data: { orderId: this.orderId, orderNo: this.orderNo } })
+ .then(res => {
+ this.order = res.data.tbBillList;
+ this.printedCount = res.data.tbBillList.bgqty || 0;
+ this.defectiveCount = res.data.tbBillList.blQty || 0;
+ this.productionCount = this.order.todayOutput || 0;
+ });
},
getXS0101() {
- this.$post({ url: "/MesStaff/GetAllXS0101" }).then(res => {
- this.staff = res.data.tbBillList;
- this.users = this.staff.map(s => s.staffNo + ":" + s.staffName);
- });
+ this.$post({ url: "/MesStaff/GetAllXS0101" })
+ .then(res => {
+ this.staff = res.data.tbBillList;
+ this.users = this.staff.map(s => s.staffNo + ":" + s.staffName);
+ });
},
getWomdaaPrintById() {
- this.$post({
- url: "/Womdaa/GetWomdaaPrintById",
- data: { orderId: this.orderId }
- }).then(res => {
- if (!res || !res.data || !res.data.tbBillList) return;
- const data = res.data.tbBillList;
- this.bqty = data.bqty;
- this.icount = 1;
- this.sQuantity = data.sQuantity || 0;
- this.initialValue = data.initialValue || 0;
- this.kgQty = data.kgQty || 0;
- this.barcodeAmount = data.qqty || 0;
- if (this.bqty === 0) this.Completed();
- }).catch(() => { });
+ this.$post({ url: "/Womdaa/GetWomdaaPrintById", data: { orderId: this.orderId } })
+ .then(res => {
+ if (!res?.data?.tbBillList) return;
+ const d = res.data.tbBillList;
+ this.bqty = d.bqty;
+ this.icount = 1;
+ this.sQuantity = d.sQuantity || 0;
+ this.initialValue = d.initialValue || 0;
+ this.kgQty = d.kgQty || 0;
+ this.barcodeAmount = d.qqty || 0;
+ if (this.bqty === 0) this.Completed();
+ }).catch(() => { });
},
Completed() {
- this.$post({
- url: "/MesOrderSta/Completed",
- data: { orderId: this.orderId, orderNo: this.orderNo }
- });
+ this.$post({ url: "/MesOrderSta/Completed", data: { orderId: this.orderId, orderNo: this.orderNo } });
},
- // 浠ヤ笅鎵撳嵃鐩稿叧鍑芥暟浠嶄繚鐣欙紙鑻ュ畬鍏ㄤ笉鐢ㄥ彲缁х画鍒犻櫎锛�
init() {
try {
- const androidVersion = this.getAndroidVersion();
- if (androidVersion >= 12) this.initForAndroid12Plus(); else this.initForAndroidLegacy();
+ const v = this.getAndroidVersion();
+ v >= 12 ? this.initForAndroid12Plus() : this.initForAndroidLegacy();
} catch (e) { console.error(e); }
},
getAndroidVersion() {
- try {
- var Build = plus.android.importClass("android.os.Build");
- return Build.VERSION.SDK_INT;
- } catch { return 30; }
+ try { var Build = plus.android.importClass("android.os.Build"); return Build.VERSION.SDK_INT; }
+ catch { return 30; }
},
initForAndroid12Plus() {
try {
@@ -401,18 +423,16 @@
var Context = plus.android.importClass("android.content.Context");
var UUID = plus.android.importClass("java.util.UUID");
this.uuid = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
- var bluetoothManager = main.getSystemService(Context.BLUETOOTH_SERVICE);
- var bluetoothAdapter = bluetoothManager.getAdapter();
- if (bluetoothAdapter && bluetoothAdapter.isDiscovering()) bluetoothAdapter.cancelDiscovery();
+ var mgr = main.getSystemService(Context.BLUETOOTH_SERVICE);
+ var adp = mgr.getAdapter();
+ if (adp && adp.isDiscovering()) adp.cancelDiscovery();
this.printMac = uni.getStorageSync('printMac');
- var address_mac = this.printMac ? this.printMac : "DC:1D:30:91:06:52";
- if (bluetoothAdapter) {
- this.device = bluetoothAdapter.getRemoteDevice(address_mac);
+ var mac = this.printMac || "DC:1D:30:91:06:52";
+ if (adp) {
+ this.device = adp.getRemoteDevice(mac);
plus.android.importClass(this.device);
}
- } catch (e) {
- this.initForAndroidLegacy();
- }
+ } catch (e) { this.initForAndroidLegacy(); }
},
initForAndroidLegacy() {
try {
@@ -422,9 +442,9 @@
var BAdapter = BluetoothAdapter.getDefaultAdapter();
if (BAdapter) BAdapter.cancelDiscovery();
this.printMac = uni.getStorageSync('printMac');
- var address_mac = this.printMac ? this.printMac : "DC:1D:30:91:06:52";
+ var mac = this.printMac || "DC:1D:30:91:06:52";
if (BAdapter) {
- this.device = BAdapter.getRemoteDevice(address_mac);
+ this.device = BAdapter.getRemoteDevice(mac);
plus.android.importClass(this.device);
this.bluetoothSocket = this.device.createInsecureRfcommSocketToServiceRecord(this.uuid);
plus.android.importClass(this.bluetoothSocket);
@@ -435,207 +455,295 @@
this.isShow = false;
this.isGeneratingBarcode = false;
this.generateRequestId = null;
- this.bufferData = '';
- this.dataToPrint = [];
- this.staffNo = null;
- this.user = '';
- this.barcodeAmount = '';
- this.icount = 1;
- this.staff = null;
+ this.bufferData = ''; this.dataToPrint = [];
+ this.staffNo = null; this.user = ''; this.barcodeAmount = ''; this.icount = 1; this.staff = null;
}
}
- };
+ }
</script>
<style scoped>
- /* 鏍峰紡淇濇寔鍘熸湁锛屽ぇ鍧楀垹闄ゅ尯鍩熶笉鍐嶉渶瑕侀澶栨牱寮� */
+ /* 鍘熸牱寮忎繚鎸侊紝鏂板鍑犺杈呭姪鏍峰紡 */
+ .report-table .summary-row {
+ background: #f0f8ff;
+ font-weight: 600;
+ }
+
+ .report-table .no-data {
+ text-align: center;
+ color: #777;
+ font-size: 14px;
+ }
+
+ /* 鏂板锛氭爣棰樿鏍峰紡 */
+ .report-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 8px;
+ }
+
+ .header-buttons {
+ display: flex;
+ align-items: center;
+ gap: 12px;
+ }
+
+ .refresh-btn-header {
+ background: #00A2E9;
+ color: #fff;
+ border: none;
+ font-size: 16px;
+ border-radius: 8px;
+ padding: 8px 20px;
+ transition: background 0.15s;
+ }
+
+ .refresh-btn-header:hover {
+ background: #0086c0;
+ }
+
+ .reset-btn-header {
+ background: #ff6b6b;
+ color: #fff;
+ border: none;
+ font-size: 14px;
+ border-radius: 8px;
+ padding: 8px 16px;
+ transition: background 0.15s;
+ }
+
+ .reset-btn-header:hover {
+ background: #e94d4d;
+ }
+
+ /* 鍏朵綑鏍峰紡淇濇寔涓嶅彉 */
+
.page {
- padding: 2vh;
+ padding: 1.2vh 2vw;
display: flex;
flex-direction: column;
- justify-content: space-between;
box-sizing: border-box;
}
- .refresh-btn {
- float: right;
- background-color: #00A2E9;
- color: #fff;
- border: none;
- font-size: 32px;
- border-radius: 15px;
- margin-top: -32px;
- margin-bottom: 49px;
- padding: 0 25px;
+ .wide-layout {
+ max-width: 1600px;
+ margin: 0 auto;
}
+
+ .page.has-overlay .status-section > :not(.overlay) {
+ pointer-events: none;
+ }
+
+ .page.has-overlay .status-section > .overlay {
+ pointer-events: auto;
+ }
+
+ .report-table-wrapper {
+ margin-bottom: 12px;
+ }
+
+ .table-scroll {
+ overflow-x: auto;
+ }
+
+ .report-title {
+ font-size: 24px;
+ font-weight: 600;
+ text-align: center;
+ margin: 0;
+ }
+
+ .report-table {
+ min-width: 1080px;
+ width: 100%;
+ border-collapse: collapse;
+ font-size: 14px;
+ background: #fff;
+ }
+
+ .report-table th, .report-table td {
+ border: 1px solid #555;
+ padding: 6px 8px;
+ text-align: center;
+ white-space: nowrap;
+ }
.status-section {
display: flex;
flex-direction: column;
- margin-bottom: 3vh;
- padding-top: 14px;
+ gap: 10px;
}
.status-row {
display: flex;
- justify-content: flex-start;
+ flex-wrap: wrap;
align-items: center;
- margin-bottom: 20px;
- background-color: #f9f9f9;
- padding: 15px;
+ gap: 10px;
+ background: #f9f9f9;
+ padding: 10px 14px;
border-radius: 8px;
- box-shadow: 0 1px 3px rgba(0,0,0,.05);
+ box-shadow: 0 1px 4px rgba(0,0,0,.06);
}
.status-box {
display: flex;
align-items: center;
- padding: 0 10px;
}
.result-box {
- background-color: #f0f8ff;
- padding: 5px 15px;
+ background: #f0f8ff;
+ padding: 4px 12px;
border-radius: 6px;
- border-left: 4px solid #007aff;
+ border-left: 5px solid #007aff;
}
input.highlight {
- width: 10vw;
- font-weight: 700;
+ width: 9vw;
+ min-width: 110px;
+ font-weight: 600;
border: none;
- background-color: #fff;
+ background: #fff;
text-align: center;
- font-size: 1.5vw;
- padding: 8px;
- border-radius: 4px;
- box-shadow: inset 0 1px 3px rgba(0,0,0,.1);
+ font-size: 18px;
+ padding: 6px 0;
+ border-radius: 6px;
+ box-shadow: inset 0 1px 3px rgba(0,0,0,.12);
}
.operator-box {
display: flex;
justify-content: center;
align-items: center;
- font-size: 36px;
+ font-size: 28px;
font-weight: bold;
- margin: 0 15px;
color: #007aff;
- width: 40px;
- height: 40px;
+ margin: 0 6px;
}
- .header-container {
+ .btn-group {
+ margin-left: auto;
display: flex;
- justify-content: space-between;
align-items: center;
- margin-bottom: 20px;
- padding: 10px 15px;
- background-color: #f2f2f2;
+ gap: 12px;
+ }
+
+ .refresh-btn-inline, .reset-btn-inline {
+ transition: .15s;
+ }
+
+ .refresh-btn-inline {
+ background: #00A2E9;
+ color: #fff;
+ border: none;
+ font-size: 18px;
border-radius: 10px;
- box-shadow: 0 2px 5px rgba(0,0,0,.1);
+ padding: 8px 30px;
}
- .header-title {
- font-size: 24px;
- font-weight: bold;
- color: #333;
+ .refresh-btn-inline:hover {
+ background: #0086c0;
+ }
+
+ .reset-btn-inline {
+ background: #ff6b6b;
+ color: #fff;
+ border: none;
+ font-size: 16px;
+ border-radius: 10px;
+ padding: 8px 18px;
}
- .version-info-top {
- font-size: 13px;
- color: #666;
- margin-right: 10px;
+ .reset-btn-inline:hover {
+ background: #e94d4d;
+ }
+
+ .flex-row {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 20px;
+ align-items: stretch;
+ }
+
+ .flex-grow {
+ flex: 1 1 540px;
+ }
+
+ .gap-lg {
+ gap: 30px;
+ }
+
+ .defective-section {
+ display: flex;
+ align-items: center;
+ gap: 14px;
+ font-size: 18px;
+ }
+
+ .submit-section {
+ display: flex;
+ align-items: center;
}
.inp {
- width: 65%;
- padding: 1vh;
- margin-top: -13px;
- font-size: 1.3vw;
+ padding: 8px;
+ font-size: 16px;
border: 1px solid #808080;
- border-radius: .5vw;
+ border-radius: 8px;
box-sizing: border-box;
}
- .form-row {
- display: flex;
- justify-content: space-between;
- margin-bottom: 3vh;
- flex-wrap: nowrap;
- }
-
- .form-item {
- width: 30%;
- }
-
- .print-section {
- padding: 1vh;
- border-radius: 1vw;
- margin-bottom: 2vh;
- display: flex;
- flex-wrap: wrap;
- align-items: center;
- }
-
- .barcode-info {
- display: flex;
- align-items: flex-start;
- gap: 2vw;
+ .bad-input {
+ width: 320px;
+ max-width: 100%;
+ height: 66px;
+ border: 3px solid #808080;
+ font-size: 34px;
+ text-align: center;
}
.details-btn {
- display: inline-block;
- padding: 1.5vh;
- background-color: #00a2e9;
+ padding: 12px 34px;
+ background: #00a2e9;
color: #fff;
- font-size: 1.5vw;
+ font-size: 20px;
border: none;
cursor: pointer;
- border-radius: 1vw;
+ border-radius: 12px;
}
- .reason-section {
- margin-bottom: 3vh;
- }
-
- .reason-buttons {
- display: grid;
- grid-template-columns: repeat(5,1fr);
- gap: 1vw;
- }
-
- .reason-btn {
- padding: .5vh;
- background-color: #808080;
- color: #fff;
- font-size: 1.3vw;
- border: none;
- border-radius: .5vw;
- cursor: pointer;
- }
-
- .reason-btn.selected {
- background-color: #FFD700;
- color: #000;
+ .details-btn:hover {
+ background: #008ac2;
}
- .bottom-section {
+ .current-user-section {
display: flex;
- justify-content: space-between;
- margin-top: 2vh;
+ align-items: center;
+ font-size: 18px;
+ border: 1.5px solid #f00;
+ border-radius: 10px;
+ padding: 14px 22px;
+ background: #fff;
+ gap: 14px;
+ flex: 0 0 auto;
}
- .save-btn, .cancel-btn {
- width: 48%;
- padding: 1.5vh;
- background-color: #00A2E9;
- color: #fff;
- font-size: 1.5vw;
- border: none;
- text-align: center;
- cursor: pointer;
- border-radius: .5vw;
+ .current-user-name {
+ font-weight: bold;
+ font-size: 22px;
}
+
+ .select-user-btn {
+ padding: 6px 22px;
+ background: #eee;
+ border: 1px solid #aaa;
+ border-radius: 8px;
+ font-size: 16px;
+ }
+
+ .select-user-btn:hover {
+ background: #ddd;
+ }
.overlay {
position: fixed;
@@ -643,49 +751,244 @@
left: 0;
width: 100%;
height: 100%;
- background-color: rgba(0,0,0,.5);
+ background: rgba(0,0,0,.45);
display: flex;
justify-content: center;
align-items: center;
+ z-index: 1000;
}
.popup {
- background-color: #fff;
+ background: #fff;
padding: 2vh;
border: 1px solid #ccc;
- box-shadow: 0 0 10px rgba(0,0,0,.1);
- width: 70vw;
+ box-shadow: 0 0 14px rgba(0,0,0,.12);
+ width: 72vw;
+ max-width: 1400px;
height: 70vh;
- font-size: 1.6vw;
+ font-size: 1.4vw;
max-height: 80vh;
overflow-y: auto;
+ border-radius: 12px;
+ z-index: 1001;
+ }
+
+ .user-select-popup {
+ width: 860px;
+ max-width: 80vw;
+ height: auto;
+ min-height: 480px;
+ padding: 0;
+ display: flex;
+ flex-direction: column;
+ }
+ /* 鎼滅储鏉℃牱寮� */
+ .user-search-bar {
+ display: flex;
+ align-items: center;
+ gap: 12px;
+ padding: 18px 32px 0 32px;
+ background: #fff;
+ flex-wrap: wrap;
+ }
+
+ .user-search-input {
+ flex: 1 1 260px;
+ padding: 10px 14px;
+ font-size: 16px;
+ border: 1px solid #bbb;
border-radius: 8px;
+ outline: none;
+ }
+
+ .user-search-input:focus {
+ border-color: #007aff;
+ box-shadow: 0 0 0 2px rgba(0,122,255,.15);
+ }
+
+ .user-search-clear {
+ padding: 10px 18px;
+ background: #ff9f43;
+ color: #fff;
+ border: none;
+ border-radius: 8px;
+ font-size: 14px;
+ cursor: pointer;
+ }
+
+ .user-search-clear:hover {
+ background: #ff8920;
+ }
+
+ .user-search-info {
+ font-size: 14px;
+ color: #555;
+ }
+
+ .user-list-scroll {
+ flex: 1 1 auto;
+ overflow-y: auto;
+ padding: 24px 32px 0 32px;
+ }
+
+ .user-list-grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fill,minmax(110px,1fr));
+ gap: 12px 12px;
+ }
+
+ .user-list-btn {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ gap: 4px;
+ padding: 10px 8px;
+ height: 75px;
+ font-size: 14px;
+ background: #00a2e9;
+ color: #fff;
+ border: none;
+ border-radius: 8px;
+ cursor: pointer;
+ box-sizing: border-box;
+ word-break: break-word;
+ }
+
+ .user-list-btn .user-code {
+ font-weight: 600;
+ font-size: 14px;
+ }
+
+ .user-list-btn .user-name {
+ font-size: 13px;
+ }
+
+ .user-list-btn.selected {
+ background: #0072c9;
+ box-shadow: 0 0 0 3px rgba(255,255,255,.6) inset;
+ }
+
+ .user-list-btn:hover {
+ background: #008ed0;
+ }
+
+ .no-user-result {
+ padding: 40px 0;
+ text-align: center;
+ font-size: 18px;
+ color: #666;
+ }
+
+ .user-popup-footer {
+ flex-shrink: 0;
+ padding: 22px 32px 32px 32px;
+ background: #fff;
+ text-align: center;
}
.clean-btn {
width: 48%;
- padding: 1.5vh;
+ padding: 1.6vh;
color: #fff;
- font-size: 1.5vw;
+ font-size: 1.4vw;
border: none;
text-align: center;
cursor: pointer;
- border-radius: .5vw;
- background-color: #007aff;
+ border-radius: .6vw;
+ background: #007aff;
}
+
+ .clean-btn.wide-btn {
+ width: 60%;
+ font-size: 20px;
+ }
+
+ .clean-btn:hover {
+ background: #0062c9;
+ }
+
+ .reason-section {
+ margin: 14px 0 18px;
+ }
+
+ .reason-buttons {
+ display: grid;
+ grid-template-columns: repeat(5,1fr);
+ gap: 12px;
+ }
+
+ .reason-btn {
+ padding: 10px 6px;
+ background: #808080;
+ color: #fff;
+ font-size: 14px;
+ border: none;
+ border-radius: 8px;
+ cursor: pointer;
+ }
+
+ .reason-btn.selected {
+ background: #FFD700;
+ color: #000;
+ }
+
+ .bottom-section {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 16px;
+ gap: 16px;
+ }
+
+ .save-btn, .cancel-btn {
+ flex: 1;
+ padding: 16px 0;
+ background: #00A2E9;
+ color: #fff;
+ font-size: 20px;
+ border: none;
+ border-radius: 10px;
+ }
+
+ .save-btn:hover, .cancel-btn:hover {
+ background: #0086c0;
+ }
.table1 {
width: 100%;
border-spacing: 3px;
}
- .reset-btn {
- background-color: #ff6b6b;
- color: #fff;
- border: none;
- font-size: 18px;
- border-radius: 6px;
- padding: 8px 15px;
- margin-left: 10px;
+ @media (max-width:1400px) {
+ input.highlight {
+ font-size: 16px;
+ }
+
+ .user-list-btn {
+ 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;
+ }
+
+ .refresh-btn-header {
+ font-size: 14px;
+ padding: 6px 16px;
+ }
+
+ .reset-btn-header {
+ font-size: 12px;
+ padding: 6px 12px;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3