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

yusijie

2024-04-19 6af1928d442ad9d422438ba4827876d1a3e82c43

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

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

@@ -237,11 +237,28 @@
                                        </div>
                                    </div>        
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">备注</label>
                                            <div class="layui-input-block">
                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">项目代码</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" lay-verify="HProjectNumber" name="HProjectNumber" id="HProjectNumber" value="" style="background-color: #efefef4d;float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjectID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" 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>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HProjectName" id="HProjectName" autocomplete="off" readonly>
                                            </div>
                                           
                                        </div>
                                    </div>
                                </div>
@@ -368,6 +385,7 @@
            var shijian = year + "-" + month + "-" + day;

            var allVal;
           
            //#endregion


@@ -375,7 +393,7 @@

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            get_LoginIs();

            window.OptionData = {};
            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "1402";
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
@@ -508,7 +526,10 @@
            form.on('submit(HManagerList)', function () {
                get_checkManager();
            });

            //项目代码
            form.on('submit(btnSearchHProNumber)', function () {
                get_checkSearchHProNumber();
            });

            //保存按钮
            form.on('submit(Saver)', function (data) {
@@ -680,13 +701,16 @@
                                ,"HWHID": "0"
                                , "发货仓库": ""
                                , "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""

                            
                                , "HSourceBillNo": checkStatus.data[i].单据号
                                , "HSourceBillType": checkStatus.data[i].HBillType
                                , "HSourceInterID": checkStatus.data[i].hmainid
                                , "HSourceEntryID": checkStatus.data[i].hsubid
                            })
                        }
                        $("#HProjectID").val(checkStatus.data[0].HProjectID);
                        $("#HProjectNumber").val(checkStatus.data[0].项目编码);
                        $("#HProjectName").val(checkStatus.data[0].项目名称);
                        table.render(option);
                        layer.close(index);//关闭弹窗
                    }
@@ -788,6 +812,10 @@
                                //, "HConveyTypeID": data.运输方式
                                //, "HConveyMoney": data.运费
                                //, "HDFflag": data.是否垫付
                                , "HProjectID": data.HProjectID
                                , "HProjectNumber": data.项目编码
                                , "HProjectName": data.项目名称

                                , "Box2": ""
                                , "HRemark": data.表头备注
                                , "HMaker": data.制单人
@@ -994,7 +1022,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=HWHSub', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1006,10 +1034,17 @@
                                    }
                                    //更新表格缓存的数据
                                    obj.update({

                                        "HWHID": checkStatus.data[0].HItemID,
                                        "发货仓库": checkStatus.data[0].仓库名称
                                        , "HWHID": checkStatus.data[0].HItemID
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "发货仓库": OptionData.仓库名称
                                    })
                                }
                            })
                        }
@@ -1089,7 +1124,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1099,6 +1134,16 @@
                        }
                        $("#HWHName").val(checkStatus.data[0].仓库名称);
                        $("#HWHID").val(checkStatus.data[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"] = checkStatus.data[0].HItemID;
                                    option.data[i]["发货仓库"] = checkStatus.data[0].仓库名称;
                                }
                            }
                        }
                        table.render(option);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -1173,6 +1218,43 @@
                })
            }

            //项目代码
            function get_checkSearchHProNumber() {
                var HOrgID = $("#HOrgID").val();
                //打开工程项目小窗体
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim"                           //加上边框
                    , title: "工程项目列表"                             //标题
                    , closeBtn: 1                                       //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2                                          //弹出动画
                    , area: ["90%", "90%"]                              //窗体大小
                    , maxmin: true                                      //设置最大最小按钮是否显示
                    , content: ["../../项目管理/工程项目/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

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

                        //判断项目是否关闭
                        if (checkStatus.data[0].关闭人 == null || checkStatus.data[0].关闭人 == "") {
                            $("#HProjectID").val(checkStatus.data[0].HInterID);
                            $("#HProjectNumber").val(checkStatus.data[0].项目代码);//工程项目代码
                            $("#HProjectName").val(checkStatus.data[0].项目名称);//工程项目代码
                        } else {
                            layer.msg("该项目已关闭，不可选择！");
                        }
                        layer.close(index);//关闭弹窗
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#region èŽ·å–源单类型
            function HSourceBillType() {
                var HName = '发货通知单';
@@ -1236,11 +1318,37 @@
        //    $("#HDeptID").val(obj[0].HItemID);
        //}

        //function GetHWHValue(obj)  //返回仓库
        //{
        //    $("#HWHName").val(obj[0].HName);
        //    $("#HWHID").val(obj[0].HItemID);
        //}
        //项目代码
        function GetProjectBillValue(obj) {
            if (obj[0].关闭人 == null || obj[0].关闭人 == "") {
                $("#HProjectID").val(obj[0].HInterID);
                $("#HProjectNumber").val(obj[0].项目代码);//工程项目代码
                $("#HProjectName").val(obj[0].项目名称);//工程项目代码

            } else {
                layer.msg("该项目已关闭，不可选择！");
            }
        }

        //双击返回仓库
        function GetHWHSubValue(data) {
            OptionData = data[0]
        }

        function GetHWHValue(obj)  //返回仓库
        {
            $("#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]["发货仓库"] == undefined) {
                        option.data[i]["HWHID"] = obj[0].HItemID;
                        option.data[i]["发货仓库"] = obj[0].仓库名称;
                    }
                }
            }
            layui.table.render(option);
        }
    </script>
</body>
</html>

 WebTM/views/ÏúÊÛ¹ÜÀí/ÍË»õ֪ͨµ¥/Xs_SeOutStockBackBill.html

@@ -194,6 +194,23 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">项目代码</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" lay-verify="HProjectNumber" name="HProjectNumber" id="HProjectNumber" value="" style="background-color: #efefef4d;float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjectID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" 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>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HProjectName" id="HProjectName" autocomplete="off" readonly>
                                            </div>

                                        </div>
                                        <div class="layui-col-xs4 layui-inline" style="display:none">
                                            <label class="layui-form-label">内部单据号</label>
                                            <div class="layui-input-inline">
@@ -482,6 +499,10 @@
            form.on('submit(HConveyCompList)', function () {
                get_checkConveyComp();
            });
            //项目代码
            form.on('submit(btnSearchHProNumber)', function () {
                get_checkSearchHProNumber();
            });


            //保存按钮
@@ -600,6 +621,9 @@
                                , "HSourceEntryID": checkStatus.data[i].hsubid
                            })
                        }
                        $("#HProjectID").val(checkStatus.data[0].HProjectID);
                        $("#HProjectNumber").val(checkStatus.data[0].项目编码);
                        $("#HProjectName").val(checkStatus.data[0].项目名称);
                        table.render(option);
                        layer.close(index);//关闭弹窗
                    }
@@ -696,6 +720,9 @@
                                , "HCusID": data.HCusID
                                , "HCusName": data.客户
                                , "HAddress": data.交货地点
                                , "HProjectID": data.HProjectID
                                , "HProjectNumber": data.项目编码
                                , "HProjectName": data.项目名称
                                , "HRemark": data.表头备注
                                , "HExplanation": data.摘要
                                , "HSourceBillType": data.源单类型                             
@@ -884,7 +911,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=HWHSub', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -896,10 +923,17 @@
                                    }
                                    //更新表格缓存的数据
                                    obj.update({

                                        "HWHID": checkStatus.data[0].HItemID,
                                        "收货仓库": checkStatus.data[0].仓库名称
                                        , "HWHID": checkStatus.data[0].HItemID
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "收货仓库": OptionData.仓库名称
                                    })
                                }
                            })
                        }
@@ -1009,7 +1043,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1019,6 +1053,16 @@
                        }
                        $("#HWHName").val(checkStatus.data[0].仓库名称);
                        $("#HWHID").val(checkStatus.data[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"] = checkStatus.data[0].HItemID;
                                    option.data[i]["发货仓库"] = checkStatus.data[0].仓库名称;
                                }
                            }
                        }
                        table.render(option);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -1161,6 +1205,44 @@
                })
            }

            //项目代码
            function get_checkSearchHProNumber() {
                var HOrgID = $("#HOrgID").val();
                //打开工程项目小窗体
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim"                           //加上边框
                    , title: "工程项目列表"                             //标题
                    , closeBtn: 1                                       //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2                                          //弹出动画
                    , area: ["90%", "90%"]                              //窗体大小
                    , maxmin: true                                      //设置最大最小按钮是否显示
                    , content: ["../../项目管理/工程项目/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

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

                        //判断项目是否关闭
                        if (checkStatus.data[0].关闭人 == null || checkStatus.data[0].关闭人 == "") {
                            $("#HProjectID").val(checkStatus.data[0].HInterID);
                            $("#HProjectNumber").val(checkStatus.data[0].项目代码);//工程项目代码
                            $("#HProjectName").val(checkStatus.data[0].项目名称);//工程项目代码
                        } else {
                            layer.msg("该项目已关闭，不可选择！");
                        }
                        layer.close(index);//关闭弹窗
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }

            //#region ä¿å­˜åŽæµè§ˆæ–¹æ³•
            function ReRoadBillMain() {
                location.replace('Add_Edit_Xs_SeOutStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
@@ -1192,7 +1274,6 @@
                })
            }
            //#endregion



            //#endregion
@@ -1261,6 +1342,38 @@
            $("#HConveyCompID").val(obj[0].HItemID);
        }

        //项目代码
        function GetProjectBillValue(obj) {
            if (obj[0].关闭人 == null || obj[0].关闭人 == "") {
                $("#HProjectID").val(obj[0].HInterID);
                $("#HProjectNumber").val(obj[0].项目代码);//工程项目代码
                $("#HProjectName").val(obj[0].项目名称);//工程项目代码

            } else {
                layer.msg("该项目已关闭，不可选择！");
            }
        }

        //双击返回仓库
        function GetHWHSubValue(data) {
            OptionData = data[0]
        }

        function GetHWHValue(obj)  //返回仓库
        {
            $("#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]["收货仓库"] == undefined) {
                        option.data[i]["HWHID"] = obj[0].HItemID;
                        option.data[i]["收货仓库"] = obj[0].仓库名称;
                    }
                }
            }
            layui.table.render(option);
        }

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

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

@@ -89,7 +89,7 @@
                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;"  readonly>
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -100,11 +100,11 @@
                                        <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="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>-->
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -113,8 +113,8 @@
                                                <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>-->
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -123,8 +123,8 @@
                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HManagerID" id="HManagerID" 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>-->
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -133,8 +133,8 @@
                                                <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;">
                                                <!--<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>-->
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>-->
                                            </div>
                                        </div>
                                    </div>
@@ -145,8 +145,8 @@
                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color:#efefef4d;" 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>-->
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -175,8 +175,8 @@
                                                <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HSellSID" id="HSellSID" 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>-->
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -238,6 +238,43 @@
                                            </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" class="layui-input" lay-verify="HProjectNumber" name="HProjectNumber" id="HProjectNumber" value="" style="background-color: #efefef4d;float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjectID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" 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-block">
                                                <input type="text" class="layui-input" lay-verify="HProjectName" name="HProjectName" id="HProjectName" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">班组</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" lay-verify="HGroupName" name="HGroupName" id="HGroupName" value="" style="background-color: #efefef4d;float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHGroup" id="btnSearchHGroup" 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">
                                                <select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 180px; ">
                                                    <option  value="成本价" selected="selected">成本价</option>
                                                    <option  value="结算价">结算价</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织<label style="color:red"> * </label></label>
@@ -274,7 +311,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label"></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HConveyMoney" id="HConveyMoney" autocomplete="off" value="0" >
                                                <input class="layui-input" name="HConveyMoney" id="HConveyMoney" autocomplete="off" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -444,7 +481,7 @@
            var HOrgIDBar = 0;

            //子表渲染参数
            var option = {};
            window.option = {};
            //#endregion


@@ -652,6 +689,18 @@
            //#region é€‰æ‹©æºå•æŒ‰é’®
            form.on('submit(HMainSource)', function () {
                get_checkMainSource();
            });
            //#endregion  

            //#region é¡¹ç›®ä»£ç 
            form.on('submit(btnSearchHProNumber)', function () {
                get_checkSearchHProNumber();
            });
            //#endregion

            //#region ç­ç»„
            form.on('submit(btnSearchHGroup)', function () {
                get_checkSearchHGroup();
            });
            //#endregion

@@ -1261,9 +1310,9 @@
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '出库仓库列表'//标题
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1274,15 +1323,15 @@
                        $("#HWHName").val(checkStatus.data[0].仓库名称);
                        $("#HWHID").val(checkStatus.data[0].HItemID);

                        //根据表头 å‡ºåº“仓库 å¸¦å‡ºå­è¡¨ å‘货仓库
                        for (var i = 0; i < option.data.length; i++) {
                            if (option.data[i].HWHID + "" == "0") {
                                option.data[i].HWHID = checkStatus.data[0].HItemID;
                                option.data[i].发货仓库 = checkStatus.data[0].仓库名称;
                        if (option.data.length > 0) {
                            for (var i = 0; i < option.data.length; i++) {
                                if (option.data[i]["HWHID"] == 0) {
                                    option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
                                    option.data[i]["发货仓库"] = checkStatus.data[0].仓库名称;
                                }
                            }
                        }
                        table.render(option);

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -1351,6 +1400,76 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion

            //#region é¡¹ç›®ä»£ç 
            function get_checkSearchHProNumber() {
                var HOrgID = $("#HOrgID").val();
                //打开工程项目小窗体
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim"                           //加上边框
                    , title: "工程项目列表"                             //标题
                    , closeBtn: 1                                       //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2                                          //弹出动画
                    , area: ["90%", "90%"]                              //窗体大小
                    , maxmin: true                                      //设置最大最小按钮是否显示
                    , content: ["../../项目管理/工程项目/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

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

                        //判断项目是否关闭
                        if (checkStatus.data[0].关闭人 == null || checkStatus.data[0].关闭人 == "") {
                            $("#HProjectID").val(checkStatus.data[0].HInterID);
                            $("#HProjectNumber").val(checkStatus.data[0].项目代码);//工程项目代码
                            $("#HProjectName").val(checkStatus.data[0].项目名称);//工程项目代码
                        } else {
                            layer.msg("该项目已关闭，不可选择！");
                        }
                        layer.close(index);//关闭弹窗
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion

            //#region ç­ç»„
            function get_checkSearchHGroup() {
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim"                           //加上边框
                    , title: "班组列表"                             //标题
                    , closeBtn: 1                                       //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2                                          //弹出动画
                    , area: ["90%", "90%"]                              //窗体大小
                    , maxmin: true                                      //设置最大最小按钮是否显示
                    , content: ["../../基础资料/工资基础资料/Gy_Group.html?type=HGroup", "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

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

                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        $("#HGroupName").val(checkStatus.data[0].班组名称);//工程项目代码
                        layer.close(index);//关闭弹窗
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion
@@ -1581,6 +1700,12 @@
                                , "HKeeperName": data.保管员
                                , "HWHID": data.HWHID_Main
                                , "HWHName": data.主表仓库
                                , "HProjectID": data.HProjectID
                                , "HProjectNumber": data.项目编码
                                , "HProjectName": data.项目名称
                                , "HGroupID": data.HGroupID
                                , "HGroupName": data.班组
                                , "HPriceType": data.单价类型
                                , "HRemark": data.表头备注


@@ -2080,7 +2205,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=HWHSub', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -2092,10 +2217,17 @@
                                    }
                                    //更新表格缓存的数据
                                    obj.update({

                                        "HWHID": checkStatus.data[0].HItemID,
                                        "发货仓库": checkStatus.data[0].仓库名称
                                        , "HWHID": checkStatus.data[0].HItemID
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "发货仓库": OptionData.仓库名称
                                    })
                                }
                            })
                        }
@@ -2446,6 +2578,9 @@
                    , "HCurID": dataArray[0].HCurID
                    , "HCurName": dataArray[0].币别
                    , "HExRate": dataArray[0].汇率
                    , "HProjectID": dataArray[0].HProjectID
                    , "HProjectNumber": dataArray[0].项目编码
                    , "HProjectName": dataArray[0].项目名称
                });

                //子表  èµ‹å€¼
@@ -2698,11 +2833,11 @@
            $("#HDeptID").val(obj[0].HItemID);
        }

        function GetHWHValue(obj)  //返回仓库
        {
            //$("#HWHName").val(obj[0].HName);
            //$("#HWHID").val(obj[0].HItemID);
        }
        //function GetHWHValue(obj)  //返回仓库
        //{
        //    //$("#HWHName").val(obj[0].HName);
        //    //$("#HWHID").val(obj[0].HItemID);
        //}

        function GetSellStyleValue(obj)  //返回销售方式
        {
@@ -2734,9 +2869,48 @@
            $("#HConveyCompID").val(obj[0].HItemID);
        }

        function GetHSCWHNAMEValue(obj) { //返回出库仓库
            $("#HWHName").val(obj[0].HName);

        //function GetHSCWHNAMEValue(obj) { //返回出库仓库
        //    $("#HWHName").val(obj[0].HName);
        //    $("#HWHID").val(obj[0].HItemID);
        //}

        function GetHGroupValue(obj)  //返回班组
        {
            $("#HGroupID").val(obj[0].HItemID);
            $("#HGroupName").val(obj[0].班组名称);
        }

        //项目代码
        function GetProjectBillValue(obj) {
            if (obj[0].关闭人 == null || obj[0].关闭人 == "") {
                $("#HProjectID").val(obj[0].HInterID);
                $("#HProjectNumber").val(obj[0].项目代码);//工程项目代码
                $("#HProjectName").val(obj[0].项目名称);//工程项目代码

            } else {
                layer.msg("该项目已关闭，不可选择！");
            }
        }

        //双击返回仓库
        function GetHWHSubValue(data) {
            OptionData = data[0]
        }

        function GetHWHValue(obj)  //返回仓库
        {
            $("#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]["发货仓库"] == undefined) {
                        option.data[i]["HWHID"] = obj[0].HItemID;
                        option.data[i]["发货仓库"] = obj[0].仓库名称;
                    }
                }
            }
            layui.table.render(option);
        }

        //#region æ ¹æ®å®¢æˆ·èŽ·å–币别、汇率、结算方式、客户信用额度、联系人、联系电话