仓库管理流程优化

zrg

2024-04-29 59db56126675dc926c2c203b4077ba13bcb38e63

仓库管理流程优化

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,12 +3,12 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Add_Edit_Kf_MoveStockBill.html

@@ -793,18 +793,19 @@

                                , "HEmpID": data[0]["HEmpID"]
                                , "HEmpName": data[0]["业务员"]
                                , "HWHID": data[0]["HWHID"]
                                , "HWHName": data[0]["调入仓库"]
                                , "HSCWHID": data[0]["HWHID"]
                                , "HSCWHName": data[0]["调出仓库"]
                                , "HSecManagerID": data[0]["HSecManagerID"]
                                , "HSecManagerName": data[0]["验收员"]
                                , "HKeeperID": data[0]["HKeeperID"]
                                , "HKeeperName": data[0]["保管员"]
                               
                                , "HDeptID": data[0]["HDeptID"]
                                , "HManagerID": data[0]["HManagerID"]
                                , "HMangerName": data[0]["主管"]

                                , "HWHID": data[0]["HWHID"]
                                , "HWHName": data[0]["调入仓库"]
                                , "HSCWHID": data[0]["HSCWHID"]
                                , "HSCWHName": data[0]["调出仓库"]
                               
                                
                                , "HExplanation": data[0]["HExplanation"]
                                , "HInvoiceBillNo": data[0]["发票编号"]
                                , "HProjectID": data[0]["HProjectID"]
@@ -1199,17 +1200,17 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length>0) {
                                        obj.update({
                                            "HMaterID": OptionData.HMaterID
                                            , "物料代码": OptionData.物料代码
                                            , "物料名称": OptionData.物料名称
                                            , "规格型号": OptionData.规格型号
                                            , "HUnitID": OptionData.HUnitID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                    //if (OptionData.length>0) {
                                    //    OptionData = [];
                                    //}
                                    obj.update({
                                        "HMaterID": OptionData.HItemID
                                        , "物料代码": OptionData.物料代码
                                        , "物料名称": OptionData.物料名称
                                        , "规格型号": OptionData.规格型号
                                        , "HUnitID": OptionData.HUnitID
                                        , "计量单位": OptionData.计量单位名称
                                    })
                                    
                                }
                            });
@@ -1242,14 +1243,13 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HPropertyID": OptionData.HItemID
                                            , "辅助属性": OptionData.辅助属性名称
                                        })
                                        OptionData = [];
                                    }
                                
                                    //if (OptionData.length > 0) {
                                    //    OptionData = [];
                                    //}
                                    obj.update({
                                        "HPropertyID": OptionData.HItemID
                                        , "辅助属性": OptionData.辅助属性名称
                                    })
                            }
                            })
                        }
@@ -1286,8 +1286,8 @@
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HUnitID": OptionData.HItemID
                                            , "计量单位": OptionData.计量单位名称
                                            "HUnitID": OptionData[0].HItemID
                                            , "计量单位": OptionData[0].计量单位名称
                                        })
                                        OptionData = [];
                                    }
@@ -1324,13 +1324,13 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HWHID": OptionData.HItemID
                                            , "调入仓库": OptionData.仓库名称
                                        })
                                        OptionData = [];
                                    }
                                    //if (OptionData.length > 0) {
                                    //    OptionData = [];
                                    //}
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "调入仓库": OptionData.仓库名称
                                    })
                                
                            }
                            })
@@ -1365,13 +1365,13 @@
                                        layer.close(index);//关闭弹窗
                                    }
                                    , end: function () {
                                        if (OptionData.length > 0) {
                                            obj.update({
                                                "HSCWHID": OptionData.HItemID
                                                , "调出仓库": OptionData.仓库名称
                                            })
                                            OptionData = [];
                                        }
                                        //if (OptionData.length > 0) {
                                        //    OptionData = [];
                                        //}
                                        obj.update({
                                            "HSCWHID": OptionData.HItemID
                                            , "调出仓库": OptionData.仓库名称
                                        })
                                       
                                    }
                                })
@@ -1399,19 +1399,19 @@
                                    //更新表格缓存的数据
                                    obj.update({
                                       
                                        "HSPID": checkStatus.data[0].HItemID,
                                        "HSPID": checkStatus.data[0].HMainID,
                                         "仓位名称": checkStatus.data[0].仓位名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HSPID": OptionData.HItemID
                                            , "仓位名称": OptionData.仓位名称
                                        })
                                        OptionData = [];
                                    }
                                    //if (OptionData.length > 0) {
                                    //    OptionData = [];
                                    //}
                                    obj.update({
                                        "HSPID": OptionData.HMainID
                                        , "仓位名称": OptionData.仓位名称
                                    })
                               
                            }
                            })
@@ -1625,6 +1625,7 @@
                       
                });
            });

            //判断所选着与表格是否有重复数据
            function checkDuplicateData(data) {
                const duplicates = [];
@@ -1792,7 +1793,7 @@
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
        function GetAuxiliaryUnitValue(data) {
             OptionData = data
         }

@@ -1807,7 +1808,7 @@
         } 

         //双击返回仓位
         function GetGyStockPlace(data) {
         function GetStockPlaceValue(data) {
             OptionData = data
         }
        //双击返回调入仓库

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBillList.html

@@ -368,6 +368,7 @@
                        , { field: 'hmainid', title: '单据ID', hide: true, sort: true }
                        , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                        , { field: '单据号', title: '单据号', width: 160, sort: true }
                        , { field: '状态', title: '状态', width: 160, sort: true }
                        , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true, sort: true }
                        , { field: '验收员代码', title: '验收员代码', width: 200, sort: true }
                        , { field: '验收员', title: '验收员', width: 160, sort: true }
@@ -490,28 +491,33 @@
                    var InterID = data[0].hmainid.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Kf_MoveStockBill/DelteteGetMoveStockBill", //方法所在页面和方法名
                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                        if (data[0].状态 =="创建") {
                            $.ajax({
                                type: "GET",
                                url: GetWEBURL() + "Kf_MoveStockBill/DelteteGetMoveStockBill", //方法所在页面和方法名
                                data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                        });

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                            });
                        } else {
                            layer.msg('此条数据不是创建状态,不能删除！');
                        }
                       
                    })
                }
                else {

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockRequestBillEdit.html

@@ -69,7 +69,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">日期</label>
                                            <label class="layui-form-label">日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
@@ -83,7 +83,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">往来单位</label>
                                            <label class="layui-form-label">往来单位<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -93,7 +93,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">业务员</label>
                                            <label class="layui-form-label">业务员<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -103,7 +103,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">主管</label>
                                            <label class="layui-form-label">主管<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -115,7 +115,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">调入仓库</label>
                                            <label class="layui-form-label">调入仓库<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -125,7 +125,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">调出仓库</label>
                                            <label class="layui-form-label">调出仓库<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -135,7 +135,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">验收</label>
                                            <label class="layui-form-label">验收<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -147,7 +147,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">保管员</label>
                                            <label class="layui-form-label">保管员<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -157,7 +157,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">部门</label>
                                            <label class="layui-form-label">部门<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -339,6 +339,27 @@
                        $("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //结算方式
                    }
                });
                //页面初始化加载
                $("#HDeptID").val(sessionStorage["HDeptID"]);
                $("#HDeptName").val(sessionStorage["HDept"]);

                //根据当前登录用户的部门 èŽ·å– ä¸»ç®¡
                if ($("#HDeptID").val() != 0) {
                    $.ajax({
                        url: GetWEBURL() + "Gy_Department/list",
                        async: false,
                        type: "GET",
                        data: {
                            "sWhere": "and HItemID = '" + $("#HDeptID").val() + "'", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
                        },
                        success: function (result) {
                            $("#HMangerID").val(result.data[0].HEmpID);
                            $("#HMangerName").val(result.data[0].负责人);
                        }, error: function () {
                            layer.alert("发生错误!", { icon: 5 });
                        }
                    });
                }
            } else {//如果修改则走下面 new
                $("#HInterID").val(linterid);
                RoadBillMain(linterid);
@@ -548,62 +569,61 @@
                //查询检验方案单是否存在
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/Cg_POOrderBill/cx",
                    url: GetWEBURL() + "/Kf_MoveStockRequestBill/cx",
                    type: "GET",
                    data: {
                        "HInterID": linterid
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            var data = result.data;
                            allVal = result.data[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
                                , "HSSDate": formatDate(data.结算日期)
                                //, "HInnerBillNo": data.内部单据号
                                , "HAddress": data.交货地点
                                , "HDeptName": data.部门
                                , "HDeptID": data.HDeptID
                                , "HSupID": data.HSupID
                                , "HSupName": data.供应商
                                , "HEmpID": data.HEmpID
                                , "HEmpName": data.业务员
                                , "HCurID": data.HCurID
                                , "HCurName": data.币别
                                , "HExRate": data.汇率
                                , "HManagerName": data.主管
                                , "HManagerID": data.HManagerID
                                , "HPSStyleID": data.HPSStyleID
                                , "HPSStyleName": data.采购方式
                                , "HSSID": data.HSSID
                                , "HSSName": data.结算方式
                                , "HLinkMan": data.联系人
                                , "HLinkPhone": data.联系电话
                                , "HInnerBillNo": data.辅助字段
                                , "HRemark": data.表头备注
                                , "HMaker": data.制单人
                                , "HChecker": data.审核人
                                , "HCloseMan": data.关闭人
                                , "HMakeDate": data.制单日期
                                , "HCheckDate": data.审核日期
                                , "HCloseDate": data.关闭日期
                                , "HUpDateDate": data.修改日期
                                , "HDeleteDate": data.作废日期
                                "HBillNo": data[0].单据号
                                , "HDate": formatDate(data[0].日期)
                                , "HDeptName": data[0].部门
                                , "HDeptID": data[0].HDeptID
                                , "HSupID": data[0].HSupID
                                , "HSupName": data[0].往来单位
                                , "HEmpID": data[0].HEmpID
                                , "HEmpName": data[0].业务员                             
                                , "HMangerName": data[0].主管
                                , "HMangerID": data[0].HMangerID
                                , "HSecManagerName": data[0].验收员
                                , "HSecManagerID": data[0].HSecManagerID
                                , "HKeeperName": data[0].保管员
                                , "HKeeperID": data[0].HKeeperID

                                , "HWHID": data[0].主调入仓库ID
                                , "HWHName": data[0].主调入仓库
                                , "HSCWHID": data[0].主调出仓库ID
                                , "HSCWHName": data[0].主调出仓库

                                , "HInnerBillNo": data[0].辅助字段
                                , "HRemark": data[0].表头备注
                                , "HMaker": data[0].制单人
                                , "HChecker": data[0].审核人
                                , "HCloseMan": data[0].关闭人
                                , "HMakeDate": data[0].制单日期
                                , "HCheckDate": data[0].审核日期
                                , "HCloseDate": data[0].关闭日期
                                , "HUpDateDate": data[0].修改日期
                                , "HDeleteDate": data[0].作废日期
                            });

                            //子表  èµ‹å€¼
                            var rowdata = [];
                            for (var i = 0; i < 1; i++) {
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HMaterID": data.HMaterID, "物料代码": data.物料代码, "物料名称": data.物料名称
                                        , "规格型号": data.规格型号, "HUnitID": data.HUnitID
                                        , "计量单位": data.计量单位, "HQty": data.数量, "HRemark": data.表体备注
                                        , "HPrice": data.单价, "HMoney": data.金额, "HTaxRate": data.税率
                                        , "HTaxMoney": data.金额 * data.税率, "HlineTotal": data.金额 + data.税额, "HlineTotalBB": (data.金额 + data.税额) * data.汇率
                                        , "HTaxPrice": data.含税单价, "HDiscountRate": data.折扣率, "HRelTaxPrice": data.实际含税单价
                                        , "HDate": Format(new Date(data.交货日期), "yyyy-MM-dd")
                                        "HMaterID": data[i].HMaterID, "物料代码": data[i].物料代码, "物料名称": data[i].物料名称, "规格型号": data[i].规格型号,
                                        "HUnitID": data[i].HUnitID, "计量单位": data[i].计量单位, "HSecUnitRate": data[i].换算率,
                                        "HSecUnitID": data[i].HSecUnitID, "辅助计量单位": data[i].辅助计量单位
                                        , "HQtyMust": data[i].应收数量, "HQty": data[i].实收数量, "HRemark": data[i].表体备注
                                        , "HPrice": data[i].单价, "HMoney": data[i].金额, "HOutPrice": data[i].调出单价, "HOutMoney": data[i].调出金额
                                        , "HWHID": data[i].HWHID, "调入仓库": data[i].调入仓库, "HSCWHID": data[i].HSCWHID, "调出仓库": data[i].调出仓库,
                                        "HBASEUNITID": data[i].HBASEUNITID, "基本计量单位": data[i].基本计量单位,
                                        "HEXTAUXUNITID": data[i].HEXTAUXUNITID, "辅单位": data[i].辅单位
                                    }
                                )
                            }
@@ -626,6 +646,43 @@

            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {

                if (OperationType == undefined) {
                    OperationType = 1;
                }

                if ($("#HWHID").val() == 0) {
                    layer.msg("请选择调入仓库！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HSCWHID").val() == 0) {
                    layer.msg("请选择调出仓库！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HManagerID").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 ($("#HEmpID").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 ($("#HSupID").val() == 0) {
                    layer.msg("请选择供应商！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HDeptID").val() == 0) {
                    layer.msg("请选择部门！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }

                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -704,7 +761,7 @@
                                }
                              , end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        "HMaterID": OptionData.HItemID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
@@ -722,7 +779,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -739,11 +796,14 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                                , end: function () {
                                    if (OptionData.length>0) {
                                        obj.update({
                                            "HUnitID": OptionData[0].HItemID
                                            , "计量单位": OptionData[0].计量单位名称
                                        })
                                    }
                               
                            }
                            })
                        }
@@ -757,7 +817,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -774,11 +834,14 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "辅助计量单位": OptionData.计量单位名称
                                })
                                , end: function () {
                                    if (OptionData.length>0) {
                                        obj.update({
                                            "HSecUnitID": OptionData[0].HItemID
                                            , "辅助计量单位": OptionData[0].计量单位名称
                                        })
                                    }
                                
                            }
                            })
                        } 
@@ -862,7 +925,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -879,11 +942,15 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                               , end: function () {
                                obj.update({
                                    "HBASEUNITID": OptionData.HItemID
                                    , "基本计量单位": OptionData.计量单位名称
                                })
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HBASEUNITID": OptionData[0].HItemID
                                            , "基本计量单位": OptionData[0].计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                
                            }
                            })
                        } 
@@ -897,7 +964,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -914,11 +981,14 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                obj.update({
                                    "HEXTAUXUNITID": OptionData.HItemID
                                    , "辅单位": OptionData.计量单位名称
                                })
                                , end: function () {
                                    if (OptionData.length>0) {
                                        obj.update({
                                            "HEXTAUXUNITID": OptionData[0].HItemID
                                            , "辅单位": OptionData[0].计量单位名称
                                        })
                                        OptionData = [];
                                     }
                            }
                            })
                        }
@@ -1168,12 +1238,30 @@
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
            if (option.data.length > 0) {
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["HWHID"] == 0) {
                        option.data[i]["HWHID"] = obj[0].HItemID;
                        option.data[i]["调入仓库"] = obj[0].仓库名称;
                    }
                }
            }
            layui.table.render(option);
        }

         function GetHSCWHValue(obj)  //返回调出仓库
        {
            $("#HSCWHName").val(obj[0].仓库名称);
            $("#HSCWHID").val(obj[0].HItemID);
             $("#HSCWHID").val(obj[0].HItemID);
             if (option.data.length > 0) {
                 for (var i = 0; i < option.data.length; i++) {
                     if (option.data[i]["HSCWHID"] == 0) {
                         option.data[i]["HSCWHID"] = obj[0].HItemID;
                         option.data[i]["调出仓库"] = obj[0].仓库名称;
                     }
                 }
             }
             layui.table.render(option);
        }

        function GetHDeptNameValue(obj)  //返回部门
@@ -1199,7 +1287,7 @@
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
        function GetAuxiliaryUnitValue(data) {
             OptionData = data
         }


 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockRequestBillList.html

@@ -178,7 +178,7 @@
                    case 'btn-Add': set_AddNew();
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                    case 'btn-Edit': set_ShowBill();
                        break;
                    //删除
                    case 'btn-Delete': set_DeleteBill();

 WebTM/views/²Ö´æ¹ÜÀí/·Ö²½Ê½µ÷Èëµ¥/Fb_StepFoldinBillEdit.html

@@ -564,70 +564,70 @@
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            var data = result.data;
                            allVal = result.data[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
                                "HBillNo": data[0].单据号
                                , "HDate": formatDate(data[0].日期)
                                /*, "HSSDate": formatDate(data.结算日期)*/
                                //, "HInnerBillNo": data.内部单据号
                                , "HAddress": data.交货地点
                                , "HDeptName": data.部门
                                , "HDeptID": data.HDeptID
                                , "HSupID": data.HSupID
                                , "HSupName": data.供应商
                                , "HEmpID": data.HEmpID
                                , "HEmpName": data.仓管员
                                , "HCurID": data.HCurID
                                , "HCurName": data.币别
                                , "HExRate": data.汇率
                                , "HWHID": data.HWHID
                                , "HWHName": data.调入仓库
                                , "HSCWHID": data.HSCWHID
                                , "HSCWHName": data.调出仓库
                                , "HManagerName": data.负责人
                                , "HManagerID": data.HManagerID
                                , "HSecManagerID": data.HSecManagerID
                                , "HSecManagerName": data.验收
                                , "HKeeperID": data.HKeeperID
                                , "HKeeperName": data.保管员
                                , "HPSStyleID": data.HPSStyleID
                                , "HPSStyleName": data.采购方式
                                , "HSourceBillType": data.源单类型
                                , "HSSID": data.HSSID
                                , "HSSName": data.结算方式
                                , "HLinkMan": data.联系人
                                , "HLinkPhone": data.联系电话
                                , "HInnerBillNo": data.辅助字段
                                , "HRemark": data.表头备注
                                , "HMaker": data.制单人
                                , "HMakeDate": data.制单日期
                                , "HUpDater": data.修改人
                                , "HUpDateDate": data.修改日期
                                , "HChecker": data.审核人
                                , "HCheckDate": data.审核日期
                                , "HCloseMan": data.关闭人
                                , "HCloseDate": data.关闭日期
                                , "HDeleteMan": data.作废人
                                , "HDeleteDate": data.作废日期
                                , "HAddress": data[0].交货地点
                                , "HDeptName": data[0].部门
                                , "HDeptID": data[0].HDeptID
                                , "HSupID": data[0].HSupID
                                , "HSupName": data[0].供应商
                                , "HEmpID": data[0].HEmpID
                                , "HEmpName": data[0].仓管员
                                , "HCurID": data[0].HCurID
                                , "HCurName": data[0].币别
                                , "HExRate": data[0].汇率
                                , "HWHID": data[0].HWHID
                                , "HWHName": data[0].调入仓库
                                , "HSCWHID": data[0].HSCWHID
                                , "HSCWHName": data[0].调出仓库
                                , "HManagerName": data[0].负责人
                                , "HManagerID": data[0].HManagerID
                                , "HSecManagerID": data[0].HSecManagerID
                                , "HSecManagerName": data[0].验收
                                , "HKeeperID": data[0].HKeeperID
                                , "HKeeperName": data[0].保管员
                                , "HPSStyleID": data[0].HPSStyleID
                                , "HPSStyleName": data[0].采购方式
                                , "HSourceBillType": data[0].源单类型
                                , "HSSID": data[0].HSSID
                                , "HSSName": data[0].结算方式
                                , "HLinkMan": data[0].联系人
                                , "HLinkPhone": data[0].联系电话
                                , "HInnerBillNo": data[0].辅助字段
                                , "HRemark": data[0].表头备注
                                , "HMaker": data[0].制单人
                                , "HMakeDate": data[0].制单日期
                                , "HUpDater": data[0].修改人
                                , "HUpDateDate": data[0].修改日期
                                , "HChecker": data[0].审核人
                                , "HCheckDate": data[0].审核日期
                                , "HCloseMan": data[0].关闭人
                                , "HCloseDate": data[0].关闭日期
                                , "HDeleteMan": data[0].作废人
                                , "HDeleteDate": data[0].作废日期
                            });

                            //子表  èµ‹å€¼
                            var rowdata = [];
                            for (var i = 0; i < 1; i++) {
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HMaterID": data.HMaterID, "物料代码": data.物料代码, "物料名称": data.物料名称
                                        , "规格型号": data.规格型号, "HUnitID": data.HUnitID
                                        , "计量单位": data.计量单位, "HQtyMust": data.应收数量, "HQty": data.实收数量, "HRemark": data.表体备注
                                        , "HPrice": data.单价, "HMoney": data.金额, "HOrderPrice": data.采购金额, "HWHID": data.HWHID, "调入仓库": data.调入仓库, "HSCWHID": data.HSCWHID, "调出仓库": data.调出仓库, "HTaxRate": data.税率
                                        , "HTaxMoney": data.金额 * data.税率, "HlineTotal": data.金额 + data.税额, "HlineTotalBB": (data.金额 + data.税额) * data.汇率
                                        , "HTaxPrice": data.含税单价, "HDiscountRate": data.折扣率, "HRelTaxPrice": data.实际含税单价
                                        , "HDate": Format(new Date(data.交货日期), "yyyy-MM-dd"), "HBatchNo": data.批次,
                                          "HSourceBillNo": data.源单单号,    //源单号
                                        "HSourceBillType": data.源单类型,   //源单类型
                                        "HSourceInterID": data.源单主内码,   //源单主内码
                                        "HSourceEntryID": data.源单子内码     //源单子内码
                                        "HMaterID": data[i].HMaterID, "物料代码": data[i].物料代码, "物料名称": data[i].物料名称
                                        , "规格型号": data[i].规格型号, "HUnitID": data[i].HUnitID
                                        , "计量单位": data[i].计量单位, "HQtyMust": data[i].应收数量, "HQty": data[i].实收数量, "HRemark": data[i].表体备注
                                        , "HPrice": data[i].单价, "HMoney": data[i].金额, "HOrderPrice": data[i].采购金额, "HWHID": data[i].HWHID, "调入仓库": data[i].调入仓库, "HSCWHID": data[i].HSCWHID, "调出仓库": data[i].调出仓库, "HTaxRate": data[i].税率
                                        , "HTaxMoney": data[i].金额 * data[i].税率, "HlineTotal": data[i].金额 + data[i].税额, "HlineTotalBB": (data[i].金额 + data[i].税额) * data[i].汇率
                                        , "HTaxPrice": data[i].含税单价, "HDiscountRate": data[i].折扣率, "HRelTaxPrice": data[i].实际含税单价
                                        , "HDate": Format(new Date(data[i].交货日期), "yyyy-MM-dd"), "HBatchNo": data[i].批次,
                                        "HSourceBillNo": data[i].源单单号,    //源单号
                                        "HSourceBillType": data[i].源单类型,   //源单类型
                                        "HSourceInterID": data[i].源单主内码,   //源单主内码
                                        "HSourceEntryID": data[i].源单子内码     //源单子内码
                                    }
                                )
                            }
@@ -759,17 +759,17 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length>0) {
                                        obj.update({
                                            "HMaterID": OptionData.HMaterID
                                            , "物料代码": OptionData.物料代码
                                            , "物料名称": OptionData.物料名称
                                            , "规格型号": OptionData.规格型号
                                            , "HUnitID": OptionData.HUnitID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                    //if (OptionData.length>0) {
                                    //    OptionData = [];
                                    //}
                                    obj.update({
                                        "HMaterID": OptionData.HItemID
                                        , "物料代码": OptionData.物料代码
                                        , "物料名称": OptionData.物料名称
                                        , "规格型号": OptionData.规格型号
                                        , "HUnitID": OptionData.HUnitID
                                        , "计量单位": OptionData.计量单位名称
                                    })
                                    
                                }
                            })
@@ -784,7 +784,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -804,8 +804,8 @@
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HUnitID": OptionData.HItemID
                                            , "计量单位": OptionData.计量单位名称
                                            "HUnitID": OptionData[0].HItemID
                                            , "计量单位": OptionData[0].计量单位名称
                                        })
                                        OptionData = [];
                                    }
@@ -880,13 +880,13 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HWHID": OptionData.HItemID
                                            , "调入仓库": OptionData.仓库名称
                                        })
                                        OptionData = [];
                                    }
                                    //if (OptionData.length > 0) {
                                    //    OptionData = [];
                                    //}
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "调入仓库": OptionData.仓库名称
                                    })
                                
                            }
                            })
@@ -919,13 +919,13 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HSCWHID": OptionData.HItemID
                                            , "调出仓库": OptionData.仓库名称
                                        })
                                        OptionData = [];
                                    }
                                    //if (OptionData.length > 0) {
                                    //    OptionData = [];
                                    //}
                                    obj.update({
                                        "HSCWHID": OptionData.HItemID
                                        , "调出仓库": OptionData.仓库名称
                                    })
                               
                            }
                            })
@@ -1399,7 +1399,7 @@
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
        function GetAuxiliaryUnitValue(data) {
             OptionData = data
         }


 WebTM/views/²Ö´æ¹ÜÀí/·Ö²½Ê½µ÷Èëµ¥/Fb_StepFoldinBillList.html

@@ -267,6 +267,7 @@
                        , { field: '日期', title: '日期', width: 125, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '单据号', title: '单据号', width: 195, sort: true }
                        , { field: '单据类型', title: '单据类型', width: 110, sort: true, hide: true }
                        , { field: '状态', title: '状态', width: 195, sort: true }
                        , { field: '物料代码', title: '物料代码', width: 110, sort: true }
                        , { field: '物料名称', title: '物料名称', width: 110, sort: true }
                        , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true, sort: true }
@@ -412,31 +413,36 @@
                    var InterID = data[0].hmainid.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Fb_StepFoldInBill/DeltetFb_StepFoldInBill", //方法所在页面和方法名
                            data: { "HInterID": InterID },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                        if (data[0].状态=="创建") {
                            var wait = layer.load();
                            $.ajax({
                                type: "GET",
                                url: GetWEBURL() + "/Fb_StepFoldInBill/DeltetFb_StepFoldInBill", //方法所在页面和方法名
                                data: { "HInterID": InterID },
                                success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                        });

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                    layer.close(wait);
                                }, error: function () {
                                    layer.close(wait);
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                                layer.close(wait);
                            }, error: function () {
                                layer.close(wait);
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                            });
                        } else {
                            layer.msg('此数据不是创建状态,无法删除！');
                        }
                       
                    })
                }
                else {

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

@@ -100,56 +100,46 @@
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">采购部门</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hdeptlist" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">业务员</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName"  class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">主管</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                        <div class="layui-inline"style="width:625px">
                                            <label class="layui-form-label">供应商<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 505px" readonly>
                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 505px;">
                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">采购部门<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px; " readonly>
                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>-->
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">业务员<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">币别</label>
                                            <label class="layui-form-label">币别<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>-->
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -159,27 +149,37 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">采购方式</label>
                                            <label class="layui-form-label">采购方式<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="text" name="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HPSStyleID" id="HPSStyleID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hsellslist" style="width:40px;">
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>-->
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HPSStyleList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">结算方式<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>-->
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">主管</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">付款日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-block">
@@ -498,9 +498,9 @@
                }
                //#endregion

                //if (AllowLoadData(data)) {
                if (AllowLoadData(data)) {
                    set_SaveBill(data);
                //}
                }
            });
            //#endregion
            //#endregion
@@ -759,7 +759,7 @@
                    }
                });
            }
            ////#endregion
            //#endregion

            //#region å¼¹çª—选择方法
            //#region é€‰æ‹©é‡‡è´­éƒ¨é—¨
@@ -770,7 +770,19 @@
                    , area: ['90%', '90%']//大小
                    , title: '采购部门列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.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('请选择数据');
                        }
                        $("#HDeptName").val(checkStatus.data[0].部门名称);
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
@@ -783,7 +795,19 @@
                    , area: ['90%', '90%']//大小
                    , title: '采购主管列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HManager', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', '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('请选择数据');
                        }
                        $("#HMangerName").val(checkStatus.data[0].职员名称);
                        $("#HMangerID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
@@ -796,7 +820,19 @@
                    , area: ['90%', '90%']//大小
                    , title: '业务员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', '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('请选择数据');
                        }
                        $("#HEmpName").val(checkStatus.data[0].职员名称);
                        $("#HEmpID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
@@ -822,7 +858,20 @@
                    , area: ['90%', '90%']//大小
                    , title: '采购方式列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_PoStockStyle.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_PoStockStyle.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('请选择数据');
                        }
                    
                        $("#HPSStyleName").val(checkStatus.data[0].采购方式名称);
                        $("#HPSStyleID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
@@ -835,7 +884,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '结算方式列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_SettleStyle.html', 'yes']
                    , content: ['../../基础资料/基础资料/Gy_SettleStyle.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -843,7 +892,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HSSName").val(checkStatus.data[0].HName);
                        $("#HSSName").val(checkStatus.data[0].结算方式名称);
                        $("#HSSID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
@@ -2303,6 +2352,42 @@
                return res;
            }
            //#endregion

            //#region ä¿å­˜æ–¹æ³•æ ¡éªŒ
            function AllowLoadData(data) {
                if ($("#HCurID").val() == 0) {
                    layer.msg("请选择币别！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HExRate").val() == 0) {
                    layer.msg("请输入汇率！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HEmpID").val() == 0) {
                    layer.msg("请选择业务员员！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HDeptID").val() == 0) {
                    layer.msg("请选择采购部门！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HSupID").val() == 0) {
                    layer.msg("请选择供应商！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HPSStyleID").val() == 0) {
                    layer.msg("请选择采购方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HSSID").val() == 0) {
                    layer.msg("请选择结算方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                return true;
            }

            //endregion

            //#endregion


@@ -2311,7 +2396,7 @@
        // åŸºç¡€èµ„料返回数据
        function GetHEmpValue(obj)  //返回业务员
        {
            $("#HEmpName").val(obj[0].HName);
            $("#HEmpName").val(obj[0].职员名称);
            $("#HEmpID").val(obj[0].HItemID);
        }

@@ -2323,25 +2408,25 @@

        function GetHManagerValue(obj)  //返回主管
        {
            $("#HMangerName").val(obj[0].HName);
            $("#HMangerName").val(obj[0].职员名称);
            $("#HMangerID").val(obj[0].HItemID);
        }

        function GetHDeptNameValue(obj)  //返回部门
        {
            $("#HDeptName").val(obj[0].HName);
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

        function GetHPSStyleValue(obj)  //返回采购方式
        function GetHPSStyleNameValue(obj)  //返回采购方式
        {
            $("#HSellSName").val(obj[0].HName);
            $("#HSellSID").val(obj[0].HItemID);
            $("#HPSStyleName").val(obj[0].采购方式名称);
            $("#HPSStyleID").val(obj[0].HItemID);
        }

        function GetSettleStyleValue(obj)           //返回结算方式
        {
            $("#HSSName").val(obj[0].HName);
            $("#HSSName").val(obj[0].结算方式名称);
            $("#HSSID").val(obj[0].HItemID);
        }


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

@@ -947,9 +947,9 @@
                }
                //#endregion

                //if (AllowLoadData(data)) {
                if (AllowLoadData(data)) {
                    set_SaveBill(data);
                //}
                }
            });
            //#endregion
       

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

@@ -1056,10 +1056,6 @@
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    //if (checkStatus.data.length != 1) {
                                    //    return layer.msg("请选择一条数据");
                                    //}

                                      OptionData = checkStatus.data[0];
                                    var rowIndex = $(obj.tr).attr("data-index") * 1;
                                    for (var i = 0; i < checkStatus.data.length; i++) {
@@ -1532,7 +1528,7 @@
         }

            //双击返回物料
         function GetGyMaterial(data) {
        function GetGyMaterial(data) {
             OptionData = data
        }
        //项目

 WebTM/views/ÁìÁÏ·¢»õ/·Ö²½Ê½µ÷³öµ¥/Fb_StepFoldOutBillEdit.html

@@ -68,7 +68,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">日期</label>
                                            <label class="layui-form-label">日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
@@ -81,18 +81,18 @@
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">供应商</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
                                        <div class="layui-col-xs4 layui-inline" style="width: 542px">
                                            <label class="layui-form-label">供应商<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline" style="width: 420px">
                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:380px;">
                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 380px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">仓管员</label>
                                            <label class="layui-form-label">仓管员<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -102,7 +102,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">负责人</label>
                                            <label class="layui-form-label">负责人<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -114,7 +114,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">调入仓库</label>
                                            <label class="layui-form-label">调入仓库<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -124,7 +124,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">调出仓库</label>
                                            <label class="layui-form-label">调出仓库<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -134,7 +134,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">验收</label>
                                            <label class="layui-form-label">验收<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -146,7 +146,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">保管员</label>
                                            <label class="layui-form-label">保管员<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -156,7 +156,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">部门</label>
                                            <label class="layui-form-label">部门<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -332,6 +332,27 @@
                       /* $("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //结算方式*/
                    }
                });
                //页面初始化加载
                $("#HDeptID").val(sessionStorage["HDeptID"]);
                $("#HDeptName").val(sessionStorage["HDept"]);
               
                //根据当前登录用户的部门 èŽ·å– ä¸»ç®¡
                if ($("#HDeptID").val() != 0) {
                    $.ajax({
                        url: GetWEBURL() + "Gy_Department/list",
                        async: false,
                        type: "GET",
                        data: {
                            "sWhere": "and HItemID = '" + $("#HDeptID").val() + "'", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
                        },
                        success: function (result) {
                            $("#HManagerID").val(result.data[0].HEmpID);
                            $("#HManagerName").val(result.data[0].负责人);
                        }, error: function () {
                            layer.alert("发生错误!", { icon: 5 });
                        }
                    });
                }
            } else {//如果修改则走下面 new
                $("#HInterID").val(linterid);
                RoadBillMain(linterid);
@@ -540,65 +561,65 @@
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            var data = result.data;
                            allVal = result.data[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
                                "HBillNo": data[0].单据号
                                , "HDate": formatDate(data[0].日期)
                                /*, "HSSDate": formatDate(data.结算日期)*/
                                //, "HInnerBillNo": data.内部单据号
                                , "HAddress": data.交货地点
                                , "HDeptName": data.部门
                                , "HDeptID": data.HDeptID
                                , "HSupID": data.HSupID
                                , "HSupName": data.供应商
                                , "HEmpID": data.HEmpID
                                , "HEmpName": data.仓管员
                                , "HCurID": data.HCurID
                                , "HCurName": data.币别
                                , "HExRate": data.汇率
                                , "HWHID": data.HWHID
                                , "HWHName": data.调入仓库
                                , "HSCWHID": data.HSCWHID
                                , "HSCWHName": data.调出仓库
                                , "HManagerName": data.负责人
                                , "HManagerID": data.HManagerID
                                , "HSecManagerID": data.HSecManagerID
                                , "HSecManagerName": data.验收
                                , "HKeeperID": data.HKeeperID
                                , "HKeeperName": data.保管员
                                , "HPSStyleID": data.HPSStyleID
                                , "HPSStyleName": data.采购方式
                                , "HSSID": data.HSSID
                                , "HSSName": data.结算方式
                                , "HLinkMan": data.联系人
                                , "HLinkPhone": data.联系电话
                                , "HInnerBillNo": data.辅助字段
                                , "HRemark": data.表头备注
                                , "HMaker": data.制单人
                                , "HMakeDate": data.制单日期 
                                , "HUpDater": data.修改人
                                , "HUpDateDate": data.修改日期 
                                , "HChecker": data.审核人
                                , "HCheckDate": data.审核日期 
                                , "HCloseMan": data.关闭人
                                , "HCloseDate": data.关闭日期
                                , "HDeleteMan": data.作废人
                                , "HDeleteDate": data.作废日期
                                , "HAddress": data[0].交货地点
                                , "HDeptName": data[0].部门
                                , "HDeptID": data[0].HDeptID
                                , "HSupID": data[0].HSupID
                                , "HSupName": data[0].供应商
                                , "HEmpID": data[0].HEmpID
                                , "HEmpName": data[0].仓管员
                                , "HCurID": data[0].HCurID
                                , "HCurName": data[0].币别
                                , "HExRate": data[0].汇率
                                , "HWHID": data[0].HWHID
                                , "HWHName": data[0].调入仓库
                                , "HSCWHID": data[0].HSCWHID
                                , "HSCWHName": data[0].调出仓库
                                , "HManagerName": data[0].负责人
                                , "HManagerID": data[0].HManagerID
                                , "HSecManagerID": data[0].HSecManagerID
                                , "HSecManagerName": data[0].验收
                                , "HKeeperID": data[0].HKeeperID
                                , "HKeeperName": data[0].保管员
                                , "HPSStyleID": data[0].HPSStyleID
                                , "HPSStyleName": data[0].采购方式
                                , "HSSID": data[0].HSSID
                                , "HSSName": data[0].结算方式
                                , "HLinkMan": data[0].联系人
                                , "HLinkPhone": data[0].联系电话
                                , "HInnerBillNo": data[0].辅助字段
                                , "HRemark": data[0].表头备注
                                , "HMaker": data[0].制单人
                                , "HMakeDate": data[0].制单日期
                                , "HUpDater": data[0].修改人
                                , "HUpDateDate": data[0].修改日期
                                , "HChecker": data[0].审核人
                                , "HCheckDate": data[0].审核日期
                                , "HCloseMan": data[0].关闭人
                                , "HCloseDate": data[0].关闭日期
                                , "HDeleteMan": data[0].作废人
                                , "HDeleteDate": data[0].作废日期
                            });

                            //子表  èµ‹å€¼
                            var rowdata = [];
                            for (var i = 0; i < 1; i++) {
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HMaterID": data.HMaterID, "物料代码": data.物料代码, "物料名称": data.物料名称
                                        , "规格型号": data.规格型号, "HUnitID": data.HUnitID
                                        , "计量单位": data.计量单位, "HQtyMust": data.HQtyMust, "HQtyMust": data.应收数量, "HQty": data.实收数量, "HRemark": data.表体备注
                                        , "HPrice": data.单价, "HMoney": data.金额, "HOrderPrice": data.采购金额, "HWHID": data.HWHID, "调入仓库": data.调入仓库, "HSCWHID": data.HSCWHID, "调出仓库": data.调出仓库, "HTaxRate": data.税率
                                        , "HTaxMoney": data.金额 * data.税率, "HlineTotal": data.金额 + data.税额, "HlineTotalBB": (data.金额 + data.税额) * data.汇率
                                        , "HTaxPrice": data.含税单价, "HDiscountRate": data.折扣率, "HRelTaxPrice": data.实际含税单价
                                        , "HDate": Format(new Date(data.交货日期), "yyyy-MM-dd"),"HBatchNo":data.批次
                                        "HMaterID": data[i].HMaterID, "物料代码": data[i].物料代码, "物料名称": data[i].物料名称
                                        , "规格型号": data[i].规格型号, "HUnitID": data[i].HUnitID
                                        , "计量单位": data[i].计量单位, "HQtyMust": data[i].HQtyMust, "HQtyMust": data[i].应收数量, "HQty": data[i].实收数量, "HRemark": data[i].表体备注
                                        , "HPrice": data[i].单价, "HMoney": data[i].金额, "HOrderPrice": data[i].采购金额, "HWHID": data[i].HWHID, "调入仓库": data[i].调入仓库, "HSCWHID": data[i].HSCWHID, "调出仓库": data[i].调出仓库, "HTaxRate": data[i].税率
                                        , "HTaxMoney": data[i].金额 * data[i].税率, "HlineTotal": data[i].金额 + data[i].税额, "HlineTotalBB": (data[i].金额 + data.税额) * data[i].汇率
                                        , "HTaxPrice": data[i].含税单价, "HDiscountRate": data[i].折扣率, "HRelTaxPrice": data[i].实际含税单价
                                        , "HDate": Format(new Date(data[i].交货日期), "yyyy-MM-dd"), "HBatchNo": data[i].批次
                                    }
                                )
                            }
@@ -626,13 +647,34 @@
                    layer.msg("请选择调入仓库！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }

                if ($("#HSCWHID").val() == 0) {
                    layer.msg("请选择调出仓库！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }


                if ($("#HManagerID").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 ($("#HEmpID").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 ($("#HSupID").val() == 0) {
                    layer.msg("请选择供应商！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HDeptID").val() == 0) {
                    layer.msg("请选择部门！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                    if (table.cache["mainTable"][i] != "") {
@@ -711,17 +753,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length>0) {
                                        obj.update({
                                            "HMaterID": OptionData.HItemID
                                            , "物料代码": OptionData.物料代码
                                            , "物料名称": OptionData.物料名称
                                            , "规格型号": OptionData.规格型号
                                            , "HUnitID": OptionData.HUnitID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                    obj.update({
                                        "HMaterID": OptionData.HItemID
                                        , "物料代码": OptionData.物料代码
                                        , "物料名称": OptionData.物料名称
                                        , "规格型号": OptionData.规格型号
                                        , "HUnitID": OptionData.HUnitID
                                        , "计量单位": OptionData.计量单位名称
                                    })
                                   
                                }
                            })
@@ -736,7 +775,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -756,8 +795,8 @@
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HUnitID": OptionData.HItemID
                                            , "计量单位": OptionData.计量单位名称
                                            "HUnitID": OptionData[0].HItemID
                                            , "计量单位": OptionData[0].计量单位名称
                                        })
                                        OptionData = [];
                                    }
@@ -832,13 +871,13 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HWHID": OptionData.HItemID
                                            , "调入仓库": OptionData.仓库名称
                                        })
                                        OptionData = [];
                                    }
                                    //if (OptionData.length > 0) {
                                    //    OptionData = [];
                                    //}
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "调入仓库": OptionData.仓库名称
                                    })
                                   
                                }
                            })
@@ -871,13 +910,13 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HSCWHID": OptionData.HItemID
                                            , "调出仓库": OptionData.仓库名称
                                        })
                                        OptionData = [];
                                    }
                                    //if (OptionData.length > 0) {
                                    //    OptionData = [];
                                    //}
                                    obj.update({
                                        "HSCWHID": OptionData.HItemID
                                        , "调出仓库": OptionData.仓库名称
                                    })

                                
                            }
@@ -907,7 +946,7 @@
                    });
                }
            }

            //仓管员
            function get_checkEmp() {
                layer.open({
                    type: 2//弹窗类型
@@ -930,7 +969,7 @@
                    , btn2: function (index, layero) { }
                })
            }

            //供应商
            function get_checkSup() {
                layer.open({
                    type: 2//弹窗类型
@@ -953,7 +992,7 @@
                    , btn2: function (index, layero) { }
                })
            }

            //验收人
            function get_checkSecManager() {
                layer.open({
                    type: 2//弹窗类型
@@ -976,7 +1015,7 @@
                    , btn2: function (index, layero) { }
                })
            }

            //部门
            function get_checkDept() {
                layer.open({
                    type: 2//弹窗类型
@@ -999,7 +1038,7 @@
                    , btn2: function (index, layero) { }
                })
            }

            //负责人
            function get_checkManager() {
                layer.open({
                    type: 2//弹窗类型
@@ -1022,7 +1061,7 @@
                    , btn2: function (index, layero) { }
                })
            }

            //保管员
            function get_checkKeeper() {
                layer.open({
                    type: 2//弹窗类型
@@ -1045,6 +1084,7 @@
                    , btn2: function (index, layero) { }
                })
            }
            //调入仓库
            function get_checkWH() {
                layer.open({
                    type: 2//弹窗类型
@@ -1067,7 +1107,7 @@
                    , btn2: function (index, layero) { }
                })
            }

            //调出仓库
            function get_checkSCWH() {
                layer.open({
                    type: 2//弹窗类型
@@ -1127,12 +1167,30 @@
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
            if (option.data.length > 0) {
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["HWHID"] == 0) {
                        option.data[i]["HWHID"] = obj[0].HItemID;
                        option.data[i]["调入仓库"] = obj[0].仓库名称;
                    }
                }
            }
            layui.table.render(option);
        }

      
         function GetHSCWHValue(obj)  //返回调出仓库
        {
            $("#HSCWHName").val(obj[0].仓库名称);
            $("#HSCWHID").val(obj[0].HItemID);
             $("#HSCWHID").val(obj[0].HItemID);
             if (option.data.length > 0) {
                 for (var i = 0; i < option.data.length; i++) {
                     if (option.data[i]["HSCWHID"] == 0) {
                         option.data[i]["HSCWHID"] = obj[0].HItemID;
                         option.data[i]["调出仓库"] = obj[0].仓库名称;
                     }
                 }
             }
             layui.table.render(option);
        }

        function GetHDeptNameValue(obj)  //返回部门
@@ -1155,10 +1213,10 @@

          //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
             OptionData = data;
         }
           //双击返回计量单位
         function GetGyUnit(data) {
        function GetAuxiliaryUnitValue(data) {
             OptionData = data
         }


 WebTM/views/ÁìÁÏ·¢»õ/·Ö²½Ê½µ÷³öµ¥/Fb_StepFoldOutBillList.html

@@ -439,31 +439,36 @@
                    var InterID = data[0].hmainid.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Fb_StepFoldOutBill/DeltetFb_StepFoldOutBill", //方法所在页面和方法名
                            data: { "HInterID": InterID },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                        if (data[0].状态 == "创建") {
                            var wait = layer.load();
                            $.ajax({
                                type: "GET",
                                url: GetWEBURL() + "/Fb_StepFoldOutBill/DeltetFb_StepFoldOutBill", //方法所在页面和方法名
                                data: { "HInterID": InterID },
                                success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                        });

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                    layer.close(wait);
                                }, error: function () {
                                    layer.close(wait);
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                                layer.close(wait);
                            }, error: function () {
                                layer.close(wait);
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                            });
                        } else {
                            layer.msg('此条数据不是创建状态,不可删除！');
                        }
                      
                    })
                }
                else {

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

@@ -1012,9 +1012,9 @@
                }
                //#endregion

                //if (AllowLoadData(data)) {
                if (AllowLoadData(data)) {
                    set_SaveBill(data);
                //}
                }
            });
            //#endregion

@@ -1964,7 +1964,7 @@
            //#endregion


         //#region æ ¹æ®ä¸»å†…码与子内码获取源单采购订单数据
            //#region æ ¹æ®ä¸»å†…码与子内码获取源单采购订单数据
            function getPushSource_POOrderBillInit(HSourceInterID, HSourceEntryID) {
                var res = "none";
                $.ajax({
@@ -1992,7 +1992,7 @@
            //#endregion


        //#region æ ¹æ®ä¸»å†…码与子内码获取源单收料通知单数据
            //#region æ ¹æ®ä¸»å†…码与子内码获取源单收料通知单数据
            function getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID) {
                var res = "none";
                $.ajax({
@@ -2018,6 +2018,50 @@
                return res;
            }
            //#endregion

            //#region ä¿å­˜æ–¹æ³•æ ¡éªŒ
            function AllowLoadData(data) {
                if ($("#HWHID").val() == 0) {
                    layer.msg("请选择仓库！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HManagerID").val() == 0) {
                    layer.msg("请选择负责人！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HEmpID").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;
                }
                if ($("#HDeptID").val() == 0) {
                    layer.msg("请选择部门！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HSupID").val() == 0) {
                    layer.msg("请选择供应商！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HPSStyleID").val() == 0) {
                    layer.msg("请选择采购方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HSSID").val() == 0) {
                    layer.msg("请选择结算方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                return true;
            }

            //endregion

            //#endregion