Merge branch 'master' into wxw

Administrator

2024-02-21 87d55df7b7446d7c4c3532a2dd2e78f72574e34b

 HTML/views/ASNSetting/LabelPrint.html

@@ -112,19 +112,24 @@
            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 () {
                if(doing){
                    doing= false;

                
                var param = {
                    Id: parseInt(id),
                    IsReset:reset, 
@@ -133,7 +138,7 @@
                    ExpirationTime:expirationTime,
                    StoreTime:storeTime
                };
                console.log(param);
                    // console.log(param);
                synData(IP + "/BllAsn/AddLabelBox", param , 'post', function (res) {
                    if (res.code == 0) { //成功  
                        layer.msg(res.msg, {
@@ -142,15 +147,19 @@
                        }, function () {
                            parent.location.reload();
                            parent.layer.close(layer.index);
                                doing = true;
                        });
                        
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                            }, function () { 
                                doing = true;
                            });
                    }
                });
                }
            });
            //打印
            $('#btnPrint').on('click', function () {
@@ -189,7 +198,7 @@

            }

            // 循环加载标签
            // 加载标签
            function div(i, isprint, bqNum) {
                             
                var param1 = {