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 |   69 +++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index cc47364..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}
@@ -206,7 +206,7 @@
                                 ,closeBtn: false
                                 ,offset: '100px'
                                 // ,area: ['800px','450px']
-                                ,area: '800px'
+                                ,area: '1000px'
                                 ,shade: 0.5
                                 ,shadeClose: true
                                 ,id: 'LAY_layuipro'
@@ -224,15 +224,16 @@
                                         height: 432,
                                         cols: [[
                                             {field: 'title', title: '鍟嗗搧', align: 'center'},
-                                            {field: 'anfme', title: '鎬绘暟閲�', align: 'center', style: 'font-weight: bold', width: 80},
+                                            {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: 80, style: 'font-weight: bold'},
+                                            {field: 'reduce', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
                                             // {field: 'remQty', title: '浣欓噺', align: 'center', width: 80},
-                                            {field: 'total', title: '鎬婚噺', align: 'center', width: 80},
+                                            {field: 'total', title: '鎬婚噺', align: 'center', width: 90},
                                         ]],
                                         done: function () {
-                                            tableX.merges('stoPreTab', [0,1]);
+                                            tableX.merges('stoPreTab', [0,1,2]);
                                             $('.layui-table-body.layui-table-main').css("overflow", "auto")
                                         }
                                     });
@@ -249,22 +250,24 @@
                             });
                         // 缂烘枡
                         } 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})
                         }
                     }
                 })
@@ -309,17 +312,17 @@
                                 shadeClose: true
                                 , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
                             }, function() {
-                                // todo 搴撳瓨璋冩嫧
+                                // 搴撳瓨璋冩嫧
                                 layer.closeAll();
                             }, function() {
-                                // printPakouts(data.number);
+                            alert(number)
                                 layer.closeAll();
                             }
                         )
                     } else if (res.code === 403){
                         top.location.href = baseUrl+"/";
                     } else {
-                        layer.msg(res.msg)
+                        layer.msg(res.msg, {icon: 2})
                     }
                     $(".layui-laypage-btn")[0].click();
                 }
@@ -327,6 +330,28 @@
         // });
     }
 
+    // 搴撳瓨璋冩嫧
+    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) {
         $.ajax({

--
Gitblit v1.9.1