From b8839c33d41a2ca70a1ac5afe64cac0775af947d Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 18 十一月 2025 16:59:27 +0800
Subject: [PATCH] 只判断当前绑定工单（第一条）是否有刀具
---
pages/index.vue | 63 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index f93579d..7bef644 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -8,18 +8,18 @@
<view class="tab-item" :class="{ active: currentTab === 0 }" @click="changeTab(0)">
涓荤晫闈�
</view>
+ <view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
+ 涓婂垁涓嬪垁
+ </view>
<view class="tab-item" :class="{ active: currentTab === 3 }" @click="changeTab(3)">
璋冩満閫佹
- </view>
- <view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
- 鍒�鍏风鐞�
</view>
<view class="tab-item" :class="{ active: currentTab === 4 }" @click="changeTab(4)">
鐢熶骇鎶ュ伐
</view>
- <!-- <view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
- 寮�宸ュ畬宸�
- </view> -->
+ <view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
+ 寮�宸ュ畬宸�
+ </view>
<view class="tab-item" :class="{ active: currentTab === 5 }" @click="changeTab(5)">
e-SOP
</view>
@@ -30,8 +30,8 @@
璁惧鐐规
</view>
<!-- <view class="tab-item" :class="{ active: currentTab === 8 }" @click="changeTab(8)">
- 鎵撳嵃鏈鸿缃�
- </view> -->
+ 鎵撳嵃鏈鸿缃�
+ </view> -->
</view>
<view class="font"></view>
@@ -408,25 +408,25 @@
getPrintInfo() {
var mac = "";
- //mac = "74:24:ca:4f:b7:9b";
- //this.$post({
- // url: "/DevMachine/GetDevMachineByPdaMac",
- // data: {
- // pdaMac: mac,
- // }
- //}).then(res => {
- // let devMachine = res.data.tbBillList;
- // this.machineNo = devMachine.machineNo;
- // this.machineName = "璋冭瘯妯″紡锛�" + this.machineNo + "鍙烽娇杞満"
+ mac = "74:24:ca:4f:b7:9b";
+ this.$post({
+ url: "/DevMachine/GetDevMachineByPdaMac",
+ data: {
+ pdaMac: mac,
+ }
+ }).then(res => {
+ let devMachine = res.data.tbBillList;
+ this.machineNo = devMachine.machineNo;
+ this.machineName = "璋冭瘯妯″紡锛�" + this.machineNo + "鍙烽娇杞満"
- // uni.setStorageSync('machineNo', this.machineNo);
- // uni.setStorageSync('printMac', devMachine.printMac);
+ uni.setStorageSync('machineNo', this.machineNo);
+ uni.setStorageSync('printMac', devMachine.printMac);
- // console.log(devMachine.printMac);
+ console.log(devMachine.printMac);
- // this.getWomdaaIsShow();
- //});
- //return;
+ this.getWomdaaIsShow();
+ });
+ return;
if (plus.os.name == "Android") {
@@ -557,6 +557,17 @@
if (!this.machineNo) {
return;
}
+
+ // 鍙垽鏂綋鍓嶇粦瀹氬伐鍗曪紙绗竴鏉★級鏄惁鏈夊垁鍏�
+ const currentOrder = this.isShowTableData[0];
+ if (currentOrder && currentOrder.outToolName && currentOrder.outToolName.trim() !== '') {
+ uni.showToast({
+ title: '褰撳墠宸ュ崟宸茬粦瀹氬垁鍏凤紝涓嶈兘娓呯┖閲嶉��',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
+ }
let editDate = this.formatDate(new Date());
@@ -893,7 +904,9 @@
margin-top: 7px;
margin-left: 10px;
text-align: center;
- font-size: 100%;
+ font-size: 32px !important; // 寮哄埗澶у瓧浣擄紝閫傞厤浣庡瘑搴�
+ min-height: 60px; // 璁╅�夋嫨妗嗛珮搴︿篃鍙樺ぇ
+ line-height: 60px;
padding: 5.5px 1px;
background-color: #fff; // 杩欓噷鏀逛负钃濊壊
border: 2px solid #007aff; // 杈规涔熸敼涓鸿摑鑹�
--
Gitblit v1.9.3