From 166070c6d723a84036b78e653f4ccb6afa7e79c8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 12 三月 2021 09:31:43 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/custOrder/custOrder.js |   52 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 0a6917f..11fa60f 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -1,10 +1,31 @@
 var pageCurr;
-layui.use(['table','laydate', 'form'], function(){
+function right(){
+    top.popupRight = top.layui.admin.popupRight({
+        id: 'LAY_adminPopupLayerTest'
+        , area: '750px'
+        , type: 2
+        , content:'custOrder/matQuery.html'
+        , success: function(){
+            // $('#'+ this.id).html('<div style="padding: 20px;">鏀惧叆鍐呭</div>');
+            //admin.view(this.id).render('system/xxx')
+        }
+        , end: function () {
+            $(".layui-laypage-btn")[0].click();
+        }
+    });
+}
+
+layui.config({
+    base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+}).extend({
+    index: 'lib/index' //涓诲叆鍙ｆā鍧�
+}).use(['table', 'laydate', 'form'], function(){
     var table = layui.table;
     var $ = layui.jquery;
     var layer = layui.layer;
     var layDate = layui.laydate;
     var form = layui.form;
+    var admin = layui.admin;
 
     // 鏁版嵁娓叉煋
     tableIns = table.render({
@@ -22,8 +43,8 @@
 //            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
             ,{field: 'number', align: 'center',title: '閿�鍞崟鍙�'}
             ,{field: 'billDate', align: 'center',title: '鍗曟嵁鏃ユ湡'}
-            ,{field: 'bTypeId', align: 'center',title: '瀹㈡埛缂栧彿'}
-            ,{field: 'eTypeId', align: 'center',title: '缁忔墜浜虹紪鍙�'}
+            ,{field: 'btypeId', align: 'center',title: '瀹㈡埛缂栧彿'}
+            ,{field: 'etypeId', align: 'center',title: '缁忔墜浜虹紪鍙�'}
             ,{field: 'userCode', align: 'center',title: '鍟嗗搧缂栧彿'}
             ,{field: 'qty', align: 'center',title: '鍟嗗搧鏁伴噺'}
             ,{field: 'price', align: 'center',title: '鍟嗗搧鍗曚环'}
@@ -123,7 +144,7 @@
                             success: function (res) {
                                 if (res.code === 200){
                                     layer.closeAll();
-                                    tableReload(false);
+                                    $(".layui-laypage-btn")[0].click();
                                 } else if (res.code === 403){
                                     top.location.href = baseUrl+"/";
                                 } else {
@@ -181,7 +202,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 +217,7 @@
                             if (res.code === 200){
                                 layer.confirm(res.msg, {
                                         shadeClose: true
-                                        , btn: ['鎵撳嵃鎹¤揣鍗�']
+                                        , btn: ['鎵撳嵃鎷ｈ揣鍗�']
                                     }, function() {
                                         layer.closeAll();
                                         printPakouts(data.number);
@@ -206,12 +227,12 @@
                             } else if (res.code === 20001) {
                                 layer.confirm(res.msg, {
                                         shadeClose: true
-                                        , btn: ['搴撳瓨璋冩嫧', '鎵撳嵃']
+                                        , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
                                     }, function() {
                                         // todo 搴撳瓨璋冩嫧
                                         layer.closeAll();
                                     }, function() {
-                                        printPakouts(data.number);
+                                        // printPakouts(data.number);
                                         layer.closeAll();
                                     }
                                 )
@@ -220,6 +241,7 @@
                             } else {
                                 layer.msg(res.msg)
                             }
+                            $(".layui-laypage-btn")[0].click();
                         }
                     })
                 });
@@ -245,7 +267,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 +276,7 @@
         }
     });
 
-    // 鎵撳嵃鎹¤揣鍗�
+    // 鎵撳嵃鎷ｈ揣鍗�
     function printPakouts(docNumber) {
         $.ajax({
             url: baseUrl+"/work/stock/out/print",
@@ -265,21 +287,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