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

yangle

2022-08-03 67bb4962ac99bd7c0b1a4434c20f3375fe5bc6a5

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

 WebTM/App_Data/MssqlReportData.cs

@@ -19,10 +19,9 @@
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井
    public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井
    //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//雅琪诺测试
    public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//瑞琪
    //public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//凯贝奈特

    //public string sServer;

 WebTM/Vlog/webapi20220731.txt

New file
@@ -0,0 +1,61 @@
2022/7/31 14:16:08 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:16:08 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:18:53 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:18:53 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:18:53 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2022/7/31 14:18:53 ReportDataSet:1

2022/7/31 14:19:14 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:19:14 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:19:14 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2022/7/31 14:19:14 ReportDataSet:1

 WebTM/views/index_Mobile.html

@@ -396,7 +396,7 @@
                      <dd>
                          <a href="领料发货/收料入库/Kf_ReciveBill_Fast.html" target="main_self_frame" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              åˆ°è´§ç‚¹æ•°
                              åˆ°è´§ç¡®è®¤
                          </a>
                      </dd>
                      <dd>
@@ -427,12 +427,6 @@
                          <a href="仓存管理/条码库存/KF_ICInventoryByMaterID.html" target="main_self_frame" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              åº“存查询
                          </a>
                      </dd>
                      <dd>
                          <a href="领料发货/收料入库/Kf_ReciveBill_Check.html" target="main_self_frame" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              æ”¶æ–™é€šçŸ¥å•å®¡æ ¸
                          </a>
                      </dd>
                  </dl>

 WebTM/views/×é×°µ¥/Sc_PCruxBindingPDA.html

@@ -179,8 +179,8 @@


            //表头初始化赋值（根据登录用户获取工序 ç”Ÿäº§èµ„源、操作员、生产班组） new
            //工序 
            
            //工序

            $("#HProcID").val(sessionStorage["HProcID"]);
            $("#HProc").val(sessionStorage["HProc"]);
            //生产资源
@@ -315,7 +315,7 @@
                    }
                });
            })
           

            //删除
            form.on('submit(cmdDelete)', function () {
                var checkStatus = table.checkStatus('tm-table')
@@ -328,7 +328,7 @@
                        type: "Get",
                        url: GetWEBURL() + "/Sc_PckSplit/Delete_PHPCruxBillListByME",
                        async: true,
                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HBarCode": sBarCode},
                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HBarCode": sBarCode },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
@@ -351,33 +351,33 @@
                var sSubStr = JSON.stringify(table.cache['pj-table']);
                var sSubStr1 = JSON.stringify(table.cache['tm-table']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ';' + sessionStorage["HUserName"];
                 $.ajax(
                        {
                            type: "POST",
                         url: GetWEBURL() + "/Sc_PckSplit/Add_PHPCruxBillList",
                            async: true,
                            data: { "msg": sMainSub },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                    layer.msg("提交成功" + data.Message + $("#HBillNo").val(), { time: 1 * 1000, icon: 1 }, function () {
                                        location.reload();
                                    });
                                    //layer.msg("提交成功" + data.Message + $("#HBillNo").val(), { icon: 1, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                    //location.reload();
                                }
                                else {
                                    //layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                    layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                                layer.closeAll("loading");
                                layui.form.render();
                            },
                            error: function (err) {
                                //layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "/Sc_PckSplit/Add_PHPCruxBillList",
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                layer.msg("提交成功" + data.Message + $("#HBillNo").val(), { time: 1 * 1000, icon: 1 }, function () {
                                    location.reload();
                                });
                                //layer.msg("提交成功" + data.Message + $("#HBillNo").val(), { icon: 1, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                //location.reload();
                            }
                        });
                            else {
                                //layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                            layer.closeAll("loading");
                            layui.form.render();
                        },
                        error: function (err) {
                            //layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
            });

            //监听提交
@@ -410,7 +410,7 @@
                        url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxSNBillList",
                        type: "GET",
                        async: false,
                        data: { "HinterID": sInterID, "HBarCode": sBarCode, "HProcID": sProcID, "HBillNo": sBillNo},
                        data: { "HinterID": sInterID, "HBarCode": sBarCode, "HProcID": sProcID, "HBillNo": sBillNo },
                        success: function (result) {
                            if (result.count == 1) {
                                option.data = result.data;
@@ -426,7 +426,7 @@
                    $("#HPCrux").focus();
                }
            });
             //关键件回车方法
            //关键件回车方法
            $('#HPCrux').on('keydown', function (event) {
                var sHPCrux = $('#HPCrux').val()
                var sInterID = $('#HInterID').val()
@@ -440,7 +440,7 @@
                        url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxBillList",
                        type: "GET",
                        async: false,
                        data: { "HinterID": sInterID, "HPCrux": sHPCrux, "HBillNo": sBillNo},
                        data: { "HinterID": sInterID, "HPCrux": sHPCrux, "HBillNo": sBillNo },
                        success: function (result) {
                            if (result.count == 1) {
                                option1.data = result.data;
@@ -507,10 +507,10 @@
                option1.data = [];
                table1.render(option1);
            }
            

        });
        
        


    </script>
</body>
</html>

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

@@ -41,6 +41,7 @@
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">反审核</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-event="btn-InStorage" lay-filter="btn-InStorage" id="btn-InStorage"></i>入库</button>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
@@ -504,6 +505,8 @@
                , element = layui.element;
            //进入页面默认光标在条形码上
            $("#HBarCode").focus();
            //进入页面入库按钮置灰
            $('#btn-InStorage').addClass("layui-btn-disabled").attr("disabled", true);

            /*固定代码，每张单据都要begin*/
            /* 1.无源单新增
@@ -587,8 +590,8 @@
            }



            function RoadBillMain(linterid)//加载表头
            //加载表头
            function RoadBillMain(linterid)
            {
                var index = layer.load();
                $.ajax({
@@ -817,14 +820,10 @@
                        if (data.count == 1) {
                            layer.close(index);
                            layer.msg("提交成功");

                            $("#HPlanQty").attr("disabled", "true");
                            $("#HQty").attr("disabled", "true");
                            $("#HWasterQty").attr("disabled", "true");
                            $("#HWorkTimes").attr("disabled", "true");
                            if (result.Verify == "Y") {
                                location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
                            } else {
                            }
                            else {
                                //保存后浏览
                                ReRoadBillMain();
                            }
@@ -837,6 +836,33 @@
                    error: function (err) {
                        layer.close(index);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            });

            //入库
            form.on('submit(btn-InStorage)', function (data) {
                var InterID = $("#HInterID").val();
                var BillNo = $("#HBillNo").val();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //方法所在页面和方法名
                    async: true,
                    data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                    },
                    error: function (err) {
                        layer.alert(err.Message, { icon: 5 });
                    }
                });
            });
@@ -921,9 +947,18 @@
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HWorker', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HEmpName").val(checkStatus.data[0].HName);
                        $("#HEmpID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
            //选择操作员2

 WebTM/views/ÁìÁÏ·¢»õ/ÊÕÁÏÈë¿â/Kf_ReciveBill_Check.html

@@ -183,14 +183,12 @@
            form.on('submit(QueDin)', function (data) {
                GetMeesageByBarCode();
            });

            //退出-关闭页面方法
            $('#btn_Cancel').on('click', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                });
            })

            //审核
            form.on('submit(btn_Check)', function (data) {//审核
                var index = layer.load();

 WebTM/views/ÁìÁÏ·¢»õ/ÊÕÁÏÈë¿â/Kf_ReciveBill_Fast.html

@@ -1,81 +1,152 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>到货点数</title>
    <title>到货确认</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <!--引用layui样式文件-->
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
    <!--引用layui js文件-->
    <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/zgqCustom/zgqCustom.js"></script>
    <!--自定义样式-->
    <style>
        .maintitle {
            background-color: #1492ff;
            color: #fff;
            padding: 5px 10px;
            border: none;
            border-radius: 4px;
        }

        .title {
            border-left: 4px solid #1492ff;
            padding-left: 6px;
            margin: 20px 10px 4px;
            font-size: 16px;
            color: #333;
        }

        .buttom_box_little {
            width: 60px;
            height: 36px;
            color: #fff;
            background-color: #1492ff;
            border-radius: 4px;
            border: none;
            margin: 10px;
        }

        .layui-input {
            width: 50%;
        }

        .layui-inline, img {
            display: block;
            vertical-align: middle
        }

        .layui-input, .layui-textarea {
            display: inline-block;
            width: 50%;
            padding-left: 10px;
        }

        .laydate-time-list ol {
            overflow-x: hidden !important;
            overflow-y: auto !important;
        }

        .layui-form-label {
            padding: 9px 5px;
            width: 85px;
        }

        .layui-input-block {
            margin-left: 85px;
            min-height: 36px;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
    <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;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <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>
                <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-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" lay-verify="required" placeholder="请键入后回车" autocomplete="off" class="layui-input">
                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" name="QueDin" id="QueDin" style="width: 70px; background-color: #1492ff;color:white">确定</button>
                            </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>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">源单号</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="hmainid" id="hmainid" lay-verify="hmainid" autocomplete="off" class="layui-input">

                                        <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>
                                    </div>
                                </div>
                                <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>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HSupplierName" id="HSupplierName" lay-verify="HSupplierName" readonly autocomplete="off" class="layui-input">
                                        <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>
                                    </div>
                                </div>

                                <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>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HDepartmentNmae" id="HDepartmentNmae" lay-verify="HDepartmentNmae" readonly autocomplete="off" class="layui-input">
                                        <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" disabled="disabled">
                                                <input type="text" class="layui-input" name="HInterID" id="HInterID" disabled="disabled" style="width:100px">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-tab-item">
                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                                <script type="text/html" id="xuhao">
                                    {{d.LAY_TABLE_INDEX+1}}
                                </script>
                                <script type="text/html" id="barDemo">
                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
                                </script>
                            </div>
                        </div>
                        <div class="layui-form-item" style="margin-bottom: 20px;">
                            <div class="layui-row">
                                <div class="layui-col-xs3">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">确认</button>
                                </div>
                            </div>
                        </div>
                    </div>

                    <div class="layer-footer" style="text-align: center;">
                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="btn_Check" id="btn_Check">审核</button>
                        <button type="button" class="layui-btn buttom_box_little" lay-filter="btn_Cancel" id="btn_Cancel">退出</button>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <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>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -87,211 +158,145 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            var option = [];
            //初始化表格
            set_InitGrid();

            //表头初始化赋值（根据登录用户获取 é»˜è®¤ä»“库、部门、验收、保管、金蝶用户） new
            $("#HWHID").val(sessionStorage["HWHID"]);
            $("#HWHNAME").val(sessionStorage["HWHName"]);
            $("#HStockPlaceID").val(sessionStorage["HSPID"]);
            $("#HStockPlaceName").val(sessionStorage["HSPName"]);
            //$("#HSupID").val(sessionStorage["HSupID"]);
            //$("#HSupName").val(sessionStorage["HSupName"]);
            $("#HDeptID").val(sessionStorage["HDeptID"]);
            $("#HDeptName").val(sessionStorage["HDept"]);
            $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
            $("#HSecManager").val(sessionStorage["HSecManager"]);
            $("#HKeeperID").val(sessionStorage["HKeeperID"]);
            $("#HKeeper").val(sessionStorage["HKeeper"]);
            $("#HMaker").val(sessionStorage["HUserName"]);
            $("#HMaker").hide();
            $("#HMakerID").hide();
            $("#HBillerID").val(sessionStorage["HBillerID"]);
            $("#HBillerID").hide();
            //行内事件
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除
            });

            //获取参数
            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];
            //进入页面默认光标在条形码上
            $("#HBarCode").focus();

            //条形码回车方法
            $('#HBarCode').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    GetMeesageByBarCode();
                }
                return vars;
            }
            var params = getUrlVars();
            var linterid = params[params[0]]; //从参数中获取 å•æ®å†…码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•ç±»åž‹
            //function RoadBillMain(linterid)//加载表头
            //{
            //    $.ajax({
            //        url: GetWEBURL() + "/Web/GetPonderationBill",
            //        type: "GET",
            //        data: { "HInterID": linterid },
            //        success: function (d) {
            //            // console.log(d.data);
            //            $("#HInterID").val(d.data[0].HInterID);
            //            $("#HBillNo").val(d.data[0].HBillNo);
            //            $("#HBillType").val(d.data[0].HSourceBillType);
            //            $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
            //            //$("#HWHID").val(d.data[0].HWhID);
            //            //$("#HKeeperID").val(d.data[0].HKeeperID);
            //            //$("#HSecManagerID").val(d.data[0].HSecManagerID);
            //            //$("#HDeptID").val(d.data[0].HDeptID);
            //            //$("#HBarCode").val(d.data[0].HBarCode);
            //            //$("#HQty").val(d.data[0].HQty);
            //            RoadSup();
            //        }
            //    })
            //}
            //function RoadSup()//根据源单类型及源单号 åŠ è½½å®¢æˆ·
            //{
            //    //var sInterID = $("#HInterID").val()
            //    var HSourceBillNo = $('#HSourceBillNo').val()
            //    var sInterID = $("#HInterID").val()
            //    var sBillNo = $("#HBillNo").val()
            //    var HSourceBillType = $("#HBillType").val()
            //    //判断文本框是否有数据    new
            //    if (HSourceBillNo == "" || sInterID <= 0) {
            //        layer.msg($('#HSourceBillNo').val(), { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
            //        return;
            //    }
            //    else {
            //        $.ajax({
            //            url: GetWEBURL() + "/SellOutBack/get_GetXs_SeOutStockBackBillList",
            //            type: "GET",
            //            data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
            //            success: function (result) {
            //                if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
            //                    $("#HSupID").val(result.data[0].HSupID);
            //                    $("#HSupName").val(result.data[0].HSupName);
            //                    $("#HDeptID").val(result.data[0].HDeptID);
            //                    $("#HDeptName").val(result.data[0].HDeptName);
            //                    sessionStorage["SourceFlag"] = true;
            //                    element.tabChange('tab-SellOutBackBill', '2');
            //                    layer.load(3);
            //                }
            //                else {
            //                    layer.msg(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
            //                }
            //                layer.closeAll("loading");
            //            }
            //        });
            //    }
            //}
            function RoadBillSub(HBillno)//加载数据
            {
            });

            //确定
            form.on('submit(QueDin)', function (data) {
                GetMeesageByBarCode();
            });
            //退出-关闭页面方法
            $('#btn_Cancel').on('click', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                });
            })
            //审核
            form.on('submit(btn_Check)', function (data) {//审核
                var index = layer.load();
                var HInterID = $('#HInterID').val();
                var HBillNo = $('#HBillNo').val();
                $.ajax({
                    url: GetWEBURL() + "/POStockInBillList/get_InfoByBillNo",
                    type: "GET",
                    data: { "HBillno": HBillno },
                    url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBill",
                    type: "Get",
                    data: { "HInterID": HInterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": HBillNo},
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HSupplierName": data.供应商
                                , "HDepartmentNmae": data.部门
                                , "hmainid": data.hmainid
                            });
                        if (result.code == "1") {
                            layer.msg("审核成功", { icon: 1, btn: ['确认'], time: 1000000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            layer.close(index);
                        }
                        else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            layer.close(index);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }

                        table.render({
                            elem: '#wl-table'
                            , url: GetWEBURL() + '/POStockInBillList/get_InfoByBillNo'
                            , toolbar: '#toolbarDemo'
                            , where: { "HBillno": HBillno }
                            , cols: [[
                                { type: 'radio' }
                                , { field: '数量', title: '数量', width: 150 }
                                , { field: '物料代码', title: '物料代码', width: 150 }
                                , { field: '物料名称', title: '物料名称', width: 150 }
                                , { field: '规格型号', title: '规格型号', width: 150 }
                                , { field: '源单主内码', title: '源单主内码', width: 150 }
                                , { field: '源单子内码', title: '源单子内码', width: 150 }
                                , { field: '源单单号', title: '源单单号', width: 150 }
                                , { field: '源单类型', title: '源单类型', width: 150 }
                            ]]
                            , height: 500
                            , done: function () {
                                layer.closeAll("loading");
                            }
                        });

                    },
                    error: function () {
                        layer.alert("发生错误!", { icon: 5 });
                    error: function (err) {
                        layer.close(index);
                        layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
                var a = 1;
            });

            }
            //判断是否新增
            /*RoadBillSub("");*/
            //单号回车
            $('#HSourceBillNo').on('keydown', function (event) {
                //扫条码
                if (event.keyCode == 13) {
                    if ($("#HSourceBillNo").val() == '') {
                        layer.msg("单据号为空，不能扫描！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return false;
            //初始化表格
            function set_InitGrid() {
                //表头
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: '数量', title: '到货数量', edit: 'text', hide: true }
                    , { field: '物料代码', title: '物料代码', edit: 'text', event: "" }
                    , { field: '物料名称', title: '物料名称', edit: 'text' }
                    , { field: '规格型号', title: '规格型号', edit: 'text'}
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
                ];
                option = {
                    id: 'mainTable'
                    , elem: '#mainTable'
                    , page: true
                    , cellMinWidth: 120
                    , height: 500
                    , cols: [columns]
                    , done: function (res, curr, count) {
                    }
                    RoadBillSub($("#HSourceBillNo").val());
                }
                };
                option.data = [{ "数量": 0, "物料代码": 0, "物料名称": "", "规格型号": ""}];
                table.render(option);
            }
            )

            //提交
            form.on('submit(Saver)', function (data) {//提交
                var hmainid = $("#hmainid").val();
                if ($("#hmainid").val() == '') {
                    layer.msg("先扫描单据！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "/POStockInBill/confirm",
                        async: true,
                        data: { "hmainid": hmainid },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                sessionStorage["SourceFlag"] = false;
                                layer.confirm("收料" + data.Message + $("#HBillNo").val(), {
                                    icon: 1,
                                    skin: 'layui-layer-lan',
                                    closeBtn: 0,
                                    btn: ['确认'],
                                    btn2: function () {
                                        //parent.layui.admin.events.closeThisTabs();关闭页签
                                        //window.close();//关闭页面，浏览器有效，PDA无效
                                        //window.location.reload();//新增
                                        parent.location.href = "../../../views/index.html"
                                    }//关闭
                                }
                                    , function () { parent.location.href = "../../../views/index.html"; }//新增
                                );
                            }
                            else {
                                //layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                            layer.closeAll("loading");
                            layui.form.render();
                        },
                        error: function (err) {
                            //layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            // è¡¨æ ¼è¡Œå†…事件删除
            function set_GridDelete(obj) {
                var data = obj.data;
                var index = layer.load();
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'del') {
                    layer.confirm('真的删除行么', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除！！！');
                        } else {
                            //obj.del();
                            layer.close(index);
                            var oldData = table.cache["mainTable"];
                            oldData.splice(obj.tr.data('index'), 1);
                            table.reload('mainTable', { data: oldData });
                            layer.close(index);
                        }
                    });
                return false;

            });
                }
            }
            //扫条码
            function GetMeesageByBarCode(obj) {  //返回工作中心
                var HBarCode = $('#HBarCode').val();//条形码（流转卡号）（数据库中为单据号）
                if (!HBarCode) {
                    layer.msg("条形码不能为空！")
                    return;
                }
                var index = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/POStockInBillList/Get_ReciveBill",
                    type: "GET",
                    data: { "HBillno": HBarCode },
                    success: function (result) {
                        if (result.code == "1") {
                            var data = result.data[0];
                            $("#HSupName").val(data.供应商);
                            $("#HDeptName").val(data.部门);
                            $("#HBillNo").val(data.单据号);
                            $("#HInterID").val(data.hmainid);
                            option.data = result.data;
                            table.render(option);
                            layer.close(index);
                        }
                        else {
                            layer.close(index);
                            layer.msg("未查找到数据", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            }
            //以上为layui模块
        });
    </script>

</body>
</html>
</html>

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

@@ -763,7 +763,7 @@
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                    window.location.href = "http://localhost:8082/LuBaoUi/views/index_Mobile.html"
                });
            })


 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_Fast.html

@@ -684,7 +684,7 @@
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                    window.history.back();
                });
            })