1
yangle
2023-04-27 07c624c777bd16e0b4351ade060386a2c3b7a7a8
1
49个文件已修改
1个文件已添加
4971 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 2805 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/PublicPage/HSourceReportHtml.html 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBill_PDA.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBillList.html 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockOutBill_Fast.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码库存/KF_ICInventoryByMaterID.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/条码明细/Kf_BarCodeDetailQuery.html 466 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNew.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产装箱单/Sc_PackUnionBill_Fast.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Check.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_FastList.html 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/委外出库/Kf_EntrustOutBillList.html 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Check_New.html 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/委外补料/Kf_EntrustReplenishOutBill_Check_New.html 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast.html 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/生产补料/Kf_MateReplenishOutBill_Check_New.html 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBackBill_Fast.html 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Check_New.html 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill_FastList.html 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBackBill_Fast.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBill_FastList.html 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBackBill.html 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBillList.html 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBill_FastList.html 201 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/其他入库/Kf_OtherInBillList.html 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBill_FastList.html 237 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/委外入库/Kf_EntrustInBillList.html 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_FastList.html 143 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large
WebTM/WebTM.csproj
@@ -203,7 +203,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_SourceList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
    <Content Include="views\模治具管理\模治具管理\Gy_SplitBarCode.html" />
    <Content Include="views\条码明细\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillListQuery.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBill_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBill_PDA_QiaoYi.html" />
WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,10 +3,11 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost/WEBAPI/";   //颜家台式机本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/LuBao/API/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
WebTM/views/PublicPage/HSourceReportHtml.html
@@ -33,13 +33,22 @@
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                    </div>
                                </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="PartNumber" id="PartNumber" style="width:190px;">
                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
                                            <!--动态渲染车间-->
                                        </select>
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">部门</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width:190px;">
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
@@ -55,6 +64,14 @@
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">物料编码</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="PartNumber" id="PartNumber" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
@@ -143,6 +160,11 @@
            var HModName = "";
            var option = [];
            var titleData = [];//不需要显示的字段 å¯æ‰©å±•
            var HDeptID = 0;
            var params = getUrlVars();
            var HDeptID = params[params[0]];
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -158,6 +180,31 @@
            else {
                layer.alert("未知操作类型!", { icon: 5 });
            }
            //获取部门列
            var HDeptName = '<option value="0" style="color:red;" selected>全部部门</option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            if (i == 0)
                                HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                            else
                                HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
                        }
                        $("#HDeptName").append(HDeptName);
                        if (!isNaN(HDeptID)) {
                            $("#HDeptName").val(HDeptID);
                        }
                        form.render('select');
                    }
                    layer.closeAll("loading");
                }
            })
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
@@ -323,6 +370,7 @@
                var HBillNo = $("#HBillNo").val();//单据编号
                var PartNumber = $("#PartNumber").val();//物料编码
                var PartName = $("#PartName").val();//物料名称
                var HDeptName = $("#HDeptName").val();//部门
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
@@ -347,7 +395,10 @@
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                //传递的参数不为NAN
                if (!isNaN(HDeptID) && HDeptName == 0) {
                    HDeptName = HDeptID;
                }
                switch (HSouceBillType) {
                    case '生产订单':
                        if (HBillNo) {
@@ -358,6 +409,9 @@
                        }
                        if (PartName) {
                            sWhere += " and ç‰©æ–™åç§° like '%" + PartName + "%'";
                        }
                        if (HDeptName && HDeptName != 0) {
                            sWhere += " and HDeptID = '" + HDeptName + "'";
                        }
                        return sWhere;
                        break;
@@ -371,6 +425,9 @@
                        if (PartName) {
                            sWhere += " and ç‰©æ–™åç§° like '%" + PartName + "%'";
                        }
                        if (HDeptName && HDeptName != 0) {
                            sWhere += " and HDeptID = '" + HDeptName + "'";
                        }
                        return sWhere;
                        break;
                    case '采购订单':
@@ -382,6 +439,9 @@
                        }
                        if (PartName) {
                            sWhere += " and ç‰©æ–™åç§° like '%" + PartName + "%'";
                        }
                        if (HDeptName && HDeptName != 0) {
                            sWhere += " and HDeptID = '" + HDeptName + "'";
                        }
                        return sWhere;
                        break;
@@ -395,6 +455,9 @@
                        if (PartName) {
                            sWhere += " and ç‰©æ–™åç§° like '%" + PartName + "%'";
                        }
                        if (HDeptName && HDeptName != 0) {
                            sWhere += " and HDeptID = '" + HDeptName + "'";
                        }
                        return sWhere;
                        break;
                    case '委外订单':
@@ -406,6 +469,9 @@
                        }
                        if (PartName) {
                            sWhere += " and ç‰©æ–™åç§° like '%" + PartName + "%'";
                        }
                        if (HDeptName && HDeptName != 0) {
                            sWhere += " and HDeptID = '" + HDeptName + "'";
                        }
                        return sWhere;
                        break;
@@ -557,6 +623,7 @@
                $("#HBillNo").val("");//单据号
                $("#PartNumber").val("");//物料编码
                $("#PartName").val("");//物料名称
                $("#HDeptName").val("");//单据号
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
@@ -580,6 +647,17 @@
            }
            //#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
            //#endregion
WebTM/views/WMSɨÂëÄ£¿é/Éú²ú¹ÜÀí/Éú²ú×éÍе¥/Sc_PackUnionBill_PDA.html
@@ -18,19 +18,23 @@
        .layui-col-xs4 {
            width: 12.333333%
        }
        .layui-col-xs8 {
            width: 55.666667%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
    <div class="layui-fluid" style="padding: 0px">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>生产组托单</span>
                    </div>
                    <div class="layui-form-item" style="padding:0px;margin:0px">
                    <div class="layui-form-item" style="padding:10px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs4">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:50px;padding-left:0px;">托条码</label>
                            </div>
                            <div class="layui-col-xs8">
@@ -41,10 +45,10 @@
                            </div>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding:0px;margin:0px">
                    <div class="layui-form-item" style="padding:10px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs4">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:50px;padding-left:0px;">条码</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
@@ -91,7 +95,7 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-form-item" style="margin-bottom: 20px;">
                            <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdLoadData" id="cmdLoadData">提交</button>
WebTM/views/index.html
@@ -210,7 +210,7 @@
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="领料发货/领料出库/Kf_MateOutBillList.html">生产领料单维护</a></dd>
                                        <dd><a lay-href="领料发货/领料出库/Kf_MateOutBackBillList.html">生产退料单维护</a></dd>
                                        <dd><a lay-href="">生产补料单维护n</a></dd>
                                        <!--<dd><a lay-href="">生产补料单维护n</a></dd>-->
                                        <dd><a lay-href="领料发货/销售出库/Kf_SellOutBillList.html">销售出库单维护</a></dd>
                                        <dd><a lay-href="销售管理/销售退货单/Kf_ICStockBillMainList.html">销售退货单维护</a></dd>
                                        <dd><a lay-href="领料发货/其他出库/Kf_OtherOutBillList.html">其他出库单维护</a></dd>
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBillList.html
@@ -115,6 +115,7 @@
                                <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="btn-BarCodeDetail"><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>
                            </div>
                        </script>
@@ -176,6 +177,8 @@
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'btn-BarCodeDetail': get_BarCodeDetail();
                        break;
                };
            });
@@ -305,30 +308,36 @@
            }
            //条码明细
            function getWmsSub() {
            function get_BarCodeDetail() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var BillType = "1207";
                    var HInterID = data[0].hmainid;
                    var HBillType = '1207';
                    var HBillNo = data[0]["单据号"];
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    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"]
                        , area: ['90%', '90%']
                        , title: '直接调拨单条码明细'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../条码明细/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                        , resize: false
                        , btn: ["确定", "取消"]
                        //, end : function () {
                        //    //刷新表格数据
                        //    get_Display(sWhere);
                        //}
                        , end: function () {
                            //刷新页面,
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
                else {
                    layer.msg('请选择一行数据!');
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html
@@ -18,7 +18,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>直接调拨单</span>
@@ -93,13 +93,13 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px;">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">先进先出仓库</label>
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--先进先出仓库-->
                                        </div>
                                        <div class="layui-col-xs6">
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                        <div class="layui-col-xs2">
                                            <button type="button" id="HFIFOWHID-BT" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT">...</button>
                                        </div>
                                    </div>
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_FastList.html
@@ -241,16 +241,19 @@
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var checkStatus3 = table.checkStatus('dj-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
            } else if (checkStatus3.data.length != 0) {
                data = checkStatus3.data;
            }else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sBillType = '1207'
            $.ajax(
                {
@@ -291,7 +294,7 @@
            var checkStatus = table.checkStatus('dj-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var sInterID = data[0].HInterID;
                var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                //逻辑删除方法
                layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                    $.ajax(
@@ -397,14 +400,14 @@
                    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                    , cols: [[
                        { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 120 }
                        , { field: 'HBillNo', title: '单据号', width: 150 }
                        , { field: 'HMaker', title: '制单人', width: 120 }
                        , { field: 'HMakeDate', title: '制单日期', width: 150 }
                        , { field: 'HQty', title: '数量', width: 100 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                        , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                        , { field: '单据内码', title: '单据内码', width: 120 }
                        , { field: '单据号', title: '单据号', width: 150 }
                        , { field: '制单人', title: '制单人', width: 120 }
                        , { field: '制单日期', title: '制单日期', width: 150 }
                        , { field: '数量', title: '数量', width: 100 }
                        , { field: '源单单号', title: '源单单号', width: 150 }
                        , { field: '红蓝字', title: '红蓝字', width: 120 }
                        , { field: '源单类型', title: '源单类型', width: 100 }
                        ]]
                      , height: 500
                      , done: function () {
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockOutBill_Fast.html
@@ -17,7 +17,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>>分步式调出单</span>
@@ -96,7 +96,7 @@
                                            <input type="hidden" name="HDBFXID" id="HDBFXID" lay-verify="HDBFXID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" id="HDBFXID-BT" lay-submit="" class="layui-btn" lay-filter="HDBFXID-BT">...</button>
                                            <button type="button" id="HDBFXID-BT" lay-submit="" class="layui-btn" lay-filter="HDBFXID-BT" style="width:65px;">...</button>
                                        </div>
                                    </div>
                                </div>
@@ -110,7 +110,7 @@
                                            <input type="hidden" name="HCHLXID" id="HCHLXID" lay-verify="HCHLXID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" id="HCHLXID-BT" lay-submit="" class="layui-btn" lay-filter="HCHLXID-BT">...</button>
                                            <button type="button" id="HCHLXID-BT" lay-submit="" class="layui-btn" lay-filter="HCHLXID-BT" style="width:65px;">...</button>
                                        </div>
                                    </div>
                                </div>
@@ -119,7 +119,7 @@
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">源单号</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs2">
WebTM/views/²Ö´æ¹ÜÀí/ÌõÂë¿â´æ/KF_ICInventoryByMaterID.html
@@ -13,7 +13,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>物料库存查询</span>
WebTM/views/ÌõÂëÃ÷ϸ/Kf_BarCodeDetailQuery.html
New file
@@ -0,0 +1,466 @@
<!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>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </style>
</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">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据内码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" id="HInterID" style="width:190px;" disabled="disabled">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" id="HBillNo" style="width:190px;" disabled="disabled">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据类型</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" id="HBillType" style="width:190px;" disabled="disabled">
                                    </div>
                                </div>
                                <!--
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                 -->
                                <div class="layui-colla-content">
                                    <!--
                                    <div class="layui-inline">
                                        <label class="layui-form-label">条形码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="MaterialName" id="MaterialName" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">仓库</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="sWH" id="sWH" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">仓位</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="sSP" id="sSP" style="width:190px;">
                                        </div>
                                    </div>
                                    <hr />
                                    <div class="layui-inline">
                                        <label class="layui-form-label">批号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="sBatchNo" id="sBatchNo" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">单据号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="BillNo" id="BillNo" style="width:190px;">
                                        </div>
                                    </div>
                                    -->
                                    <!--<div class="layui-inline">
                                        <label class="layui-form-label">制单人</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="Hmaker" id="Hmaker" style="width:190px;">
                                        </div>
                                    </div>-->
                                </div>
                            </div>
                        </div>
                        <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-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        var cols_arr = []; //存储表格头的数组
        var table = null;
        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
                , util = layui.util
            //获取传递的参数
            var params = get_UrlVars();
            var HInterID = params.HInterID;                                       //单据内码
            var HBillType = params.HBillType;                                     //单据类型
            var HBillNo = params.HBillNo;       //单据号
            var sWhere = HInterID + ",'" + HBillType + "','" + HBillNo + "'";     //拼接传递的参数
            //表格渲染参数
            var col = [];
            var option = [];
            //模块名称
            var HModName = "Kf_BarCodeDetailQuery";
            //#endregion
            //#region è¿›å…¥é¡µé¢åŠ è½½
            //初始化界面
            set_ClearBill(sWhere);
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'btn-view':
                        break;
                    case 'btn-print':
                        break;
                };
            });
            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //显示列数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid", "hsupid", "hsecmanagerid", "hkeeperid", "HDeptID", "hsubid", "hmaterid", "hunitid", "hwhid"];//不需要显示的字段 å¯æ‰©å±•
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }
                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //// æŸ¥è¯¢æŒ‰é’®
            //form.on('submit(btnSearch)', function (data) {
            //    /*get_FastQuery();*/
            //});
            //// é‡ç½®æŒ‰é’®
            //form.on('submit(btnReSearch)', function (data) {
            //    //清空过滤条件
            //    /*set_ClearQuery();*/
            //});
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
            // åˆå§‹åŒ–界面
            function set_ClearBill(sWhere) {
                //给页面上侧便签赋值
                $("#HInterID").val(HInterID);
                $("#HBillNo").val(HBillNo);
                switch (HBillType) {
                    case "1201":
                        $("#HBillType").val("外购入库单");
                        break;
                    case "1202":
                        $("#HBillType").val("产品入库单");
                        break;
                    case "1203":
                        $("#HBillType").val("其它入库单");
                        break;
                    case "1204":
                        $("#HBillType").val("生产领料");
                        break;
                    case "1205":
                        $("#HBillType").val("销售出库");
                        break;
                    case "1206":
                        $("#HBillType").val("其它出库单");
                        break;
                    case "1207":
                        $("#HBillType").val("直接调拨单");
                        break;
                    case "1210":
                        $("#HBillType").val("委外加工入库单");
                        break;
                    case "1211":
                        $("#HBillType").val("委外加工出库单");
                        break;
                }
                //初始化表格渲染参数
                set_InitGrid();
                //为表格渲染参数赋值数据并进行渲染
                get_Display(sWhere);
                //隐藏勾选字段
                DisPlay_HideColumn();
            }
            //region åˆå§‹åŒ–表格方法
            function set_InitGrid() {
                //填充表格数据
                option = {
                    elem: '#mainTable',
                    toolbar: '#toolbarDemo', //开启头部工具栏,并为其绑定左侧模板
                    title: '单据条码明细',
                    cols: [[]],    //填充表格头数据,
                    id: 'mainTable', //表格id
                    page: false,   //关闭分页
                    totalRow: true, //开启合计
                    limit: 50,     //一页能够显示的最大数目
                    limits: [50, 500, 5000, 20000], //控制多少行一页(默认五条一页)
                    method: 'get',  //提交方式
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    parseData: function (res) {  //res ä¸ºè¿”回的数据
                        if (res.code == "0") {
                            return {
                                "msg": res.Message
                            }
                        }
                    },
                    response: {
                        statusCode: 1 //重新规定成功的状态码为 1,table ç»„件默认为 0
                    },
                    done: function (res) {   //返回数据执行回调函数
                        layer.close(layer.index);    //返回数据关闭loading
                    }
                };
            }
            //进入页面显示的缓存列表
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                //sWhere = JSON.stringify(sWhere);
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Kf_ICStockInOutBill/Kf_BarCodeDetailQuery',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    async: false,
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    success: function (data1) {
                        //获取表格列表表头的数组
                        col[0] = { checkbox: true, fixed: true, totalRowText: '合计' };
                        for (var key in data1.list) {
                            if (data1.list[key].ColmCols == "HItemID") {
                                col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: data1.list[key].ColmCols, width: 200, align: 'center', hide: true };
                            } else {
                                switch (data1.list[key].ColmCols) {
                                    case "数量":
                                        col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: data1.list[key].ColmCols, width: 200, align: 'center', totalRow: true, sort: true };
                                        break;
                                    default:
                                        col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: data1.list[key].ColmCols, width: 200, sort: true };
                                }
                            }
                        }
                        //为表格渲染的参数设定值
                        option.cols = [col];
                        option.data = data1.data;
                        table.render(option);
                    }, error: function (err) {
                        layer.alert(err.Message, { icon: 5 });
                    }
                });
            }
            //// é‡ç½®è¿‡æ»¤æ¡ä»¶
            //function set_ClearQuery() {
            //    //$("#HStartDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            //    //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            //    //$("#BillNo").val("");//单据号
            //    //$("#HBarCode").val("");//条形码
            //    //$("#BillType").val("全部");//单据类型
            //    //$("#MaterialName").val("");//物料名称
            //    //$("#sBatchNo").val("");//批号
            //    //$("#sSP").val("");//仓位
            //    //$("#sWH").val("");//仓库
            //    //form.render();
            //    ////$("#Hmaker").val();//制单人
            //    //sWhere = {};
            //    //get_FastQuery();
            //}
            //// å¿«é€Ÿè¿‡æ»¤
            //function get_FastQuery() {
            //    var HStartDate = $("#HStartDate").val();
            //    var HEndDate = $("#HEndDate").val();
            //    var BillNo = $("#BillNo").val();//单据号
            //    var HBarCode = $("#HBarCode").val();//条形码
            //    var BillType = $("#BillType").val();//单据类型
            //    var MaterialName = $("#MaterialName").val();//物料名称
            //    var sBatchNo = $("#sBatchNo").val();//批号
            //    var sSP = $("#sSP").val();//仓位
            //    var sWH = $("#sWH").val();//仓库
            //    //存储为JSON字符串
            //    var sWhere = {
            //        "HStartDate": HStartDate,
            //        "HEndDate": HEndDate,
            //        "BillNo": BillNo,
            //        "HBarCode": HBarCode,
            //        "BillType": BillType,
            //        "MaterialName": MaterialName,
            //        "sBatchNo": sBatchNo,
            //        "sSP": sSP,
            //        "sWH": sWH,
            //    };
            //    //alert(JSON.stringify(sWhere));
            //    set_ClearBill( sWhere);
            //}
            //#endregion
            //以上是layui模块
        });
    </script>
</body>
</html>
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -29,14 +29,11 @@
                                </div>
                                <div class="layui-row">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">生产车间</label>
                                        <label class="layui-form-label">规格型号</label>
                                        <div class="layui-input-block">
                                            <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
                                                <!--动态渲染车间-->
                                            </select>
                                            <input type="text" class="layui-input" name="HModel" id="HModel">
                                        </div>
                                    </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">业务状态</label>
                                        <div class="layui-input-block">
@@ -61,22 +58,19 @@
                                                <!--  <option value="全部">全部</option>-->
                                                <option value="全部">全部</option>
                                                <option value="已下推">已下推</option>
                                                <option value="未下推"  selected="selected">未下推</option>
                                                <option value="未下推" selected="selected">未下推</option>
                                            </select>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">开始日期</label>
                                        <label class="layui-form-label">生产车间</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" id="HDate">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">结束日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" id="HDate1">
                                            <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
                                                <!--动态渲染车间-->
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -88,7 +82,7 @@
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                </div>
                                <div class="layui-colla-content">
                                    <div class="layui-row">
@@ -146,6 +140,19 @@
                                            </div>
                                        </div>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">开始日期</label>
                                            <div class="layui-input-block">
                                                <input type="date" class="layui-input" id="HDate">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">结束日期</label>
                                            <div class="layui-input-block">
                                                <input type="date" class="layui-input" id="HDate1">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -543,6 +550,7 @@
                var HStatus = $("#HStatus").val();//单据号
                var HBillType = $("#HBillType").val();//单据类型
                var HSF = $("#HSF").val();//单据类型
                var HModel = $("#HModel").val();//规格型号
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
@@ -614,6 +622,9 @@
                }
                if (HErpID) {
                    sWhere += " and å”¯ä¸€ID like '%" + HErpID + "%'";
                }
                if (HModel) {
                    sWhere += " and è§„格型号 like '%" + HModel + "%'";
                }
                //if (HSF) {
                //    sWhere += " and æ˜¯å¦ä¸‹æŽ¨ç”Ÿæˆæµè½¬å¡ like '%" + HSF + "%'";
@@ -633,6 +644,7 @@
                $("#HMaterName").val("");//单据号
                $("#HDeptName").val("");//单据号
                $("#HStatus").val("");//单据号
                $("#HModel").val("");//规格型号
                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_ICMOReportBill_FastNew.html
@@ -17,8 +17,8 @@
</head>
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>生产汇报单</span>
@@ -107,7 +107,7 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">班组</label>
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">班组</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HGroupName" id="HGroupName" lay-verify="HGroupName" autocomplete="off" class="layui-input" disabled="disabled">
WebTM/views/Éú²ú¹ÜÀí/Éú²ú×°Ïäµ¥/Sc_PackUnionBill_Fast.html
@@ -13,7 +13,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>生产装箱单</span>
@@ -42,7 +42,7 @@
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">拖条码</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HTBarCode" id="HTBarCode" lay-verify="HTBarCode" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
@@ -50,7 +50,7 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">单据号</label>
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">单据号</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -641,7 +641,7 @@
                    data: { "HBillType": '3301' },
                    success: function (d) {
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").attr("readOnly", false);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                    }
                });
@@ -1169,7 +1169,7 @@
                        $("#HUnitID").val(checkStatus.data[0].HUnitID);//计量单位id
                        $("#HUnitName").val(checkStatus.data[0].HUnitName);//计量单位名称
                        if ($("#HName").val() == "") {
                            $("#HName").val(checkStatus.data[0].HName);
                            $("#HName").val(checkStatus.data[0].HNumber + '/' + checkStatus.data[0].HName + '/' + checkStatus.data[0].HModel);
                        }
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBillList.html
@@ -118,6 +118,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></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="btn-BarCodeDetail"><i class="layui-icon layui-icon-form"></i>条码明细</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                            </div>
@@ -194,6 +195,7 @@
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'btn-BarCodeDetail': get_BarCodeDetail();
                };
            });
            //#endregion
@@ -380,7 +382,7 @@
                }
            }
            //条码明细
            //明细
            function getWmsSub() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
@@ -408,6 +410,39 @@
                }
            }
            //条码明细
            function get_BarCodeDetail() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid;
                    var HBillType = '1206';
                    var HBillNo = data[0]["单据号"];
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['90%', '90%']
                        , title: '其它出库单条码明细'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../条码明细/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                        , resize: false
                        , btn: ["确定", "取消"]
                        ,end: function () {
                            //刷新页面,
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //打印
            function get_print() {
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_Check.html
@@ -21,26 +21,34 @@
</head>
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>其他出库校验</span>
                    </div>
                    </div>
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                            </div>
                            <div class="layui-col-xs5">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                                <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                            <div class="layui-col-xs8">
                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                            </div>
                            <div class="layui-col-xs2">
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">确定</button>
                            </div>
                        </div>
                        <div class="layui-form-item" style="padding:0px;margin:0px">
                            <div class="layui-row">
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                                </div>
                                <div class="layui-col-xs8">
                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab layui-col-xs12" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_Fast.html
@@ -20,9 +20,9 @@
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
    <div class="layui-fluid" style="padding: 0px">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>其他出库单</span>
@@ -52,11 +52,11 @@
                    </div>
                    <div class="layui-tab" lay-filter="tab-Kf_OtherOutBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1">选择源单</li>
                            <li lay-id="2">表头信息</li>
                            <li lay-id="3">明细信息</li>
                            <li lay-id="1" style="padding:1px;">选择源单</li>
                            <li lay-id="2" style="padding:1px;">表头信息</li>
                            <li lay-id="3" style="padding:1px;">明细信息</li>
                            <li lay-id="4" style="padding:1px;">下架信息</li>
                            <li lay-id="5">合计信息</li>
                            <li lay-id="5" style="padding:1px;">合计信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--选择源单-->
@@ -106,7 +106,7 @@
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">先进先出仓库</label>
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--先进先出仓库-->
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
@@ -290,6 +290,7 @@
                                <source src="../../video/success.wav" type="audio/ogg">
                            </audio>
                        </div>
                    </div>
                </form>
            </div>
        </div>
WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_FastList.html
@@ -215,9 +215,20 @@
        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var checkStatus2 = table.checkStatus('sy-table');
            var checkStatus3 = table.checkStatus('dj-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else if (checkStatus3.data.length != 0) {
                data = checkStatus3.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sBillType = '1206'
            $.ajax(
                {
@@ -257,7 +268,7 @@
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                    var sInterID = data[0].HInterID;
                    var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                    $.ajax(
                        {
                            type: "Get",
@@ -426,6 +437,14 @@
                    };
                    table.render(option);
                }
            },
            error: function (err) {
                layer.msg('错误' + err, {
                    icon: 5,
                    time: 20000
                }, function () {
                    //do something
                });
            }
        })
        
WebTM/views/ÁìÁÏ·¢»õ/ίÍâ³ö¿â/Kf_EntrustOutBillList.html
@@ -117,6 +117,7 @@
                                <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-reload"><i class="layui-icon layui-icon-refresh"></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="btn-BarCodeDetail"><i class="layui-icon layui-icon-form"></i>条码明细</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                            </div>
@@ -187,6 +188,9 @@
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'btn-back': set_Back();
                        break;
                    //条码明细
                    case 'btn-BarCodeDetail': get_BarCodeDetail();
                        break;
                };
            });
@@ -492,6 +496,41 @@
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //条码明细
            function get_BarCodeDetail() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid;
                    var HBillType = '1211';
                    var HBillNo = data[0]["单据号"];
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['90%', '90%']
                        , title: '委外领料单条码明细'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../条码明细/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                        , resize: false
                        , btn: ["确定", "取消"]
                        , end: function () {
                            //刷新页面,
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //删除
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/ÁìÁÏ·¢»õ/ίÍâ³ö¿â/Kf_EntrustOutBill_Check_New.html
@@ -16,19 +16,23 @@
        .layui-col-xs4 {
            width: 12.333333%
        }
        .layui-col-xs8 {
            width: 55.666667%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
    <div class="layui-fluid"  style="padding: 0px">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>委外领料校验</span>
                    </div>
                    <div class="layui-form-item" style="padding:0px;margin:0px">
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs4">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                            </div>
                            <div class="layui-col-xs8">
@@ -38,22 +42,22 @@
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">确定</button>
                            </div>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding:0px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs4">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                        <div class="layui-form-item" style="padding:0px;margin:0px">
                            <div class="layui-row">
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                                </div>
                                <div class="layui-col-xs8">
                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                        </div>
                    </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-Kf_EntrustOutBillCheck">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1">表头信息</li>
                            <li lay-id="2">物料信息</li>
                            <li lay-id="3">合计信息</li>
                            <li lay-id="1" style="padding:1px;">表头信息</li>
                            <li lay-id="2" style="padding:1px;">物料信息</li>
                            <li lay-id="3" style="padding:1px;">合计信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--表头信息-->
@@ -123,7 +127,7 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-form-item" style="margin-bottom: 20px;">
                            <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSaver" id="Saver">提交</button>
@@ -140,6 +144,7 @@
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
WebTM/views/ÁìÁÏ·¢»õ/ίÍâ³ö¿â/Kf_EntrustOutBill_Fast.html
@@ -19,7 +19,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>委外出库单</span>
@@ -292,7 +292,7 @@
                            <!--日志-->
                            <div class="layui-tab-item">
                                <textarea id="rizhi" style="height: 200px;width: 100%;margin-left: 1%;"></textarea>
                                <textarea id="rizhi" style="height: 200px;width: 98%;margin-left: 1%;"></textarea>
                            </div>
                        </div>
                    </div>
WebTM/views/ÁìÁÏ·¢»õ/ίÍâ²¹ÁÏ/Kf_EntrustReplenishOutBill_Check_New.html
@@ -19,9 +19,9 @@
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
    <div class="layui-fluid" style="padding: 1px">
        <div class="layui-card">
            <div class="layui-card-body"  style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>委外补料校验</span>
@@ -51,9 +51,9 @@
                    </div>
                    <div class="layui-tab" lay-filter="tab-Kf_EntrustReplenishOutBillCheck">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1">表头信息</li>
                            <li lay-id="2">物料信息</li>
                            <li lay-id="3">合计信息</li>
                            <li lay-id="1" style="padding:1px;">表头信息</li>
                            <li lay-id="2" style="padding:1px;">物料信息</li>
                            <li lay-id="3" style="padding:1px;">合计信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--表头信息-->
@@ -123,7 +123,7 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-form-item" style="margin-bottom: 20px;">
                            <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSaver" id="Saver">提交</button>
@@ -140,6 +140,7 @@
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
WebTM/views/ÁìÁÏ·¢»õ/ÊÕÁÏÈë¿â/Kf_ReciveBill_Fast.html
@@ -24,7 +24,7 @@
            border-radius: 4px;
        }
        .title {
        /*.title {
            border-left: 4px solid #1492ff;
            padding-left: 6px;
            margin: 20px 10px 4px;
@@ -60,67 +60,83 @@
        .laydate-time-list ol {
            overflow-x: hidden !important;
            overflow-y: auto !important;
        }
        }*/
        .layui-form-label {
       /* .layui-form-label {
            padding: 9px 5px;
            width: 85px;
        }
        }*/
        .layui-input-block {
       /* .layui-input-block {
            margin-left: 85px;
            min-height: 36px;
        }*/
        .layui-table-cell {
            height: auto;
            white-space: normal;
        }
        .layui-col-xs8 {
            width: 55.666667%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
        <div class="layui-card">
            <div class="layui-card-body"  style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
                    <div class="maintitle">到货确认</div>
                    <div class="layui-form-item" style="padding-top: 10px;">
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>条码</label>
                            <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                <input type="text" name="HBarCode" id="HBarCode" placeholder="请键入后回车" autocomplete="off" class="layui-input"><!--lay-verify="required"-->
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin" name="QueDin" id="QueDin" style="width: 70px; background-color: #1492ff;color:white">确定</button>
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;"><span style="color:red;">*</span>条码</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                            </div>
                            <div class="layui-col-xs2">
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin" name="QueDin" id="QueDin">确定</button>
                            </div>
                        </div>
                    </div>
                    </div>
                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                        <ul class="layui-tab-title">
                            <li class="layui-this">表头信息</li>
                            <li>明细信息</li>
                            <li style="padding:1px;" class="layui-this">表头信息</li>
                            <li style="padding:1px;">明细信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;">单据号:</label>
                                            <div class="layui-input-block" style="margin-left: 85px;">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">确定</button>
                                                <input type="hidden" class="layui-input" name="HInterID" id="HInterID" style="width:100px">
                                            </div>
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">单据号</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs2">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">确定</button>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">供应商:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" disabled="disabled">
                                            </div>
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">供应商</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">部门:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" disabled="disabled">
                                            </div>
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">部门</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
@@ -199,7 +215,7 @@
                if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
                    sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
                    table.render(option);
                    break;
                    return;
                }
                layer.close(index);
                //$.ajax({
WebTM/views/ÁìÁÏ·¢»õ/Éú²ú²¹ÁÏ/Kf_MateReplenishOutBill_Check_New.html
@@ -19,14 +19,14 @@
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
    <div class="layui-fluid" style="padding: 0px">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>生产补料校验</span>
                    </div>
                    <div class="layui-form-item" style="padding:0px;margin:0px">
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs4">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
@@ -37,23 +37,23 @@
                            <div class="layui-col-xs2">
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">确定</button>
                            </div>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding:0px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs4">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                            <div class="layui-form-item" style="padding:0px;margin:0px">
                                <div class="layui-row">
                                    <div class="layui-col-xs4">
                                        <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                                    </div>
                                    <div class="layui-col-xs8">
                                        <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-Kf_MateReplenishOutBillCheck">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1">表头信息</li>
                            <li lay-id="2">物料信息</li>
                            <li lay-id="3">合计信息</li>
                            <li lay-id="1" style="padding:1px;">表头信息</li>
                            <li lay-id="2" style="padding:1px;">物料信息</li>
                            <li lay-id="3" style="padding:1px;">合计信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--表头信息-->
@@ -123,7 +123,7 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-form-item" style="margin-bottom: 20px;">
                            <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSaver" id="Saver">提交</button>
@@ -140,6 +140,7 @@
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBackBill_Fast.html
@@ -35,17 +35,20 @@
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
    <div class="layui-fluid" style="padding: 0px">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>销售出库(红字)</span>
                    </div>
                    <div class="layui-tab" lay-filter="tab-SellOutBackBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1">源单信息</li>
                            <li lay-id="2">单据信息</li>
                            <li lay-id="3">物料清单</li>
                            <li lay-id="4">明细清单</li>
                            <li lay-id="5">日志</li>
                            <li lay-id="1" style="padding:1px;">源单信息</li>
                            <li lay-id="2" style="padding:1px;">单据信息</li>
                            <li lay-id="3" style="padding:1px;">物料清单</li>
                            <li lay-id="4" style="padding:1px;">明细清单</li>
                            <li lay-id="5" style="padding:1px;">日志</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html
@@ -118,6 +118,7 @@
                                <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="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BarCodeDetail"><i class="layui-icon layui-icon-logout"></i>条码明细</button>
                            </div>
                        </script>
                    </form>
@@ -357,9 +358,44 @@
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    case 'btn-BarCodeDetail': get_BarCodeDetail();
                        break;
                };
            });
            //条码明细
            function get_BarCodeDetail() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid;
                    var HBillType = '1205';
                    var HBillNo = data[0]["单据号"];
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['90%', '90%']
                        , title: '销售出库单条码明细'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../条码明细/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                        , resize: false
                        , btn: ["确定", "取消"]
                        , end: function () {
                            //刷新页面,
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(table, option) {
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Check_New.html
@@ -16,19 +16,23 @@
        .layui-col-xs4 {
            width: 12.333333%
        }
        .layui-col-xs8 {
            width: 55.666667%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
    <div class="layui-fluid" style="padding: 0px">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>销售出库校验</span>
                    </div>
                    <div class="layui-form-item" style="padding:0px;margin:0px">
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs4">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                            </div>
                            <div class="layui-col-xs8">
@@ -38,22 +42,22 @@
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">确定</button>
                            </div>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding:0px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs4">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                        <div class="layui-form-item" style="padding:0px;margin:0px">
                            <div class="layui-row">
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                                </div>
                                <div class="layui-col-xs8">
                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                        </div>
                    </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-Kf_SellOutBillCheck">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1">表头信息</li>
                            <li lay-id="2">物料信息</li>
                            <li lay-id="3">合计信息</li>
                            <li lay-id="1" style="padding:1px;">表头信息</li>
                            <li lay-id="2" style="padding:1px;">物料信息</li>
                            <li lay-id="3" style="padding:1px;">合计信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--表头信息-->
@@ -123,7 +127,7 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-form-item" style="margin-bottom: 20px;">
                            <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSaver" id="Saver">提交</button>
@@ -140,6 +144,7 @@
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html
@@ -19,7 +19,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>销售出库单</span>
@@ -103,13 +103,13 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">先进先出仓库</label>
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--先进先出仓库-->
                                        </div>
                                        <div class="layui-col-xs6">
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HWHNAME_FIFO" id="HWHNAME_FIFO" lay-verify="HWHNAME_FIFO" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HWHID_FIFO" id="HWHID_FIFO" lay-verify="HWHID_FIFO" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                        <div class="layui-col-xs2">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT" disabled:"disabled">...</button>
                                        </div>
                                    </div>
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_FastList.html
@@ -120,7 +120,8 @@
        , layer = layui.layer
        , table = layui.table
        , form = layui.form
        , element = layui.element;
            , element = layui.element;
        var option = {};
        //清空界面  new
        var sBillType = '1205'
        //动态加载源单类型列表 new
@@ -158,27 +159,7 @@
        });
        form.on('submit(cmdRefresh)', function () {//刷新
            table.render({
                elem: '#dj-table'
                , url: GetWEBURL() + '/Web/chanpinruk'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 120 }
                    , { field: 'HBillNo', title: '单据号', width: 150 }
                    , { field: 'HMaker', title: '制单人', width: 120 }
                    , { field: 'HMakeDate', title: '制单日期', width: 150 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }),
            table.render(option);
                table.render({
                    elem: '#yd-table'
                    , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
@@ -210,16 +191,19 @@
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var checkStatus3 = table.checkStatus('dj-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
            } else if (checkStatus3.data.length != 0) {
                data = checkStatus3.data;
            }else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sBillType = '1205'
            $.ajax(
                {
@@ -258,7 +242,7 @@
            var checkStatus = table.checkStatus('dj-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var sInterID = data[0].HInterID
                var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                //逻辑删除方法
                layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                    var wait = layer.load();
@@ -364,14 +348,14 @@
            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
            , cols: [[
                { type: 'radio' }
                , { field: 'HInterID', title: '单据内码', width: 120 }
                , { field: 'HBillNo', title: '单据号', width: 150 }
                , { field: 'HMaker', title: '制单人', width: 120 }
                , { field: 'HMakeDate', title: '制单日期', width: 150 }
                , { field: 'HQty', title: '数量', width: 100 }
                , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                , { field: '单据内码', title: '单据内码', width: 120 }
                , { field: '单据号', title: '单据号', width: 150 }
                , { field: '制单人', title: '制单人', width: 120 }
                , { field: '制单日期', title: '制单日期', width: 150 }
                , { field: '数量', title: '数量', width: 100 }
                , { field: '源单单号', title: '源单单号', width: 150 }
                , { field: '红蓝字', title: '红蓝字', width: 120 }
                , { field: '源单类型', title: '源单类型', width: 100 }
            ]]
            , height: 500
            , done: function () {
@@ -379,6 +363,8 @@
            }
        })
        //已上传列表
            table.render({
                elem: '#yd-table'
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBackBill_Fast.html
@@ -17,7 +17,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>生产退料单</span>
@@ -86,7 +86,7 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">配套数量</label>
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">配套数量</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HPPQty" id="HPPQty" lay-verify="HPPQty" autocomplete="off" class="layui-input">
@@ -96,13 +96,13 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">先进先出仓库</label>
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--先进先出仓库-->
                                        </div>
                                        <div class="layui-col-xs6">
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                        <div class="layui-col-xs2">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT">...</button>
                                        </div>
                                    </div>
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillList.html
@@ -110,14 +110,14 @@
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                            <div class="layui-btn-container">
                                <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-reload"><i class="layui-icon layui-icon-refresh"></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="btn-BarCodeDetail"><i class="layui-icon layui-icon-form"></i>条码明细</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                            </div>
                        </script>
                    </form>
@@ -183,6 +183,8 @@
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'btn-BarCodeDetail': get_BarCodeDetail();
                        break;
                };
            });
@@ -452,6 +454,40 @@
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //条码明细
            function get_BarCodeDetail() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid;
                    var HBillType = '1204';
                    var HBillNo = data[0]["单据号"];
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['90%', '90%']
                        , title: '生产领料单条码明细'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../条码明细/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                        , resize: false
                        , btn: ["确定", "取消"]
                        , end: function () {
                            //刷新页面,
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //删除
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_Fast.html
@@ -18,7 +18,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>领料出库单</span>
@@ -87,7 +87,7 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">配套数量</label>
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">配套数量</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HPPQty" id="HPPQty" lay-verify="HPPQty" autocomplete="off" class="layui-input">
@@ -97,14 +97,14 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">先进先出仓库</label>
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--先进先出仓库-->
                                        </div>
                                        <div class="layui-col-xs6">
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT">...</button>
                                        <div class="layui-col-xs2">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT" style="width:65px;">...</button>
                                        </div>
                                    </div>
                                </div>
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_FastList.html
@@ -120,7 +120,8 @@
        , layer = layui.layer
        , table = layui.table
        , form = layui.form
        , element = layui.element;
            , element = layui.element;
        var option = {};
        //清空界面  new
@@ -160,27 +161,9 @@
        });
        //刷新
        form.on('submit(cmdRefresh)', function () {
            table.render({
                elem: '#dj-table'
                , url: GetWEBURL() + '/Web/chanpinruk'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 120 }
                    , { field: 'HBillNo', title: '单据号', width: 150 }
                    , { field: 'HMaker', title: '制单人', width: 120 }
                    , { field: 'HMakeDate', title: '制单日期', width: 150 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }),
            //动态列-刷新缓存列表
            table.render(option),
                //刷新已上传列表
                table.render({
                    elem: '#yd-table'
                    , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
@@ -248,8 +231,8 @@
            }  else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sBillType = '1204'
            $.ajax(
                {
@@ -290,7 +273,7 @@
            var checkStatus = table.checkStatus('dj-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var sInterID = data[0].HInterID;
                var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                //逻辑删除方法
                layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                    $.ajax(
@@ -339,14 +322,14 @@
            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
            , cols: [[
                { type: 'radio' }
                , { field: 'HInterID', title: '单据内码', width: 120 }
                , { field: 'HBillNo', title: '单据号', width: 150 }
                , { field: 'HMaker', title: '制单人', width: 120 }
                , { field: 'HMakeDate', title: '制单日期', width: 150 }
                , { field: 'HQty', title: '数量', width: 100 }
                , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                , { field: '单据内码', title: '单据内码', width: 120 }
                , { field: '单据号', title: '单据号', width: 150 }
                , { field: '制单人', title: '制单人', width: 120 }
                , { field: '制单日期', title: '制单日期', width: 150 }
                , { field: '数量', title: '数量', width: 100 }
                , { field: '源单单号', title: '源单单号', width: 150 }
                , { field: '红蓝字', title: '红蓝字', width: 120 }
                , { field: '源单类型', title: '源单类型', width: 100 }
            ]]
            , height: 500
            , done: function () {
@@ -354,6 +337,8 @@
            }
        })
        //已上传列表
        table.render({
            elem: '#yd-table'
WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBackBill.html
@@ -25,17 +25,20 @@
  }
</style>-->
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
    <div class="layui-fluid" style="padding: 0px">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>产品退库</span>
                    </div>
                    <div class="layui-tab" lay-filter="tab-ProductlnBackBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1">源单信息</li>
                            <li lay-id="2">单据信息</li>
                            <li lay-id="3">物料清单</li>
                            <li lay-id="4">明细清单</li>
                            <li lay-id="5">日志</li>
                            <li lay-id="1" style="padding:1px;">源单信息</li>
                            <li lay-id="2" style="padding:1px;">单据信息</li>
                            <li lay-id="3" style="padding:1px;">物料清单</li>
                            <li lay-id="4" style="padding:1px;">明细清单</li>
                            <li lay-id="5" style="padding:1px;">日志</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBillList.html
@@ -118,6 +118,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></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="btn-BarCodeDetail"><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>
                            </div>
                        </script>
@@ -217,7 +218,8 @@
                        } else {
                            layer.msg('请选择一行数据编辑!');
                        }
                        break;
                    case 'btn-BarCodeDetail': get_BarCodeDetail();
                        break;
                    case 'btn-Delete':
                        var checkStatus = table.checkStatus('mainTable')
@@ -473,6 +475,39 @@
                })
            }
            //条码明细
            function get_BarCodeDetail() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid;
                    var HBillType = '1202';
                    var HBillNo = data[0]["单据号"];
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['90%', '90%']
                        , title: '生产入库单条码明细'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../条码明细/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                        , resize: false
                        , btn: ["确定", "取消"]
                        , end: function () {
                            //刷新页面,
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            // å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html
@@ -19,7 +19,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>产品入库单</span>
@@ -210,13 +210,6 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-tab-item">
                                <!--<div class="layui-form-item" style="padding:0px;margin:0px">
            <div class="layui-row">
@@ -250,7 +243,7 @@
                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">条码数</label>
                                            <label class="layui-form-label" style="width:50px;padding-left:0px;">条码数</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HBarCodeQtys" id="HBarCodeQtys" lay-verify="HBarCodeQtys" autocomplete="off" class="layui-input">
@@ -260,7 +253,7 @@
                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">总数量</label>
                                            <label class="layui-form-label" style="width:50px;padding-left:0px;">总数量</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" autocomplete="off" class="layui-input">
WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_FastList.html
@@ -138,6 +138,8 @@
                , table = layui.table
                , form = layui.form
                , element = layui.element;
            var option = {}
            //清空界面  new
            var sBillType = '1202'
@@ -214,27 +216,7 @@
                    }
                })
            });
            var option = {
                elem: '#dj-table'
                //, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Json'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 120 }
                    , { field: 'HBillNo', title: '单据号', width: 150 }
                    , { field: 'HMaker', title: '制单人', width: 120 }
                    , { field: 'HMakeDate', title: '制单日期', width: 150 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }
            table.render({
                elem: '#sy-table'
@@ -258,28 +240,34 @@
           
            // url: GetWEBURL() + '/Web/chanpinruk',
            form.on('submit(cmdRefresh)', function () {//刷新
                table.render({
                    elem: '#dj-table'
                    , url: GetWEBURL() + '/Web/chanpinruk'
                    , toolbar: '#toolbarDemo'
                    , defaultToolbar: []
                    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                    , cols: [[
                        { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 120 }
                        , { field: 'HBillNo', title: '单据号', width: 150 }
                        , { field: 'HMaker', title: '制单人', width: 120 }
                        , { field: 'HMakeDate', title: '制单日期', width: 150 }
                        , { field: 'HQty', title: '数量', width: 100 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                        , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                    ]]
                    , height: 500
                    , done: function () {
                        layer.closeAll("loading");
                    }
                }),
                ////刷新缓存列表的渲染
                //table.render({
                //    elem: '#dj-table'
                //    , url: GetWEBURL() + '/Web/chanpinruk'
                //    , toolbar: '#toolbarDemo'
                //    , defaultToolbar: []
                //    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                //    , cols: [[
                //        { type: 'radio' }
                //        , { field: 'HInterID', title: '单据内码', width: 120 }
                //        , { field: 'HBillNo', title: '单据号', width: 150 }
                //        , { field: 'HMaker', title: '制单人', width: 120 }
                //        , { field: 'HMakeDate', title: '制单日期', width: 150 }
                //        , { field: 'HQty', title: '数量', width: 100 }
                //        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                //        , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                //        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                //    ]]
                //    , height: 500
                //    , done: function () {
                //        layer.closeAll("loading");
                //    }
                //}),
                //动态列表-刷新缓存列表
                table.render(option);
                //刷新已上传列表
                    table.render({
                        elem: '#yd-table'
                        , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
@@ -314,16 +302,19 @@
            form.on('submit(cmdRescind)', function () {
                var checkStatus = table.checkStatus('yd-table');
                var checkStatus2 = table.checkStatus('sy-table');
                var checkStatus3 = table.checkStatus('dj-table');
                var data = "";
                if (checkStatus.data.length != 0) {
                    data = checkStatus.data;
                } else if (checkStatus2.data.length != 0) {
                    data = checkStatus2.data;
                } else if (checkStatus3.data.length != 0) {
                    data = checkStatus3.data;
                } else {
                    return layer.msg("请选择一条数据");
                }
                var sInterID = data[0].HInterID
                var sBillNo = data[0].HBillNo
                var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
                var sBillType = '1202'
                $.ajax(
                    {
@@ -365,7 +356,7 @@
                var checkStatus = table.checkStatus('dj-table')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var sInterID = data[0].HInterID
                    var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                    //逻辑删除方法
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax(
@@ -475,30 +466,106 @@
                })
            });
            ////缓存列表
            //table.render({
            //    elem: '#dj-table'
            //    , url: GetWEBURL() + '/Web/chanpinruk'
            //    , toolbar: '#toolbarDemo'
            //    , defaultToolbar: []
            //    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
            //    , cols: [[
            //        { type: 'radio' }
            //        , { field: 'HInterID', title: '单据内码', width: 120 }
            //        , { field: 'HBillNo', title: '单据号', width: 150 }
            //        , { field: 'HMaker', title: '制单人', width: 120 }
            //        , { field: 'HMakeDate', title: '制单日期', width: 150 }
            //        , { field: 'HQty', title: '数量', width: 100 }
            //        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
            //        , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
            //        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
            //    ]]
            //    , height: 500
            //    , done: function () {
            //        layer.closeAll("loading");
            //    }
            //})
            table.render({
                elem: '#dj-table'
                , url: GetWEBURL() + '/Web/chanpinruk'
                , toolbar: '#toolbarDemo'
                , defaultToolbar: []
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 120 }
                    , { field: 'HBillNo', title: '单据号', width: 150 }
                    , { field: 'HMaker', title: '制单人', width: 120 }
                    , { field: 'HMakeDate', title: '制单日期', width: 150 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
            //动态列-缓存列表
            $.ajax({
                url: GetWEBURL() + "/Web/chanpinruk1",
                type: "GET",
                async: false,
                data: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] },
                //async: false,
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'radio', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            if ($.inArray(data[i].name, "") > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        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 HH:mm:ss')}}</div>", width: 200 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                }
                            }
                        }
                        option = {
                            elem: '#dj-table'
                            , toolbar: '#toolbarDemo'
                            , height: 500
                            , page: true //开启分页
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , cols: [col]
                            , data: data1.data
                        };
                        table.render(option);
                    } else {
                        option = {
                            elem: '#dj-table'
                            , toolbar: '#toolbarDemo'
                            , height: 500
                            , page: true //开启分页
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , cols: [[
                                { type: 'radio' }
                                , { field: 'HMakeDate', title: '制单日期', width: 150 }
                                , { field: 'HBillNo', title: '单据号', width: 150 }
                                , { field: 'HMaterName', title: '物料名称', width: 150 }
                                , { field: 'HQty', title: '数量', width: 100 }
                            ]]
                            , data: []
                        };
                        table.render(option);
                    }
                },
                error: function (err) {
                    layer.msg('错误' + err, {
                        icon: 5,
                        time: 20000
                    }, function () {
                        //do something
                    });
                }
            })
            //已上传列表
            table.render({
WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBillList.html
@@ -118,6 +118,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></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="btn-BarCodeDetail"><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>
                            </div>
                        </script>
@@ -275,6 +276,7 @@
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'btn-BarCodeDetail': get_BarCodeDetail();
                };
            });
@@ -375,7 +377,7 @@
                DisPlay_HideColumn();
            }
            //条码明细
            //明细
            function getWmsSub() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
@@ -403,6 +405,41 @@
                }
            }
            //条码明细
            function get_BarCodeDetail() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid;
                    var HBillType = '1203';
                    var HBillNo = data[0]["单据号"];
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['90%', '90%']
                        , title: '其它入库单条码明细'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../条码明细/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                        , resize: false
                        , btn: ["确定", "取消"]
                        , end: function () {
                            //刷新页面,
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_Fast.html
@@ -12,12 +12,16 @@
        .layui-col-xs4 {
            width: 12.333333%
        }
         .layui-col-xs8 {
            width: 55.666667%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
    <div class="layui-fluid" style="padding: 0px">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>其他入库单</span>
@@ -27,7 +31,7 @@
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                            </div>
                            <div class="layui-col-xs5">
                            <div class="layui-col-xs8">
                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                            </div>
                            <div class="layui-col-xs2">
@@ -39,7 +43,7 @@
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                                </div>
                                <div class="layui-col-xs5">
                                <div class="layui-col-xs8">
                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                                </div>
                            </div>
@@ -48,10 +52,10 @@
                    <div class="layui-tab" lay-filter="tab-Kf_OtherInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <!-- <li lay-id="1">源单信息</li>-->
                            <li lay-id="1">源单信息</li>
                            <li lay-id="2">单据信息</li>
                            <li lay-id="3">物料清单</li>
                            <li lay-id="4">日志</li>
                            <li lay-id="1" style="padding:1px;">源单信息</li>
                            <li lay-id="2" style="padding:1px;">单据信息</li>
                            <li lay-id="3" style="padding:1px;">物料清单</li>
                            <li lay-id="4" style="padding:1px;">日志</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_FastList.html
@@ -125,6 +125,7 @@
        var sBillType = '1203';
        var col = [];
        var option = {}
        //动态加载源单类型列表 new
        //加载源单类型
@@ -141,20 +142,21 @@
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 80 }
                    , { field: 'HBillNo', title: '单据号', width: 80 }
                    , { field: 'HMaker', title: '制单人', width: 100 }
                    , { field: 'HMakeDate', title: '制单日期', width: 100 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                    , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                    , { field: '单据内码', title: '单据内码', width: 80 }
                    , { field: '单据号', title: '单据号', width: 80 }
                    , { field: '制单人', title: '制单人', width: 100 }
                    , { field: '制单日期', title: '制单日期', width: 100 }
                    , { field: '数量', title: '数量', width: 100 }
                    , { field: '源单单号', title: '源单单号', width: 100 }
                    , { field: '红蓝字', title: '红蓝字', width: 100 }
                    , { field: '源单类型', title: '源单类型', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            })
            table.render(option);
            //已上传列表
            table.render({
                elem: '#yd-table'
@@ -240,16 +242,19 @@
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var checkStatus3 = table.checkStatus('dj-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
            } else if (checkStatus3.data.length != 0) {
                data = checkStatus3.data;
            }else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sBillType = '1203'
            $.ajax(
                {
@@ -276,7 +281,7 @@
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                            time: 2000
                        }, function () {
                            //do something
                        });
@@ -291,7 +296,7 @@
            var checkStatus = table.checkStatus('dj-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var sInterID = data[0].HInterID
                var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
            //逻辑删除方法
                layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                    $.ajax(
@@ -414,8 +419,7 @@
                            }
                        }
                        //动态显示列名
                        table.render({
                        option = {
                            elem: '#dj-table'
                            , cols: [col]
                            , data: data1.data
@@ -424,7 +428,10 @@
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                        });
                        };
                        //动态显示列名
                        table.render(option);
                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });
@@ -438,7 +445,7 @@
                }
            });
        }
        //刷新明细页签
        table.render({
            elem: '#mx-table'
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBackBill.html
@@ -13,7 +13,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>外购入库单(红字)</span>
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBillList.html
@@ -93,6 +93,7 @@
                                <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="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="btn-BarCodeDetail"><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>
                            </div>
                        </script>
@@ -327,6 +328,9 @@
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    //条码明细
                    case 'btn-BarCodeDetail': get_BarCodeDetail();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
@@ -383,6 +387,41 @@
            }
            //#endregion
            //#region æ¡ç æ˜Žç»†
            function get_BarCodeDetail() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid;
                    var HBillType = '1201';
                    var HBillNo = data[0]["单据号"];
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['90%', '90%']
                        , title: '采购入库单条码明细'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../条码明细/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                        , resize: false
                        , btn: ["确定", "取消"]
                        , end: function () {
                            //刷新页面,
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //#endregion
            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_Fast.html
@@ -21,7 +21,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>外购入库单</span>
@@ -238,7 +238,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">数量</label>
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_FastList.html
@@ -123,6 +123,7 @@
                , form = layui.form
                , element = layui.element;
            var sBillType = '1201'
            var option = {};
            //清空界面  new
            //动态加载源单类型列表 new
@@ -162,86 +163,67 @@
            //刷新
            form.on('submit(cmdRefresh)', function () {//
                var sBillType = '1201'
                //动态列-刷新缓存列表
                table.render(option);
                table.render({
                    elem: '#dj-table'
                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
                    elem: '#yd-table'
                    , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                    , toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType, sWhere: '' }
                    , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                    , page: true  // å¼€å¯åˆ†é¡µ
                    , limits: [20, 40, 80, 100]
                    , limit: 20
                    , cols: [[
                        { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 120 }
                        , { field: 'HBillNo', title: '单据号', width: 150 }
                        , { field: 'HMaker', title: '制单人', width: 120 }
                        , { field: 'HMakeDate', title: '制单日期', width: 150 }
                        , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                        , { field: 'HMaterName', title: '物料名称', width: 150 }
                        , { field: 'HMaterModel', title: '规格型号', width: 150 }
                        , { field: 'HQty', title: '数量', width: 100 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                        , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                        , { field: 'HOrgID', title: '组织', width: 120 }
                    ]]
                      , height: 500
                      , done: function () {
                          layer.closeAll("loading");
                      }
                    , height: 500
                    , done: function () {
                        layer.closeAll("loading");
                    }
                })
            });
            table.render({
                elem: '#yd-table'
                , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , page: true  // å¼€å¯åˆ†é¡µ
                , limits: [20, 40, 80, 100]
                , limit: 20
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 120 }
                    , { field: 'HBillNo', title: '单据号', width: 150 }
                    , { field: 'HMaker', title: '制单人', width: 120 }
                    , { field: 'HMakeDate', title: '制单日期', width: 150 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                    , { field: 'HMaterName', title: '物料名称', width: 150 }
                    , { field: 'HMaterModel', title: '规格型号', width: 150 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    , { field: 'HOrgID', title: '组织', width: 120 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
            //撤销功能
            form.on('submit(cmdRescind)', function () {
                var checkStatus = table.checkStatus('yd-table');
                var checkStatus2 = table.checkStatus('sy-table');
                var data = "";
                if (checkStatus.data.length != 0) {
                    data = checkStatus.data;
                } else if (checkStatus2.data.length != 0) {
                    data = checkStatus2.data;
                } else {
                    return layer.msg("请选择一条数据");
                }
            })
        });
        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1201'
            $.ajax(
                {
                    type: "Get",
                    url: GetWEBURL() + "/Web/Rescind_Json",
                    async: true,
                    data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });
                var sInterID = data[0].HInterID
                var sBillNo = data[0].HBillNo
                var sBillType = '1201'
                $.ajax(
                    {
                        type: "Get",
                        url: GetWEBURL() + "/Web/Rescind_Json",
                        async: true,
                        data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    window.location.reload();
                                });
                            }
                            else {
                                layer.msg(data.Message, { icon: 2 });
@@ -262,7 +244,7 @@
                var checkStatus = table.checkStatus('dj-table')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var sInterID = data[0].HInterID
                    var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                    //逻辑删除方法
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax(
@@ -329,29 +311,108 @@
                });
            });
            ////缓存列表
            //table.render({
            //    elem: '#dj-table'
            //    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
            //    , toolbar: '#toolbarDemo'
            //    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
            //    , cols: [[
            //        { type: 'radio' }
            //        , { field: 'HInterID', title: '单据内码', width: 120 }
            //        , { field: 'HBillNo', title: '单据号', width: 150 }
            //        , { field: 'HMaker', title: '制单人', width: 120 }
            //        , { field: 'HMakeDate', title: '制单日期', width: 150 }
            //        , { field: 'HQty', title: '数量', width: 100 }
            //        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
            //        , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
            //        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
            //    ]]
            //    , height: 500
            //    , done: function () {
            //        layer.closeAll("loading");
            //    }
            //})
            //缓存列表
            table.render({
                elem: '#dj-table'
                , url: GetWEBURL() + '/Web/chanpinruk'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 120 }
                    , { field: 'HBillNo', title: '单据号', width: 150 }
                    , { field: 'HMaker', title: '制单人', width: 120 }
                    , { field: 'HMakeDate', title: '制单日期', width: 150 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
            //动态列-缓存列表
            $.ajax({
                url: GetWEBURL() + "/Web/DisBillEntryList_Mate_Webs_Json",
                type: "GET",
                async: false,
                data: { HBillType: sBillType, sWhere: '' },
                //async: false,
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'radio', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            if ($.inArray(data[i].name, "") > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        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 HH:mm:ss')}}</div>", width: 200 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                }
                            }
                        }
                        option = {
                            elem: '#dj-table'
                            , toolbar: '#toolbarDemo'
                            , height: 500
                            , page: true //开启分页
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , cols: [col]
                            , data: data1.data
                        };
                        table.render(option);
                    } else {
                        option = {
                            elem: '#dj-table'
                            , toolbar: '#toolbarDemo'
                            , height: 500
                            , page: true //开启分页
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , cols: [[
                                { type: 'radio' }
                                , { field: 'HMakeDate', title: '制单日期', width: 150 }
                                , { field: 'HBillNo', title: '单据号', width: 150 }
                                , { field: 'HMaterName', title: '物料名称', width: 150 }
                                , { field: 'HQty', title: '数量', width: 100 }
                            ]]
                            , data: []
                        };
                        table.render(option);
                    }
                },
                error: function (err) {
                    layer.msg('错误' + err, {
                        icon: 5,
                        time: 20000
                    }, function () {
                        //do something
                    });
                }
            })
            //已上传列表
            table.render({
                elem: '#yd-table'
WebTM/views/ÑéÊÕÈë¿â/ίÍâÈë¿â/Kf_EntrustInBillList.html
@@ -115,6 +115,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></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="btn-BarCodeDetail"><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>
                            </div>
                        </script>
@@ -172,6 +173,8 @@
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'btn-BarCodeDetail': get_BarCodeDetail();
                        break;
                };
            });
@@ -254,6 +257,40 @@
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //条码明细
            function get_BarCodeDetail() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid;
                    var HBillType = '1210';
                    var HBillNo = data[0]["单据号"];
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['90%', '90%']
                        , title: '委外入库单条码明细'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../条码明细/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                        , resize: false
                        , btn: ["确定", "取消"]
                        , end: function () {
                            //刷新页面,
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //显示列数据
@@ -350,7 +387,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: 'hsupid', title: 'hsupid', width: 160, hide: true }
WebTM/views/ÑéÊÕÈë¿â/ίÍâÈë¿â/Kf_EntrustInBill_Fast.html
@@ -18,7 +18,7 @@
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>委外入库单</span>
WebTM/views/ÑéÊÕÈë¿â/ίÍâÈë¿â/Kf_EntrustInBill_FastList.html
@@ -120,7 +120,8 @@
        , layer = layui.layer
        , table = layui.table
        , form = layui.form
        , element = layui.element;
            , element = layui.element;
        var option = {};
        //清空界面  new
        var sBillType = '1210'
        //动态加载源单类型列表 new
@@ -160,27 +161,7 @@
        });
         //刷新
        form.on('submit(cmdRefresh)', function () {//
            table.render({
                elem: '#dj-table'
                , url: GetWEBURL() + '/Web/chanpinruk'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 120 }
                    , { field: 'HBillNo', title: '单据号', width: 150 }
                    , { field: 'HMaker', title: '制单人', width: 120 }
                    , { field: 'HMakeDate', title: '制单日期', width: 150 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }),
            table.render(option);
                table.render({
                    elem: '#yd-table'
                    , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
@@ -322,29 +303,109 @@
        
        table.render({
            elem: '#dj-table'
            , url: GetWEBURL() + '/Web/chanpinruk'
            , toolbar: '#toolbarDemo'
            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
            , cols: [[
                { type: 'radio' }
                , { field: 'HInterID', title: '单据内码', width: 120 }
                , { field: 'HBillNo', title: '单据号', width: 150 }
                , { field: 'HMaker', title: '制单人', width: 120 }
                , { field: 'HMakeDate', title: '制单日期', width: 150 }
                , { field: 'HQty', title: '数量', width: 100 }
                , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
                , { field: 'HSourceBillType', title: '源单类型', width: 100 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
        //table.render({
        //    elem: '#dj-table'
        //    , url: GetWEBURL() + '/Web/chanpinruk'
        //    , toolbar: '#toolbarDemo'
        //    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
        //    , cols: [[
        //        { type: 'radio' }
        //        , { field: 'HInterID', title: '单据内码', width: 120 }
        //        , { field: 'HBillNo', title: '单据号', width: 150 }
        //        , { field: 'HMaker', title: '制单人', width: 120 }
        //        , { field: 'HMakeDate', title: '制单日期', width: 150 }
        //        , { field: 'HQty', title: '数量', width: 100 }
        //        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
        //        , { field: 'HRedBlueFlag', title: '红蓝字', width: 120 }
        //        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
        //    ]]
        //    , height: 500
        //    , done: function () {
        //        layer.closeAll("loading");
        //    }
        //})
        //动态列
        $.ajax({
            url: GetWEBURL() + "/Web/chanpinruk1",
            type: "GET",
            async: false,
            data: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] },
            //async: false,
            success: function (data1) {
                if (data1.count == 1) {
                    var data = [];
                    var col = [];
                    //给空的数组赋值
                    for (var key in data1.list) {
                        data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                    }
                    //在列表左边添加勾选框
                    col.push({ type: 'radio', fixed: 'left' });
                    for (var i = 0; i < data.length; i++) {
                        if ($.inArray(data[i].name, "") > -1) {
                            col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                        }
                        else {
                            switch (data[i].Type) {
                                //int
                                case 'DateTime':
                                    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 HH:mm:ss')}}</div>", width: 200 });
                                    break;
                                default:
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                            }
                        }
                    }
                    option = {
                        elem: '#dj-table'
                        , toolbar: '#toolbarDemo'
                        , height: 500
                        , page: true //开启分页
                        , limit: 50
                        , limits: [50, 500, 5000, 20000]
                        , cols: [col]
                        , data: data1.data
                    };
                    table.render(option);
                } else {
                    option = {
                        elem: '#dj-table'
                        , toolbar: '#toolbarDemo'
                        , height: 500
                        , page: true //开启分页
                        , limit: 50
                        , limits: [50, 500, 5000, 20000]
                        , cols: [[
                            { type: 'radio' }
                            , { field: 'HMakeDate', title: '制单日期', width: 150 }
                            , { field: 'HBillNo', title: '单据号', width: 150 }
                            , { field: 'HMaterName', title: '物料名称', width: 150 }
                            , { field: 'HQty', title: '数量', width: 100 }
                        ]]
                        , data: []
                    };
                    table.render(option);
                }
            },
            error: function (err) {
                layer.msg('错误' + err, {
                    icon: 5,
                    time: 20000
                }, function () {
                    //do something
                });
            }
        })
        //已上传列表
        table.render({
            elem: '#yd-table'