From fbe0595485e2e7c0fde9c0d95f02e38b58e7b2d3 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 05 五月 2025 10:39:36 +0800
Subject: [PATCH] 1.现场收料界面 2.界面优化

---
 H5/Js/Scll.js |   65 +++++++++++++++++++++++++++++---
 1 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/H5/Js/Scll.js b/H5/Js/Scll.js
index 4d57c7b..ee502a5 100644
--- a/H5/Js/Scll.js
+++ b/H5/Js/Scll.js
@@ -9,6 +9,14 @@
             },
             modeInfo: { daa001: "", planNo: "" },
             scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
+            ItemDetail: [],
+            //isPrinterPopupVisible: false, // 鎺у埗寮圭獥鏄剧ず/闅愯棌
+            //selectedPrinter: '', // 褰撳墠閫夋嫨鐨勬墦鍗版満缂栧彿
+            //printerList: [
+            //    { printerId: 'Printer1', ipAddress: '192.168.1.1' },
+            //    { printerId: 'Printer2', ipAddress: '192.168.1.2' },
+            //    { printerId: 'Printer3', ipAddress: '192.168.1.3' }
+            //], // 鎵撳嵃鏈哄垪琛�
         }
     },
     mounted() {
@@ -29,11 +37,16 @@
                 .then(function (res) {
                     var json = res;
                     if (json.status == 0) {
-                        that.modeInfo = json.data.tbBillList;
+                        that.ItemDetail = json.data.tbBillList;
+                        that.modeInfo.planNo = json.data.tbBillList.planNo;
+                        that.$refs.barcode.focus();
                     }
                     else {
                         that.$toast.fail(json.message);
                         that.$refs.daa001.focus();
+                        that.modeInfo.daa001 = "";
+                        that.modeInfo.planNo = "";
+                        that.ItemDetail = [];
                     }
                     that.isLoading = false;
                 })
@@ -42,14 +55,20 @@
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
                     console.log(error);
                     that.$refs.daa001.focus();
+                    that.modeInfo.daa001 = "";
                 });
         },
         getScan() {
             var that = this;
             if (that.modeInfo.daa001.length <= 0) {
-                that.$toast.fail("棰嗘枡鍗曞彿涓嶈兘涓虹┖锛�");
+                that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
                 return;
             }
+            if (that.scanInfo.barcode.length * 1 <= 0) {
+                that.$toast.fail("鐗╂枡鏉$爜涓嶈兘涓虹┖锛�");
+                return;
+            }
+
             that.isLoading = true;
             that.AxiosHttp("post", 'Womdaa/ScanCode', {
                 daa001: that.modeInfo.daa001,
@@ -60,13 +79,21 @@
                     var json = res;
                     if (json.status == 0) {
                         // that.scanInfo = json.data.tbBillList;
+                        that.$notify({ type: 'success', message: json.message });
                         that.getModel();
+                        that.$refs.barcode.focus();
+                        that.scanInfo.barcode = null;
+                    }
+                    else if (json.status == 2) {
+                        that.$refs.splitNum.focus();
+                        that.scanInfo.splitNum = json.data.tbBillList.splitNum;
+                        that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum;
                     }
                     else {
                         that.$toast.fail(json.message);
                         that.$refs.barcode.focus();
                     }
-                    that.$notify({ type: 'success', message: json.message });
+                    
                     that.isLoading = false;
                 })
                 .catch(function (error) {
@@ -77,9 +104,11 @@
                 });
         },
         getChaiFen() {
+            //this.isPrinterPopupVisible = true; // 鏄剧ず寮圭獥
+
             var that = this;
             if (that.modeInfo.daa001.length <= 0) {
-                that.$toast.fail("棰嗘枡鍗曞彿涓嶈兘涓虹┖锛�");
+                that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
                 return;
             }
             if (that.scanInfo.splitNum * 1 <= 0) {
@@ -91,15 +120,22 @@
                 return;
             }
             that.isLoading = true;
-            that.AxiosHttp("post", 'Womdaa/ScanCode', {
+            that.AxiosHttp("post", 'Womdaa/ScanCodeCF', {
                 daa001: that.modeInfo.daa001,
                 userName: that.userInfo.loginAccount,
                 barcode: that.scanInfo.barcode,
+                Num: that.scanInfo.splitNum,
             }, false)
                 .then(function (res) {
                     var json = res;
                     if (json.status == 0) {
-                      //  that.modeInfo = json.data.tbBillList;
+                        //  that.modeInfo = json.data.tbBillList;
+                        that.scanInfo.splitNum = null;
+                        that.scanInfo.barcodeNum = null;
+                        that.scanInfo.barcode = null;
+                        that.$notify({ type: 'success', message: json.message });
+                        that.$refs.barcode.focus();
+                        that.getModel();
                     }
                     else {
                         that.$toast.fail(json.message);
@@ -112,5 +148,22 @@
                     console.log(error);
                 });
         },
+
+        //鎵撳嵃鏈烘敞閲�
+        //selectPrinter(printer) {
+        //    this.selectedPrinter = printer.printerId; // 鏇存柊閫変腑鐨勬墦鍗版満缂栧彿
+        //},
+        //confirmSelection() {
+        //    if (this.selectedPrinter) {
+        //        alert(`鎮ㄩ�夋嫨浜嗘墦鍗版満锛�${this.selectedPrinter}`);
+        //        // 鍦ㄨ繖閲屽鐞嗛�夋嫨缁撴灉锛屼緥濡傝皟鐢ㄦ帴鍙f垨鏇存柊鐘舵��
+        //        this.isPrinterPopupVisible = false; // 鍏抽棴寮圭獥
+        //    } else {
+        //        alert('璇烽�夋嫨涓�涓墦鍗版満锛�');
+        //    }
+        //},
+        //onPrinterSelected(value) {
+        //    console.log('褰撳墠閫変腑鐨勬墦鍗版満缂栧彿:', value);
+        //},
     }
 })
\ No newline at end of file

--
Gitblit v1.9.3