From b50ca3ca2cb9f0add65268b324cddd502744f6b2 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 03 九月 2025 13:05:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/QXPDA

---
 H5/Js/Scll.js |  142 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 104 insertions(+), 38 deletions(-)

diff --git a/H5/Js/Scll.js b/H5/Js/Scll.js
index 94a8b49..04deddb 100644
--- a/H5/Js/Scll.js
+++ b/H5/Js/Scll.js
@@ -24,6 +24,11 @@
             //    { printerId: 'Printer2', ipAddress: '192.168.1.2' },
             //    { printerId: 'Printer3', ipAddress: '192.168.1.3' }
             //], // 鎵撳嵃鏈哄垪琛�
+            // 褰撳墠閫変腑琛岀殑绱㈠紩
+            currentIndex: -1, 
+            // 瀛樺偍閫変腑琛屾暟鎹璞�
+            selItem: {} ,
+            ItemBarKw: [],//褰撳ぉ琛岀浉鍏虫潯鐮佸簱浣嶄俊鎭�
         }
     },
     mounted() {
@@ -34,6 +39,62 @@
         };
     },
     methods: {
+
+
+        /**
+         * 澶勭悊琛岀偣鍑讳簨浠讹紙鍗曢�夐�昏緫锛�
+         * @param {Object} item 褰撳墠琛屾暟鎹�
+         * @param {Number} index 褰撳墠琛岀储寮�
+         */
+        handleRowClick(item, index) {
+            if (this.isLoading) {
+                return;
+            }
+
+            // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+            this.currentIndex = -1; 
+            
+            // 璁剧疆褰撳墠閫変腑琛�
+            this.currentIndex = index;
+            this.selItem = {
+                itemid: item.fMaterialId,
+                index: index
+            };
+
+            console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+            this.GetBarKwByItem();
+        },
+        GetBarKwByItem() {
+
+            var that = this;
+            that.isLoading = true;
+            that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
+                itemId: that.selItem.itemid,
+                userName: that.userInfo.loginAccount
+            }, false)
+                .then(function (res) {
+                    var json = res;
+                    if (json.status == 0) {
+                        that.ItemBarKw = json.data.tbBillList;
+                    }
+                    else {
+                        that.$toast.fail(json.message);
+                        that.$playSound('error');
+                        that.ItemBarKw = [];
+                    }
+                    that.isLoading = false;
+                })
+                .catch(function (error) {
+                    that.isLoading = false;
+                    that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
+                    console.log(error);
+                    that.ItemBarKw = [];
+                });
+        },
+
+
         getModel() {
             var that = this;
             that.isLoading = true;
@@ -47,9 +108,13 @@
                         that.ItemDetail = json.data.tbBillList;
                         that.modeInfo.planNo = json.data.tbBillList.planNo;
                         that.$refs.barcode.focus();
+                        // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+                        that.currentIndex = -1; 
+                        that.ItemBarKw = [];
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.daa001.focus();
                         that.modeInfo.daa001 = "";
                         that.modeInfo.planNo = "";
@@ -60,6 +125,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                     that.$refs.daa001.focus();
                     that.modeInfo.daa001 = "";
@@ -164,7 +230,7 @@
                         that.$notify({ type: 'success', message: json.message });
                         that.$playSound('success');
 
-                        that.sendMessage(json.data.tbBillList);
+                        that.sendPrintMessage(json.data.tbBillList);
 
                         that.$refs.barcode.focus();
                         that.getModel();
@@ -183,43 +249,43 @@
         },
 
 
-        sendMessage(tbBillList) {
-            const cfDetails = tbBillList.cfBarInfo.map(item => {
-                return "! 0 200 200 210 1\r\n" +
-                    "PAGE - WIDTH 700 \r\n" +
-                    "BOX 0 0 700 180 0 \r\n" +
-                    `T 16 0 10 10 鐗╂枡缂栫爜锛歕r\n` +
-                    `T 55 3 120 10 ${item.iteM_NO}\r\n` +
-                    `T 16 0 310 10 ${item.item_name}\r\n` +
-                    "T 55 2 10 42 鐗╂枡瑙勬牸锛歕r\n" +
-                    `T 55 2 110 42 ${item.item_model}\r\n` +
-                    "T 16 0 10 78 鏁伴噺锛歕r\n" +
-                    `T 0 5 90 78 ${item.quantity}\r\n` +
-                    `T 16 5 180 78 ${item.barType}\r\n` +
-                    `BARCODE 128 1 25 35 350 130 ${item.iteM_BARCODE}\r\n` +
-                    `T 0 1 350 130 ${item.iteM_BARCODE}\r\n` +
-                    "T 55 0 10 125 鍒涘缓鏃堕棿锛歕r\n" +
-                    `T 55 0 120 125 ${item.creatE_DATE}\r\n` +
-                    "T 55 0 10 150 鎵撳嵃鏃堕棿锛歕r\n" +
-                    `T 55 0 120 150 ${item.print_date}\r\n` +
-                    "B QR 580 12 M 2 U 4\r\n" +
-                    `MA,${item.iteM_BARCODE}\r\n` +
-                    "ENDQR\r\nFORM\r\nPRINT\r\n";
-            });
-            //alert(cfDetails);
-            let sendData = {
-                Type: 'Bar',
-                Barcode: tbBillList.cfBarInfo[0].iteM_BARCODE,
-                Detail: cfDetails,
-                Ip: tbBillList.printInfo[0].ip,
-                Port: tbBillList.printInfo[0].port,
-            }
-            console.log('sendMessage 寮�濮�1:')
-            console.log('sendMessage 寮�濮�2:' + JSON.stringify(sendData))
-            uni.webView.postMessage({
-                data: JSON.stringify(sendData)
-            })
-        },
+        //sendMessage(tbBillList) {
+        //    const cfDetails = tbBillList.cfBarInfo.map(item => {
+        //        return "! 0 200 200 210 1\r\n" +
+        //            "PAGE - WIDTH 700 \r\n" +
+        //            "BOX 0 0 700 180 0 \r\n" +
+        //            `T 16 0 10 10 鐗╂枡缂栫爜锛歕r\n` +
+        //            `T 55 3 120 10 ${item.iteM_NO}\r\n` +
+        //            `T 16 0 310 10 ${item.item_name}\r\n` +
+        //            "T 55 2 10 42 鐗╂枡瑙勬牸锛歕r\n" +
+        //            `T 55 2 110 42 ${item.item_model}\r\n` +
+        //            "T 16 0 10 78 鏁伴噺锛歕r\n" +
+        //            `T 0 5 90 78 ${item.quantity}\r\n` +
+        //            `T 16 5 180 78 ${item.barType}\r\n` +
+        //            `BARCODE 128 1 25 35 350 130 ${item.iteM_BARCODE}\r\n` +
+        //            `T 0 1 350 130 ${item.iteM_BARCODE}\r\n` +
+        //            "T 55 0 10 125 鍒涘缓鏃堕棿锛歕r\n" +
+        //            `T 55 0 120 125 ${item.creatE_DATE}\r\n` +
+        //            "T 55 0 10 150 鎵撳嵃鏃堕棿锛歕r\n" +
+        //            `T 55 0 120 150 ${item.print_date}\r\n` +
+        //            "B QR 580 12 M 2 U 4\r\n" +
+        //            `MA,${item.iteM_BARCODE}\r\n` +
+        //            "ENDQR\r\nFORM\r\nPRINT\r\n";
+        //    });
+        //    //alert(cfDetails);
+        //    let sendData = {
+        //        Type: 'Bar',
+        //        Barcode: tbBillList.cfBarInfo[0].iteM_BARCODE,
+        //        Detail: cfDetails,
+        //        Ip: tbBillList.printInfo[0].ip,
+        //        Port: tbBillList.printInfo[0].port,
+        //    }
+        //    console.log('sendMessage 寮�濮�1:')
+        //    console.log('sendMessage 寮�濮�2:' + JSON.stringify(sendData))
+        //    uni.webView.postMessage({
+        //        data: JSON.stringify(sendData)
+        //    })
+        //},
 
         //getPrintInfo() {
         //    var that = this;

--
Gitblit v1.9.3