Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

yxj

2022-11-22 d13d16e1e48ced35f297e6ff18e5caab093adabc

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/WebTM.csproj

@@ -1097,6 +1097,7 @@
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_FastCheck.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_Check_New.html" />
    <Content Include="views\验收入库\产品入库\Kf_ICStockBillSub_WMS_List.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Kf_ProductInBillList.html" />
@@ -1478,10 +1479,7 @@
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="Files\000000001043\" />
    <Folder Include="Files\000000001077\" />
    <Folder Include="Files\000000001078\" />
    <Folder Include="Files\000000001080\" />
    <Folder Include="Files\" />
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
  </ItemGroup>

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBillList.html

@@ -112,6 +112,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></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_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><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>
@@ -166,6 +167,10 @@
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //明细
                    case 'btn-WmsSub':
                        getWmsSub();
                        break;
                    //关闭
                    case 'set_CloseBill': set_CloseBill();
                        break;
@@ -219,7 +224,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: 'HEmpID', title: 'HEmpID', width: 160, hide: true }
@@ -298,6 +304,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 = "1207";
                    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() {

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_SOPBill.html

@@ -210,9 +210,10 @@
            //#region è‡ªåŠ¨æ’­æ”¾æ¨¡å¼ä¸‹èŽ·å–页面信息的方法
            function set_LoadAgain() {
                get_Display(sWhere);
                get_Display2(sWhere);
                get_Display3(sWhere);
                setTimeout(function () { ins.reload({ autoplay: false }) }, 500);
                setTimeout(function () { get_Display2(sWhere); }, 500);
                setTimeout(function () { get_Display2(sWhere); }, 500);
                setTimeout(function () { get_Display3(sWhere); }, 500);
                setTimeout(function () { ins.reload({ autoplay: false }) }, 1000);
            }
            //#endregion

@@ -338,7 +339,7 @@
                    , limit: 50
                    , height: 300
                    , cols: [[
                        , { field: '计划', title: '计划', width: 100 }
                        , { field: '源单单号', title: '计划', width: 100 }
                        , { field: '日期', title: '日期', width: 100, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '物料代码', title: '物料代码', width: 100 }
                        , { field: '物料名称', title: '物料名称', width: 100 }

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -388,10 +388,11 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        { type: 'checkbox', fixed: 'left', totalRowText: '合计' }
                        , { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
                        , { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
                        , { field: '单据号', title: '单据号', sort: true, width: 170 }
@@ -404,7 +405,7 @@
                        , { field: '规格型号', title: '规格型号', width: 215 }
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '生产车间', title: '生产车间', width: 115 }
                        , { field: '生产任务单数量', title: '生产订单数量', width: 115 }
                        , { field: '生产任务单数量', title: '生产订单数量', width: 115, totalRow: true }
                        , { field: '包装标识代码', title: '包装标识代码', width: 115 }
                        , { field: '包装标识', title: '包装标识', width: 115 }
                        , { field: '计量单位代码', title: '计量单位代码', width: 115 }

 WebTM/views/ϵͳ¹ÜÀí/×éÖ¯¼Ü¹¹ÉèÖÃ/Gy_DutyEdit.html

@@ -6,12 +6,12 @@
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <style type="text/css">
        .layui-form-label {
            width: 85px;
@@ -109,7 +109,7 @@
</html>
<script>
    layui.config({
        base: '../../../../layuiadmin/' //静态资源所在路径
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index', //主入口模块
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -725,7 +725,7 @@
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
@@ -738,7 +738,11 @@
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            if (data[i].name == '数量' || data[i].name == '出站数量' || data[i].name == '报废数量') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            }                                            
                                    }
                                }
                            }
@@ -751,6 +755,7 @@
                                , data: data1.data
                                , height: 550
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -815,7 +815,7 @@
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
@@ -828,7 +828,11 @@
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            if (data[i].name == '生产数量' || data[i].name == '流转卡数量' || data[i].name == '入库数量') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            }
                                    }
                                }
                            }
@@ -841,6 +845,7 @@
                                , data: data1.data
                                , height: 550
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/ProductionPlanReportList.html

@@ -248,9 +248,10 @@
                    , toolbar: '#toolbarDemo'
                    , cellMinWidth: 120
                    , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                    , totalRow: true
                    , height: 'full-70'
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        { type: 'checkbox', fixed: 'left', totalRowText: '合计' }
                        , { field: '流转卡号', title: '流转卡号', width: 160 }
                        , { field: '唯一ID', title: '唯一ID', width: 160 }
                        , { field: '生产订单号', title: '批号', width: 160 }
@@ -259,11 +260,11 @@
                        , { field: '开工日期', title: '下达日期', width: 160, templet: "<div>{{d.开工日期 ==null ?'':layui.util.toDateString(d.开工日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '要求完工', title: '要求完工', width: 160, templet: "<div>{{d.要求完工 ==null ?'':layui.util.toDateString(d.要求完工, 'yyyy-MM-dd')}}</div>" }
                        , { field: '包装标识', title: '包装标识', width: 200 }
                        , { field: '整批', title: '整批', width: 160 }
                        , { field: '报废数量', title: '报废', width: 160 }
                        , { field: '整批', title: '整批', width: 160, totalRow: true }
                        , { field: '报废数量', title: '报废', width: 160, totalRow: true}
                        , { field: '汇报单数量', title: '汇报单数量', width: 160 }
                        , { field: '入库', title: '入库', width: 200 }
                        , { field: '在制', title: '在制', width: 200 }
                        , { field: '入库', title: '入库', width: 200, totalRow: true}
                        , { field: '在制', title: '在制', width: 200, totalRow: true }
                        , { field: '工序', title: '工序', width: 200 }
                        , { field: '班组', title: '班组', width: 200 }
                        , { field: '状态', title: '状态', width: 200 }
@@ -272,6 +273,25 @@
                        , { field: '销售订单号', title: '销售单号', width: 160 }
                        , { field: '等级', title: '等级', width: 160 }
                    ]]
                    ,done: function (res) {
                        var count = 0;
                        var HBillNo = "";
                        for (var i = 0; i < res.data.length; i++) {
                            if (res.data[i]["流转卡号"] != HBillNo) {
                                count += res.data[i]["整批"];
                                HBillNo = res.data[i]["流转卡号"];
                            }
                        }
                        var divArr = $(".layui-table-total div.layui-table-cell");
                        $.each(divArr, function (index, item) {
                            var _div = $(item);
                            var content = _div.html();
                            if (index == 9) {
                                content = count;
                            }
                            _div.html(content);
                        });
                    }
                };
            }

@@ -285,6 +305,18 @@
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            //var num = 0;
                            //for (let i = 0; i < data1.data.length; i++) {
                            //    for (let j = i + 1; j < data1.data.length; j++) {
                            //        if (data1.data[i].流转卡号 === data1.data[j].流转卡号) {
                            //            //num += data1.data[i].整批;
                            //            //data1.data[i].filter(() => {
                            //            //    return 
                            //            //})
                            //            data1.data[j].整批 = '';
                            //        }
                            //    }
                            //}
                            table.render(option);
                            layer.close(wait);
                        } else {
@@ -418,7 +450,9 @@
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;

 WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/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(',');


 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -1296,6 +1296,15 @@
                    if (sBarCode != "") {
                        $('#HBarCode').val("");
                    }
                    //仓位必须录入
                    //if (sHSPID == '' || sHSPID == 0) {
                    //    //
                    //    playSound();
                    //    layer.msg("仓位为空，不能扫描！", { icon: 5, btn: ['确定'], time: 100000, offset: 't' });
                    //    //11
                    //    return false;
                    //}
                    //
                    $.ajax({
                        url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
                        type: "GET",

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ICStockBillSub_WMS_List.html

New file
@@ -0,0 +1,167 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>条码明细</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <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="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
</body>
</html>

<script>
        //#region æŠ˜å æ³¨é‡Š
        //#endregion
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

        //#region å…¬ç”¨å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½

            var params = getUrlVars();
            var BillType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
            var HInterID = params[params[1]]; //从参数中获取 å•æ®å†…码

            //if (BillType == undefined) {
            //    BillType = 3711;
            //    HInterID = 70;
            //}
          
            //初始化界面
            set_ClearBill();

        //#endregion

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //退出按钮
                    case 'get_Exit': Pub_Close(1);
                        break;
                };
            });
            //#endregion

        //#endregion

        //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
            }
            //#endregion

            //#region åˆå§‹åŒ–表格方法
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                         { type: 'numbers', title: '序号', totalRow: true }
                        , { field: '物料代码', title: '物料代码' }
                        , { field: '物料名称', title: '物料名称' }
                        , { field: '规格型号', title: '规格型号' }
                        , { field: '条码', title: '条码' }
                        , { field: '数量', title: '数量' }
                        , { field: '仓库代码', title: '仓库代码'}
                        , { field: '仓库名称', title: '仓库名称' }
                    ]]
                };
            }
            //#endregion

            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                sWhere = " and HInterID=" + HInterID + " and HBillType='" + BillType+"'";
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Kf_ICStockBillSub_WMS/Kf_ICStockBillSub_WMS_List',
                    type: "GET",
                    data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //获取参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }

        //#endregion

        //以上是layui模块
        });




</script>

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBillList.html

@@ -111,6 +111,7 @@
                                <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_Refresh"><i class="layui-icon layui-icon-refresh-3"></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>
@@ -256,6 +257,10 @@
                        else {
                            layer.msg('请选择一行数据删除！');
                        }
                        break;
                    //明细
                    case 'btn-WmsSub':
                        getWmsSub();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
@@ -475,9 +480,6 @@
            }


        //#endregion


            // å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HDate = $("#HBeginDate").val();//开始日期
@@ -523,6 +525,35 @@
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

            //条码明细
            function getWmsSub() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var BillType = "1202";
                    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 set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -543,7 +574,7 @@
                set_ClearQuery();
                get_Display(sWhere);
            }
            //#endregion
        //#endregion

            //以上是layui模块
        });

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBillList.html

@@ -111,6 +111,7 @@
                                <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_Refresh"><i class="layui-icon layui-icon-refresh-3"></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>
@@ -261,6 +262,10 @@
                            layer.msg('请选择一行数据删除！');
                        }
                        break;
                    //明细
                    case 'btn-WmsSub':
                        getWmsSub();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
@@ -370,6 +375,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 = "1203";
                    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() {
                var colName = "";