parent: 6f926325 | 补丁 | 提交 | show whitespace
yxj
2023-03-13 75e6f0dce0fd2edeaba8b2d3d82fc3a3b967a15f 
其他出库、其他入库扫码模块界面增加日期选择框，优化
5个文件已修改
224 ■■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html 110 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/layuiadmin/Scripts/webConfig.js


@@ -1,10 +1,10 @@





function GetWEBURL() {


    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器


    var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/


    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/


    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";


    //var WEBURL = "http://localhost:8085/API/";   //zgq本地


    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置


    var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置


    //var WEBURL = "http://localhost/WEBAPI/";   //颜家台式机本地配置


    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置


    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置




 WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_Fast.html


@@ -129,6 +129,16 @@


                                        </div>


                                    </div>


                                </div>


                                <div class="layui-form-item">


                                    <div class="layui-row">


                                        <div class="layui-col-xs4">


                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">日期</label>


                                        </div>


                                        <div class="layui-col-xs8">


                                            <input name="HDate" id="HDate" autocomplete="off" class="layui-input">


                                        </div>


                                    </div>


                                </div>


                            </div>


                            <!--表头信息-->


                            <div class="layui-tab-item">


@@ -299,6 +309,7 @@


                , layer = layui.layer


                , table = layui.table


                , form = layui.form


                , laydate = layui.laydate


                , element = layui.element;


            var HStockOrgID = sessionStorage["OrganizationID"]


            var HSourceFlag = sessionStorage["SourceFlag"];


@@ -323,11 +334,23 @@


            $("#HBillerID").val(sessionStorage["HBillerID"]);


            $("#HBillerID").hide();


            $("#HBillSubType").val(sessionStorage["HBillSubType"]);








            $("#HDate").val(formatDate(sessionStorage["HDate"]));




            //默认带入的仓库，如果启用仓位则仓位有效，如果没有启用则仓位灰度 new






            // ç¼–辑获取表头时时间格式矫正方式


            function formatDate(date) {


                var d = new Date(date),


                    month = '' + (d.getMonth() + 1),


                    day = '' + d.getDate(),


                    year = d.getFullYear();




                if (month.length < 2) month = '0' + month;


                if (day.length < 2) day = '0' + day;




                return [year, month, day].join('-');


            }






            //获取参数


@@ -345,6 +368,17 @@


            var linterid = params[params[0]]; //从参数中获取 å•æ®å†…码


            var lSourceBillType = params[params[2]];  //从单据获取 æºå•ç±»åž‹




            //初始化表单插件


            set_InitFrom();




            //初始化表单插件


            function set_InitFrom() {


                //常规用法


                laydate.render({


                    elem: '#HDate'


                });


            }




            function RoadBillMain(linterid)//加载表头


            {


                $.ajax({


@@ -355,8 +389,29 @@


                        // console.log(d.data);


                        $("#HInterID").val(d.data[0].HInterID);


                        $("#HBillNo").val(d.data[0].HBillNo);


                        $("#HBillType").val(d.data[0].HSourceBillType);


                        $("#HBillType").val(d.data[0].HSourceBillType == null ? "1242" : d.data[0].HSourceBillType);


                        //获取源单类型、源单单号


                        if (d.data[0].HSourceBillType == "1242") {


                            $("#HBillType").empty();


                            $("#HBillType").val("1242");


                            var optionHtml = '';


                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '出库申请单' + "</option>";


                            $("#HBillType").append(optionHtml);


                            layui.form.render('select');


                            $("#HBillType").attr("readonly", "readonly");


                        }


                        else {


                            $("#HBillType").empty();


                            $("#HBillType").val("-1");


                            var optionHtml = '';


                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '手工录入' + "</option>";


                            $("#HBillType").append(optionHtml);


                            layui.form.render('select');


                            $("#HBillType").attr("readonly", "readonly");


                        }


                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);


                        $("#HSourceBillNo").attr("disabled", "true");


                        $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));


                        HSourceFlag = true;


                        //$("#HWHID").val(d.data[0].HWhID);


                        //$("#HKeeperID").val(d.data[0].HKeeperID);


@@ -434,6 +489,7 @@


                        //console.log(d.data);


                        $("#HInterID").val(d.data[0].HInterID);


                        $("#HBillNo").val(d.data[0].HBillNo);


                        $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));


                    }


                });


                //获取单据子类型


@@ -1113,17 +1169,47 @@


                                    element.tabChange('tab-Kf_OtherOutBill', '3');


                                }


                                else {


                                    if (HSourceFlag == "false") {


                                        $("#HBillType").find("option:contains('手工录入')").attr("selected", true);


                                        $("#HSourceBillNo").val("");


                                    //if (HSourceFlag == "false") {


                                    //    $("#HBillType").find("option:contains('手工录入')").attr("selected", true);


                                    //    $("#HSourceBillNo").val("");




                                        $("#HSourceBillNo").attr("readonly", "readonly");


                                        $("#HBillType").attr("disabled", "disabled");


                                        form.render('select');


                                    }


                                    HSourceFlag = true;


                                    //    $("#HSourceBillNo").attr("readonly", "readonly");


                                    //    $("#HBillType").attr("disabled", "disabled");


                                    //    form.render('select');


                                    //}


                                    //HSourceFlag = true;


                                    //element.tabChange('tab-Kf_OtherOutBill', '3');




                                    if (HSourceFlag == true) {


                                    element.tabChange('tab-Kf_OtherOutBill', '3');


                                }


                                    else {


                                        HSourceFlag = true;


                                        $("#HSourceBillNo").val(result.data.hSourceBillNoField);


                                        $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1242" : result.data.hSourceBillTypeField);


                                        //获取源单类型、源单单号


                                        if (result.data.hSourceBillTypeField == "1242") {


                                            $("#HBillType").empty();


                                            $("#HBillType").val("1242");


                                            var optionHtml = '';


                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '出库申请单' + "</option>";


                                            $("#HBillType").append(optionHtml);


                                            layui.form.render('select');


                                            $("#HBillType").attr("readonly", "readonly");


                                        }


                                        else {


                                            //$("#HBillType").empty();


                                            $("#HBillType").val("-1");


                                            var optionHtml = '';


                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '手工录入' + "</option>";


                                            $("#HBillType").append(optionHtml);


                                            layui.form.render('select');


                                            $("#HBillType").attr("readonly", "readonly");


                                        }


                                        $("#HSourceBillNo").attr("readonly", "readonly");


                                        element.tabChange('tab-Kf_OtherOutBill', '3');


                                    }


                                }


                                layer.load(3)


                                $.ajax({


                                    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',




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


@@ -120,7 +120,7 @@


                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">日期</label>


                                        </div>


                                        <div class="layui-col-xs8">


                                            <input type="date" name="HDate" id="HDate" autocomplete="off" class="layui-input">


                                            <input name="HDate" id="HDate" autocomplete="off" class="layui-input">


                                        </div>


                                    </div>


                                </div>




 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html


@@ -108,7 +108,7 @@


                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">日期</label>


                                        </div>


                                        <div class="layui-col-xs8">


                                            <input type="date" name="HDate" id="HDate" autocomplete="off" class="layui-input">


                                            <input name="HDate" id="HDate" autocomplete="off" class="layui-input">


                                        </div>


                                    </div>


                                </div>




 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_Fast.html


@@ -93,6 +93,16 @@


                                        </div>


                                    </div>


                                </div>


                                <div class="layui-form-item">


                                    <div class="layui-row">


                                        <div class="layui-col-xs3">


                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">日期</label>


                                        </div>


                                        <div class="layui-col-xs8">


                                            <input name="HDate" id="HDate" autocomplete="off" class="layui-input">


                                        </div>


                                    </div>


                                </div>


                            </div>


                            <div class="layui-tab-item">


                                <div class="layui-form-item" style="padding:0px;margin:0px">


@@ -245,6 +255,7 @@


                , layer = layui.layer


                , table = layui.table


                , form = layui.form


                , laydate = layui.laydate


                , element = layui.element;




            //表头初始化赋值（根据登录用户获取 é»˜è®¤ä»“库、部门、验收、保管、金蝶用户） new


@@ -268,7 +279,23 @@


            $("#HOrgID").val(sessionStorage["OrganizationID"]);


            $("#HOrgID").hide();


            $("#HBillSubType").val(sessionStorage["HBillSubType"]);


            $("#HDate").val(formatDate(sessionStorage["HDate"]));


            var HSourceFlag = sessionStorage["SourceFlag"];


            //默认带入的仓库，如果启用仓位则仓位有效，如果没有启用则仓位灰度 new






            // ç¼–辑获取表头时时间格式矫正方式


            function formatDate(date) {


                var d = new Date(date),


                    month = '' + (d.getMonth() + 1),


                    day = '' + d.getDate(),


                    year = d.getFullYear();




                if (month.length < 2) month = '0' + month;


                if (day.length < 2) day = '0' + day;




                return [year, month, day].join('-');


            }






            //获取参数


@@ -286,6 +313,17 @@


            var linterid = params[params[0]]; //从参数中获取 å•æ®å†…码


            var lSourceBillType = params[params[2]];  //从单据获取 æºå•ç±»åž‹




            //初始化表单插件


            set_InitFrom();




            //初始化表单插件


            function set_InitFrom() {


                //常规用法


                laydate.render({


                    elem: '#HDate'


                });


            }




            function RoadBillMain(linterid)//加载表头


            {


                $.ajax({


@@ -296,14 +334,36 @@


                        // console.log(d.data);


                        $("#HInterID").val(d.data[0].HInterID);


                        $("#HBillNo").val(d.data[0].HBillNo);


                        $("#HBillType").val(d.data[0].HSourceBillType);


                        $("#HBillType").val(d.data[0].HSourceBillType == null ? "1241" : d.data[0].HSourceBillType);


                        //获取源单类型、源单单号


                        if (d.data[0].HSourceBillType == "1241") {


                            $("#HBillType").empty();


                            $("#HBillType").val("1241");


                            var optionHtml = '';


                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '入库申请单' + "</option>";


                            $("#HBillType").append(optionHtml);


                            layui.form.render('select');


                            $("#HBillType").attr("readonly", "readonly");


                        }


                        else {


                            $("#HBillType").empty();


                            $("#HBillType").val("-1");


                            var optionHtml = '';


                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '手工录入' + "</option>";


                            $("#HBillType").append(optionHtml);


                            layui.form.render('select');


                            $("#HBillType").attr("readonly", "readonly");


                        }


                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);


                        $("#HSourceBillNo").attr("disabled", "true");


                        $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));


                        //$("#HWHID").val(d.data[0].HWhID);


                        //$("#HKeeperID").val(d.data[0].HKeeperID);


                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);


                        //$("#HDeptID").val(d.data[0].HDeptID);


                        //$("#HBarCode").val(d.data[0].HBarCode);


                        //$("#HQty").val(d.data[0].HQty);


                        HSourceFlag = true;


                    }


                })


                //获取单据子类型


@@ -375,6 +435,7 @@


                        //console.log(d.data);


                        $("#HInterID").val(d.data[0].HInterID);


                        $("#HBillNo").val(d.data[0].HBillNo);


                        $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));


                    }


                });


                //获取单据子类型


@@ -1015,7 +1076,7 @@


                    //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //方法所在页面和方法名


                    url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",


                    type: "GET",


                    data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": sessionStorage["SourceFlag"], "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },


                    data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },


                    success: function (result) {


                        if (result.count == 1) {


                            if (result.data.HBarType == '仓库条码') {


@@ -1045,7 +1106,7 @@


                                $("#HDeptName").val(result.data.HDeptName);


                                $("#HDeptID").val(result.data.HDeptID);


                                $("#HSourceBillNo").val(result.data.HSourceBillNo);


                                sessionStorage["SourceFlag"] = true;


                                HSourceFlag = true;


                                //获取源单类型、源单单号


                                if (result.data.HSourceBillType == "1241") {


                                    $("#HBillType").val("1241");


@@ -1058,7 +1119,7 @@


                                element.tabChange('tab-Kf_OtherInBill', '3');


                            }


                            else {


                                if (sessionStorage["SourceFlag"] == "true") {


                                if (HSourceFlag == true) {


                                    element.tabChange('tab-Kf_OtherInBill', '3');


                                }


                                else {


@@ -1067,15 +1128,40 @@


                                    //$("#HDeptName").val(result.data.HDeptName);


                                    //$("#HDeptID").val(result.data.HDeptID);


                                    //$("#HSourceBillNo").val(result.data.HSourceBillNo);


                                    sessionStorage["SourceFlag"] = true;


                                    //sessionStorage["SourceFlag"] = true;


                                    //获取源单类型、源单单号


                                    if (result.data.HSourceBillType == "1241") {


                                        $("#HBillType").val("1241");


                                    //if (result.data.HSourceBillType == "1241") {


                                    //    $("#HBillType").val("1241");




                                    //}


                                    //else if (result.data.HSourceBillType == "1601") {


                                    //    $("#HBillType").val("1601");


                                    //}






                                    HSourceFlag = true;


                                    $("#HSourceBillNo").val(result.data.hSourceBillNoField);


                                    $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1241" : result.data.hSourceBillTypeField);


                                    //获取源单类型、源单单号


                                    if (result.data.hSourceBillTypeField == "1241") {


                                        $("#HBillType").empty();


                                        $("#HBillType").val("1241");


                                        var optionHtml = '';


                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '入库申请单' + "</option>";


                                        $("#HBillType").append(optionHtml);


                                        layui.form.render('select');


                                        $("#HBillType").attr("readonly", "readonly");


                                    }


                                    else if (result.data.HSourceBillType == "1601") {


                                        $("#HBillType").val("1601");


                                    else {


                                        //$("#HBillType").empty();


                                        $("#HBillType").val("-1");


                                        var optionHtml = '';


                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '手工录入' + "</option>";


                                        $("#HBillType").append(optionHtml);


                                        layui.form.render('select');


                                        $("#HBillType").attr("readonly", "readonly");


                                    }


                                    $("#HSourceBillNo").attr("readonly", "readonly");


                                    $("#HNote").val(";物料条码");


                                    element.tabChange('tab-Kf_OtherInBill', '3');


                                }


@@ -1236,7 +1322,7 @@


                            element.tabChange('tab-Kf_OtherInBill', '2'); 


                            playSound1();


                            HSourceFlag = true;


                            sessionStorage["SourceFlag"] = true;


                            //sessionStorage["SourceFlag"] = true;


                            layer.load(3)


                            //table.render({


                            //    elem: '#wl-table'