zrg
2024-03-06 6b977a9a914c23e50be602dade8afcf062629aa3
发货通知单选单号
5个文件已修改
123 ■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/其他应付单/YF_PayMentOtherBillMain.html 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,10 +3,10 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
WebTM/views/²É¹º¹ÜÀí/ÍËÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBackBillList.html
@@ -344,6 +344,7 @@
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HInterID").val("0");
                $("#HBillNo").val("");
                $.ajax({
WebTM/views/ÏúÊÛ¹ÜÀí/ÆäËûÓ¦¸¶µ¥/YF_PayMentOtherBillMain.html
@@ -97,7 +97,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">汇率<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" step="background-color: #efefef4d;" readonly>
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
                                            </div>
                                        </div>   
                                    </div>
@@ -130,7 +130,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">不含税金额</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMoney" id="HMoney"  value="0"  autocomplete="off" >
                                                <input type="text" class="layui-input" name="HMoney" id="HMoney" style="background-color: #efefef4d;" value="0"  autocomplete="off" readonly >
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -405,10 +405,14 @@
                    var HTaxRate = $("#HTaxRate").val() * 1;      //税率
                    var HRelSumMoney = HMoney * (1 + HTaxRate);    //总金额
                    $("#HSumMoney").val(HRelSumMoney);
                    //$("#HSumMoney").val(HRelSumMoney);
                
                });
                //#endregion
                //#region ç¨ŽçŽ‡å¤±ç„¦äº‹ä»¶
                var oldHTaxRate = "";                          //修改前的值
@@ -428,22 +432,24 @@
                    //输入的税率,
                    var HTaxRate = newHTaxRate * 1; //税率
                    var HMoney = $("#HMoney").val() * 1;      //税率
                    var HSumMoney= HMoney * (1 + HTaxRate);    //总金额
                    $("#HSumMoney").val(HSumMoney);
                    var HSumMoney = $("#HSumMoney").val() * 1;      //单据金额
                    var HMoney = HSumMoney / (1 + (HTaxRate * 0.01));    //不含税金额
                    $("#HMoney").val(HMoney);
                });
                //#endregion
                //#region æ€»é‡‘额失焦事件
                  ///不含税金额= å«ç¨Žé‡‘额/(100+税率)/100
                //#region å•据金额失焦事件
                var oldHSumMoney = "";                          //修改前的值
                var newHSumMoney = "";                          //修改后的值
                $("#HSumMoney").on('focus', function (data) {
                    oldHSumMoney = $("#HSumMoney").val() * 1;   //不含税金额文本框获取焦点时获取修改前的值
                    oldHSumMoney = $("#HSumMoney").val() * 1;   //单据金额文本框获取焦点时获取修改前的值
                }).on('blur', function (data) {
                    newHSumMoney = $("#HSumMoney").val();       //不含税金额文本框失焦时获取修改后的值
                    newHSumMoney = $("#HSumMoney").val();       //单据金额文本框失焦时获取修改后的值
                    if (newHSumMoney!=0) {
                        //判断输入的金额是否合法
                        var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
@@ -456,7 +462,7 @@
                        //输入的总金额合法,重算不含税金额
                        var HSumMoney = newHSumMoney * 1;                    //不含税金额
                        var HTaxRate = $("#HTaxRate").val() * 1;      //税率
                        var HMoney = HSumMoney / (1 + HTaxRate);    //不含税金额
                        var HMoney = HSumMoney / (100 + HTaxRate)/100;    //不含税金额
                        $("#HMoney").val(HMoney);
                    }
WebTM/views/ÏúÊÛ¹ÜÀí/ÆäËûÓ¦ÊÕµ¥/YS_ReceiveOtherBillMain.html
@@ -97,7 +97,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">汇率<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" step="background-color: #efefef4d;" readonly>
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
                                            </div>
                                        </div>   
                                    </div>
@@ -403,7 +403,7 @@
                    //输入的不含税金额合法,重
                    var HMoney = newHMoney * 1; //算总金额                       //不含税金额
                    var HTaxRate = $("#HTaxRate").val() * 1;      //税率
                    var HRelSumMoney = HMoney * (1 + HTaxRate);    //总金额
                    var HRelSumMoney = HMoney * (1 + (HTaxRate * 0.01) );    //总金额
                    $("#HSumMoney").val(HRelSumMoney);
                
@@ -429,7 +429,7 @@
                    //输入的税率,
                    var HTaxRate = newHTaxRate * 1; //税率
                    var HMoney = $("#HMoney").val() * 1;      //税率
                    var HSumMoney= HMoney * (1 + HTaxRate);    //总金额
                    var HSumMoney = HMoney * (1 + (HTaxRate * 0.01));    //总金额
                    $("#HSumMoney").val(HSumMoney);
@@ -456,7 +456,7 @@
                        //输入的总金额合法,重算不含税金额
                        var HSumMoney = newHSumMoney * 1;                    //不含税金额
                        var HTaxRate = $("#HTaxRate").val() * 1;      //税率
                        var HMoney = HSumMoney / (1 + HTaxRate);    //不含税金额
                        var HMoney = HSumMoney / (1 + (HTaxRate * 0.01));    //不含税金额
                        $("#HMoney").val(HMoney);
                    }
WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Add_Edit_Xs_SeOutStockBillList.html
@@ -65,7 +65,7 @@
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -157,6 +157,16 @@
                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="" id="" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;"   readonly>
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
@@ -396,7 +406,8 @@
            var rowdata = [{
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": "0", "发货仓库": "",
                "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
                "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
            }];
            // åˆå§‹åŒ–界
@@ -409,7 +420,8 @@
                //新增行表格数据
                var NewRow = {
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": "0", "发货仓库": "",
                    "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
                    "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -588,6 +600,62 @@
                }
            });
            //#endregion
            //#region è¡¨å¤´ä¿¡æ¯é€‰æ‹©å•据弹窗
            form.on('submit(XDHList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: '销售订单列表'  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["90%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ["../../销售管理/销售订单/Xs_SeOrderBillList.html", "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        //layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //获取销售订单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            ProcessNumber.push(checkStatus.data[i]);
                        }
                        for (var i = 0; i < ProcessNumber.length; i++) {
                            option.data.push({
                                "HMaterID": checkStatus.data[i].HMaterID
                                , "物料代码": checkStatus.data[i].物料代码
                                , "物料名称": checkStatus.data[i].物料名称
                                , "规格型号": checkStatus.data[i].规格型号
                                , "HUnitID": checkStatus.data[i].HUnitID
                                , "计量单位": checkStatus.data[i].计量单位
                                ,"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
                            })
                        }
                        table.render(option);
                        layer.close(index);//关闭弹窗
                    }
                });
            });
            //#endregion
            //#endregion
@@ -613,6 +681,10 @@
                    , cols: [[ //子表
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', width: 100, totalRow: true }
                        , { type: 'HSourceBillNo', title: '源单号', width: 100, hide: true }//源单号
                        , { field: 'HSourceBillType', title: '源单类型', width: 100, hide: true }//源单类型
                        , { type: 'HSourceInterID', title: '源单主内码', width: 100, hide: true }//源单主内码
                        , { field: 'HSourceEntryID', title: '源单子内码', width: 100, hide: true }//源单子内码
                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
                        , { field: '物料代码', title: '物料代码', width: 150, edit: 'text', event: "HMaterID" }//f7
                        , { field: '物料名称', title: '物料名称', width: 150, }
@@ -697,6 +769,10 @@
                                    {
                                        "HMaterID": subdata[i].HMaterID, "物料代码": subdata[i].物料代码, "物料名称": subdata[i].物料名称, "规格型号": subdata[i].规格型号, "HUnitID": subdata[i].HUnitID, "计量单位": subdata[i].计量单位,
                                        "HWHID": subdata[i].HWHID, "发货仓库": subdata[i].发货仓库, "HQty": subdata[i].数量, "HPrice": subdata[i].单价, "HMoney": subdata[i].金额, "HRemark": subdata[i].表体备注
                                        , "HSourceBillNo": subdata[i].源单单号,    //源单号
                                        "HSourceBillType": subdata[i].源单类型,   //源单类型
                                        "HSourceInterID": subdata[i].源单主内码,   //源单主内码
                                        "HSourceEntryID": subdata[i].源单子内码     //源单子内码
                                    }
                                )
                            }