From 0ffa7a000fee8d7bde4d9a4cd91327b063b41f7f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 三月 2021 15:59:49 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/custOrder/custOrder.js |  217 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 126 insertions(+), 91 deletions(-)

diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 6358a08..f79ac41 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -38,7 +38,7 @@
         cols: [[
             {type: 'checkbox'}
 //            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-            ,{field: 'number', align: 'center',title: '閿�鍞崟鍙�'}
+            ,{field: 'number', align: 'center',title: '鍗曞彿'}
 
             ,{field: 'btypeId', align: 'center',title: '瀹㈡埛缂栧彿'}
             ,{field: 'etypeId', align: 'center',title: '缁忔墜浜虹紪鍙�', hide: true}
@@ -74,6 +74,7 @@
                 top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
+            tableX.merges('custOrder', [1, 11]);
             limit();
             form.on('checkbox(tableCheckbox)', function (data) {
                 var _index = $(data.elem).attr('table-index')||0;
@@ -196,7 +197,6 @@
                     }),
                     method: 'POST',
                     success: function (res) {
-                        console.log(res)
                         layer.close(loadIndex);
                         // 鎴愬姛
                         if (res.code === 200){
@@ -205,106 +205,72 @@
                                 ,title: false
                                 ,closeBtn: false
                                 ,offset: '100px'
-                                ,area: '1200px;'
+                                // ,area: ['800px','450px']
+                                ,area: '1000px'
                                 ,shade: 0.5
+                                ,shadeClose: true
                                 ,id: 'LAY_layuipro'
-                                ,btn: ['椹笂鎷h揣', '绋嶅悗澶勭悊']
+                                ,btn: ['绔嬪嵆鐢熸垚', '绋嶅悗澶勭悊']
                                 ,btnAlign: 'c'
                                 ,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
-                                // ,content: '<div style="padding: 50px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">浣犵煡閬撳悧锛熶翰锛�<br>layer 鈮� layui<br><br>layer鍙槸浣滀负Layui鐨勪竴涓脊灞傛ā鍧楋紝鐢变簬鍏剁敤鎴峰熀鏁拌緝澶э紝鎵�浠ュ父甯镐細鏈変汉浠ヤ负layui鏄痩ayerui<br><br>layer铏界劧宸茶 Layui 鏀剁紪涓哄唴缃殑寮瑰眰妯″潡锛屼絾浠嶇劧浼氫綔涓轰竴涓嫭绔嬬粍浠跺叏鍔涚淮鎶ゃ�佸崌绾с��<br><br>鎴戜滑姝ゅ悗鐨勫緛閫旀槸鏄熻景澶ф捣 ^_^</div>'
                                 ,content: $('#stoukOutPreview')
                                 ,success: function(layero, index){
                                     table.render({
                                         elem: '#stoPreTab',
-                                        // url: 'tablex-tb2.json',
                                         data: res.data,
                                         page: true,
                                         cellMinWidth: 100,
+                                        // ,width: admin.screen() > 1 ? 892 : ''
+                                        height: 432,
                                         cols: [[
-                                            {field: 'title', title: '鍚嶇О', sort: true},
-                                            {field: 'maktx', title: '鑿滃崟鍚嶇О'},
-                                            {field: 'locNo', title: '璐т綅'},
-                                            {field: 'reduce', title: '鍑哄簱鏁伴噺'},
-                                            {field: 'prior', title: '鎺ㄨ崘璐т綅'},
+                                            {field: 'title', title: '鍟嗗搧', align: 'center'},
+                                            {field: 'anfme', title: '鎬绘暟閲�', align: 'center', style: 'font-weight: bold', width: 90},
+                                            {field: 'type', title: '浠撳簱', align: 'center', templet: '#typeTpl', width: 90},
+                                            {field: 'locNo', title: '璐т綅', align: 'center'},
+                                            {field: 'prior$', title: '鎺ㄨ崘璐т綅', align: 'center', width: 100},
+                                            {field: 'reduce', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+                                            // {field: 'remQty', title: '浣欓噺', align: 'center', width: 80},
+                                            {field: 'total', title: '鎬婚噺', align: 'center', width: 90},
                                         ]],
                                         done: function () {
-                                            tableX.merges('stoPreTab', [0]);
+                                            tableX.merges('stoPreTab', [0,1,2]);
+                                            $('.layui-table-body.layui-table-main').css("overflow", "auto")
                                         }
                                     });
 
-                                    // var btn = layero.find('.layui-layer-btn');
-                                    // btn.find('.layui-layer-btn0').attr({
-                                    //     href: 'http://www.layui.com/'
-                                    //     ,target: '_blank'
-                                    // });
+                                }
+                                ,yes: function(index, layero){
+                                    //鎸夐挳銆愰┈涓婃嫞璐с�戠殑鍥炶皟
+                                    stockOut(data.number);
+                                }
+                                ,btn2: function(index, layero){
+                                    //鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
                                 }
                             });
                         // 缂烘枡
                         } else if (res.code === 20001) {
-                            layer.confirm(res.msg, {
-                                    shadeClose: true
-                                    , area: ['400px']
-                                    , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
-                                }, function() {
-                                    // todo 搴撳瓨璋冩嫧
-                                    layer.closeAll();
-                                }, function() {
-                                    // printPakouts(data.number);
-                                    layer.closeAll();
-                                }
-                            )
+                            // layer.confirm(res.msg, {
+                            //         shadeClose: true
+                            //         , area: ['400px']
+                            //         , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
+                            //     }, function() {
+                            //         // 搴撳瓨璋冩嫧
+                            //         stockTransfer(data.number);
+                            //         layer.closeAll();
+                            //     }, function() {
+                            //         // printPakouts(data.number);
+                            //         layer.closeAll();
+                            //     }
+                            // )
+                            layer.msg(res.msg, {icon: 2})
                         } else if (res.code === 403){
                             top.location.href = baseUrl+"/";
                         } else {
-                            layer.msg(res.msg, {icon: 1})
+                            layer.msg(res.msg, {icon: 2})
                         }
                     }
                 })
-
-
-                // layer.confirm(data.number + ' 璁㈠崟寮�濮嬫嫞璐э紵', {shadeClose: true}, function(){
-                //     layer.closeAll();
-                //     $.ajax({
-                //         url: baseUrl+"/work/stock/out",
-                //         headers: {'token': localStorage.getItem('token')},
-                //         contentType:'application/json;charset=UTF-8',
-                //         data: JSON.stringify({
-                //             number: data.number
-                //         }),
-                //         method: 'POST',
-                //         success: function (res) {
-                //             // 鎴愬姛
-                //             if (res.code === 200){
-                //                 layer.confirm(res.msg, {
-                //                         shadeClose: true
-                //                         , btn: ['鎵撳嵃鎷h揣鍗�']
-                //                     }, function() {
-                //                         layer.closeAll();
-                //                         printPakouts(data.number);
-                //                     }
-                //                 )
-                //             // 缂烘枡
-                //             } else if (res.code === 20001) {
-                //                 layer.confirm(res.msg, {
-                //                         shadeClose: true
-                //                         , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
-                //                     }, function() {
-                //                         // todo 搴撳瓨璋冩嫧
-                //                         layer.closeAll();
-                //                     }, function() {
-                //                         // printPakouts(data.number);
-                //                         layer.closeAll();
-                //                     }
-                //                 )
-                //             } else if (res.code === 403){
-                //                 top.location.href = baseUrl+"/";
-                //             } else {
-                //                 layer.msg(res.msg)
-                //             }
-                //             $(".layui-laypage-btn")[0].click();
-                //         }
-                //     })
-                // });
                 break;
             // 鎵撳嵃
             case 'print':
@@ -316,6 +282,75 @@
 
         }
     });
+
+    // 寮�濮嬫嫞璐�
+    function stockOut(number) {
+        // layer.confirm(number + ' 璁㈠崟寮�濮嬫嫞璐э紵', {shadeClose: true}, function(){
+            layer.closeAll();
+            $.ajax({
+                url: baseUrl+"/work/stock/out",
+                headers: {'token': localStorage.getItem('token')},
+                contentType:'application/json;charset=UTF-8',
+                data: JSON.stringify({
+                    number: number
+                }),
+                method: 'POST',
+                success: function (res) {
+                    // 鎴愬姛
+                    if (res.code === 200){
+                        layer.confirm(res.msg, {
+                                shadeClose: true
+                                , btn: ['鎵撳嵃鎷h揣鍗�']
+                            }, function() {
+                                layer.closeAll();
+                                printPakouts(number);
+                            }
+                        )
+                    // 缂烘枡
+                    } else if (res.code === 20001) {
+                        layer.confirm(res.msg, {
+                                shadeClose: true
+                                , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
+                            }, function() {
+                                // 搴撳瓨璋冩嫧
+                                layer.closeAll();
+                            }, function() {
+                            alert(number)
+                                layer.closeAll();
+                            }
+                        )
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2})
+                    }
+                    $(".layui-laypage-btn")[0].click();
+                }
+            })
+        // });
+    }
+
+    // 搴撳瓨璋冩嫧
+    function stockTransfer(number) {
+
+        $.ajax({
+            url: baseUrl + "/work/stock/transfer",
+            headers: {'token': localStorage.getItem('token')},
+            data: {
+                number: number
+            },
+            method: 'POST',
+            success: function (res) {
+                if (res.code === 200) {
+                    layer.msg(res.msg, {icon: 1})
+                } else if (res.code === 403) {
+                    top.location.href = baseUrl + "/";
+                } else {
+                    layer.msg(res.msg, {icon: 2})
+                }
+            }
+        });
+    }
 
     // 鎵撳嵃鎷h揣鍗�
     function printPakouts(docNumber) {
@@ -478,22 +513,22 @@
         page: {
             curr: pageCurr
         },
-        done: function (res, curr, count) {
-            if (res.code === 403) {
-                top.location.href = baseUrl+"/";
-            }
-            pageCurr=curr;
-            if (res.data.length === 0 && count !== 0) {
-                tableIns.reload({
-                    where: searchData,
-                    page: {
-                        curr: pageCurr-1
-                    }
-                });
-                pageCurr -= 1;
-            }
-            limit(child);
-        }
+        // done: function (res, curr, count) {
+        //     if (res.code === 403) {
+        //         top.location.href = baseUrl+"/";
+        //     }
+        //     pageCurr=curr;
+        //     if (res.data.length === 0 && count !== 0) {
+        //         tableIns.reload({
+        //             where: searchData,
+        //             page: {
+        //                 curr: pageCurr-1
+        //             }
+        //         });
+        //         pageCurr -= 1;
+        //     }
+        //     limit(child);
+        // }
     });
 }
 

--
Gitblit v1.9.1