From 87d55df7b7446d7c4c3532a2dd2e78f72574e34b Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 21 二月 2024 08:23:53 +0800
Subject: [PATCH] Merge branch 'master' into wxw

---
 HTML/views/ASNSetting/LabelPrint.html |   71 ++++++++++++++++++++---------------
 1 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/HTML/views/ASNSetting/LabelPrint.html b/HTML/views/ASNSetting/LabelPrint.html
index 974caae..2519584 100644
--- a/HTML/views/ASNSetting/LabelPrint.html
+++ b/HTML/views/ASNSetting/LabelPrint.html
@@ -112,45 +112,54 @@
             var laydate = layui.laydate;
             
             var id = getQueryString('Id');
-            var reset = getQueryString('Reset');
+            var reset = getQueryString('IsReset');
             var arriveQty = getQueryString('ArriveQty');
             
             var productionTime = getQueryString('ProductionTime');
             var expirationTime = getQueryString('ExpirationTime');
             var storeTime = getQueryString('StoreTime');  
             
-            console.log(productionTime);
-            console.log(expirationTime);
-            console.log(storeTime);
+            var doing = true;
+            // console.log(productionTime);
+            // console.log(expirationTime);
+            // console.log(storeTime);
 
             //鐢熸垚
             $('#btnAdd').on('click', function () {
-                var param = {
-                    Id: parseInt(id),
-                    IsReset:reset, 
-                    ArriveQty:arriveQty,  
-                    ProductionTime:productionTime,
-                    ExpirationTime:expirationTime,
-                    StoreTime:storeTime
-                };
-                console.log(param);
-                synData(IP + "/BllAsn/AddLabelBox", param , 'post', function (res) {
-                    if (res.code == 0) { //鎴愬姛  
-                        layer.msg(res.msg, {
-                            icon: 1,
-                            time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-                        }, function () {
-                            parent.location.reload();
-                            parent.layer.close(layer.index);
-                        });
-                        
-                    } else { //涓嶆垚鍔�
-                        layer.msg(res.msg, {
-                            icon: 2,
-                            time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-                        }, function () { });
-                    }
-                });
+                if(doing){
+                    doing= false;
+
+                
+                    var param = {
+                        Id: parseInt(id),
+                        IsReset:reset, 
+                        ArriveQty:arriveQty,  
+                        ProductionTime:productionTime,
+                        ExpirationTime:expirationTime,
+                        StoreTime:storeTime
+                    };
+                    // console.log(param);
+                    synData(IP + "/BllAsn/AddLabelBox", param , 'post', function (res) {
+                        if (res.code == 0) { //鎴愬姛  
+                            layer.msg(res.msg, {
+                                icon: 1,
+                                time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+                            }, function () {
+                                parent.location.reload();
+                                parent.layer.close(layer.index);
+                                doing = true;
+                            });
+                            
+                        } else { //涓嶆垚鍔�
+                            layer.msg(res.msg, {
+                                icon: 2,
+                                time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+                            }, function () { 
+                                doing = true;
+                            });
+                        }
+                    });
+                }
             });
             //鎵撳嵃
             $('#btnPrint').on('click', function () {
@@ -189,7 +198,7 @@
 
             }
 
-            // 寰幆鍔犺浇鏍囩
+            // 鍔犺浇鏍囩
             function div(i, isprint, bqNum) {
                              
                 var param1 = {

--
Gitblit v1.8.0