From 6e332109c3d179a29514d929dbe9f45d69db32d6 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 15 十月 2025 15:59:34 +0800
Subject: [PATCH] 下拉工单状态，新增“开工”，去除“完工”
---
components/WorkOrderPrint.vue | 949 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 524 insertions(+), 425 deletions(-)
diff --git a/components/WorkOrderPrint.vue b/components/WorkOrderPrint.vue
index 832214c..1ee9177 100644
--- a/components/WorkOrderPrint.vue
+++ b/components/WorkOrderPrint.vue
@@ -1,44 +1,44 @@
<template>
- <view class="page">
+ <view class="page wide-layout" :class="{'has-overlay': (isShowUserSelect || isShow || barcodeIsShow)}">
<view class="status-section">
- <!-- 鎶ュ伐璁板綍琛� -->
<view class="report-table-wrapper">
<view class="report-title">鎶ュ伐璁板綍琛�</view>
- <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>
- <td>{{ nowTime }}</td>
- <td>{{ staffNo || '-' }}</td>
- <td>{{ orderNo || '-' }}</td>
- <td>{{ order.daa003 || '-' }}</td>
- <td>{{ planQtyDisplay }}</td>
- <td>{{ machineNo || '-' }}</td>
- <td>{{ initialValue }}</td>
- <td>{{ productionCount }}</td>
- <td>{{ calculatedTotalProduction }}</td>
- <td>{{ calculatedDefectiveCount }}</td>
- <td>{{ sQuantity }}</td>
- </tr>
- </tbody>
- </table>
+ <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>
+ <td>{{ nowTime }}</td>
+ <td>{{ staffDisplay || '-' }}</td>
+ <td>{{ orderNo || '-' }}</td>
+ <td>{{ order.daa003 || '-' }}</td>
+ <td>{{ planQtyDisplay }}</td>
+ <td>{{ machineNo || '-' }}</td>
+ <td>{{ initialValue }}</td>
+ <td>{{ productionCount }}</td>
+ <td>{{ calculatedTotalProduction }}</td>
+ <td>{{ calculatedDefectiveCount }}</td>
+ <td>{{ sQuantity }}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</view>
- <!-- 椤堕儴鐘舵�侊紙淇濈暀鍘熺涓�琛岋級 -->
<view class="status-row">
<view class="status-box">
<text>鏈哄彴闈㈡澘鏁帮細</text>
@@ -62,77 +62,75 @@
<text>宸茬敓浜ф暟锛�</text>
<input v-model="calculatedTotalProduction" class="highlight" disabled />
</view>
- </view>
-
- <!-- 澶撮儴 -->
- <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>
- <button class="refresh-btn" @click="refresh">鍒锋柊</button>
- <button v-if="isGeneratingBarcode" class="reset-btn" @click="resetGenerateState">閲嶇疆</button>
+ <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>
- <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 class="flex-row gap-lg">
+ <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="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 class="user-select">
+ <button class="details-btn" @click="confirmCustomAmount">纭鎻愪氦</button>
</view>
</view>
</view>
+
+ <view class="current-user-section fill-width">
+ <text>褰撳墠鎶ュ伐浜猴細</text>
+ <text class="current-user-name">{{ staffDisplay || '鏈�夋嫨' }}</text>
+ <button class="select-user-btn" @click="isShowUserSelect = true">閫変汉</button>
+ </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 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="user-select" style="margin-left:30px;">
- <button class="details-btn" @click="confirmCustomAmount">纭鎻愪氦</button>
+ <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>
+ <view class="user-popup-footer">
+ <button class="clean-btn wide-btn" @click="isShowUserSelect = false">鍏抽棴</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>
-
- <!-- 搴曢儴鎸夐挳 -->
<view class="bottom-section">
<button class="save-btn" @click="save">淇濆瓨骞剁敓鏁�</button>
<button class="cancel-btn" @click="cancel">鍙栨秷</button>
</view>
- <!-- 涓嬮潰寮圭獥閫昏緫淇濈暀锛堝涓嶉渶瑕佸彲鍐嶅垹闄わ級 -->
+ <!-- 淇濈暀鏃у脊绐� -->
<view v-if="isShow" class="overlay">
<view class="popup">
<view class="bottom-section1">
@@ -143,7 +141,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>
@@ -159,23 +159,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>
@@ -186,75 +176,40 @@
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,
- nowTimeTimer: null,
- nowTime: ''
- };
+ 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: ''
+ }
},
computed: {
- calculatedCurrentCount() {
- const production = this.productionCount || 0;
- const initial = this.initialValue || 0;
- return production - initial;
+ calculatedCurrentCount() { return (this.productionCount || 0) - (this.initialValue || 0); },
+ calculatedTotalProduction() { return (this.kgQty || 0) + this.calculatedCurrentCount; },
+ calculatedDefectiveCount() { return this.calculatedTotalProduction - (this.sQuantity || 0); },
+ planQtyDisplay() { return this.order.planQty || this.order.planQuantity || this.order.daa007 || this.order.daa010 || 0; },
+ staffDisplay() {
+ if (!this.staffNo) return '';
+ const segs = this.staffNo.split(':');
+ return segs.length > 1 ? `${segs[0]} ${segs[1]}` : this.staffNo;
},
- 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;
- },
- planQtyDisplay() {
- // 璁″垝鐢熶骇鏁板瓧娈典笉纭畾鏃跺厹搴�
- return this.order.planQty || this.order.planQuantity || this.order.daa007 || this.order.daa010 || 0;
+ // 鏂板锛氳繃婊ゅ悗鐨勭敤鎴峰垪琛�
+ filteredUsers() {
+ if (!this.userSearch) return this.users;
+ const kw = this.userSearch.trim().toLowerCase();
+ return this.users.filter(u => u.toLowerCase().includes(kw));
}
},
created() {
@@ -265,33 +220,26 @@
this.updateNowTime();
this.nowTimeTimer = setInterval(this.updateNowTime, 60000);
},
- beforeDestroy() {
- if (this.nowTimeTimer) clearInterval(this.nowTimeTimer);
- },
+ 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();
- const pad = n => (n < 10 ? '0' + n : n);
- this.nowTime = `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+ 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())}`;
},
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() {
@@ -299,18 +247,11 @@
url: "http://192.168.0.94:9095/Numerical/RefreshDev",
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);
@@ -321,107 +262,78 @@
this.getOrderById();
this.getWomdaaPrintById();
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;
+ 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; }
+ const amount = Number(this.customAmount);
this.$post({
url: "/MesInvItemBarcodes/AddBFToBarcodes",
- data: {
- orderNo: this.orderNo,
- orderId: this.orderId,
- bf: amount
- }
+ data: { orderNo: this.orderNo, orderId: this.orderId, bf: amount }
}).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.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' });
},
- 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 {
@@ -430,18 +342,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 {
@@ -451,9 +361,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);
@@ -464,39 +374,51 @@
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>
.page {
- padding: 2vh;
+ padding: 1.2vh 2vw;
display: flex;
flex-direction: column;
- justify-content: space-between;
box-sizing: border-box;
}
+ .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: 20px;
+ margin-bottom: 12px;
+ }
+
+ .table-scroll {
+ overflow-x: auto;
}
.report-title {
- font-size: 26px;
+ font-size: 24px;
font-weight: 600;
text-align: center;
- margin-bottom: 10px;
+ margin: 0 0 8px;
}
.report-table {
+ min-width: 1080px;
width: 100%;
border-collapse: collapse;
font-size: 14px;
@@ -505,190 +427,190 @@
.report-table th, .report-table td {
border: 1px solid #555;
- padding: 6px;
+ padding: 6px 8px;
text-align: center;
white-space: nowrap;
}
- .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;
- }
-
.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;
+ }
- .inp {
- width: 65%;
- padding: 1vh;
- margin-top: -13px;
- font-size: 1.3vw;
- border: 1px solid #808080;
- border-radius: .5vw;
- box-sizing: border-box;
- }
-
- .form-row {
+ .flex-row {
display: flex;
- justify-content: space-between;
- margin-bottom: 3vh;
- flex-wrap: nowrap;
+ flex-wrap: wrap;
+ gap: 20px;
+ align-items: flex-start;
}
- .form-item {
- width: 30%;
+ .flex-grow {
+ flex: 1 1 540px;
+ }
+
+ .gap-lg {
+ gap: 30px;
}
.print-section {
- padding: 1vh;
- border-radius: 1vw;
- margin-bottom: 2vh;
- display: flex;
- flex-wrap: wrap;
- align-items: center;
+ padding: 6px 0 14px;
+ margin-bottom: 0;
+ flex: 1;
}
.barcode-info {
display: flex;
+ flex-wrap: wrap;
align-items: flex-start;
- gap: 2vw;
+ gap: 30px;
+ }
+
+ .inp {
+ padding: 8px;
+ font-size: 16px;
+ border: 1px solid #808080;
+ border-radius: 8px;
+ box-sizing: border-box;
+ }
+
+ .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;
}
- .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;
+ .fill-width {
+ flex: 0 1 380px;
}
+
+ .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;
@@ -696,49 +618,226 @@
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(150px,1fr));
+ gap: 24px 24px;
+ }
+
+ .user-list-btn {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ gap: 6px;
+ padding: 16px 10px;
+ height: 120px;
+ font-size: 18px;
+ background: #00a2e9;
+ color: #fff;
+ border: none;
+ border-radius: 10px;
+ cursor: pointer;
+ box-sizing: border-box;
+ word-break: break-word;
+ }
+
+ .user-list-btn .user-code {
+ font-weight: 600;
+ font-size: 18px;
+ }
+
+ .user-list-btn .user-name {
+ font-size: 16px;
+ }
+
+ .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: 110px;
+ font-size: 16px;
+ }
+
+ .reason-btn {
+ font-size: 12px;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3