沈泽
2021-08-30 c55106b0797ac56f8d3fd55b78a8dcc9b312880c
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
4个文件已修改
674 ■■■■■ 已修改文件
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html 188 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html 217 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sc_MouldConkBookBillList.html 247 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier.html
@@ -155,7 +155,6 @@
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_Supplier/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
@@ -184,23 +183,7 @@
                if (HName) {
                    sWhere += " and ä¾›åº”商名称 like '%" + HName + "%'";
                }
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_Supplier/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            // é‡ç½®æŒ‰é’®
@@ -282,9 +265,6 @@
            //#endregion
            //以上是layui模块
        });
    </script>
WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier_Edit.html
@@ -57,6 +57,7 @@
                                <label class="layui-form-label">编码</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
                                    <input type="hidden" name="HInterID" id="HInterID">
                                </div>
                            </div>
                            <div class="layui-inline">
@@ -168,7 +169,7 @@
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" name="HAreaName" id="HAreaName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                    <input type="hidden" name="HAreaID" id="HAreaID" value="0">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnArea" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                    </button>
                                </div>
@@ -186,7 +187,7 @@
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" name="HCurName" id="HCurName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                    <input type="hidden" name="HCurID" id="HCurID" value="0">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCurrency" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                    </button>
                                </div>
@@ -233,6 +234,7 @@
                                            <label class="layui-form-label">创建人</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3">
@@ -336,6 +338,7 @@
                set_AddFNew();
            }
            else if (OperationType == 3) {//编辑
                $("#HInterID").val(linterid);
                set_EditFromGrid();
            }
            else {
@@ -345,52 +348,139 @@
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //选择验收
            form.on('submit(HSecManagerID-BT)', function (data) {//选择验收
                var sMainStr = JSON.stringify(data.field);
            //结算方式弹窗
            form.on('submit(btnSearchProc)', function () {
                //页面层-自定义
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '验收列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '结算方式列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/SettleStyleInformation.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('请选择数据');
                    }
                })
                        $("#HSSName").val(checkStatus.data[0].HName);
                        $("#HSSID").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //默认货币弹窗
            form.on('submit(btnCurrency)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '结算方式列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/CurrencyInformation.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('请选择数据');
                        }
                        $("#HCurName").val(checkStatus.data[0].HName);
                        $("#HCurID").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //地区弹窗
            form.on('submit(btnArea)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '结算方式列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/AreaInformation.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('请选择数据');
                        }
                        $("#HAreaName").val(checkStatus.data[0].HName);
                        $("#HAreaID").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //保存
            form.on('submit(Saver)', function (data) {//提交
                var ModRightNameAdd = 'Gy_Supplier_Edit';
                var user = sessionStorage["HUserName"];
                var user ="Admin" /*sessionStorage["HUserName"]*/;
                var oMain = JSON.stringify(data.field)
                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
                var index = layer.load();
                if (AllowLoadData()) {
                    if (OperationType === 3) {
                    if (OperationType =="3") {
                        $.ajax({
                            type: "POST",
                            url: GetWEBURL() + "/Gy_Supplier/AddBill1",
                            //url: "http://localhost:12761/Gy_Supplier/AddBill1",
                            async: true,
                            data: { "oMain": sBillModeify },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) {
                                    //layer.confirm(data.Message, {
                                    //    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                    //    btn2: function () {
                                    //        //parent.layui.admin.events.closeThisTabs();关闭页签
                                    //        //window.close();//关闭页面,浏览器有效,PDA无效
                                    //        parent.location.href = "../../../views/index.html"
                                    //    }//关闭
                                    //}, function () { window.location.reload(); });//新增
                                    layer.close(index);
                                    layer.msg("保存成功");
                                     layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                        parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                                    });
                                }
                                else {
                                    layer.close(index);
@@ -407,22 +497,16 @@
                        $.ajax({
                            type: "POST",
                            url: GetWEBURL() + "/Gy_Supplier/AddBill",
                            //url: "http://localhost:12761/Gy_Supplier/AddBill",
                            async: true,
                            data: { "oMain": oMain },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) {
                                    //layer.confirm(data.Message, {
                                    //    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                    //    btn2: function () {
                                    //        //parent.layui.admin.events.closeThisTabs();关闭页签
                                    //        //window.close();//关闭页面,浏览器有效,PDA无效
                                    //        parent.location.href = "../../../views/index.html"
                                    //    }//关闭
                                    //}, function () { window.location.reload(); });//新增
                                    layer.close(index);
                                    layer.msg("提交成功");
                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                        parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                                    });
                                }
                                else {
                                    layer.close(index);
@@ -485,6 +569,28 @@
                    success: function (d) {
                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
                        $("#HNumber").val(d.data[0].HNumber);
                        $("#HCreateOrgID").val(d.data[0].HCREATEORGID);
                        $("#HUseOrgID").val(d.data[0].HUSEORGID);
                        $("#HHelpCode").val(d.data[0].HHelpCode);
                        $("#HShortName").val(d.data[0].HShortName);
                        $("#HAddress").val(d.data[0].HAddress);
                        $("#HLinkMan").val(d.data[0].HLinkMan);
                        $("#HLinkPhone").val(d.data[0].HLinkPhone);
                        $("#HMobilePhone").val(d.data[0].HMobilePhone);
                        $("#HFax").val(d.data[0].HFax);
                        $("#HPostalCode").val(d.data[0].HPostalCode);
                        $("#HEmail").val(d.data[0].HEmail);
                        $("#HCorMan").val(d.data[0].HCorMan);
                        $("#HBank").val(d.data[0].HBank);
                        $("#HTaxNum").val(d.data[0].HTaxNum);
                        $("#HEnglishName").val(d.data[0].HEnglishName);
                        $("#HEnglishAddress").val(d.data[0].HEnglishAddress);
                        $("#HCountry").val(d.data[0].HCountry);
                        $("#HAreaID").val(d.data[0].HAreaID);
                        $("#HTaxRate").val(d.data[0].HTaxRate);
                        $("#HCurID").val(d.data[0].HCurID);
                        $("#HSSID").val(d.data[0].HSSID);
                        $("#HBankAccount").val(d.data[0].HBankAccount);
                        $("#HName").val(d.data[0].HName);
                        $("#HRemark").val(d.data[0].HRemark);
                        $("#HUpDater").val(sessionStorage["HUserName"]);//修改人
WebTM/views/»ù´¡×ÊÁÏ/ÏúÊÛ»ù´¡×ÊÁÏ/Gy_Customer_Edit.html
@@ -185,7 +185,7 @@
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" name="HAreaName" id="HAreaName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HAreaID" id="HAreaID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnArea" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                    </button>
                                                </div>
@@ -198,7 +198,7 @@
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" name="HCurName" id="HCurName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HCurID" id="HCurID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCurrency" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                    </button>
                                                </div>
@@ -224,7 +224,7 @@
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" name="HCusTypeName" id="HCusTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HCusTypeID" id="HCusTypeID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCustomerType" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                    </button>
                                                </div>
@@ -389,6 +389,154 @@
                    }
                })
            });
            //结算方式弹窗
            form.on('submit(btnSearchProc)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '结算方式列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/SettleStyleInformation.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('请选择数据');
                        }
                        $("#HSSName").val(checkStatus.data[0].HName);
                        $("#HSSID").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //默认货币弹窗
            form.on('submit(btnCurrency)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '结算方式列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/CurrencyInformation.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('请选择数据');
                        }
                        $("#HCurName").val(checkStatus.data[0].HName);
                        $("#HCurID").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //客户分类弹窗
            form.on('submit(btnCustomerType)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '结算方式列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/CustomerTypeInformation.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('请选择数据');
                        }
                        $("#HCusTypeName").val(checkStatus.data[0].HName);
                        $("#HCusTypeID").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //地区弹窗
            form.on('submit(btnArea)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '结算方式列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/AreaInformation.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('请选择数据');
                        }
                        $("#HAreaName").val(checkStatus.data[0].HName);
                        $("#HAreaID").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //选择使用组织
            form.on('submit(HUseOrgID-BT)', function (data) {//选择创建组织
                var sMainStr = JSON.stringify(data.field);
@@ -408,33 +556,27 @@
            });
            //保存
            form.on('submit(Saver)', function (data) {//选择创建组织
                var oMain = JSON.stringify(data.field)
                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
                var index = layer.load();
                var ModRightNameAdd = 'Gy_Customer_Edit';
                var user = sessionStorage["HUserName"];
                var oMain = JSON.stringify(data.field)
                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
                console.log(AllowLoadData());
                if (AllowLoadData()) {
                    //编辑——保存
                    if (OperationType == 3) {
                    if (OperationType == "3") {
                        $.ajax({
                            type: "POST",
                            //url: GetWEBURL() + "/Gy_Customer/AddBill1",
                            url: "http://localhost:12761/Gy_Customer/AddBill1",
                            url: GetWEBURL() + "/Gy_Customer/AddBill1",
                            async: true,
                            data: { "oMain": sBillModeify },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) {
                                    //layer.confirm(data.Message, {
                                    //    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                    //    btn2: function () {
                                    //        //parent.layui.admin.events.closeThisTabs();关闭页签
                                    //        //window.close();//关闭页面,浏览器有效,PDA无效
                                    //        parent.location.href = "../../../views/index.html"
                                    //    }//关闭
                                    //}, function () { window.location.reload(); });//新增
                                    layer.close(index);
                                    layer.msg("保存成功");
                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                        parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                                    });
                                }
                                else {
                                    layer.close(index);
@@ -451,23 +593,17 @@
                    else {
                        $.ajax({
                            type: "POST",
                            //url: GetWEBURL() + "/Gy_Customer/AddBill",
                            url: "http://localhost:12761/Gy_Customer/AddBill",
                            url: GetWEBURL() + "/Gy_Customer/AddBill",
                            async: true,
                            data: { "oMain": oMain },
                            data: { "oMain": sBillModeify },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) {
                                    //layer.confirm(data.Message, {
                                    //    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                    //    btn2: function () {
                                    //        //parent.layui.admin.events.closeThisTabs();关闭页签
                                    //        //window.close();//关闭页面,浏览器有效,PDA无效
                                    //        parent.location.href = "../../../views/index.html"
                                    //    }//关闭
                                    //}, function () { window.location.reload(); });//新增
                                    layer.close(index);
                                    layer.msg("提交成功");
                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                        parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                                    });
                                }
                                else {
                                    layer.close(index);
@@ -572,7 +708,6 @@
            function AllowLoadData() {
                var HCreateOrg = $("#HCreateOrg").val();
                if (HCreateOrg == null || HCreateOrg == undefined || HCreateOrg == "") {
                    layer.msg("请先选择创建组织!", { icon: 5 });
                    return;
@@ -581,36 +716,36 @@
                if (HCreateOrgID == null || HCreateOrgID == undefined || HCreateOrgID == "") {
                    layer.msg("请先选择创建组织!", { icon: 5 });
                    return;
                    return false;
                }
                var HUseOrg = $("#HUseOrg").val();
                if (HUseOrg == null || HUseOrg == undefined || HUseOrg == "") {
                    layer.msg("请先选择使用组织!", { icon: 5 });
                    return;
                    return false;
                }
                var HUseOrgID = $("#HUseOrgID").val();
                if (HUseOrgID == null || HUseOrgID == undefined || HUseOrgID == "") {
                    layer.msg("请先选择使用组织!", { icon: 5 });
                    return;
                    return false;
                }
                var HNumber = $("#HNumber").val();
                if (HNumber == null || HNumber == undefined || HNumber == "") {
                    layer.msg("请输入客户编码!", { icon: 5 });
                    return;
                    return false;
                }
                var HName = $("#HName").val();
                if (HName == null || HName == undefined || HName == "") {
                    layer.msg("请输入客户名称!", { icon: 5 });
                    return;
                    return false;
                }
                else {
                    return true;
                }
            }
            //返回验收
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldConkBookBillList.html
@@ -37,7 +37,7 @@
                                            <option value="ZHSJ">上架归还单</option>
                                        </select>
                                    </div>
                                </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -48,16 +48,6 @@
                                    <label class="layui-form-label">制单人</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
                                    </div>
                                </div>-->
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>-->
                                <!--<div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -72,7 +62,18 @@
                                            <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                        </div>
                                    </div>
                                </div>-->
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -106,6 +107,7 @@
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å…¨å±€å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
@@ -117,8 +119,65 @@
                , util = layui.util
            //查询条件
            var sWhere = "";
            var option = [];
            //#endregion
            var option = {
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化界面
            set_ClearBill();
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //新增
                    case 'btn-Add': set_AddNew();
                        break;
                    //编辑
                    case 'btn-Edit': set_ShowBill();
                        break;
                    //删除
                    case 'btn-Delete': set_DeleteBill();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                };
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {//选择仓位
                get_FastQuery();
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#HBillNo").val("");//单据号
                $("#HCreateBy").val("");//制单人
                $("#BenginHCreateDate").val("");//开始制单时间
                $("#EndHCreateDate").val("");//结束制单时间
                $("#btnSearch").click();
            });
            //#endregion
            //初始化界面
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
            }
            //初始化表格
            function set_InitGrid() {
                option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-50'
@@ -178,14 +237,56 @@
                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
                ]]
            };
            }
            var index = layer.load(0);
            //查询
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                        } else {
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    case 'btn-Add':
            //快速过滤
            function get_FastQuery() {
                var HBillNo = $("#HBillNo").val();//单据号
                var HCreateBy = $("#HCreateBy").val();//制单人
                var BenginHCreateDate = $("#BenginHCreateDate").val();//开始制单时间
                var EndHCreateDate = $("#EndHCreateDate").val();//结束制单时间
                if (HBillNo) {
                    sWhere += " and HBillNo like '%" + HBillNo + "%'";
                }
                if (HCreateBy) {
                    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
                }
                if (BenginHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
                }
                if (EndHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //新增
            function set_AddNew() {
                        //页面层-自定义
                        layer.open({
                            type: 2,
@@ -204,8 +305,10 @@
                            }
                        });
                        break;
                    case 'btn-Edit':
            }
            //编辑
            function set_ShowBill() {
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
@@ -234,8 +337,10 @@
                            layer.msg('请选择一行数据编辑!');
                        }
                        break;
                    case 'btn-Delete':
            }
            //删除
            function set_DeleteBill() {
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
@@ -269,104 +374,8 @@
                        else {
                            layer.msg('请选择一行数据删除!');
                        }
                        break;
                };
            });
            //进入页面显示的缓存列表
            $.ajax({
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
                type: "GET",
                data: { "sWhere": sWhere},
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
            //重置按钮
            //form.on('submit(btnReSearch)', function (data) {
            //    $("#HBillType").val("");//单据类型
            //    $("#HBillNo").val("");//单据号
            //    $("#HSourceBillNo").val("");//源单号
            //    $("#HCreateBy").val("");//制单人
            //    $("#BenginHCreateDate").val("");//开始制单时间
            //    $("#EndHCreateDate").val("");//结束制单时间
            //    $("#btnSearch").click();
            //});
            //查询按钮
            form.on('submit(btnSearch)', function (data) {//选择仓位
                //var HBillType = $("#HBillType").val();//单据类型
                //var HBillNo = $("#HBillNo").val();//单据号
                //var HCreateBy = $("#HCreateBy").val();//制单人
                //var BenginHCreateDate = $("#BenginHCreateDate").val();//开始制单时间
                //var EndHCreateDate = $("#EndHCreateDate").val();//结束制单时间
                //if (HBillNo) {
                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
                //}
                //if (HCreateBy) {
                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
                //}
                //if (BenginHCreateDate) {
                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
                //}
                //if (EndHCreateDate) {
                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
                //}
                var index = layer.load(0);
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL1() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
                    type: "GET",
                    data: { "sWhere": sWhere},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                            layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
                //调用接口后清空sWhere缓存
                sWhere = "";
                //$("#HBillType").val("");//单据类型
                //$("#HBillNo").val("");//单据号
                //$("#HSourceBillNo").val("");//源单号
                //$("#HCreateBy").val("");//制单人
                //$("#BenginHCreateDate").val("");//开始制单时间
                //$("#EndHCreateDate").val("");//结束制单时间
            });
            //监听行双击事件
            table.on('rowDouble(mainTable)', function (obj) {
                layer.alert("双击事件", { icon: 1 });
            });
            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});
            //以上是layui模块