From 94e4a7598d2ed0bee320174bcd44a3844d59cc0d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 19:25:00 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/order.js |   69 ++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 108bf99..90c1539 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -159,7 +159,8 @@
         } else if (layEvent === 'del') {
             doDel(data.id);
         }else if (layEvent === 'btnPrint') {
-            btnPrint(data.id, data.orderNo, 4);
+            //btnPrint(data.id, data.orderNo, 4);
+            btnPrint2(data.id, data.orderNo, 4);
         } else if (layEvent === 'complete') {
             doModify(data.id, data.orderNo, 4);
         }else if (layEvent === 'manPrint') {
@@ -196,6 +197,7 @@
                             {field: 'payment$', title: '璐х墿鐗瑰緛', width: 160},
                             // {field: 'batch', title: '鎵瑰彿'},
                             {field: 'anfme', title: '鏁伴噺'},
+                            {field: 'batch', title: '鎵规'},
                             {field: 'workQty', title: '浣滀笟鏁伴噺'},
                             {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
                             // {field: 'unit', title: '鍗曚綅'},
@@ -270,6 +272,11 @@
                             layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
                             return false;
                         }
+
+                        if (nList[xi].batch === ""){
+                            layer.msg('鎵规涓嶈兘涓虹┖', {icon: 2});
+                            return false;
+                        }
                     }
                     for (let xi = 0; xi < nList.length; xi++) {
                         if (nList[xi].owner <= 0){
@@ -320,6 +327,7 @@
                         {field: 'specs', title: '瑙勬牸'},
                         {field: 'weight', title: '閲嶉噺', edit: true},
                         {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+                        {field: 'batch', title: '鎵规(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                         {field: 'owner', title: '璐т富缂栧彿', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                         {field: 'payment', title: '璐х墿鐘舵��', style: 'color: blue;font-weight: bold', templet: '#payment'},
                         // {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},
@@ -602,5 +610,64 @@
     }
 
 
+    function btnPrint2(orderId, orderNo, settle) {
+        console.log(orderId);
+        console.log(orderNo);
+        console.log(settle);
+        printMatCodeNos.push(orderNo)
+        var templateNo = 4;
+        $.ajax({
+            url: baseUrl + "/order/print2/auth",
+            headers: {'token': localStorage.getItem('token')},
+            data: {param: printMatCodeNos},
+            method: 'POST',
+            async: false,
+            success: function (res) {
+                if (res.code === 200) {
+                    layer.closeAll();
+                    var json = res;
+
+                    json.docNum = orderNo;
+                    console.log("json"+json);
+                    var sum = new Decimal("0");
+
+
+                    for (let i = 0; i < res.data.length; i++){
+                        sum = sum.plus(res.data[i].anfme);
+
+                    }
+                    json.anfmeSum = sum;
+                    var barcodeUrl = baseUrl + "/order/code/auth?type=1&param=" + res.data[0].docNum;
+                    console.log("barcodeUrl:"+barcodeUrl);
+                    json.barcodeUrl = barcodeUrl;
+                    console.log(json.data);
+                    for (let i = 0; i < json.data.length; i++) {
+                        var templateDom = $("#templatePreview" + templateNo);
+                        var className = templateDom.attr("class");
+
+                        if (className === 'template-barcode') {
+                            json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2&param=" + (json.data[i].orderNo+";"+json.data[i].matnr+";");
+                        } else {
+                            json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2&param=" + (json.data[i].orderNo+";"+json.data[i].matnr+";");
+                        }
+                    }
+                    var tpl = templateDom.html();
+                    var template = Handlebars.compile(tpl);
+                    var html = template(json);
+                    var box = $("#box");
+                    box.html(html);
+                    box.show();
+                    box.print({mediaPrint: true});
+                    box.hide();
+                } else if (json.code === 403) {
+                    top.location.href = baseUrl + "/";
+                } else {
+                    layer.msg(json.msg)
+                }
+            }
+        })
+    }
+
+
 
 });

--
Gitblit v1.9.1