From 2da79f8364653941c59c3a6f5aec261ab9ea22ac Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 02 七月 2020 15:36:01 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/trayCode/tray.html |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/views/trayCode/tray.html b/src/main/webapp/views/trayCode/tray.html
index 2b37552..bd53dcc 100644
--- a/src/main/webapp/views/trayCode/tray.html
+++ b/src/main/webapp/views/trayCode/tray.html
@@ -72,7 +72,7 @@
         </div>
     </div>
     <div class="layui-form-item cool-button-contain">
-        <button class="layui-btn layui-btn-normal" lay-filter="print" lay-submit="">鎵撳嵃</button>
+        <button class="layui-btn layui-btn-normal" id="print" lay-filter="print" lay-submit="">鎵撳嵃</button>
         <button class="layui-btn layui-btn-primary" id="cancel">鍙栨秷</button>
     </div>
 </form>
@@ -89,15 +89,30 @@
         let form = layui.form;
 
         form.on('submit(print)', function (data) {
-            http.post(baseUrl + '/trayCode/print/preview', data.field, function (res) {
-
-                console.log(res.data)
+            $.ajax({
+                url: baseUrl+"/trayCode/print/preview",
+                headers: {'token': localStorage.getItem('token')},
+                data: data.field,
+                method: 'POST',
+                async: false,
+                success: function (res) {
+                    if (res.code === 200){
+                        for (let i=0;i<res.data.length;i++){
+                            res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1&param="+res.data[i].item;
+                        }
+                        parent.printPreview(res);
+                        // parent.layer.close(parent.layer.getFrameIndex(window.name));
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    }else {
+                        layer.msg(res.msg)
+                    }
+                }
             })
         });
 
         $('#cancel').click(function () {
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
+            parent.layer.close(parent.layer.getFrameIndex(window.name));
         })
 
     });

--
Gitblit v1.9.1