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

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

diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 99453ed..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) {
             // 鎷h揣
             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: ['鎵撳嵃鎷h揣鍗�']
                                     }, 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 + ' 鎷h揣鍗曪紵', {shadeClose: true}, function(){
                     layer.closeAll();
                     printPakouts(data.number);
                 })
@@ -254,7 +255,7 @@
         }
     });
 
-    // 鎵撳嵃鎹¤揣鍗�
+    // 鎵撳嵃鎷h揣鍗�
     function printPakouts(docNumber) {
         $.ajax({
             url: baseUrl+"/work/stock/out/print",
@@ -266,12 +267,10 @@
             method: 'POST',
             success: function (res) {
                 if (res.code === 200){
-                    res.data["barcodeUrl"]=baseUrl+"/custOrder/code/auth?type=2&param="+res.data.docNum;
+                    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);
-                    console.log(html)
-                    console.log(res)
                     var box = $("#pakoutPrintBox");
                     box.html(html);box.show();
                     box.print({
@@ -282,7 +281,7 @@
                                     url: baseUrl+"/pakout/print/auth",
                                     headers: {'token': localStorage.getItem('token')},
                                     data: {
-                                        docNume: docNumber
+                                        docNumber: docNumber
                                     },
                                     method: 'POST',
                                     success: function (res) {

--
Gitblit v1.9.1