From 79f209a5ec9236adfd4576285d50a7b860da7230 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 26 十二月 2023 13:22:12 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/order.js |   88 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 1e87b29..abe7000 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -146,6 +146,7 @@
         })
     }
 
+
     // 宸ュ叿鏉＄偣鍑讳簨浠�
     table.on('tool(order)', function (obj) {
         var data = obj.data;
@@ -158,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') {
@@ -206,7 +208,7 @@
                             // {field: 'inQty', title: '宸插叆搴撻噺'},
                             // {field: 'color', title: '棰滆壊'},
                             // {field: 'specs', title: '瑙勬牸'},
-                            // {field: 'weight', title: '閲嶉噺'}
+                             {field: 'weight', title: '閲嶉噺'}
                         ]],
                         request: {
                             pageName: 'curr',
@@ -230,6 +232,9 @@
                     });
                 }
             });
+        }
+        else if (layEvent === 'printExcel'){
+            printExcel(data);
         }
     });
 
@@ -313,8 +318,8 @@
                         {type: 'numbers', title: '#'},
                         {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
                         {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
-                        {field: 'batch', title: '鎵瑰彿', edit: true},
                         {field: 'specs', title: '瑙勬牸'},
+                        {field: 'weight', title: '閲嶉噺', edit: true},
                         {field: 'anfme', 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'},
@@ -350,6 +355,7 @@
                     },
                     size: ''
                 };
+
                 if (!isExpAdd) {
                     $.ajax({
                         url: baseUrl+"/order/detl/all/auth?orderId=" + expTpe.id,
@@ -420,7 +426,7 @@
                         }
                     }
                     data[obj.field] = obj.value;
-                    insTbSSXM.reload({data: xxDataList});
+                   insTbSSXM.reloadData({data: xxDataList,scrollPos: true});
                 });
 
                 $('#matAddBtnComment').click(function () {
@@ -502,7 +508,11 @@
 
             }
         });
+
+
     }
+
+
 
     // 鍒犻櫎鍗曟嵁
     function doDel(orderId) {
@@ -582,5 +592,75 @@
         ,range: true
     });
 
+    function printExcel(data){
+        layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+            layer.closeAll();
+            layer.load(1, {shade: [0.1,'#fff']});
+            // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
+            location.href = baseUrl+"/order/printExport/auth?orderNo="+data.orderNo;
+            layer.closeAll('loading');
+        });
+    }
+
+
+    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