应付单,收料通知单,退料通知单,采购订单,退料通知单,采购退料单测试优化
8个文件已修改
321 ■■■■■ 已修改文件
WebTM/views/采购管理/应付单/Cg_PayableBill.html 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/应付单/Cg_PayableBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/收料通知单/Cg_POInStockBillQuery.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/退料通知单/Cg_POInStockBackBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html 191 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html
@@ -726,7 +726,9 @@
                                        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].HMoney += rowdataEntry[j].HMoney;//金额
                                                rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].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();
@@ -826,7 +828,8 @@
                                        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].HMoney += rowdataEntry[j].HMoney;//金额
                                                rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].HQty;//单价
                                                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();
@@ -1466,7 +1469,8 @@
                                    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].HMoney += rowdataEntry[j].HMoney;//金额
                                            rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].HQty;//单价
                                            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();
@@ -1588,7 +1592,8 @@
                                    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].HMoney += rowdataEntry[j].HMoney;//金额
                                            rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].HQty;//单价
                                            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();
@@ -1768,6 +1773,9 @@
                for (var i = 0; i < option.cols[0].length; i++) {
                    if (option.cols[0][i]["field"] == "HQty") {
                       option.cols[0][i]["edit"] = false;
                    }
                    if (option.cols[0][i]["field"] == "HMoney") {
                        option.cols[0][i]["edit"] = false;
                    }
                    
                }
@@ -2447,7 +2455,6 @@
                    $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                }
                var sMainStr = JSON.stringify(data.field);
                debugger
                //获取子表数据
                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -3310,7 +3317,8 @@
                    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].HMoney += rowdataEntry[j].HMoney;//金额
                            rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].HQty;//单价
                            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();
@@ -3443,7 +3451,8 @@
                    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].HMoney += rowdataEntry[j].HMoney;//金额
                            rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].HQty;//单价
                            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();
WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBillList.html
@@ -768,7 +768,7 @@
                }
                sWhere += addSWhereByOpenType();
                //根据用户过滤用户关联客户的记录
                sWhere += getSWhereByHUser();
                /*sWhere += getSWhereByHUser();*/
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Cg_POInStockBillQuery.html
@@ -1070,8 +1070,8 @@
            //快速过滤
            function get_FastQuery(table, option,number) {
                var HBeginDate = $("#HDate").val();//开始日期
                var HEndDate = $("#HDate1").val();//结束日期
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var HSupID = $("#HSupID").val();
                var HDeptID = $("#HDeptID").val();
@@ -1179,7 +1179,6 @@
                sWhere += addSWhereByOpenType();
                //添加查询条件,根据当前登录用户关联职员返回数据
                //sWhere += " and HUserID =" + sessionStorage["Czybm"]
                var index = layer.load(0);
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";
WebTM/views/²É¹º¹ÜÀí/ÍËÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBackBillList.html
@@ -987,16 +987,16 @@
                                , "HUnitID": dataArray[i].HUnitID
                                , "计量单位": dataArray[i].计量单位
                                , "HWHID": dataArray[i].HWHID
                                , "退料仓库": dataArray[i].退料仓库
                                , "退料仓库": dataArray[i].仓库
                                , "HSPID": dataArray[i].HSPID    
                                , "仓位名称": dataArray[i].仓位名称
                                , "HSecUnitID": dataArray[i].HSecUnitID
                                , "辅助单位": dataArray[i].辅助单位
                                , "HQty": dealDoubleToFixed(dataArray[i].数量, 1)
                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                , 'HDiscountRate': dataArray[i].折扣率                                                    //
                                , 'HRelTaxPrice': "0"
                                /*, "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)*/
                                /*, 'HDiscountRate': dataArray[i].折扣率*/                                                    //
                                /*, 'HRelTaxPrice': "0"*/
                                , "HTaxRate": dataArray[i].税率
                                , 'HTaxMoney': dataArray[i].税额                                                     //
                                , "HMoney": dealDoubleToFixed(dataArray[i].金额, 2)
@@ -1021,7 +1021,8 @@
                        );
                    }
                    option.data = rowdata;
                    table.render(option);
                table.render(option);
                OperationType = 1;//设置操作类型为新增
                }
        
            //#endregion
@@ -1053,10 +1054,10 @@
                    layer.msg("请选择仓库!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HManagerName").val() == 0) {
                    layer.msg("请选择主管!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if ($("#HManagerName").val() == 0) {
                //    layer.msg("请选择主管!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //子表数据检验简单表单验证
                //后续可用多个数组存储列名扩展
                for (var i = 0; i < option.data.length; i++) {
@@ -1065,7 +1066,7 @@
                    }
                    var rowData = option.data[i];
                    for (var col of Object.keys(rowData)) {
                        if (rowData[col] == "0" && col != "LAY_TABLE_INDEX") {
                        if (rowData[col] == "0" && (col == "HQty" || col == "HMaterID" || col == "HUnitID")) {
                            layer.msg("第" + (i + 1) + "行:" + col + "不能为0!");
                            return;
                        }
@@ -1516,7 +1517,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=Warehouse', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1533,12 +1534,15 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "退料仓库": OptionData.仓库名称
                                })
                            }
                                , end: function () {
                                    if (typeof (OptionData[0].HItemID) != undefined) {
                                        obj.update({
                                            "HWHID": OptionData[0].HItemID
                                            , "退料仓库": OptionData[0].仓库名称
                                        })
                                    }
                                    OptionData = "";
                                }
                            })
                        }
                        //退料仓位
@@ -2109,7 +2113,11 @@
            $("#HManagerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        }
        function GetGyCur(obj) {
            $("#HCurName").val(obj.货币名称);
            $("#HCurID").val(obj.HItemID);
            $("#HExRate").val(obj.汇率);
        }
         //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
WebTM/views/²É¹º¹ÜÀí/ÍËÁÏ֪ͨµ¥/Cg_POInStockBackBillList.html
@@ -901,7 +901,7 @@
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
                get_FastQuery();
            }
            //#endregion
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html
@@ -2182,7 +2182,7 @@
           $("#HSSName").val(obj[0].结算方式);
           $("#HAddress").val(obj[0].地区);
           $("#HPSStyleName").val(obj[0].采购方式);
           $("#HPSStyleID").val(obj[0].HPSStyleID == "" ? 0 : obj[0].HPSStyleID);
           $("#HPSStyleID").val(obj[0].HPSStyleID == null ? 0 : obj[0].HPSStyleID);
        } 
        //时间格式
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillLEdit.html
@@ -80,9 +80,12 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">工艺单号<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" class="layui-input" value="" style="float:left;">
                                                <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" class="layui-input" value="" style="float: left; width: 150px;">
                                                <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID" value="0">
                                                <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID" value="0">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchProcExchBill" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
@@ -514,6 +517,45 @@
                    }
                });
            });
            //#endregion
            //#region é€‰æ‹©æµè½¬å¡å¼¹çª—
            form.on('submit(btnSearchProcExchBill)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '流转卡列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../车间管理/工序流转卡/Sc_ProcessExchangeBillList.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('请选择数据');
                        }
                        $("#HProcExchBillNo").val(checkStatus.data[0].单据号);
                        getMainInfoByHProcExchBillNo();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            })
            //#endregion
            //#region é€‰æ‹©æ‰“浆人弹窗
@@ -1990,10 +2032,10 @@
                            layer.msg("明细记录第" + (i + 1) + "行,计量单位为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        if (sSubStr[i].HMaterRuleType == null || sSubStr[i].HMaterRuleType == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,物料公式为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        //if (sSubStr[i].HMaterRuleType == null || sSubStr[i].HMaterRuleType == "") {
                        //    layer.msg("明细记录第" + (i + 1) + "行,物料公式为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        //    return Result = false;
                        //}
                        temp = sSubStr[i].HRate + "";
                        if (temp == "" || temp *1 == "0") {
                            layer.msg("明细记录第" + (i + 1) + "行,用量为空或为0!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBackBill_Add_Up.html
@@ -212,82 +212,83 @@
                                    </div>
                                </div>
                            </div>
                        </div>
                        <!--制单信息-->
                        <div class="layui-tab-item">
                            <div class="layui-form-item">
                                <div class="layui-row">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">制单人</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
                            <!--制单信息-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">制单人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">审核人</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">制单日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">关闭人</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">制单日期</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">审核日期</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">关闭日期</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">修改人</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">作废人</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">修改日期</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">作废日期</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
@@ -1010,16 +1011,16 @@
                        , "HDeptName": dataArray[0].部门
                        , "HManagerID": dataArray[0].HManagerID
                        , "HManagerName": dataArray[0].主管
                        , "HWHID": dataArray[0].HWHID
                        , "HWHName": dataArray[0].仓库
                        , "HWHID": dataArray[0].主表仓库ID == null ? 0 : dataArray[0].主表仓库ID
                        , "HWHName": dataArray[0].主表仓库
                        , "HEmpID": dataArray[0].HEmpID
                        , "HEmpName": dataArray[0].业务员
                        , "HSupID": dataArray[0].HSupID
                        , "HSupName": dataArray[0].供应商
                        , "HSecManagerID": dataArray[0].HSecManagerID
                        , "HSecManagerName": dataArray[0].验收员
                        , "HKeeperID": dataArray[0].HKeeperID
                        , "HKeeperName": dataArray[0].保管员
                        //, "HSecManagerID": dataArray[0].HSecManagerID
                        //, "HSecManagerName": dataArray[0].验收员
                        //, "HKeeperID": dataArray[0].HKeeperID
                        //, "HKeeperName": dataArray[0].保管员
                        , "HCurID": dataArray[0].HCurID
                        , "HCurName": dataArray[0].币别
                        , "HExRate": dataArray[0].汇率
@@ -1046,6 +1047,7 @@
                                , "HSecUnitID": dataArray[i].HSecUnitID
                                , "辅助单位": dataArray[i].辅助单位
                                , "HQty": dealDoubleToFixed(dataArray[i].数量, 1)
                                , "HQtyMust": dealDoubleToFixed(dataArray[i].数量, 1)
                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                , 'HDiscountRate': dataArray[i].折扣率                                                    //
                                , 'HRelTaxPrice': "0"
@@ -1097,14 +1099,14 @@
                    layer.msg("请选择仓库!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HKeeperID").val() == 0) {
                    layer.msg("请选择保管员!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HSecManagerID").val() == 0) {
                    layer.msg("请选择验收员!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if ($("#HKeeperID").val() == 0) {
                //    layer.msg("请选择保管员!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //if ($("#HSecManagerID").val() == 0) {
                //    layer.msg("请选择验收员!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                var num = [];
@@ -1710,6 +1712,35 @@
                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HMainSourceInterID": "0"
                            , "HMainSourceEntryID": "0"
                            , "HMainSourceBillNo": ""
                            , "HMainSourceBillType": $("#BillType").val()
                            , "HDeptID": checkStatus.data[0].HDeptID
                            , "HDeptName": checkStatus.data[0].部门
                            , "HManagerID": checkStatus.data[0].HManagerID
                            , "HManagerName": checkStatus.data[0].主管
                            , "HWHID": checkStatus.data[0].主表仓库ID == null ? 0 : checkStatus.data[0].主表仓库ID
                            , "HWHName": checkStatus.data[0].主表仓库
                            , "HEmpID": checkStatus.data[0].HEmpID
                            , "HEmpName": checkStatus.data[0].业务员
                            , "HSupID": checkStatus.data[0].HSupID
                            , "HSupName": checkStatus.data[0].供应商
                            //, "HSecManagerID": checkStatus.data[0].HSecManagerID
                            //, "HSecManagerName": checkStatus.data[0].验收员
                            //, "HKeeperID": checkStatus.data[0].HKeeperID
                            //, "HKeeperName": checkStatus.data[0].保管员
                            , "HCurID": checkStatus.data[0].HCurID
                            , "HCurName": checkStatus.data[0].币别
                            , "HExRate": checkStatus.data[0].汇率
                            /*, "HAddress": data.交货地点*/
                            , "HRemark": checkStatus.data[0].表头备注
                            , "HInnerBillNo": checkStatus.data[0].内部单据号
                        });
                        //layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //获取收料通知单代码
                        var ProcessNumber = [];
@@ -1727,8 +1758,8 @@
                                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].计量单位, 
                                    "HQty": checkStatus.data[j].数量-checkStatus.data[j].关联数量,"HQtyMust": checkStatus.data[j].应收数量, "HPrice": checkStatus.data[j].单价,
                                    "HMoney": checkStatus.data[j].金额,  "HTaxRate": checkStatus.data[j].税率, "HTaxMoney": checkStatus.data[j].税额,"HWHID": checkStatus.data[j].HWHID,
                                    "HQty": checkStatus.data[j].数量 - checkStatus.data[j].关联数量, "HQtyMust": checkStatus.data[j].数量 - checkStatus.data[j].关联数量, "HPrice": checkStatus.data[j].单价,
                                    "HMoney": (checkStatus.data[j].数量 - checkStatus.data[j].关联数量) * Number(checkStatus.data[j].单价), "HTaxRate": checkStatus.data[j].税率, "HTaxMoney": checkStatus.data[j].税额, "HWHID": checkStatus.data[j].HWHID,
                                    "收料仓库": checkStatus.data[j].收料仓库,"HSPID": checkStatus.data[j].HSPID,"仓位名称": checkStatus.data[j].仓位名称,"HSecUnitID": checkStatus.data[j].HSecUnitID,"辅助单位": checkStatus.data[j].辅助单位,
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid
                                })