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

pzy

2024-09-06 6d1eb4d1d542637ef71d29971e14c059c16bb92e

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

 WebTM/Vlog/webapi20240905.txt

New file
@@ -0,0 +1,23 @@
2024/9/5 10:23:53 æ‰“印sql:exec h_p_Kf_SellOutBillList_PrintSellOutBill 13787793

2024/9/5 10:23:53 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/5 10:23:53 ReportDataSet:1

2024/9/5 10:25:44 æ‰“印sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793

2024/9/5 10:25:44 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/5 10:25:44 ReportDataSet:1

2024/9/5 10:28:34 æ‰“印sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793

2024/9/5 10:28:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/5 10:28:34 ReportDataSet:1

2024/9/5 10:28:47 æ‰“印sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793

2024/9/5 10:28:47 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/5 10:28:47 ReportDataSet:1

 WebTM/Vlog/webapi20240906.txt

New file
@@ -0,0 +1,23 @@
2024/9/6 8:17:07 æ‰“印sql:exec h_p_Kf_SellOutBillList_PrintSellOutBill 13787793

2024/9/6 8:17:07 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/6 8:17:07 ReportDataSet:1

2024/9/6 8:17:40 æ‰“印sql:exec h_p_Kf_SellOutBillList_PrintSellOutBill 13787793

2024/9/6 8:17:40 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/6 8:17:40 ReportDataSet:1

2024/9/6 8:17:42 æ‰“印sql:exec h_p_Kf_SellOutBillList_PrintSellOutBill 13787793

2024/9/6 8:17:42 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/6 8:17:42 ReportDataSet:1

2024/9/6 8:22:54 æ‰“印sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793

2024/9/6 8:22:54 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/6 8:22:54 ReportDataSet:1

 WebTM/views/»ù´¡×ÊÁÏ/Òþ²ØÁÐÉèÖÃ/Gy_GridView_Hide.html

@@ -119,6 +119,12 @@
        <input type="checkbox" name="IsHide" lay-filter="IsHide" id="IsHide{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
    </div>
</script>
<!--复选框 æ˜¯å¦ç»Ÿè®¡è¡Œ-->
<script type="text/html" id="IsTotalRow">
    <div class="layui-input-block" style="margin-left: 20px;">
        <input type="checkbox" name="IsTotalRow" lay-filter="IsTotalRow" id="IsTotalRow{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
    </div>
</script>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
@@ -179,6 +185,19 @@
            });
        });

        //是否统计
        form.on('checkbox(IsTotalRow)', function (data) {
            //获取下拉框选中的值
            var elem = data.othis.parents('tr');
            var dataindex = elem.attr("data-index");
            $.each(option.data, function (index, value) {
                if (value.LAY_TABLE_INDEX == dataindex) {
                    value.IsTotalRow = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                }
            });
        });


        //保存提交
        form.on('submit(btnSave)', function (data) {//提交
            set_AddNew(data);
@@ -233,12 +252,12 @@
                    var colNames = [];//相对单据传过来的列名
                    var cols = [];//要传进表格的数据
                    var dataCol = [];
                

                    if (data1.data.length != 0) {
                        //数据库查询出的列数据
                        dataCol = data1.data[0].HGridString.split(',');
                    }
                   

                    colNames = colName.split(',');

                    if (data1.data.length != 0 && dataCol.length == colNames.length) {
@@ -255,7 +274,7 @@
                        for (var i = 0; i < colNames.length; i++) {
                            var dataCols = dataCol[i].split('|');
                            var ColumnName_Other = dataCols[4] == dataCols[5] ? "" : dataCols[4];
                            cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5] })
                            cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5], "IsTotalRow": dataCols[6] == 1 ? true : false })
                        }
                        option.data = cols;
                        table.render(option);
@@ -266,6 +285,9 @@
                            if (dataCols[1] == 1) {
                                $("#IsHide" + (i + 1)).attr("checked", true);
                            }
                            if (dataCols[6] == 1) {
                                $("#IsTotalRow" + (i + 1)).attr("checked", true);
                            }
                            $('#Alignment' + (i + 1)).find("option[value='" + dataCols[2] + "']").attr("selected", true);
                        }
                        form.render('checkbox');
@@ -275,7 +297,7 @@
                        var colTitleNames = colTitleName.split(',');
                        //默认不选中 æ˜¾ç¤ºå­—体居左  è¡¨æ ¼çš„数据填充
                        for (var i = 0; i < colNames.length; i++) {
                            cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "ColumnName_Other": colTitleNames[i] })
                            cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "ColumnName_Other": colTitleNames[i], "IsTotalRow": false })
                        }
                        option.data = cols;
                        table.render(option);
@@ -283,6 +305,7 @@
                        //默认不选中 æ˜¾ç¤ºå­—体居左 é¡µé¢å¤šé€‰æ¡† ä¸‹æ‹‰æ¡† é‡æ–°æ¸²æŸ“
                        for (var i = 0; i < colNames.length; i++) {
                            $('#IsHide' + (i + 1)).prop("checked", false);
                            $('#IsTotalRow' + (i + 1)).prop("checked", false);
                            $('#Alignment' + (i + 1)).find("option[value='L']").attr("selected", true);
                        }
                        form.render('checkbox');
@@ -310,7 +333,8 @@
                    , { field: 'Alignment', title: '对齐方式', width: 100, templet: '#Alignment' }
                    , { field: 'ColumnWidth', title: '列宽', width: 100, edit: 'text' }
                    , { field: 'ColumnName_Other', title: '别名', width: 120, edit: 'text' }
                    , { field: 'ColumnName_real', title: '别名对应列名', width: 120, edit: 'text',hide:"true" }
                    , { field: 'ColumnName_real', title: '别名对应列名', width: 120, edit: 'text', hide: "true" }
                    , { field: 'IsTotalRow', title: '是否统计', width: 100, templet:'#IsTotalRow' }
                ]]
            };
        }

 WebTM/views/»ù´¡×ÊÁÏ/Òþ²ØÁÐÉèÖÃ/Gy_GridView_Hide_New.html

@@ -121,6 +121,12 @@
        <input type="checkbox" name="IsHide" lay-filter="IsHide" id="IsHide{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
    </div>
</script>
<!--复选框 æ˜¯å¦ç»Ÿè®¡è¡Œ-->
<script type="text/html" id="IsTotalRow">
    <div class="layui-input-block" style="margin-left: 20px;">
        <input type="checkbox" name="IsTotalRow" lay-filter="IsTotalRow" id="IsTotalRow{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
    </div>
</script>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
@@ -176,7 +182,17 @@
                }
            });
        });

        //是否统计
        form.on('checkbox(IsTotalRow)', function (data) {
            //获取下拉框选中的值
            var elem = data.othis.parents('tr');
            var dataindex = elem.attr("data-index");
            $.each(option.data, function (index, value) {
                if (value.LAY_TABLE_INDEX == dataindex) {
                    value.IsTotalRow = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                }
            });
        });
        //保存提交
        form.on('submit(btnSave)', function (data) {//提交
            set_AddNew(data);
@@ -223,6 +239,9 @@
                            if (option.data[j - 1].IsHide == true) {
                                $("#IsHide" + j).attr("checked", true);
                            }
                            if (option.data[j - 1].IsTotalRow == true) {
                                $("#IsTotalRow" + j).attr("checked", true);
                            }
                            $('#Alignment' + j).find("option[value='" + option.data[j - 1].Alignment + "']").attr("selected", true);
                        }
                        form.render('select');
@@ -254,6 +273,9 @@
                        for (var j = 1; j <= option.data.length; j++) {
                            if (option.data[j - 1].IsHide == true) {
                                $("#IsHide" + j).attr("checked", true);
                            }
                            if (option.data[j - 1].IsTotalRow == true) {
                                $("#IsTotalRow" + j).attr("checked", true);
                            }
                            $('#Alignment' + j).find("option[value='" + option.data[j - 1].Alignment + "']").attr("selected", true);
                        }
@@ -296,7 +318,7 @@
                    var colNames = [];//相对单据传过来的列名
                    var cols = [];//要传进表格的数据
                    var dataCol = [];//表格数据
                

                    if (data1.data.length != 0) {
                        //数据库查询出的列数据
                        dataCol = data1.data[0].HGridString.split(',');
@@ -317,7 +339,7 @@
                        for (var i = 0; i < colNames.length; i++) {
                            var dataCols = dataCol[i].split('|');
                            var ColumnName_Other = dataCols[4] == dataCols[5] ? "" : dataCols[4];
                            cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5] })
                            cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5], "IsTotalRow": dataCols[6] == 1 ? true : false })
                        }
                        option.data = cols;
                        table.render(option);
@@ -328,6 +350,9 @@
                            if (dataCols[1] == 1) {
                                $("#IsHide" + (i + 1)).attr("checked", true);
                            }
                            if (dataCols[6] == 1) {
                                $("#IsTotalRow" + (i + 1)).attr("checked", true);
                            }
                            $('#Alignment' + (i + 1)).find("option[value='" + dataCols[2] + "']").attr("selected", true);
                        }
                        form.render('checkbox');
@@ -336,7 +361,7 @@
                    } else {
                        //默认不选中 æ˜¾ç¤ºå­—体居左  è¡¨æ ¼çš„数据填充
                        for (var i = 0; i < colNames.length; i++) {
                            cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120 })
                            cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "IsTotalRow": false })
                        }
                        option.data = cols;
                        table.render(option);
@@ -344,6 +369,7 @@
                        //默认不选中 æ˜¾ç¤ºå­—体居左 é¡µé¢å¤šé€‰æ¡† ä¸‹æ‹‰æ¡† é‡æ–°æ¸²æŸ“
                        for (var i = 0; i < colNames.length; i++) {
                            $('#IsHide' + (i + 1)).prop("checked", false);
                            $('#IsTotalRow' + (i + 1)).prop("checked", false);
                            $('#Alignment' + (i + 1)).find("option[value='L']").attr("selected", true);
                        }
                        form.render('checkbox');
@@ -374,6 +400,7 @@
                    , { field: 'ColumnWidth', title: '列宽', width: 100, edit: 'text' }
                    , { field: 'ColumnName_Other', title: '别名', width: 120, edit: 'text' }
                    , { field: 'ColumnName_real', title: '别名对应列名', width: 120, edit: 'text', hide: "true" }
                    , { field: 'IsTotalRow', title: '是否统计', width: 100, templet: '#IsTotalRow' }
                ]]
            };
        }

 WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html

@@ -92,7 +92,7 @@
                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; ">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -574,6 +574,243 @@
                get_checkMainSource();
            });
            //#endregion

            //#region å›žè½¦é€‰æ‹©æºå•
            $('#HMainSourceBillNo').on('keydown', function (event) {
                var HSourceBillNo = $('#HMainSourceBillNo').val();//（源单单据号）
                if (event.keyCode == 13) {
                    var ajaxLoad = layer.load();
                    var url;
                    //判断文本框是否有数据    new
                    if (HSourceBillNo == "") {
                        return;
                    }
                    if ($("#BillType").val() == "1102") {
                        //源单类型是采购订单
                        url = "/Cg_POOrderBill/PushList";
                    } else if ($("#BillType").val() == "1201") {
                        //源单类型是收料通知单
                        url = "/Kf_POStockInBill/PushList";
                    }
                    $.ajax({
                        url: GetWEBURL() + url,
                        type: "GET",
                        data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var dataArray = result.data;
                                if ($("#BillType").val() == "1102") {
                                    form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HMainSourceInterID": "0"
                                        , "HMainSourceEntryID": "0"
                                        /*, "HMainSourceBillNo": ""*/
                                        , "HMainSourceBillType": $("#BillType").val()

                                        , "HDeptID": dataArray[0].HDeptID
                                        , "HDeptName": dataArray[0].部门
                                        , "HMangerID": dataArray[0].HManagerID
                                        , "HMangerName": dataArray[0].主管
                                        , "HEmpID": dataArray[0].HEmpID
                                        , "HEmpName": dataArray[0].业务员
                                        , "HSupID": dataArray[0].HSupID
                                        , "HSupName": dataArray[0].供应商
                                        , "HCurID": dataArray[0].HCurID
                                        , "HCurName": dataArray[0].币别
                                        , "HExRate": dataArray[0].汇率
                                        , "HSSID": dataArray[0].HSSID
                                        , "HSSName": dataArray[0].结算方式
                                        , "HPSStyleID": dataArray[0].HPSStyleID
                                        , "HPSStyleName": dataArray[0].采购方式
                                    });

                                    //子表Entry  èµ‹å€¼
                                    var rowdataEntry = [];
                                    for (var i = 0; i < dataArray.length; i++) {
                                        var HQty = dataArray[i].数量 - dataArray[i].关联数量;                           //数量
                                        var HPrice = dataArray[i].单价;               //单价
                                        var HMoney = HQty * HPrice;                     //金额=数量*单价
                                        var HTaxRate = dataArray[i].税率 * 0.01;           //税率
                                        var HTaxMoney = Number((HMoney * HTaxRate));         //税额=金额*税率
                                        var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                                        var HExRate = $("#HExRate").val();                      //汇率
                                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //本位币价税合计=(税额+金额)*汇率
                                        var HMoneyBB = HMoney * HExRate;
                                        rowdataEntry.push(
                                            {
                                                "HMaterID": dataArray[i].HMaterID
                                                , "物料代码": dataArray[i].物料代码
                                                , "物料名称": dataArray[i].物料名称
                                                , "规格型号": dataArray[i].规格型号
                                                , "HUnitID": dataArray[i].HUnitID
                                                , "计量单位": dataArray[i].计量单位
                                                , "HQty": dealDoubleToFixed(HQty, 1)
                                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                , 'HDiscountRate': "0"                                                     //
                                                , 'HRelTaxPrice': "0"
                                                , "HTaxRate": dataArray[i].税率
                                                , 'HTaxMoney': HTaxMoney                                                         //
                                                , "HMoney": dealDoubleToFixed(HMoney, 2)
                                                , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
                                                , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
                                                , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
                                                , "HRemark": ""

                                                , "HSourceInterID": dataArray[i].hmainid
                                                , "HSourceEntryID": dataArray[i].hsubid
                                                , "HSourceBillNo": dataArray[i].单据号
                                                , "HSourceBillType": dataArray[i].单据类型
                                                , "HRelationQty": "0"
                                                , "HRelationMoney": "0"

                                                , 'HPOOrderInterID': "0"
                                                , 'HPOOrderEntryID': "0"
                                                , 'HPOOrderBillNo': ""

                                                , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                , "HSeOrderInterID": dataArray[i].hmainid
                                                , "HSeOrderEntryID": dataArray[i].hsubid
                                                , "HSeOrderBillNo": dataArray[i].单据号
                                            }
                                        );
                                    }
                                    optionEntry.data = rowdataEntry;
                                    table.render(optionEntry);
                                    //子表汇总
                                    for (var i = 0; i < rowdataEntry.length; i++) {
                                        var item = rowdataEntry[i];

                                        for (var j = i + 1; j < rowdataEntry.length; j++) {
                                            if (rowdataEntry[j].HMaterID == item.HMaterID) {
                                                rowdataEntry[i].HQty += rowdataEntry[j].HQty;//数量
                                                rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//金额=数量*单价
                                                rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//税额
                                                rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //价税合计
                                                var HExRate = $("#HExRate").val();
                                                rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //本位币价税合计
                                                rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //本位币金额
                                                rowdataEntry.splice(j, 1);
                                                j = j - 1;
                                            }
                                        }
                                    }
                                    set_InitGridHaveSource();
                                    option.data = rowdataEntry;

                                } else if ($("#BillType").val() == "1201") {
                                    form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HMainSourceInterID": "0"
                                        , "HMainSourceEntryID": "0"
                                        /*, "HMainSourceBillNo": ""*/
                                        , "HMainSourceBillType": $("#BillType").val()

                                        , "HDeptID": dataArray[0].HDeptID
                                        , "HDeptName": dataArray[0].部门
                                        , "HMangerID": dataArray[0].hmanagerid == null ? "0" : dataArray[0].hmanagerid
                                        , "HMangerName": dataArray[0].主管
                                        , "HEmpID": dataArray[0].HEmpID
                                        , "HEmpName": dataArray[0].业务员
                                        , "HSupID": dataArray[0].HSupID
                                        , "HSupName": dataArray[0].供应商
                                        , "HCurID": dataArray[0].HCurID
                                        , "HCurName": dataArray[0].币别
                                        , "HExRate": dataArray[0].汇率
                                        , "HSSID": "0"
                                        , "HSSName": ""
                                        , "HPSStyleID": dataArray[0].HPSStyleID
                                        , "HPSStyleName": dataArray[0].采购方式
                                    });
                                    //子表Entry  èµ‹å€¼
                                    var rowdataEntry = [];
                                    for (var i = 0; i < dataArray.length; i++) {
                                        var HQty = dataArray[i].实收数量 - dataArray[i].关联数量;                           //数量
                                        var HPrice = dataArray[i].单价;               //单价
                                        var HMoney = HQty * HPrice;                     //金额=数量*单价
                                        var HTaxRate = dataArray[i].税率 * 0.01;           //税率
                                        var HTaxMoney = Number((HMoney * HTaxRate));         //税额=金额*税率
                                        var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                                        var HExRate = $("#HExRate").val();                      //汇率
                                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //本位币价税合计=(税额+金额)*汇率
                                        var HMoneyBB = HMoney * HExRate;
                                        rowdataEntry.push(
                                            {
                                                "HMaterID": dataArray[i].HMaterID
                                                , "物料代码": dataArray[i].物料代码
                                                , "物料名称": dataArray[i].物料名称
                                                , "规格型号": dataArray[i].规格型号
                                                , "HUnitID": dataArray[i].HUnitID
                                                , "计量单位": dataArray[i].计量单位
                                                , "HQty": dealDoubleToFixed(HQty, 1)
                                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                , 'HDiscountRate': "0"                                                     //
                                                , 'HRelTaxPrice': "0"
                                                , "HTaxRate": dataArray[i].税率
                                                , 'HTaxMoney': HTaxMoney                                                         //
                                                , "HMoney": dealDoubleToFixed(HMoney, 2)
                                                , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
                                                , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
                                                , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
                                                , "HRemark": ""

                                                , "HSourceInterID": dataArray[i].hmainid
                                                , "HSourceEntryID": dataArray[i].hsubid
                                                , "HSourceBillNo": dataArray[i].单据号
                                                , "HSourceBillType": dataArray[i].单据类型
                                                , "HRelationQty": "0"
                                                , "HRelationMoney": "0"

                                                , 'HPOOrderInterID': "0"
                                                , 'HPOOrderEntryID': "0"
                                                , 'HPOOrderBillNo': ""

                                                // , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
                                                , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
                                                , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].源单单号 : ""
                                            }
                                        );
                                    }
                                    optionEntry.data = rowdataEntry;
                                    table.render(optionEntry);
                                    //子表汇总
                                    for (var i = 0; i < rowdataEntry.length; i++) {
                                        var item = rowdataEntry[i];
                                        for (var j = i + 1; j < rowdataEntry.length; j++) {
                                            if (rowdataEntry[j].HMaterID == item.HMaterID) {
                                                rowdataEntry[i].HQty += rowdataEntry[j].HQty;
                                                rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//金额=数量*单价
                                                rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//税额
                                                rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //价税合计
                                                var HExRate = $("#HExRate").val();
                                                rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //本位币价税合计
                                                rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //本位币金额
                                                rowdataEntry.splice(j, 1);
                                                j = j - 1;
                                            }
                                        }
                                    }
                                    set_InitGridHaveSource();
                                    option.data = rowdataEntry;
                                    
                                }
                                haveSource = true;
                                table.render(option);
                                layer.close(ajaxLoad);
                                layer.msg("查询成功", { time: 1 * 1000, icon: 1 });
                            } else {
                                layer.alert(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                layer.close(ajaxLoad);
                            }
                        }, error: function () {
                            layer.alert(result.Message + "发生错误!", { icon: 5 });
                            layer.close(ajaxLoad);
                        }
                    });
                }
            });
            //#endregion


            //#endregion

@@ -1248,6 +1485,7 @@
                        var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                        var HExRate = $("#HExRate").val();                      //汇率
                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //本位币价税合计=(税额+金额)*汇率
                        var HMoneyBB = HMoney * HExRate;

                        HQty = Number(HQty.toFixed(HQtyDec));
                        HPrice = Number(HPrice.toFixed(HPriceDec));
@@ -1255,6 +1493,7 @@
                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
                        HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
                        HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
                        HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
                        //同步更新表格和缓存对应的值
                        obj.update({
                            HQty: HQty
@@ -1263,6 +1502,7 @@
                            , HTaxMoney: HTaxMoney
                            , HlineTotal: HlineTotal
                            , HlineTotalBB: HlineTotalBB
                            , HMoneyBB: HMoneyBB
                        });
                        table.render(option);
                        break;
@@ -1291,7 +1531,7 @@
                        var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4));   //实际含税单价=含税单价*折扣率
                        var HExRate = $("#HExRate").val();                      //汇率
                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4));     //本位币价税合计=(税额+金额)*汇率

                        var HMoneyBB = HMoney * HExRate;
                        //数字精度
                        HQty = Number(HQty.toFixed(HQtyDec));
                        HPrice = Number(HPrice.toFixed(HPriceDec));
@@ -1301,6 +1541,7 @@
                        HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
                        HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
                        HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
                        //同步更新表格和缓存对应的值
                        obj.update({
                            HQty: HQty
@@ -1311,6 +1552,7 @@
                            , HTaxPrice, HTaxPrice
                            , HRelTaxPrice: HRelTaxPrice
                            , HlineTotalBB: HlineTotalBB
                            , HMoneyBB: HMoneyBB
                        });
                        table.render(option);
                        break;
@@ -1341,6 +1583,7 @@
                        var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4));   //实际含税单价=含税单价*折扣率
                        var HExRate = $("#HExRate").val();                       //汇率
                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4));       //本位币价税合计=(税额+金额)*汇率
                        var HMoneyBB = HMoney * HExRate;
                        //数字精度
                        HQty = Number(HQty.toFixed(HQtyDec));
                        HPrice = Number(HPrice.toFixed(HPriceDec));
@@ -1350,6 +1593,7 @@
                        HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
                        HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
                        HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
                        //同步更新表格和缓存对应的值
                        obj.update({
                            HTaxRate: HTaxRate * 100
@@ -1362,6 +1606,7 @@
                            , HTaxPrice, HTaxPrice
                            , HRelTaxPrice: HRelTaxPrice
                            , HlineTotalBB: HlineTotalBB
                            , HMoneyBB: HMoneyBB
                        });
                        table.render(option);
                        break;
@@ -1409,7 +1654,6 @@
                        });
                        table.render(option);
                        break;
                        
                    case "HTaxPrice":                                         //单价
                        //数据格式校验  
                        temp = value + "";     //修改后的值 è½¬ä¸ºå­—符串 èµ‹å€¼ç»™  å˜é‡temp
@@ -1436,6 +1680,7 @@
                        var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4));   //实际含税单价=含税单价*折扣率
                        var HExRate = $("#HExRate").val();                      //汇率
                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4));     //本位币价税合计=(税额+金额)*汇率
                        var HMoneyBB = HMoney * HExRate;
                        //数字精度
                        HQty = Number(HQty.toFixed(HQtyDec));
                        HPrice = Number(HPrice.toFixed(HPriceDec));
@@ -1445,6 +1690,7 @@
                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
                        HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
                        HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
                        HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
                        //同步更新表格和缓存对应的值
                        obj.update({                    //更新表格数据                æ–¹æ³•æ˜¯è¯¥å¯¹è±¡æä¾›çš„一个方法，用于更新其内部状态或与之关联的数据源
                            HQty: HQty                               //更新HQty字段，HQty
@@ -1455,6 +1701,7 @@
                            , HTaxPrice, HTaxPrice                   //更新HTaxPrice字段，HTaxPrice
                            , HRelTaxPrice: HRelTaxPrice            //更新HRelTaxPrice字段，其值来自变量HRelTaxPrice
                            , HlineTotalBB: HlineTotalBB              //更新HlineTotalBB字段，其值来自变量HlineTotalBB
                            , HMoneyBB: HMoneyBB
                        });
                        table.render(option);
                        break;
@@ -2589,6 +2836,15 @@
                //子表Entry  èµ‹å€¼
                var rowdataEntry = [];
                for (var i = 0; i < dataArray.length; i++) {
                    var HQty = dataArray[i].数量 - dataArray[i].关联数量;                           //数量
                    var HPrice = dataArray[i].单价;               //单价
                    var HMoney = HQty * HPrice;                     //金额=数量*单价
                    var HTaxRate = dataArray[i].税率 * 0.01;           //税率
                    var HTaxMoney = Number((HMoney * HTaxRate));         //税额=金额*税率
                    var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                    var HExRate = $("#HExRate").val();                      //汇率
                    var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //本位币价税合计=(税额+金额)*汇率
                    var HMoneyBB = HMoney * HExRate;
                    rowdataEntry.push(
                        {
                            "HMaterID": dataArray[i].HMaterID
@@ -2597,17 +2853,17 @@
                            , "规格型号": dataArray[i].规格型号
                            , "HUnitID": dataArray[i].HUnitID
                            , "计量单位": dataArray[i].计量单位
                            , "HQty": dealDoubleToFixed(dataArray[i].数量 - dataArray[i].关联数量, 1)
                            , "HQty": dealDoubleToFixed(HQty, 1)
                            , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                            , 'HDiscountRate': "0"                                                     //
                            , 'HRelTaxPrice': "0"
                            , "HTaxRate": dataArray[i].税率
                            , 'HTaxMoney': "0"                                                         //
                            , "HMoney": dealDoubleToFixed(dataArray[i].金额, 2)
                            , 'HMoneyBB': dealDoubleToFixed(dataArray[i].金额 * dataArray[0].汇率, 2)
                            , 'HlineTotal': dealDoubleToFixed(dataArray[i].价税合计, 2)
                            , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].价税合计 * dataArray[0].汇率, 2)
                            , 'HTaxMoney': HTaxMoney                                                         //
                            , "HMoney": dealDoubleToFixed(HMoney, 2)
                            , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
                            , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
                            , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
                            , "HRemark": ""

                            , "HSourceInterID": dataArray[i].hmainid
@@ -2642,6 +2898,7 @@
                            rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //价税合计
                            var HExRate = $("#HExRate").val();
                            rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //本位币价税合计
                            rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //本位币金额
                            rowdataEntry.splice(j, 1);
                            j = j - 1;
                        }
@@ -2703,6 +2960,15 @@
                //子表Entry  èµ‹å€¼
                var rowdataEntry = [];
                for (var i = 0; i < dataArray.length; i++) {
                    var HQty = dataArray[i].实收数量 - dataArray[i].关联数量;                           //数量
                    var HPrice = dataArray[i].单价;               //单价
                    var HMoney = HQty * HPrice;                     //金额=数量*单价
                    var HTaxRate = dataArray[i].税率 * 0.01;           //税率
                    var HTaxMoney = Number((HMoney * HTaxRate));         //税额=金额*税率
                    var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                    var HExRate = $("#HExRate").val();                      //汇率
                    var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //本位币价税合计=(税额+金额)*汇率
                    var HMoneyBB = HMoney * HExRate;
                    rowdataEntry.push(
                        {
                            "HMaterID": dataArray[i].HMaterID
@@ -2711,14 +2977,17 @@
                            , "规格型号": dataArray[i].规格型号
                            , "HUnitID": dataArray[i].HUnitID
                            , "计量单位": dataArray[i].计量单位
                            , "HQty": dealDoubleToFixed(dataArray[i].实收数量 - dataArray[i].关联数量, 1)
                            , "HQty": dealDoubleToFixed(HQty, 1)
                            , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                            , 'HDiscountRate': "0"                                                     //
                            , 'HRelTaxPrice': "0"
                            , "HTaxRate": dataArray[i].税率
                            , 'HTaxMoney': "0"                                                         //
                            , "HMoney": dataArray[i].金额
                            , 'HTaxMoney': HTaxMoney                                                         //
                            , "HMoney": dealDoubleToFixed(HMoney, 2)
                            , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
                            , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
                            , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
                            , "HRemark": ""

                            , "HSourceInterID": dataArray[i].hmainid
@@ -2752,6 +3021,7 @@
                            rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //价税合计
                            var HExRate = $("#HExRate").val();
                            rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //本位币价税合计
                            rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //本位币金额
                            rowdataEntry.splice(j, 1);
                            j = j - 1;
                        }

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBillList.html

@@ -851,18 +851,14 @@
                        return;
                    }
                    $.ajax({
                        url: GetWEBURL() + '/Cg_POOrderBill/list',
                        url: GetWEBURL() + '/Cg_POOrderBill/PushList',
                        type: "GET",
                        data: { "sWhere": "and å•æ®å· = '" + HSourceBillNo+"'", "user": sessionStorage["HUserName"] },
                        data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var checkStatus = result;
                                if (checkStatus.data[0].状态 != "已审核") {
                                    layer.close(ajaxLoad);
                                    layer.msg("源单状态未审核", { icon: 5 });
                                    return;
                                }
                                if ($("#HSourceBillType").val() == "1102") {
                                    option.data = [];//清空子表
                                    $("#HProjectName").val(checkStatus.data[0].项目名称);
                                    $("#HProjectNumber").val(checkStatus.data[0].项目代码);
                                    $("#HProjectID").val(checkStatus.data[0].HProjectID);
@@ -886,7 +882,7 @@
                                    for (var i = 0; i < result.data.length; i++) {
                                        var HNewQty = checkStatus.data[j].数量 - checkStatus.data[j].关联数量//数量
                                        var HNewMoney = checkStatus.data[j].金额 - checkStatus.data[j].关联数量 * checkStatus.data[j].单价//减少关联数量的金额
                                        var HNewTaxMoney = HNewMoney * checkStatus.data[j].税率*0.01
                                        var HNewTaxMoney = HNewMoney * checkStatus.data[j].税率 * 0.01
                                        option.data.push({
                                            "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                            "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位,
@@ -899,13 +895,15 @@
                                    }
                                    table.render(option);
                                    layer.close(ajaxLoad);
                                    layer.msg("查询成功", { time: 1 * 1000,icon: 1 });
                                    layer.msg("查询成功", { time: 1 * 1000, icon: 1 });
                                }
                            } else {
                                layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                layer.alert(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                layer.close(ajaxLoad);
                            }
                        }, error: function () {
                            layer.alert(result.msg+"发生错误!", { icon: 5 });
                            layer.alert(result.Message + "发生错误!", { icon: 5 });
                            layer.close(ajaxLoad);
                        }
                    });
                }

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html

@@ -2025,6 +2025,10 @@
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //统计列
                                if (dataCols[6] == 1) {
                                    option.cols[0][i + 1]["totalRow"] = true;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -2258,6 +2258,10 @@
                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //统计列
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //字体所在位置(å·¦ å±…中 å³)
                                            switch (dataCols[2]) {
                                                case "L":

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillQuery.html

@@ -18,7 +18,14 @@
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <style type="text/css">
        .layui-table-click {
            background: #ceedfa;
            color: black
        }
    </style>
</head>

<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
@@ -54,10 +61,10 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>
                                
                                <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>
@@ -68,12 +75,6 @@
                                </div>
                                <div class="layui-colla-content">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">业务员</label>
                                            <div class="layui-input-block">
@@ -86,6 +87,13 @@
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HSupName" id="HSupName" 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 ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
                                            </div>
                                        </div>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>
                                    </div>
                                    <div class="layui-inline">
                                        <div class="layui-row" style="margin-top:5px">
@@ -236,7 +244,6 @@
            var sWhere = "";
            var option = [];
            var optionSub = [];
            var Name = "Cg_POOrderBillWidth";
            var HModName = "Cg_POOrderBillQuery";
            var HModNameSub = "Cg_POOrderBillQuerySub";
            var HBillType = "1102";
@@ -244,11 +251,11 @@
            var HModuleType = "1102";
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
            //#endregion 
            //#endregion

            ////不需要显示的字段 å¯æ‰©å±•
            var titleData = [];
            //#endregion 
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

@@ -269,7 +276,7 @@

            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等

           


            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
@@ -364,7 +371,7 @@
                };
            });
            //表格点击事件
            


            //重新同步按钮
            form.on('submit(btnResCnz)', function (data) {
@@ -404,44 +411,6 @@
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery(table, option,2);
            });

            //表头信息部门弹窗
            form.on('submit(Department)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '供应商列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/SupplierInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HSupName").val(checkStatus.data[0].HName);
                        $("#HSupID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //日期间隔下拉列表监听
@@ -485,7 +454,7 @@
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
                

                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -523,7 +492,7 @@
                        , { field: '物料名称', title: '物料名称', width: 130 }
                        , { field: '数量', title: '订单数量', width: 100, totalRow: true }
                        , { field: '打印条码数量', title: '打印条码数量', width: 120, totalRow: true  }
                        /* å®‰ç‘žæ–°å¢žå­—段 begin */                   
                        /* å®‰ç‘žæ–°å¢žå­—段 begin */
                        , { field: '可打印条码数量', title: '可打印条码数量', width: 120, totalRow: true}
                        /* å®‰ç‘žæ–°å¢žå­—段 end */
                        , { field: '关联数量', title: '已发货数量', width: 120, totalRow: true}
@@ -596,12 +565,12 @@
                        , { field: '作废日期', title: '作废日期', width: 120, templet: "<div>{{d.作废日期 ==null ?'':layui.util.toDateString(d.作废日期, 'yyyy-MM-dd HH:mm:ss')}}</div>" }

                ]]
               

                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
                };
                

                optionSub = {
                    elem: '#mainTableSub'
                    , toolbar: '#toolbarDemoSub'
@@ -642,7 +611,7 @@
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'});
                            col.push({ type: 'radio', fixed: 'left', totalRowText: '合计'});
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
@@ -666,7 +635,7 @@
                                    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=="行关闭日期"?"行关闭人":data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{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 });
@@ -681,7 +650,7 @@
                            //刷新表格数据
                            DisPlay_HideColumn();

                            

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
@@ -725,7 +694,7 @@
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            col.push({ type: 'radio', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
@@ -830,7 +799,7 @@
                    var InterID = data[0].hmainid.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        

                        if (data[0].状态 == "创建") {
                            $.ajax({
                                type: "GET",
@@ -850,42 +819,21 @@
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                  

                                }, error: function () {
                                    

                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                            });
                        } else {
                            layer.msg('该条数据不是创建状态,无法删除！');
                          

                        }
                       

                    })
                }
                else {
                    layer.msg('请选择一行数据删除！');
                }
            }

            //预览
            function get_ViewReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('请选择一行数据打印！');
                }
            }

@@ -952,7 +900,7 @@
                }
            }
            //#endregion
           

            //#region å‘起审批
            function set_startCheckBill() {
                var checkStatus = table.checkStatus('mainTable')
@@ -1157,8 +1105,8 @@
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                    //修改为功后刷新子表界面
                                    $("tr.layui-table-click").trigger("click");
                                });

                            } else {
@@ -1211,117 +1159,6 @@
            }
            //#endregion


            //获取列宽
            function getColumnsWidth() {
                var result = [];
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                //获取列宽
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/list',
                    async: false,
                    type: "Get",
                    dataType: "json",
                    data: { "colNum": colNum, "Name": Name },
                    success: function (data1) {
                        if (data1.code == 1) {
                            result = data1.data;
                        }
                        else if (data1.code == -1) {

                        }
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });

                return result;
            }
            //保存列宽
            function set_SaveGridColWidth() {
                var arr = [];
                // åˆ—æ•°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
                    if (colName != "" && colName != null) {
                        arr.push(colWidth == -1 ? 200 : colWidth);
                    }
                }
                arr.unshift(40); //首位追加
                $.ajax({
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    type: "POST",
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": Name },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.alert(data1.Message, { icon: 1 });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //设置赋值列宽
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                get_FastQuery(table, option);
            }
            //默认列宽
            function set_DefaultGridColWidth() {
                var arr = [];
                // åˆ—æ•°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    if (colName != "" && colName != null) {
                        arr.push(300);   //默认宽度200
                    }
                }
                arr.unshift(40); //首位追加
                $.ajax({
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    type: "POST",
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": Name },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.alert(data1.Message, { icon: 1 });

                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //设置赋值列宽
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                get_FastQuery(table, option);
            }


            //快速过滤
@@ -1658,7 +1495,7 @@
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            console.log(titleData)

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < optionSub.cols[0].length - 1; i++) {
@@ -1739,49 +1576,27 @@

            //#region è¡Œç‚¹å‡»äº‹ä»¶
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                //显示子表
                get_DisplaySub(obj.data);
                //选中行改变颜色
                check_row(obj);
            })
            table.on('row(mainTableSub)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).eq(2).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).eq(2).attr({ "style": "background:" });//取消当前tr颜色
                //判断是否已经被选中
                if (obj.tr.find('.layui-form-radioed').length == 0) {
                    //触发单选框选中事件
                    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTableSub, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });


            })
            //子表单选
            table.on('row(mainTableSub)', function (obj) {
                //判断是否已经被选中
                if (obj.tr.find('.layui-form-radioed').length == 0) {
                    //触发单选框选中事件
                    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
                }
            })
            //#endregion

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            function check_row(obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).first().attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).first().attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            }
            //#endregion

            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
@@ -1860,7 +1675,7 @@
                                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                              

                                ////执行查询方法
                                //get_FastQuery();
                            } else {

 WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Add_Edit_Xs_SeOutStockBillList.html

@@ -229,7 +229,7 @@
                                         <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="" id="" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;"   readonly>
                                                <input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float: left; width: 150px;">
                                                
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -591,6 +591,84 @@
                }
            });

            //#region å›žè½¦é€‰æ‹©æºå•
            $('#HSourceBillNo').on('keydown', function (event) {
                var HSourceBillNo = $('#HSourceBillNo').val();//（源单单据号）
                if (event.keyCode == 13) {
                    var ajaxLoad = layer.load();
                    //判断文本框是否有数据    new
                    if (HSourceBillNo == "") {
                        return;
                    }
                    $.ajax({
                        url: GetWEBURL() + '/Xs_SeOrderBill/PushList',
                        type: "GET",
                        data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var checkStatus = result;
                                if ($("#HSourceBillType").val() == "1401") {
                                    option.data = [];//清空子表
                                    $("#HProjectID").val(checkStatus.data[0].HProjectID ? checkStatus.data[0].HProjectID : 0);
                                    $("#HProjectNumber").val(checkStatus.data[0].项目编码);
                                    $("#HProjectName").val(checkStatus.data[0].项目名称);

                                    $("#HCusID").val(checkStatus.data[0].HCusID);
                                    $("#HCusName").val(checkStatus.data[0].客户);
                                    $("#HDeptID").val(checkStatus.data[0].HDeptID);
                                    $("#HDeptName").val(checkStatus.data[0].部门);
                                    $("#HManagerID").val(checkStatus.data[0].HManagerID);
                                    $("#HManagerName").val(checkStatus.data[0].主管);
                                    $("#HEmpID").val(checkStatus.data[0].HEmpID);
                                    $("#HEmpName").val(checkStatus.data[0].业务员);
                                    $("#HCurID").val(checkStatus.data[0].HCurID);
                                    $("#HCurName").val(checkStatus.data[0].币别);
                                    $("#HExRate").val(checkStatus.data[0].汇率);
                                    $("#HWHID").val(checkStatus.data[0].主仓库id);
                                    $("#HWHName").val(checkStatus.data[0].主仓库);

                                    var j = 0;
                                    for (var i = 0; i < result.data.length; i++) {
                                        var HQty = checkStatus.data[i].数量 - checkStatus.data[i].关联数量;                           //数量
                                        var HPrice = checkStatus.data[i].单价;               //单价
                                        var HMoney = HQty * HPrice;                     //金额=数量*单价
                                        option.data.push({
                                            "HMaterID": checkStatus.data[i].HMaterID
                                            , "物料代码": checkStatus.data[i].物料代码
                                            , "物料名称": checkStatus.data[i].物料名称
                                            , "规格型号": checkStatus.data[i].规格型号
                                            , "HUnitID": checkStatus.data[i].HUnitID
                                            , "计量单位": checkStatus.data[i].计量单位
                                            , "HWHID": checkStatus.data[i].HWhID
                                            , "发货仓库": checkStatus.data[i].子仓库
                                            , "HQty": HQty,
                                             "HPrice": checkStatus.data[i].单价,
                                             "HMoney": HMoney
                                            , "HRemark": ""
                                            , "HSourceBillNo": checkStatus.data[i].单据号
                                            , "HSourceBillType": checkStatus.data[i].HBillType
                                            , "HSourceInterID": checkStatus.data[i].hmainid
                                            , "HSourceEntryID": checkStatus.data[i].hsubid
                                        })
                                        j++;
                                    }
                                    table.render(option);
                                    layer.close(ajaxLoad);
                                    layer.msg("查询成功", { time: 1 * 1000, icon: 1 });
                                }
                            } else {
                                layer.alert(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                layer.close(ajaxLoad);
                            }
                        }, error: function () {
                            layer.alert(result.Message + "发生错误!", { icon: 5 });
                            layer.close(ajaxLoad);
                        }
                    });
                }
            });
            //#endregion

            //#region ç›‘听单元格编辑  å•å…ƒæ ¼ç¼–辑后 å˜æ›´
            table.on('edit(mainTable)', function (obj) {
                //数值格式校验工具
@@ -733,6 +811,9 @@
                            ProcessNumber.push(checkStatus.data[i]);
                        }
                        for (var i = 0; i < ProcessNumber.length; i++) {
                            var HQty = checkStatus.data[i].数量 - checkStatus.data[i].关联数量;                           //数量
                            var HPrice = checkStatus.data[i].单价;               //单价
                            var HMoney = HQty * HPrice;                     //金额=数量*单价
                            option.data.push({
                                "HMaterID": checkStatus.data[i].HMaterID
                                , "物料代码": checkStatus.data[i].物料代码
@@ -742,10 +823,10 @@
                                , "计量单位": checkStatus.data[i].计量单位
                                , "HWHID": checkStatus.data[i].HWhID
                                , "发货仓库": checkStatus.data[i].子仓库
                                , "HQty": checkStatus.data[i].数量,
                                , "HQty": HQty,
                                "HPrice": checkStatus.data[i].单价,
                                "HMoney": checkStatus.data[i].金额, "HRemark": ""
                            
                                "HMoney": HMoney
                                , "HRemark": ""
                                , "HSourceBillNo": checkStatus.data[i].单据号
                                , "HSourceBillType": checkStatus.data[i].HBillType
                                , "HSourceInterID": checkStatus.data[i].hmainid

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

@@ -3170,6 +3170,7 @@
                        return;
                    }
                } else {
                    return;
                }
                //#endregion
                var InterID = $("#HInterID").val();
@@ -3186,7 +3187,7 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: false //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + InterID + '&MyMsg=' + InterID + '&Type=Kf_SellOutBillListByID', 'yes']
                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + InterID + '&MyMsg=' + InterID + '&Type=Kf_SellOutBillList', 'yes']
                                , resize: false
                            })
                        } else {

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

@@ -1474,7 +1474,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillListByID', 'yes']
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
                        , resize: false
                    })
                }

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html

@@ -155,7 +155,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">

                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -580,6 +580,116 @@
                }
            });

            //#region å›žè½¦é€‰æ‹©æºå•
            $('#HSourceBillNo').on('keydown', function (event) {
                var HSourceBillNo = $('#HSourceBillNo').val();//（源单单据号）
                if (event.keyCode == 13) {
                    var ajaxLoad = layer.load();
                    var url;
                    //判断文本框是否有数据    new
                    if (HSourceBillNo == "") {
                        return;
                    }
                    if ($("#HSourceBillType").val() == "1102") {
                        //源单类型是采购订单
                        url = "/Cg_POOrderBill/PushList";
                    } else if ($("#HSourceBillType").val() == "1103") {
                        //源单类型是收料通知单
                        url = "/Cg_POInStockBill/PushList";
                    }
                    $.ajax({
                        url: GetWEBURL() + url,
                        type: "GET",
                        data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var checkStatus = result;
                                if ($("#HSourceBillType").val() == "1102") {
                                    option.data = [];//清空子表
                                    $("#HProjectName").val(checkStatus.data[0].项目名称);
                                    $("#HProjectNumber").val(checkStatus.data[0].项目代码);
                                    $("#HProjectID").val(checkStatus.data[0].HProjectID);

                                    $("#HDeptID").val(checkStatus.data[0].HDeptID);
                                    $("#HDeptName").val(checkStatus.data[0].部门);
                                    $("#HWHID").val(checkStatus.data[0].HWHID);
                                    $("#HWHName").val(checkStatus.data[0].仓库);
                                    $("#HSupID").val(checkStatus.data[0].HSupID);
                                    $("#HSupName").val(checkStatus.data[0].供应商);
                                    $("#HEmpID").val(checkStatus.data[0].HEmpID);
                                    $("#HEmpName").val(checkStatus.data[0].业务员);
                                    $("#HManagerID").val(checkStatus.data[0].HManagerID);
                                    $("#HManagerName").val(checkStatus.data[0].主管);
                                    $("#HInvoiceBillNo").val(checkStatus.data[0].发票编号);
                                    $("#HInnerBillNo").val(checkStatus.data[0].内部单据号);

                                    var j = 0;
                                    for (var i = 0; i < result.data.length; i++) {
                                        var HNewQty = checkStatus.data[j].数量 - checkStatus.data[j].关联数量//数量
                                        var HNewMoney = checkStatus.data[j].金额 - checkStatus.data[j].关联数量 * checkStatus.data[j].单价//减少关联数量的金额
                                        var HNewTaxMoney = HNewMoney * checkStatus.data[j].税率 * 0.01
                                        var HNewlineTotal = HNewMoney + HNewTaxMoney;
                                        option.data.push({
                                            "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                            "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HWHID": checkStatus.data[j].HWHIDSub, "收料仓库": checkStatus.data[j].仓库名称,
                                            "HSPID": checkStatus.data[j].HSPID, "仓位名称": checkStatus.data[j].仓位名称, "HQtyMust": checkStatus.data[j].数量,
                                            "HQty": HNewQty, "HPrice": checkStatus.data[j].单价, "HMoney": HNewMoney,"HOrderPrice": checkStatus.data[j].金额,
                                            "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                            "HTaxRate": checkStatus.data[j].税率, "HTaxPrice": checkStatus.data[j].含税单价, "HlineTotal": HNewlineTotal
                                        })
                                        j++;
                                    }

                                } else if ($("#HSourceBillType").val() == "1103") {
                                    option.data = [];//清空子表
                                    $("#HProjectName").val(checkStatus.data[0].项目名称);
                                    $("#HProjectNumber").val(checkStatus.data[0].项目代码);
                                    $("#HProjectID").val(checkStatus.data[0].HProjectID);
                                    $("#HDeptID").val(checkStatus.data[0].HDeptID);
                                    $("#HDeptName").val(checkStatus.data[0].部门);
                                    $("#HWHID").val(checkStatus.data[0].主表仓库ID);
                                    $("#HWHName").val(checkStatus.data[0].主表仓库);
                                    $("#HSupID").val(checkStatus.data[0].HSupID);
                                    $("#HSupName").val(checkStatus.data[0].供应商);
                                    $("#HEmpID").val(checkStatus.data[0].HEmpID);
                                    $("#HEmpName").val(checkStatus.data[0].业务员);
                                    $("#HManagerID").val(checkStatus.data[0].HManagerID);
                                    $("#HManagerName").val(checkStatus.data[0].主管);
                                    $("#HInvoiceBillNo").val(checkStatus.data[0].发票编号);
                                    $("#HInnerBillNo").val(checkStatus.data[0].内部单据号);
                                    var j = 0;
                                    for (var i = 0; i < result.data.length; i++) {
                                        var HNewQty = checkStatus.data[j].数量 - checkStatus.data[j].关联数量//数量
                                        var HNewMoney = checkStatus.data[j].金额 - checkStatus.data[j].关联数量 * checkStatus.data[j].单价//减少关联数量的金额
                                        var HNewTaxMoney = HNewMoney * checkStatus.data[j].税率 * 0.01
                                        var HNewlineTotal = HNewMoney + HNewTaxMoney;
                                        option.data.push({
                                            "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                            "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HQtyMust": checkStatus.data[j].数量, "HQty": checkStatus.data[j].数量 - checkStatus.data[j].关联数量, "HRemark": "",
                                            "HPrice": checkStatus.data[j].单价, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].金额, "HWHID": checkStatus.data[j].HWHID, "收料仓库": checkStatus.data[j].收料仓库,
                                            "HSPID": checkStatus.data[j].HSPID, "仓位名称": checkStatus.data[j].仓位名称, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                                            "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                                            "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                            "HTaxRate": checkStatus.data[j].税率, "HTaxPrice": checkStatus.data[j].含税单价, "HlineTotal": HNewlineTotal
                                        })
                                        j++;
                                    }
                                }
                                table.render(option);
                                layer.close(ajaxLoad);
                                layer.msg("查询成功", { time: 1 * 1000, icon: 1 });
                            } else {
                                layer.alert(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                layer.close(ajaxLoad);
                            }
                        }, error: function () {
                            layer.alert(result.Message + "发生错误!", { icon: 5 });
                            layer.close(ajaxLoad);
                        }
                    });
                }
            });
            //#endregion

            //#endregion

@@ -1102,7 +1212,7 @@
                }
            });

      //#region ä¿å­˜æŒ‰é’®
            //#region ä¿å­˜æŒ‰é’®
            form.on('submit(Saver)', function (data) {
                //#region åˆ¤æ–­æºå•çŠ¶æ€
                if (OperationType == 1 || OperationType == 4) {
@@ -2184,13 +2294,17 @@
                           
                            var j = 0;
                            for (var i = 0; i < checkStatus.data.length; i++) {
                                var HNewQty = checkStatus.data[j].数量 - checkStatus.data[j].关联数量//数量
                                var HNewMoney = checkStatus.data[j].金额 - checkStatus.data[j].关联数量 * checkStatus.data[j].单价//减少关联数量的金额
                                var HNewTaxMoney = HNewMoney * checkStatus.data[j].税率 * 0.01
                                var HNewlineTotal = HNewMoney + HNewTaxMoney;
                                option.data.push({
                                    "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                    "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HWHID": checkStatus.data[j].HWHIDSub, "收料仓库": checkStatus.data[j].仓库名称,
                                    "HSPID": checkStatus.data[j].HSPID, "仓位名称": checkStatus.data[j].仓位名称, "HQtyMust": checkStatus.data[j].数量,
                                    "HQty": checkStatus.data[j].数量-checkStatus.data[j].关联数量, "HPrice": checkStatus.data[j].单价,"HMoney": checkStatus.data[j].金额,
                                    "HQty": HNewQty, "HPrice": checkStatus.data[j].单价, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].金额,
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                    "HTaxRate": checkStatus.data[j].税率, "HTaxPrice": checkStatus.data[j].含税单价, "HlineTotal": checkStatus.data[j].价税合计
                                    "HTaxRate": checkStatus.data[j].税率, "HTaxPrice": checkStatus.data[j].含税单价, "HlineTotal": HNewlineTotal
                                })
                                j++;
                            }
@@ -2200,14 +2314,18 @@
                         
                            var j = 0;
                            for (var i = 0; i < ProcessNumber.length; i++) {
                                var HNewQty = checkStatus.data[j].数量 - checkStatus.data[j].关联数量//数量
                                var HNewMoney = checkStatus.data[j].金额 - checkStatus.data[j].关联数量 * checkStatus.data[j].单价//减少关联数量的金额
                                var HNewTaxMoney = HNewMoney * checkStatus.data[j].税率 * 0.01
                                var HNewlineTotal = HNewMoney + HNewTaxMoney;
                                option.data.push({
                                    "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                    "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HQtyMust": checkStatus.data[j].数量, "HQty": checkStatus.data[j].数量-checkStatus.data[j].关联数量, "HRemark": "",
                                    "HPrice": checkStatus.data[j].单价, "HMoney": checkStatus.data[j].金额, "HOrderPrice": "0", "HWHID": checkStatus.data[j].HWHID, "收料仓库": checkStatus.data[j].收料仓库,
                                    "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HQtyMust": checkStatus.data[j].数量, "HQty": checkStatus.data[j].数量 - checkStatus.data[j].关联数量, "HRemark": "",
                                    "HPrice": checkStatus.data[j].单价, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].金额, "HWHID": checkStatus.data[j].HWHID, "收料仓库": checkStatus.data[j].收料仓库,
                                    "HSPID": checkStatus.data[j].HSPID, "仓位名称": checkStatus.data[j].仓位名称, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                    "HTaxRate": checkStatus.data[j].税率, "HTaxPrice": checkStatus.data[j].含税单价, "HlineTotal": (checkStatus.data[j].金额 + (checkStatus.data[j].金额 * checkStatus.data[j].税率))
                                    "HTaxRate": checkStatus.data[j].税率, "HTaxPrice": checkStatus.data[j].含税单价, "HlineTotal": HNewlineTotal
                                })
                                j++;
                            }