From a4a87f8371296173a899d07129f01ae42debe65a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 30 十一月 2024 08:21:14 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/order.js |   53 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index ee40725..1f7db00 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -42,14 +42,15 @@
         cellMinWidth: 100,
         cols: [[
             {type: 'numbers'},
-            {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
-            {field: 'docType$', align: 'center', title: '绫诲瀷',  minWidth: 160, width: 160},
-            {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
-            {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
+            {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl',minWidth: 200},
+            {field: 'docType$', align: 'center', title: '绫诲瀷'},
+            {align: 'center', title: '鏄庣粏', toolbar: '#tbLook'},
+            {field: 'createTime$', title: '鍒涘缓鏃堕棿'},
             {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl',  minWidth: 160, width: 160},
             {field: 'shipName', align: 'center',title: '鍒跺崟浜�'},
+            {field: 'itemName', align: 'center',title: '浠撳簱'},
             {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
-            {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+            {align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
         ]],
         request: {
             pageName: 'curr',
@@ -105,7 +106,7 @@
             layer.open({
                 type: 1,
                 title: false,
-                area: '820px',
+                area: '1000px',
                 offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                 shade: .01,
                 shadeClose: true,
@@ -125,10 +126,12 @@
                             {type: 'numbers'},
                             {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+                            {field: 'specs', title: '瑙勬牸', width: 160},
                             {field: 'batch', title: '鎵瑰彿'},
                             {field: 'anfme', title: '鏁伴噺'},
                             {field: 'workQty', title: '浣滀笟鏁伴噺'},
                             {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
+                            {align: 'center', title: '鎵撳嵃', toolbar: '#printOperate', width: 80}
                             // {field: 'unit', title: '鍗曚綅'},
                             // {
                             //     field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -137,7 +140,7 @@
                             // },
                             // {field: 'inQty', title: '宸插叆搴撻噺'},
                             // {field: 'color', title: '棰滆壊'},
-                            {field: 'specs', title: '瑙勬牸'}
+
                         ]],
                         request: {
                             pageName: 'curr',
@@ -164,6 +167,42 @@
         }
     });
 
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(lookSSXMTable)', function(obj) {
+        $.ajax({
+            url: baseUrl+"/orderDetl/getPrintDetl/" + obj.data.id,
+            headers: {'token': localStorage.getItem('token'),'Content-Type' :'application/json'},
+            method: 'GET',
+            async: false,
+            success: function (res) {
+                if (res.code === 200){
+                    layer.closeAll();
+                    let data = res.data
+                        var templateDom = $("#templatePreview1");
+                        var className = templateDom.attr("class");
+                        var param = "缂栫爜:"+data.matnr+";鍚嶇О:"+data.maktx+";鎵规:"+data.batch+";瑙勬牸:"+data.specs
+                            +";鍗曚綅:"+data.unit+";鏁伴噺:"+data.anfme+";閿�鍞崟鍙�:"+data.suppCode+";瀹㈡埛鍚嶇О:"+data.sku;
+                        var encodeUrl = encodeURIComponent(param);
+                        data["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+encodeUrl;
+                        console.log(data["barcodeUrl"]);
+                    let list = Array.isArray(res.data) ? res.data : [res.data];
+                    res.data = list;
+                    var tpl = templateDom.html();
+                    var template = Handlebars.compile(tpl);
+                    var html = template(res);
+                    var box = $("#box");
+                    box.html(html);box.show();
+                    box.print({mediaPrint:true});
+                    box.hide();
+                } else if (res.code === 403){
+                    top.location.href = baseUrl+"/";
+                }else {
+                    layer.msg(res.msg)
+                }
+            }
+        })
+    });
+
     // 鏄剧ず琛ㄥ崟寮圭獥
     function showEditModel(expTpe) {
         admin.open({

--
Gitblit v1.9.1