duhe
2023-11-06 1486fe37aee08fa6b5068f36c035367a138f5896
销售订单:保存时增加数据校验
2个文件已修改
133 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html 131 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4671,7 +4671,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html">
      <publishTime>10/30/2023 18:13:02</publishTime>
      <publishTime>11/06/2023 23:22:33</publishTime>
    </File>
    <File Include="views/销售管理/销售订单/Xs_SeOrderBillDyColList.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Add_Edit_Xs_SeOrderBillList.html
@@ -468,9 +468,9 @@
            //#region è¡¨å¤´æŒ‰é’®è§¦å‘事件
            //#region ä¿å­˜æŒ‰é’®
            form.on('submit(set_SaveBill)', function (data) {
                //if (AllowLoadData(data)) {
                if (AllowLoadData(data)) {
                    set_SaveBill(data);
                //}
                }
            });
            //#endregion
@@ -509,7 +509,7 @@
                    "HTaxMoney": "0",
                    "HlineTotal": "0",
                    "HlineTotalBB": "0",
                    "HDate": "",
                    "HDate": Format(new Date(), 'yyyy-MM-dd'),
                    "HOutStockQty": "0",
                    "HInvoiceQty": "0",
                    "HRemark": ""
@@ -592,7 +592,7 @@
                        //数据校验合格,重算记录
                        var HQty = value * 1;                           //数量
                        var HPrice = obj.data.HPrice * 1;               //单价
                        var HTaxRate = obj.data.HTaxRate * 1;           //税率
                        var HTaxRate = obj.data.HTaxRate * 0.01;           //税率
                        /*var HDiscountRate = obj.data.HDiscountRate * 1; //折扣率*/
                        var HTaxPrice = HPrice * (1 + HTaxRate);        //含税单价=单价*(1+税率)
                        /*var HRelTaxPrice = HTaxPrice * HDiscountRate;   //实际含税单价=含税单价*折扣率*/
@@ -607,7 +607,7 @@
                        obj.update({
                            HQty: HQty
                            , HPrice: HPrice
                            , HTaxRate: HTaxRate
                            , HTaxRate: HTaxRate * 100
                            , HTaxPrice: HTaxPrice
                            , HMoney: HMoney
                            , HlineTotal: HlineTotal
@@ -632,7 +632,7 @@
                        //数据校验合格,重算记录
                        var HQty = obj.data.HQty * 1;                   //数量
                        var HPrice = value * 1;                         //单价
                        var HTaxRate = obj.data.HTaxRate * 1;           //税率
                        var HTaxRate = obj.data.HTaxRate * 0.01;           //税率
                        /*var HDiscountRate = obj.data.HDiscountRate * 1; //折扣率*/
                        var HTaxPrice = HPrice * (1 + HTaxRate);        //含税单价=单价*(1+税率)
                        /*var HRelTaxPrice = HTaxPrice * HDiscountRate;   //实际含税单价=含税单价*折扣率*/
@@ -647,7 +647,7 @@
                        obj.update({
                            HQty: HQty
                            , HPrice: HPrice
                            , HTaxRate: HTaxRate
                            , HTaxRate: HTaxRate * 100
                            , HTaxPrice: HTaxPrice
                            , HMoney: HMoney
                            , HlineTotal: HlineTotal
@@ -672,7 +672,7 @@
                        //数据校验合格,重算记录
                        var HQty = obj.data.HQty * 1;                   //数量
                        var HPrice = obj.data.HPrice * 1;               //单价
                        var HTaxRate = value * 1;                       //税率
                        var HTaxRate = value * 0.01;                       //税率
                        /*var HDiscountRate = obj.data.HDiscountRate * 1; //折扣率*/
                        var HTaxPrice = HPrice * (1 + HTaxRate);        //含税单价=单价*(1+税率)
                        /*var HRelTaxPrice = HTaxPrice * HDiscountRate;   //实际含税单价=含税单价*折扣率*/
@@ -687,7 +687,7 @@
                        obj.update({
                            HQty: HQty
                            , HPrice: HPrice
                            , HTaxRate: HTaxRate
                            , HTaxRate: HTaxRate * 100
                            , HTaxPrice: HTaxPrice
                            , HMoney: HMoney
                            , HlineTotal: HlineTotal
@@ -825,7 +825,7 @@
                    "HTaxMoney": "0",
                    "HlineTotal": "0",
                    "HlineTotalBB": "0",
                    "HDate": "",
                    "HDate": Format(new Date(),'yyyy-MM-dd'),
                    "HOutStockQty": "0",
                    "HInvoiceQty": "0",
                    "HRemark": ""
@@ -1238,11 +1238,6 @@
                    return false;
                }
                if ($("#HCusID").val() == "0") {
                    layer.msg("客户未选择!");
                    return false;
                }
                if ($("#HEmpID").val() == "0") {
                    layer.msg("销售员未选择!");
                    return false;
@@ -1253,8 +1248,17 @@
                    return false;
                }
                if ($("#HMangerID").val() == "0") {
                    layer.msg("销售主管未选择!");
                temp = $("HExRate").val() + "";
                if (temp == 0 || temp == "") {
                    layer.msg("汇率不能为0或空!");
                    return false;
                } else if (!ref.test(temp)) {
                    layer.msg("汇率请输入大于0的数字!");
                    return false;
                }
                if ($("#HCusID").val() == "0") {
                    layer.msg("客户未选择!");
                    return false;
                }
@@ -1262,6 +1266,18 @@
                    layer.msg("结算方式未选择!");
                    return false;
                }
                if ($("#HSellSID").val() == "0") {
                    layer.msg("销售方式未选择!");
                    return false;
                }
                if ($("#HMangerID").val() == "0") {
                    layer.msg("销售主管未选择!");
                    return false;
                }
                //if ($("#HPayCusID").val() == "0") {
                //    layer.msg("结算方未选择!");
@@ -1273,14 +1289,7 @@
                //    return false;
                //}
                temp = $("HExRate").val() + "";
                if (temp == 0 || temp == "") {
                    layer.msg("汇率不能为0或空!");
                    return false;
                } else if (!ref.test(temp)){
                    layer.msg("汇率请输入大于0的数字!");
                    return false;
                }
                //#endregion
                //#region å­è¡¨ æ•°æ®æ£€éªŒ
@@ -1292,11 +1301,6 @@
                    if (option.data[i]["HUnitID"] == "0") {
                        layer.msg("第" + i + "行:计量单位未选择!");
                        return false;
                    }
                    if (option.data[i]["HDate"] == "") {
                        layer.msg("第" + i + "行:交货日期不能为空!");
                        return false;
                    }
@@ -1320,6 +1324,16 @@
                        return false;
                    }
                    //税率格式校验
                    temp = option.data[i]["HTaxRate"] + "";
                    if (temp == "0") {
                        layer.msg("第" + i + "行:税率不能为0!");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + i + "行:税率请输入大于0的数字!");
                        return false;
                    }
                    //含税单价格式校验
                    temp = option.data[i]["HTaxPrice"] + "";
                    if (temp == "0") {
@@ -1339,6 +1353,27 @@
                        layer.msg("第" + i + "行:金额请输入大于0的数字!");
                        return false;
                    }
                    //价税合计格式校验
                    temp = option.data[i]["HlineTotal"] + "";
                    if (temp == "0") {
                        layer.msg("第" + i + "行:价税合计不能为0!");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + i + "行:价税合计请输入大于0的数字!");
                        return false;
                    }
                    if (option.data[i]["HDate"] == "") {
                        layer.msg("第" + i + "行:交货日期不能为空!");
                        return false;
                    }
                    ////折扣率格式校验
                    //temp = option.data[i]["HDiscountRate"] + "";
@@ -1360,35 +1395,19 @@
                    //    return false;
                    //}
                    //税率格式校验
                    temp = option.data[i]["HTaxRate"] + "";
                    if (temp == "0") {
                        layer.msg("第" + i + "行:税率不能为0!");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + i + "行:税率请输入大于0的数字!");
                        return false;
                    }
                    //税额格式校验
                    temp = option.data[i]["HTaxMoney"] + "";
                    if (temp == "0") {
                        layer.msg("第" + i + "行:税额不能为0!");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + i + "行:税额请输入大于0的数字!");
                        return false;
                    }
                    //temp = option.data[i]["HTaxMoney"] + "";
                    //if (temp == "0") {
                    //    layer.msg("第" + i + "行:税额不能为0!");
                    //    return false;
                    //} else if (!ref.test(temp)) {
                    //    layer.msg("第" + i + "行:税额请输入大于0的数字!");
                    //    return false;
                    //}
                    //价税合计格式校验
                    temp = option.data[i]["HlineTotal"] + "";
                    if (temp == "0") {
                        layer.msg("第" + i + "行:价税合计不能为0!");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + i + "行:价税合计请输入大于0的数字!");
                        return false;
                    }
                    ////本位币价税合计格式校验
                    //temp = option.data[i]["HlineTotalBB"] + "";