From b9eee33b8d3f3adf57fd40a9ff225c6717d20158 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 15 十二月 2023 14:27:17 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/picking/picking.js |   55 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index 553fb28..fbca122 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -1,6 +1,7 @@
 var pageCurr;
 var printMatCodeNos = [];
 var ordernoo = "123";
+var insTbCount = 0;
 layui.config({
     base: baseUrl + "/static/layui/lay/modules/"
 }).use(['table','laydate', 'form', 'admin', 'layer'], function(){
@@ -26,12 +27,10 @@
             // {type: 'checkbox'}
             {type: 'numbers'}
             ,{field: 'wrkNo', align: 'center',title: 'id', hide:true}
-            ,{field: 'docNum',title: '鎷ｈ揣鍗曞彿' }
+            ,{field: 'doc_num',title: '鎷ｈ揣鍗曞彿' }
             ,{align: 'center', title: '浜岀淮鐮�', toolbar: '#operate', width: 200 , hide:true}
             ,{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160}
             ,{field: 'status$', align: 'center',title: '鐘舵��'}
-            ,{field: 'owner$', align: 'center',title: '璐т富'}
-            ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��'}
             // ,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О', width: 160}
             ,{field: 'createTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
             ,{align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
@@ -86,15 +85,19 @@
     // 鐩戝惉琛屽伐鍏蜂簨浠�
     table.on('tool(saasLog)', function(obj){
         var data = obj.data;
+        console.log(data);
         switch (obj.event) {
             case "btnPrint":
-                btnPrint(data.wrkNo, data.docNum, 4);
+                btnPrint(data.wrkNo, data.doc_num, 4);
                 break;
             case "wrkTrace":
-                btnPrint(data.wrkNo, data.docNum, 4);
+                btnPrint(data.wrkNo, data.doc_num, 4);
                 break;
             case "btnPrint2":
-                btnPrint2(data.wrkNo, data.docNum, 4);
+                btnPrint2(data.wrkNo, data.doc_num, 4);
+                break;
+            case "del":
+                doDel(data);
                 break;
             case "look":
                 var $a = $(obj.tr).find('a[lay-event="look"]');
@@ -117,7 +120,7 @@
                             headers: {token: localStorage.getItem('token')},
                             url: baseUrl+'/ManPakOut/list/auth',
                             where: {
-                                doc_num: data.docNum,
+                                doc_num: data.doc_num,
                                 uuid: data.uuid
                             },
                             page: true,
@@ -131,10 +134,6 @@
                                 ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
                                 ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
                                 ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-                                ,{field: 'owner$', align: 'center',title: '璐т富'}
-                                ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��'}
-                                ,{field: 'owner', align: 'center',title: '璐т富', hide:true}
-                                ,{field: 'payment', align: 'center',title: '璐х墿褰㈡��', hide:true}
                                 ,{field: 'createTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
                                 ,{field: 'count', align: 'center',title: '瀹屾垚鏁�'}
                                 ,{field: 'status$', align: 'center',title: '鐘舵��'}
@@ -297,9 +296,9 @@
                             var className = templateDom.attr("class");
 
                             if (className === 'template-barcode') {
-                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
+                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].batch+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
                             } else {
-                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
+                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].batch+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
                             }
                         }
                         var tpl = templateDom.html();
@@ -319,6 +318,36 @@
             })
         }
 
+    function doDel(data) {
+        console.log(data)
+        layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
+            shade: .1,
+            skin: 'layui-layer-admin'
+        }, function (i) {
+            layer.close(i);
+            layer.load(2);
+            $.ajax({
+                url: baseUrl+"/pakout/delete/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data:{
+                    docNum:data.doc_num
+                },
+                method: 'GET',
+                success: function (res) {
+                    layer.closeAll('loading');
+                    if (res.code === 200){
+                        tableIns.reload({page: {curr: 1}});
+                        layer.msg(res.msg, {icon: 1});
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    }else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
 
 
 

--
Gitblit v1.9.1