From 9d13343087fad70aebae38f04d533dd3832ef40c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 三月 2021 13:20:42 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/custOrder/custOrder.js |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 0a6917f..abf215e 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -181,7 +181,7 @@
         switch (obj.event) {
             // 鎷ｈ揣
             case 'stockOut':
-                layer.confirm(data.number + ' 璁㈠崟寮�濮嬫崱璐э紵', {shadeClose: true}, function(){
+                layer.confirm(data.number + ' 璁㈠崟寮�濮嬫嫞璐э紵', {shadeClose: true}, function(){
                     layer.closeAll();
                     $.ajax({
                         url: baseUrl+"/work/stock/out",
@@ -196,7 +196,7 @@
                             if (res.code === 200){
                                 layer.confirm(res.msg, {
                                         shadeClose: true
-                                        , btn: ['鎵撳嵃鎹¤揣鍗�']
+                                        , btn: ['鎵撳嵃鎷ｈ揣鍗�']
                                     }, function() {
                                         layer.closeAll();
                                         printPakouts(data.number);
@@ -220,6 +220,7 @@
                             } else {
                                 layer.msg(res.msg)
                             }
+                            $(".layui-laypage-btn")[0].click();
                         }
                     })
                 });
@@ -245,7 +246,7 @@
                 break;
             // 鎵撳嵃
             case 'print':
-                layer.confirm('寮�濮嬫墦鍗�' +data.number + ' 鎹¤揣鍗曪紵', {shadeClose: true}, function(){
+                layer.confirm('寮�濮嬫墦鍗�' +data.number + ' 鎷ｈ揣鍗曪紵', {shadeClose: true}, function(){
                     layer.closeAll();
                     printPakouts(data.number);
                 })
@@ -254,7 +255,7 @@
         }
     });
 
-    // 鎵撳嵃鎹¤揣鍗�
+    // 鎵撳嵃鎷ｈ揣鍗�
     function printPakouts(docNumber) {
         $.ajax({
             url: baseUrl+"/work/stock/out/print",
@@ -265,21 +266,23 @@
             contentType:'application/json;charset=UTF-8',
             method: 'POST',
             success: function (res) {
-                console.log(res)
                 if (res.code === 200){
+                    res.data["barcodeUrl"]=baseUrl+"/custOrder/code/auth?type=1&param="+res.data.docNum;
                     var tpl = $('#pakoutPrintTpl').html();
                     var template = Handlebars.compile(tpl);
                     var html = template(res);
-                    var box = $("#box");
+                    var box = $("#pakoutPrintBox");
                     box.html(html);box.show();
                     box.print({
                         mediaPrint:true,
                         deferred: $.Deferred().done(function () {
                             layer.confirm('[閲嶈] 鎵撳嵃鏄惁鎴愬姛锛�',  {btn: ['Yes', 'No']}, function(){
                                 $.ajax({
-                                    url: baseUrl+"/trayCode/print/auth",
+                                    url: baseUrl+"/pakout/print/auth",
                                     headers: {'token': localStorage.getItem('token')},
-                                    data: data.field,
+                                    data: {
+                                        docNumber: docNumber
+                                    },
                                     method: 'POST',
                                     success: function (res) {
                                         if (res.code === 200){

--
Gitblit v1.9.1