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

yusijie

2022-11-22 047ebcfe7352ea3ef5bd46887cf112f662d3c5d3

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

 WebTM/WebTM.csproj

@@ -1095,6 +1095,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" />
@@ -1476,10 +1477,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/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Add_Edit_Gy_WorkDay.html

@@ -27,7 +27,7 @@
    </style>
</head>
<body>
        

    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
@@ -43,54 +43,54 @@
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">日期</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
                                    <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">上班时间</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">下班时间：</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">创建人</label>
                                <label class="layui-form-label">上班时间</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HMakeEmp" id="HMakeEmp" class="layui-input" value="" style="float:left;width:150px;">
                                    <input type="hidden" name="HMakeEmpID" id="HMakeEmpID" value="0">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                    </button>
                                    <input class="layui-input" name="HWorkBegin" id="HWorkBegin" autocomplete="off" model="datetime">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">包装材质</label>
                                <label class="layui-form-label">下班时间：</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HPackMaterial" id="HPackMaterial" lay-verify="HPackMaterial" autocomplete="off" placeholder="" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">备注</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                    <input class="layui-input" name="HWorkEnd" id="HWorkEnd" autocomplete="off" model="datetime">
                                </div>
                            </div>
                        </div>
                      
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">午休开始</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HNoonbreakBegin" id="HNoonbreakBegin" autocomplete="off" model="datetime">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">午休结束：</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HNoonbreakEnd" id="HNoonbreakEnd" autocomplete="off" model="datetime">
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">晚休开始</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HNightbreakBegin" id="HNightbreakBegin" autocomplete="off" model="datetime">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">晚休结束：</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HNightbreakEnd" id="HNightbreakEnd" autocomplete="off" model="datetime">
                                </div>
                            </div>
                        </div>
                    </div>
                    <input id="HItemID" name="HItemID" type="hidden" value="0" />
                    <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
                    <input id="HParentID" name="HParentID" type="hidden" value="0" />
                    <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
                    <input id="HShortNumber" name="HShortNumber" type="hidden" />
                </form>
            </div>
        </div>
@@ -111,7 +111,8 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
                , element = layui.element
                , laydate = layui.laydate;
            var sWhere = "";
            var date = new Date();
            var day = date.getDate();
@@ -120,10 +121,37 @@
            var shijian = year + "-" + month + "-" + day;
            //#endregion


            laydate.render({
                elem: '#HDate'
                //, type:'year'
            });
            laydate.render({
                elem: '#HWorkBegin'
                , type: 'time'
            });
            laydate.render({
                elem: '#HWorkEnd'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNoonbreakBegin'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNoonbreakEnd'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNightbreakBegin'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNightbreakEnd'
                , type: 'time'
            });
            //#region è¿›å…¥é¡µé¢å³åŠ è½½

            $('#HMakeTime').val(Format(new Date(), "yyyy-MM-dd"))
            $('#HDate').val(Format(new Date(), "yyyy-MM-dd"))

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            get_LoginIs();
@@ -175,7 +203,7 @@
            form.on('submit(HEmp-BT)', function () {
                get_checkEmp();
            });
            

            //保存按钮
            form.on('submit(set_SaveBill)', function (data) {
                set_SaveBill(data);
@@ -201,7 +229,7 @@
                //查询检验方案单是否存在
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "Gy_PackType/cx",
                    url: GetWEBURL() + "Gy_WorkDay/cx",
                    type: "GET",
                    data: {
                        "HInterID": linterid
@@ -221,21 +249,13 @@
                            }
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HItemID": data.HItemID
                                ,"HNumber": data.包装方式代码
                                , "HName": data.包装方式名称
                                , "HParentID": data.HParentID
                                , "HShortNumber": data.短代码
                                , "HHelpCode": data.助记码
                                //, "HMakeEmp": data.创建人
                                , "HPackMaterial": data.包装材质
                                , "HLevel": data.等级
                                , "HLenhth": data.长
                                , "HWidth": data.宽
                                , "HHeight": data.高
                                //, "HStopflag": data.禁用标记
                                , "HRemark": data.备注
                                , "HUseFlag": data.使用标记
                                , "HMakeTime": Format(data.创建时间, "yyyy-MM-dd")
                                , "HDate": data.HDate
                                , "HWorkBegin": data.HWorkBegin
                                , "HWorkEnd": data.HWorkEnd
                                , "HNoonbreakBegin": data.HNoonbreakBegin
                                , "HNoonbreakEnd": data.HNoonbreakEnd
                                , "HNightbreakBegin": data.HNightbreakBegin
                                , "HNightbreakEnd": data.HNightbreakEnd
                            });
                            layer.close(ajaxLoad);
                        } else {
@@ -253,33 +273,9 @@
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                var sMainStr = JSON.stringify(data.field);
                if (!$("#HNumber").val()) {
                    layer.msg("请输入包装方式代码！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HName").val()) {
                    layer.msg("请输入包装方式名称！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HMakeEmpID").val() == 0) {
                    layer.msg("请选择创建人！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HLenhth").val()) {
                    layer.msg("请输入长！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HWidth").val()) {
                    layer.msg("请输入宽！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HHeight").val()) {
                    layer.msg("请输入高！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_PackType/ModifyByID", //方法所在页面和方法名
                    url: GetWEBURL() + "Gy_WorkDay/ModifyByID", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
                    dataType: "json",
@@ -302,33 +298,6 @@
                });
            }
            //#endregion

            //#region é€‰æ‹©èŒå‘˜æ–¹æ³•
            function get_checkEmp() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '职员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HMakeEmp").val(checkStatus.data[0].HName);
                        $("#HMakeEmpID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion


            //#region ä¿å­˜åŽæµè§ˆæ–¹æ³•
            function ReRoadBillMain() {
                location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_WorkDay.html

@@ -25,15 +25,9 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">包装代码</label>
                                    <label class="layui-form-label">日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">包装名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                        <input type="text" class="layui-input" name="HDate" id="HDate">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -110,11 +104,14 @@
            var sWhere = "";
            var option = [];
            var Organization = sessionStorage["Organization"]
            var HModName = "Gy_PackType";
            var HModName = "Gy_WorkDay";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID","HParentID",];
            //#endregion

            laydate.render({
                elem: '#HDate'
                //, type:'year'
            });
            //#region è¿›å…¥é¡µé¢å³åŠ è½½

            //初始化界面
@@ -218,7 +215,7 @@
                var ajaxLoad = layer.load();
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_PackType/list',
                    url: GetWEBURL() + '/Gy_WorkDay/list',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },

@@ -286,12 +283,10 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                var HDate = $("#HDate").val();
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
@@ -313,11 +308,8 @@
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (HNumber) {
                    sWhere += " and åŒ…装方式代码 like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and åŒ…装方式名称 like '%" + HName + "%'";
                if (HDate) {
                    sWhere += " and DATEDIFF(D,日期,'" + HDate +"')=0";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -341,7 +333,7 @@
                    type: 2
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['100%', '100%']
                    , title: '包装方式列表-新增'
                    , title: '工作日-新增'
                    , shift: 0//弹出动画
                    , content: '../工资基础资料/Add_Edit_Gy_WorkDay.html?OperationType=1&linterid=&HSouceBillType='
                })
@@ -358,7 +350,7 @@
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '包装方式列表-编辑'
                        , title: '工作日-编辑'
                        , shift: 0//弹出动画
                        , content: '../工资基础资料/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })
@@ -378,7 +370,7 @@
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_PackType',
                            url: GetWEBURL() + 'DeltetGy_WorkDay',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {

 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/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/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_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 = "";