~yhj/XM_GK_QD.git

			@@ -178,6 +178,8 @@

			<view class="history-record">
			<button @click="viewHistory" class="lsjl">åå²è®°å½</button <!-- å¼¹åºçªå£æ¾ç¤ºåå²è®°å½ -->
			<button @click="fetchDrawingNumber" class="lsjl">è°åPLMå¾çº¸</button <!-- å¼¹åºçªå£æ¾ç¤ºplmå¾çº¸è®°å½ -->

			<view v-if="showHistoryPopup" class="history-popup">
			<!-- å¼¹çªå¤´é¨ -->
			<view class="popup-header">
			@@ -206,10 +208,61 @@
			</view>
			</scroll-view>
			</view>

			</view>

			<!-- <button @click="reprintLast" :disabled="isButtonDisabled2" class="uni-btn">{{ isButtonDisabled2 ? 'è¯·ç¨å...' : 'è¡¥æä¸ä¸å¼ ' }}</button>
			--></view>
			<view v-if="drawingShow" class="history-popup">
			<!-- å¼¹çªå®¹å¨ -->
			<view class="popup-container">
			<!-- åå®¹åºå -->
			<view class="popup-content">
			<!-- è¡¨å¤´ -->
			<view class="history-header">
			<view class="header-item" id="tm">ç¸å³ææ¡£</view>
			<view class="header-item" id="sl">ææ å³èPDFæä»¶</view>
			<view class="header-item" id="sj">è½å¦æå¼æä»¶</view>
			<view class="header-item" id="ry">æä½ï¼ç¹å»ï¼</view>
			</view>

			<!-- è¡¨æ ¼åå®¹åºå -->
			<scroll-view scroll-y="true" class="history-scroll">
			<!-- æ°æ®ä¸ºç©ºæ¶çæç¤º -->
			<view v-if="(!drawing \|\| drawing.length === 0)" class="empty-text">
			ææ æ´å¤æ°æ®
			</view>

			<!-- ææ°æ®æ¶æ¾ç¤ºçåè¡¨ -->
			<view v-for="(item, index) in (drawing \|\| [])" :key="index" class="history-record">
			<view class="record-item">{{ item.fName }}</view>
			<view class="record-item" style="font-size:25px;">
			<div v-if="item.fRelevantObject==' '" style="color: #E47470;">Ã</div>
			<div style="color: #90BA87;" v-else>â</div>
			</view>
			<view class="record-item" style="font-size:25px;">
			<div v-if="item.isSupported \|\| item.fRelevantObject!=' '"
			style="color: #90BA87;">â</div>
			<div style="color: #E47470;" v-else>Ã</div>
			</view>
			<view class="record-item click-wd" @click="openDrawings(item)">
			æå¼ææ¡£
			</view>
			</view>
			</scroll-view>
			</view>

			<!-- åºå®å¨æåºé¨çæé®åºå -->
			<view class="popup-footer">
			<view class="popup-buttons">
			<button class="popup-button cancel-button" @click="drawingCancel">åæ¶</button>
			<button class="popup-button confirm-button" @click="drawingConfirm">ç¡®å®</button>
			</view>
			</view>
			</view>
			</view>

			<!-- <button @click="reprintLast" :disabled="isButtonDisabled2" class="uni-btn">{{ isButtonDisabled2 ? 'è¯·ç¨å...' : 'è¡¥æä¸ä¸å¼ ' }}</button>
			-->
			</view>
			</view>

			</view>
			@@ -230,12 +283,13 @@
			{{ deviceState }}
			</view>
			</view>
			<button @click="reprintLast" :disabled="isButtonDisabled2" class="uni-btn">{{ isButtonDisabled2 ? 'è¯·ç¨å...' : 'è¡¥æä¸ä¸å¼ ' }}</button>

			<button @click="reprintLast" :disabled="isButtonDisabled2"
			class="uni-btn">{{ isButtonDisabled2 ? 'è¯·ç¨å...' : 'è¡¥æä¸ä¸å¼ ' }}</button>

			<!-- æé®æ¾å¨ç¶æææ¬çä¸æ¹ -->
			<!-- <button @click="manualCheck" class="check-button">æå¨æ£æµ</button> -->
			<view class="version" v-if="version">
			çæ¬å·ï¼{{ version }}
			çæ¬å·ï¼{{ version }}
			</view>
			</view>

			@@ -247,7 +301,7 @@
			<button @click="sendForFirstInspection" class="round-btn">é¦æ£éæ£</button>
			</view>
			</view>


			</view>
			</template>

			@@ -267,6 +321,9 @@
			data() {
			return {
			showHistoryPopup: false, // æ§å¶å¼¹åºæ¡æ¾ç¤º
			drawing: [],
			drawingShow: false,
			itemShow: false,
			selectedPerson: '',
			selectedLine: '',
			selectedOrder: '',
			@@ -288,7 +345,7 @@
			orderQuantity: '', // è®¢åæ°é
			producedQuantity: '', // å·²çäº§æ°
			bzsl: '', // æ¨èåè£æ°
			gdzt:'',
			gdzt: '',
			itemId: '', // ç©æID
			itemNo: '', // ç©æç¼ç
			itemname: '', // ç©æåç§°
			@@ -329,8 +386,8 @@
			networkState: "æ£æµä¸...",
			deviceState: "æ£æµä¸...",
			networkModalVisible: false, // æ§å¶ç½ç»å¼¹çªæ¯å¦å·²æ¾ç¤º
			usbModalVisible: false ,// æ§å¶ USB å¼¹çªæ¯å¦å·²æ¾ç¤º
			updateChecked: false,
			usbModalVisible: false, // æ§å¶ USB å¼¹çªæ¯å¦å·²æ¾ç¤º
			updateChecked: false,
			};
			},
			// components:{
			@@ -350,9 +407,9 @@
			console.log("é¡µé¢å è½½ï¼å¼å§æ£æµ USB åç½ç»...");
			console.log("UsbModule:", UsbModule); // æå° UsbModule æ¯å¦å¯ç¨
			console.log("UsbModule.isUsbConnect:", UsbModule?.isUsbConnect); // æå°æ¹æ³æ¯å¦åå¨
			if (typeof plus !== 'undefined') {
			this.version = plus.runtime.version;
			}
			if (typeof plus !== 'undefined') {
			this.version = plus.runtime.version;
			}

			this.checkForUpdate(); // å¯å¨æ¶æ£æ¥çæ¬æ´æ°
			//this.startAutoUpdateCheck(); // å¼å§å®æ¶æ£æ¥çæ¬æ´æ°
			@@ -376,7 +433,7 @@
			this.stopAutoUpdateCheck(); // é¡µé¢éæ¯æ¶åæ¢å®æ¶å¨ï¼é²æ¢ååæ³æ¼
			},
			checkForUpdate() {
			if (this.updateChecked) return;
			if (this.updateChecked) return;
			uni.request({
			url: "http://192.168.0.107:10086/update.json", // ä½ çæå¡å¨ JSON æä»¶å°å
			success: (res) => {
			@@ -395,9 +452,9 @@
			// }
			// });
			this.downloadNewApk(res.data.apkUrl);
			this.updateChecked = true; // æ è®°æ´æ°å·²æ£æ¥è¿
			this.updateChecked = true; // æ è®°æ´æ°å·²æ£æ¥è¿
			// // å¦æææ°çæ¬ï¼å¼å§ä¸è½½
			//download(res.data.apkUrl);
			//download(res.data.apkUrl);
			}
			},
			fail: (err) => {
			@@ -405,7 +462,7 @@
			}
			});
			},



			downloadNewApk(apkUrl) {
			uni.showToast({
			@@ -423,7 +480,7 @@
			}, function() {
			console.log("å®è£æåï¼éå¯åºç¨");
			//plus.runtime.restart();
			//plus.runtime.quit();
			//plus.runtime.quit();
			// uni.navigateBack()
			}, function(e) {
			console.error("å®è£å¤±è´¥:", e);
			@@ -918,7 +975,7 @@
			productionOrder: '', // çäº§è®¢å
			orderQuantity: '', // è®¢åæ°é
			bzsl: '', // æ¨èåè£æ°
			gdzt:'',
			gdzt: '',
			producedQuantity: '', // å·²çäº§æ°
			itemId: '', // ç©æID
			itemNo: '', // ç©æç¼ç
			@@ -1050,61 +1107,61 @@
			});
			}
			});

			// è°ç¨ API è·åå·¥åè¯¦æ
			uni.request({
			url: `http://192.168.0.107:44380/api/orderDetails?orderNo=${encodeURIComponent(this.orderNo)}`, // ä½¿ç¨åå¨çorderNo
			method: 'GET',
			header: {
			'Content-Type': 'application/json'
			},
			success: (res) => {
			console.log('gongdanxinx', res.data);
			if (res.statusCode === 200) {
			this.orderDetails = {
			requirementDoc: res.data.requirementDoc, // éæ±åæ®
			productionOrder: res.data.productionOrder, // çäº§è®¢å
			orderQuantity: res.data.orderQuantity, // è®¢åæ°é
			bzsl: res.data.bzsl, // æ¨èåè£æ°
			gdzt: res.data.gdzt, // å·¥åç¶æ
			producedQuantity: res.data.producedQuantity, // å·²çäº§æ°
			itemId: res.data.itemId, // ç©æID
			itemNo: res.data.itemNO, // ç©æç¼ç
			itemname: res.data.itemname, // ç©æåç§°
			itemmodel: res.data.itemmodel, // è§æ ¼åå·


			};
			// æ ¹æ® sj å xj çå¼æ¥è®¾ç½®é¦æ£åå·¡æ£ç¶æ
			// æ ¹æ® sj å xj çå¼æ¥è®¾ç½®é¦æ£åå·¡æ£ç¶æ
			if (res.data.sj === 1) {
			this.checkFirstPass = true; // é¦æ£åæ ¼
			} else if (res.data.sj === 2) {
			this.checkFirstPass = false; // é¦æ£ä¸åæ ¼

			// è°ç¨ API è·åå·¥åè¯¦æ
			uni.request({
			url: `http://192.168.0.107:44380/api/orderDetails?orderNo=${encodeURIComponent(this.orderNo)}`, // ä½¿ç¨åå¨çorderNo
			method: 'GET',
			header: {
			'Content-Type': 'application/json'
			},
			success: (res) => {
			console.log('gongdanxinx', res.data);
			if (res.statusCode === 200) {
			this.orderDetails = {
			requirementDoc: res.data.requirementDoc, // éæ±åæ®
			productionOrder: res.data.productionOrder, // çäº§è®¢å
			orderQuantity: res.data.orderQuantity, // è®¢åæ°é
			bzsl: res.data.bzsl, // æ¨èåè£æ°
			gdzt: res.data.gdzt, // å·¥åç¶æ
			producedQuantity: res.data.producedQuantity, // å·²çäº§æ°
			itemId: res.data.itemId, // ç©æID
			itemNo: res.data.itemNO, // ç©æç¼ç
			itemname: res.data.itemname, // ç©æåç§°
			itemmodel: res.data.itemmodel, // è§æ ¼åå·


			};
			// æ ¹æ® sj å xj çå¼æ¥è®¾ç½®é¦æ£åå·¡æ£ç¶æ
			// æ ¹æ® sj å xj çå¼æ¥è®¾ç½®é¦æ£åå·¡æ£ç¶æ
			if (res.data.sj === 1) {
			this.checkFirstPass = true; // é¦æ£åæ ¼
			} else if (res.data.sj === 2) {
			this.checkFirstPass = false; // é¦æ£ä¸åæ ¼
			} else {
			this.checkFirstPass = null; // é¦æ£æªå
			}

			if (res.data.xj === 1) {
			this.checkXJ = true; // å·¡æ£åæ ¼
			} else if (res.data.xj === 2) {
			this.checkXJ = false; // å·¡æ£ä¸åæ ¼
			} else {
			this.checkXJ = null; // å·¡æ£æªå
			}


			console.log('Order details loaded:', this.orderDetails);

			} else {
			this.checkFirstPass = null; // é¦æ£æªå
			console.error('Failed to fetch order details:', res);
			}

			if (res.data.xj === 1) {
			this.checkXJ = true; // å·¡æ£åæ ¼
			} else if (res.data.xj === 2) {
			this.checkXJ = false; // å·¡æ£ä¸åæ ¼
			} else {
			this.checkXJ = null; // å·¡æ£æªå
			}


			console.log('Order details loaded:', this.orderDetails);

			} else {
			console.error('Failed to fetch order details:', res);
			},
			fail: (err) => {
			console.error('Error fetching order details:', err);
			}
			},
			fail: (err) => {
			console.error('Error fetching order details:', err);
			}
			});

			});

			},
			mapStatus(status) {
			if (status === 3) {
			@@ -1245,19 +1302,19 @@
			// æäº¤æ¥å·¥ä¿¡æ¯çæ¹æ³
			printBarcode() {
			// åæ£æ¥ USB è¿æ¥ç¶æ
			if (!UsbModule \|\| !UsbModule.isUsbConnect \|\| !UsbModule.isUsbConnect()) {
			uni.showModal({
			title: ` ${this.networkState}`,
			content: "è¯·æ£æ¥æå°æºè¿æ¥",
			showCancel: false,
			success: () => {
			this.modalVisible = false;
			/* if (!UsbModule \|\| !UsbModule.isUsbConnect \|\| !UsbModule.isUsbConnect()) {
			uni.showModal({
			title: ` ${this.networkState}`,
			content: "è¯·æ£æ¥æå°æºè¿æ¥",
			showCancel: false,
			success: () => {
			this.modalVisible = false;

			}
			});
			return; // USB è¿æ¥å¤±è´¥ï¼ç´æ¥è¿åï¼é²æ¢æ§è¡æå°
			}

			}
			});
			return; // USB è¿æ¥å¤±è´¥ï¼ç´æ¥è¿åï¼é²æ¢æ§è¡æå°
			}*/

			uni.request({
			url: `http://192.168.0.107:44380/api/persons/${encodeURIComponent(this.personCode)}`, // ä¿®æ¹åçè¯·æ±è·¯å¾
			method: 'GET',
			@@ -1302,7 +1359,7 @@

			return;
			}


			// æ ¼å¼åå½åæ¶é´ä¸º"å¹´ææ¥æ¶åç§"æ ¼å¼
			const currentTime = new Date();
			const formattedTime = this.formatDate(currentTime);
			@@ -1317,8 +1374,8 @@
			//itemSpec: 'è§æ ¼åå·', // è¿éå¯æ¹æå®éæ°æ®
			quantity: Number(this.reportedQuantity) // ç¡®ä¿æ¯æ´æ°

			};
			this.logPrintEvent("æå°å", "æå°æ¡ç å",requestData.uniqueValue);
			};
			this.logPrintEvent("æå°å", "æå°æ¡ç å", requestData.uniqueValue);
			// å° requestData ä¿åå° lastRequestData ä¸
			this.lastRequestData = requestData;
			console.log(requestData);
			@@ -1368,8 +1425,8 @@
			//æå°æ¡ç
			return;
			}
			// åè®°å½ "æå°å" äºä»¶
			this.logPrintEvent("æå°å", "æå°", requestData.uniqueValue);
			// åè®°å½ "æå°å" äºä»¶
			this.logPrintEvent("æå°å", "æå°", requestData.uniqueValue);
			//æå°æ¡ç
			console.log('tiaoma', requestData.uniqueValue);
			console.log('gd', this.orderDetails.productionOrder);
			@@ -1443,27 +1500,27 @@
			// command.setFeed(30);
			this.sendData = command.getData();

			// 1. æ§è¡åé
			let printResult = this.senUSBData();

			// 2. å¤æåéæ¯å¦æå
			if (printResult.success) {
			// â åéæåï¼è®°å½æå°æ¥å¿
			this.logPrintEvent("æå°å", "æå°", requestData.uniqueValue);
			} else {
			// â åéå¤±è´¥ï¼æç¤ºç¨æ·ï¼ä¸è®°å½æ¥å¿
			uni.showToast({
			title: "æå°å¤±è´¥ï¼æªè®°å½æ¥å¿",
			duration: 2000
			});
			}
			// 1. æ§è¡åé
			let printResult = this.senUSBData();

			this.oldbgs = this.reportedQuantity;
			this.bgr=
			//ä»æ°å·æ°å·¥åä¿¡æ¯
			loadOrderDetails();
			// 2. å¤æåéæ¯å¦æå
			if (printResult.success) {
			// â åéæåï¼è®°å½æå°æ¥å¿
			this.logPrintEvent("æå°å", "æå°", requestData.uniqueValue);
			} else {
			// â åéå¤±è´¥ï¼æç¤ºç¨æ·ï¼ä¸è®°å½æ¥å¿
			uni.showToast({
			title: "æå°å¤±è´¥ï¼æªè®°å½æ¥å¿",
			duration: 2000
			});
			}

			this.oldbgs = this.reportedQuantity;
			this.bgr =
			//ä»æ°å·æ°å·¥åä¿¡æ¯
			loadOrderDetails();
			//ä»æ°å·æ°åå²è®°å½


			this.fetchHistoryRecords(this.orderNo);

			},
			@@ -1486,10 +1543,179 @@
			// lines.push(text); // æåä¸è¡
			// return lines;
			// },


			drawingConfirm() {
			this.drawingShow = false
			// this.imageShow = false
			// this.productionShow = false
			// this.itemShow = false
			},
			drawingCancel() {
			this.drawingShow = false
			// this.imageShow = false
			// this.productionShow = false
			// this.itemShow = false
			},

			fetchDrawingNumber() {
			// const item = 'BC.XM.001.006.009.0002'
			const item = this.orderDetails.itemNo;
			console.log(this.orderDetails.itemNo)
			// console.log(item)
			// const url = this.$store.state.serverInfo.serverAPI +"/PLM/RetrieveDrawings?ItemNo=" + item

			// const item = '5.06.04.4002';
			const url = "http://192.168.0.107:10054/api/PLM/RetrieveDrawings?ItemNo=" + item

			let _this = this;

			uni.request({
			url: url,
			method: 'POST',
			success: (response) => {
			console.log(response)
			if (response.data.data == 'è¿åç»æä¸ºç©º') {
			_this.drawing = []
			} else {
			_this.drawing = response.data.data
			// éåæ°æ®ï¼å¤ææä»¶åç¼å¹¶æ·»å åæ®µ
			_this.drawing.forEach((file) => {
			// è·åæä»¶åçåç¼
			const fileExtension = file.fName.split('.').pop()
			.toLowerCase();

			// å®ä¹æ¯æçæä»¶ç±»å
			const supportedExtensions = ['jpg', 'pdf', 'xlsx', 'doc',
			'docx',
			'xls'
			];

			// å¤ææ¯å¦æ¯æè¯¥æä»¶ç±»å
			file.isSupported = supportedExtensions.includes(fileExtension);
			});
			}
			},
			fail: (error) => {
			uni.showToast({
			title: 'è¯·æ±å¾çº¸é¾æ¥å¤±è´¥',
			icon: 'none'
			});
			}
			});
			this.drawingShow = true
			},


			//å¾çº¸ç¸å³ææ¡£
			openDrawings(item) {
			console.log("jkjoi", item.fRelevantObject)
			if (item.fRelevantObject.length > 2) {
			// çæè¯·æ±URLï¼ç®åç¼ç é»è¾ï¼
			const encodedName = encodeURIComponent(item.fName);
			const url = `http://192.168.0.107:10054/api/PLM/OpenDrawingsGet?fileId=${item.fRelevantObject}&fName=${encodedName}`;
			console.log('è¯·æ±URL:', url);

			const now = new Date();
			const timestamp = [
			now.getFullYear(),
			String(now.getMonth() + 1).padStart(2, '0'),
			String(now.getDate()).padStart(2, '0'),
			String(now.getHours()).padStart(2, '0'),
			String(now.getMinutes()).padStart(2, '0'),
			String(now.getSeconds()).padStart(2, '0')
			].join('');

			// çææ°æä»¶åï¼åºç¡å_æ¶é´æ³.åç¼ï¼
			this.fileName = `${item.fName}_${timestamp}.pdf`;
			console.log('æ°æä»¶å:', this.fileName);

			uni.downloadFile({
			url: url,
			success: (res) => {
			console.log(res);
			let fileName = this.fileName;
			let fileExt = fileName.split('.').pop();
			// let newFilePath = "_doc/uniapp_temp_1742877118745/download" + "/" + fileName;
			// console.log('newFilePath', newFilePath)
			if (fileExt === 'xls' \|\| fileExt === 'xlsx' \|\| fileExt === 'pdf' \|\| fileExt ===
			'jpg' \|\| fileExt === 'png') {
			plus.io.resolveLocalFileSystemURL(res.tempFilePath, (entry) => {
			// è·åæä»¶æå¨çç®å½
			entry.getParent((parentEntry) => {
			let newFileName = this.fileName; // æ°çæä»¶å

			// ç§»å¨å¹¶éå½åæä»¶
			entry.moveTo(
			parentEntry,
			newFileName,
			(newEntry) => {
			console.log('éå½åæå:', newEntry.fullPath);

			// æå¼ Excel æä»¶
			plus.runtime.openFile(newEntry
			.fullPath, {}, (e) => {
			console.error('æ æ³æå¼ Excel æä»¶:',
			e);
			});

			// let pages = getCurrentPages();
			// let beforePage = pages[pages.length - 2];
			// uni.navigateBack({
			// delta: 1, //è¿åçé¡µé¢æ°ï¼å¦æä¸º1è¡¨ç¤ºè¿åä¸ä¸é¡µ
			// success: (event) => {
			// beforePage.$vm.reload()
			// }
			// });

			},
			(err) => {
			console.error('éå½åå¤±è´¥:', err);
			}
			);
			}, (err) => {
			console.error('è·åç¶ç®å½å¤±è´¥:', err);
			});
			}, (err) => {
			console.error('è·åæä»¶å¤±è´¥:', err);
			});
			} else {
			console.error('æä»¶æ ¼å¼ä¸å¹é:', fileExt);
			uni.showToast({
			title: 'æä»¶æ ¼å¼ä¸æ¯æ',
			icon: 'none'
			});
			}
			}
			})

			uni.request({
			url: url,
			method: 'POST',
			responseType: 'arraybuffer',
			success: (response) => {
			console.log(response.data)
			if (!response) {
			uni.showToast({
			title: "åè®®é¢è§å¤±è´¥",
			duration: 2000
			});
			}

			},
			fail: (error) => {
			console.log(error)
			uni.showToast({
			title: 'è¯·æ±é¢è§é¾æ¥å¤±è´¥',
			icon: 'none'
			});
			}
			});
			}
			},

			// è¡¥æä¸ä¸å¼ è®°å½
			reprintLast() {


			// ç¦ç¨æé®5ç§
			this.isButtonDisabled2 = true;
			setTimeout(() => {
			@@ -1530,7 +1756,7 @@
			});
			}
			});
			this.selectedPerson = this.lastRequestData.printedBy;
			this.selectedPerson = this.lastRequestData.printedBy;
			// è¡¥æä¸ä¸å¼ è®°å½
			this.fetchHistoryRecords(this.orderNo);
			if (!this.lastRequestData) {
			@@ -1541,8 +1767,8 @@
			});
			return;
			}
			//20250507 æ°å èµå¼åå²æ¡ç æ¥å·¥äºº
			this.selectedPerson = this.lastRequestData.printedBy;
			//20250507 æ°å èµå¼åå²æ¡ç æ¥å·¥äºº
			this.selectedPerson = this.lastRequestData.printedBy;
			console.log("èæ¡ç ", this.oldbgs);
			// éæ°æå°ä¸ä¸å¼ è®°å½
			// async reprintLast() {
			@@ -1562,8 +1788,8 @@
			// });
			// return; // éåºï¼é¿åç»§ç»æ§è¡æå°
			// }
			// è®°å½ "è¡¥æå" äºä»¶
			this.logPrintEvent("æå°å", "è¡¥æ", this.lastRequestData);
			// è®°å½ "è¡¥æå" äºä»¶
			this.logPrintEvent("æå°å", "è¡¥æ", this.lastRequestData);
			// æå°åå®¹æ ·å¼è®¾ç½®
			const command = tsc.jpPrinter.createNew();

			@@ -1622,59 +1848,58 @@
			command.setPagePrint();
			command.setFeed(3);
			this.sendData = command.getData();
			// 1. æ§è¡åé
			let printResult = this.senUSBData();

			// 2. å¤æåéæ¯å¦æå
			if (printResult.success) {
			// åéæåï¼è®°å½æå°æ¥å¿
			this.logPrintEvent("æå°å", "è¡¥æ", this.lastRequestData);
			} else {
			// åéå¤±è´¥ï¼æç¤ºç¨æ·ï¼ä¸è®°å½æ¥å¿
			uni.showToast({
			title: "æå°å¤±è´¥ï¼æªè®°å½æ¥å¿",
			duration: 2000
			});
			}
			F
			// 1. æ§è¡åé
			let printResult = this.senUSBData();

			// 2. å¤æåéæ¯å¦æå
			if (printResult.success) {
			// åéæåï¼è®°å½æå°æ¥å¿
			this.logPrintEvent("æå°å", "è¡¥æ", this.lastRequestData);
			} else {
			// åéå¤±è´¥ï¼æç¤ºç¨æ·ï¼ä¸è®°å½æ¥å¿
			uni.showToast({
			title: "æå°å¤±è´¥ï¼æªè®°å½æ¥å¿",
			duration: 2000
			});
			}
			F
			// åéæ°æ®
			this.senUSBData();
			// è®°å½ "è¡¥æå" äºä»¶

			// è®°å½ "è¡¥æå" äºä»¶

			},
			logPrintEvent(eventType, printType, barcodeValue) {


			const requestData = {
			barcode: barcodeValue, // æ¡ç
			worker: this.personCode, // æ¥å·¥äºº
			eventType: eventType, // "æå°å" æ "æå°å"
			printType: printType, // "æå°" æ "è¡¥æ"
			orderNo: this.selectedOrder, // å·¥åå·
			line: this.selectedLine,
			version: this.version // çº¿ä½
			};
			console.log(requestData);
			uni.request({
			url: "http://192.168.0.107:44380/api/LogPrintEvent/logEvent",
			method: 'POST',
			header: {
			'Content-Type': 'application/json'
			},
			data: requestData,
			success: (response) => {
			if (response.statusCode === 200) {
			console.log(`${eventType} - ${printType} è®°å½æå`);
			} else {
			console.error(`${eventType} - ${printType} è®°å½å¤±è´¥:`, response);
			}
			},
			fail: (err) => {
			console.error("è¯·æ±å¤±è´¥:", err);
			}
			});
			}
			,
			logPrintEvent(eventType, printType, barcodeValue) {


			const requestData = {
			barcode: barcodeValue, // æ¡ç
			worker: this.personCode, // æ¥å·¥äºº
			eventType: eventType, // "æå°å" æ "æå°å"
			printType: printType, // "æå°" æ "è¡¥æ"
			orderNo: this.selectedOrder, // å·¥åå·
			line: this.selectedLine ,
			version:this.version// çº¿ä½
			};
			console.log(requestData);
			uni.request({
			url: "http://192.168.0.107:44380/api/LogPrintEvent/logEvent",
			method: 'POST',
			header: {
			'Content-Type': 'application/json'
			},
			data: requestData,
			success: (response) => {
			if (response.statusCode === 200) {
			console.log(`${eventType} - ${printType} è®°å½æå`);
			} else {
			console.error(`${eventType} - ${printType} è®°å½å¤±è´¥:`, response);
			}
			},
			fail: (err) => {
			console.error("è¯·æ±å¤±è´¥:", err);
			}
			});
			}
			}
			};
			</script>
			@@ -2369,4 +2594,204 @@
			box-sizing: border-box;
			/* ç¡®ä¿åè¾¹è·åè¾¹æ¡åå«å¨å®½åº¦å */
			}

			/* å¦æéè¦æé®çå®½å¹¶é è¾¹ */
			.popup-buttons {
			display: flex;
			justify-content: space-between;
			/* å·¦å³åå¸ */
			gap: 20px;
			/* æé®ä¹é´çé´è· */
			}

			.popup-button {
			flex: 1;
			/* è®©ä¸¤ä¸ªæé®çå®½ */
			min-width: 100px;
			padding: 12px 0;
			border-radius: 6px;
			font-size: 8px;
			font-weight: 500;
			}

			/* æèä¿æåå®½åº¦ä½åºå®å¨ä¸¤è¾¹ */
			.popup-buttons.fixed-sides {
			display: flex;
			justify-content: space-between;
			}

			.popup-buttons.fixed-sides .popup-button {
			flex: 0 0 auto;
			/* ä¸ä¼¸ç¼©ï¼ä¿æåå¤§å° */
			}

			/* å¼¹çªæ´ä½æ ·å¼ä¿æä¸åï¼å¢å é«åº¦æ§å¶ */
			.history-popup {
			position: fixed;
			top: 50%;
			left: 50%;
			transform: translate(-50%, -50%);
			width: 80%;
			height: 70%;
			background-color: #fff;
			border-radius: 8px;
			box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
			z-index: 1000;
			display: flex;
			flex-direction: column;
			}

			/* å¼¹çªå¤´é¨ */
			.popup-header {
			display: flex;
			justify-content: space-between;
			align-items: center;
			padding: 10px;
			border-bottom: 1px solid #ccc;
			flex-shrink: 0;
			/* é²æ¢å¤´é¨è¢«åç¼© */
			}

			.popup-title {
			font-size: 18px;
			font-weight: bold;
			}

			/* åå®¹åè£å¨ - åºå®é«åº¦ï¼å¯æ»å¨ */
			.popup-content-wrapper {
			flex: 1;
			/* å æ®å©ä½ç©ºé´ */
			display: flex;
			flex-direction: column;
			overflow: hidden;
			/* éèæº¢åºåå®¹ */
			}

			/* è¡¨å¤´åºå® */
			.history-header {
			display: flex;
			justify-content: space-between;
			font-weight: bold;
			border-bottom: 1px solid #ccc;
			padding: 10px 5px;
			background-color: #fff;
			flex-shrink: 0;
			/* é²æ¢è¡¨å¤´è¢«åç¼© */
			z-index: 1;
			/* ç¡®ä¿è¡¨å¤´å¨æä¸å± */
			}

			/* æ»å¨åºå - èªéåºé«åº¦ */
			.history-scroll {
			flex: 1;
			/* å æ®å©ä½ç©ºé´ */
			overflow-y: auto;
			padding: 0 5px;
			}

			/* ç©ºæ°æ®æç¤º */
			.empty-text {
			text-align: center;
			padding: 40px 0;
			color: #999;
			font-size: 16px;
			}

			/* åºå®å¨å¼¹çªåºé¨çæé®åºå */
			.popup-footer {
			padding: 15px 20px;
			border-top: 1px solid #eee;
			background-color: #fff;
			flex-shrink: 0;
			/* é²æ¢åºé¨è¢«åç¼© */
			box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.05);
			}

			/* æé®åºå */
			.popup-buttons {
			display: flex;
			justify-content: space-between;
			gap: 20px;
			}

			.popup-button {
			flex: 1;
			min-width: 100px;
			padding: 12px 0;
			border-radius: 6px;
			font-size: 16px;
			font-weight: 500;
			border: none;
			outline: none;
			cursor: pointer;
			}

			.cancel-button {
			background-color: #f8f9fa;
			color: #6c757d;
			border: 1px solid #dee2e6;
			}

			.cancel-button:hover {
			background-color: #e9ecef;
			color: #495057;
			}

			.confirm-button {
			background-color: #1890ff;
			color: white;
			}

			.confirm-button:hover {
			background-color: #40a9ff;
			}

			/* è¡¨æ ¼åå®¹è¡æ ·å¼ */
			.history-record {
			display: flex;
			justify-content: space-between;
			border-bottom: 1px solid #eee;
			padding: 10px 0;
			font-size: 14px;
			}

			/* è¡¨å¤´åè¡¨æ ¼åå®¹çæ¯åæ ·å¼ */
			.header-item,
			.record-item {
			flex: 1;
			text-align: center;
			padding: 0 5px;
			word-wrap: break-word;
			overflow: hidden;
			text-overflow: ellipsis;
			}

			/* æå¼ææ¡£æ ·å¼ */
			.click-wd {
			color: #1890ff;
			cursor: pointer;
			text-decoration: underline;
			}

			.click-wd:hover {
			color: #40a9ff;
			}

			/* ç§»å¨ç«¯éé */
			@media (max-width: 768px) {
			.history-popup {
			width: 95%;
			height: 85%;
			}

			.popup-button {
			min-width: 80px;
			padding: 10px 0;
			font-size: 14px;
			}

			.popup-buttons {
			gap: 10px;
			}
			}
			</style>