From 391ea14026d1fe6417d4ce88ebedc6654b6519ad Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 01 六月 2021 13:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htwms' into htwms

---
 src/main/webapp/static/js/safeSto/safeSto.js |   65 +++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/main/webapp/static/js/safeSto/safeSto.js b/src/main/webapp/static/js/safeSto/safeSto.js
index d53037b..b59490c 100644
--- a/src/main/webapp/static/js/safeSto/safeSto.js
+++ b/src/main/webapp/static/js/safeSto/safeSto.js
@@ -105,33 +105,44 @@
         switch (obj.event) {
             // 琛ヤ粨
             case 'allot':
-                layer.confirm(data.node_name +'琛ヤ粨 '+ data.matnr + '锛屾暟閲忥細' + (data.safe_qua - data.amount), function(){
-                    var index = layer.load(1, {shade: [0.1,'#000']});
-                    $.ajax({
-                        url: baseUrl+"/work/stock/transfer",
-                        headers: {'token': localStorage.getItem('token')},
-                        contentType:'application/json;charset=UTF-8',
-                        data: JSON.stringify({
-                            node_id: data.node_id,
-                            matnr: data.matnr,
-                            safe_qua: data.safe_qua,
-                            amount: data.amount
-                        }),
-                        dataType:'json',
-                        method: 'POST',
-                        success: function (res) {
-                            if (res.code === 200) {
-                                layer.msg(res.msg, {icon: 1})
-                                $(".layui-laypage-btn")[0].click();
-                            } else if (res.code === 403) {
-                                top.location.href = baseUrl+"/";
-                            } else {
-                                layer.msg(res.msg, {icon: 2})
-                            }
-                            layer.close(index);
-                        }
-                    });
-                });
+                // layer.confirm(data.node_name +'琛ヤ粨 '+ data.matnr + '锛屾暟閲忥細' + (data.safe_qua - data.amount), function(){
+                //     var index = layer.load(1, {shade: [0.1,'#000']});
+                //     $.ajax({
+                //         url: baseUrl+"/work/stock/transfer",
+                //         headers: {'token': localStorage.getItem('token')},
+                //         contentType:'application/json;charset=UTF-8',
+                //         data: JSON.stringify({
+                //             node_id: data.node_id,
+                //             matnr: data.matnr,
+                //             safe_qua: data.safe_qua,
+                //             amount: data.amount
+                //         }),
+                //         dataType:'json',
+                //         method: 'POST',
+                //         success: function (res) {
+                //             if (res.code === 200) {
+                //                 layer.msg(res.msg, {icon: 1})
+                //                 $(".layui-laypage-btn")[0].click();
+                //             } else if (res.code === 403) {
+                //                 top.location.href = baseUrl+"/";
+                //             } else {
+                //                 layer.msg(res.msg, {icon: 2})
+                //             }
+                //             layer.close(index);
+                //         }
+                //     });
+                // });
+                layer.open({
+                    type: 2,
+                    title: '琛ヤ粨',
+                    offset: '100px',
+                    area: ['90%', '80%'],
+                    shadeClose: true,
+                    content: 'locAllot.html?matnr=' + data.matnr,
+                    success: function(layero, index){
+
+                    }
+                })
                 break;
         }
     });

--
Gitblit v1.9.1