From 047ebcfe7352ea3ef5bd46887cf112f662d3c5d3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 22 十一月 2022 08:43:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 3 deletions(-)

diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
index 2fe89a2..bce69e6 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
@@ -105,13 +105,14 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>--> 
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -171,6 +172,10 @@
                         break;
                     //鍒犻櫎鎸夐挳
                     case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鏄庣粏
+                    case 'btn-WmsSub':
+                        getWmsSub();
                         break;
                     //娴忚
                     case 'btn-view': get_ViewReport();
@@ -242,7 +247,8 @@
                     , limit: 50
                     , limits: [50, 500, 5000, 20000]
                     , cols: [[
-                        { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        { type: 'checkbox', fixed: 'left' }
+                        ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
                         , { field: 'hmanagerid', title: 'hmanagerid', width: 160, hide: true }
@@ -308,6 +314,7 @@
                     ]]
                 }
             }
+
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             function get_Display(sWhere) {
                 var index = layer.load(0);
@@ -335,6 +342,34 @@
                 DisPlay_HideColumn();
             }
 
+
+            //鏉$爜鏄庣粏
+            function getWmsSub() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var BillType = "1206";
+                    layer.open({
+                        type: 2
+                        , skin: "layui-layer-rim" //鍔犱笂杈规
+                        , title: "鏉$爜鏄庣粏"  //鏍囬
+                        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                        , shift: 2 //寮瑰嚭鍔ㄧ敾
+                        , area: ["90%", "90%"] //绐椾綋澶у皬
+                        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                        , content: ['../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html?BillType=' + BillType + '&InterID=' + InterID, "yes"]
+                        , btn: ["纭畾", "鍙栨秷"]
+                        //, end : function () {
+                        //    //鍒锋柊琛ㄦ牸鏁版嵁
+                        //    get_Display(sWhere);
+                        //}
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
 
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
@@ -374,7 +409,7 @@
 
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["鍗曟嵁ID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 

--
Gitblit v1.9.1