From df499252aa425d30cd9ae4697e8f6ceeacb62098 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 23 十二月 2025 13:53:12 +0800
Subject: [PATCH] 添加上刀下刀记录界面

---
 pages/index.vue |   73 ++++++++++++++++++++----------------
 1 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index 610bebb..ab6616b 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -14,6 +14,9 @@
 			<view class="tab-item" :class="{ active: currentTab === 3 }" @click="changeTab(3)">
 				璋冩満閫佹
 			</view>
+			<view class="tab-item" :class="{ active: currentTab === 10 }" @click="changeTab(10)">
+				涓婁笅鍒�璁板綍
+			</view>
 			<view class="tab-item" :class="{ active: currentTab === 4 }" @click="changeTab(4)">
 				鐢熶骇鎶ュ伐
 			</view>
@@ -150,6 +153,10 @@
 				<!--        &lt;!&ndash; 璋冪敤 mold 缁勪欢 &ndash;&gt;-->
 				<machine :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
 			</view>
+			<view v-if="currentTab === 10" class="tab-content">
+				<!-- 璋冪敤 moldRecord 缁勪欢 -->
+				<MoldRecord :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
+			</view>
 			<view v-if="currentTab === 4" class="tab-content">
 				<!--  璋冪敤 mold 缁勪欢 -->
 				<WorkOrderPrint :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
@@ -277,6 +284,7 @@
 import PrintInit from "../components/PrintInit.vue";
 import PrintTest from "../components/PrintTest.vue";
 import EquipmentInspection from "../components/EquipmentInspection.vue";
+import MoldRecord from "../pages/moldRecord.vue";
 
 	export default {
 		components: {
@@ -290,7 +298,8 @@
 			PDFShow,
 			PrintInit,
 			PrintTest,
-			EquipmentInspection
+			EquipmentInspection,
+			MoldRecord
 		},
 		data() {
 			return {
@@ -474,43 +483,43 @@
 				return;
 				
 				
-	 			if (plus.os.name == "Android") {
-	 				//鑾峰彇鎵嬫満MAC鍦板潃
-	 				var Context = plus.android.importClass("android.content.Context");
-	 				var WifiManager = plus.android.importClass("android.net.wifi.WifiManager");
-	 				var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
-	 				var WifiInfo = plus.android.importClass("android.net.wifi.WifiInfo");
-	 				var wifiInfo = wifiManager.getConnectionInfo();
-	 				mac = wifiInfo.getMacAddress();
+	//  			if (plus.os.name == "Android") {
+	//  				//鑾峰彇鎵嬫満MAC鍦板潃
+	//  				var Context = plus.android.importClass("android.content.Context");
+	//  				var WifiManager = plus.android.importClass("android.net.wifi.WifiManager");
+	//  				var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
+	//  				var WifiInfo = plus.android.importClass("android.net.wifi.WifiInfo");
+	//  				var wifiInfo = wifiManager.getConnectionInfo();
+	//  				mac = wifiInfo.getMacAddress();
 					
-	 				//濡傛灉mac涓衡��02:00:00:00:00:00鈥濓紝鍒欏彲鑳芥槸瀹夊崜6.0浠ヤ笂鐗堟湰锛屽垯浣跨敤鍙︿竴绉嶆柟娉曡幏鍙杕ac鍦板潃
-	 				if (mac == "02:00:00:00:00:00") {
-	 					mac = this.getMacNew();
-	 				}
-	 				//濡傛灉mac浣跨敤鏂版柟娉曚緷鐒舵槸鈥�02:00:00:00:00:00鈥濆垯涓嶈繘琛屼繚瀛�
-	 				if (mac == "02:00:00:00:00:00") {
-	 					return;
-	 				}
-	 				uni.setStorageSync('pdaMac', mac);
+	//  				//濡傛灉mac涓衡��02:00:00:00:00:00鈥濓紝鍒欏彲鑳芥槸瀹夊崜6.0浠ヤ笂鐗堟湰锛屽垯浣跨敤鍙︿竴绉嶆柟娉曡幏鍙杕ac鍦板潃
+	//  				if (mac == "02:00:00:00:00:00") {
+	//  					mac = this.getMacNew();
+	//  				}
+	//  				//濡傛灉mac浣跨敤鏂版柟娉曚緷鐒舵槸鈥�02:00:00:00:00:00鈥濆垯涓嶈繘琛屼繚瀛�
+	//  				if (mac == "02:00:00:00:00:00") {
+	//  					return;
+	//  				}
+	//  				uni.setStorageSync('pdaMac', mac);
 
-	 				this.$post({
-	 					url: "/DevMachine/GetDevMachineByPdaMac",
-	 					data: {
-	 						pdaMac: mac,
-	 					}
-	 				}).then(res => {
-	 					let devMachine = res.data.tbBillList;
-	 					this.machineNo = devMachine.machineNo;
-	 					this.machineName = "褰撳墠鏈哄彴锛�" + this.machineNo + "鍙烽娇杞満";
+	//  				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);
  
 
-	 					this.getWomdaaIsShow();
+	//  					this.getWomdaaIsShow();
 
-	 				});
-	 			}
+	//  				});
+	//  			}
 			},
 			save() {
 				let data = this.selectedItems();

--
Gitblit v1.9.3