返修流程；下销售订单子类型HBillSubType为售后订单类型(允许单价为0)，下推生产订单 (售后订单类型)、生产订单下推/批量下推工序流转卡(售...

duhe

2024-03-08 9b309151de36d7372e27dbb5b6a7722f6dda388e

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Add_Edit_Xs_SeOrderBillList.html

@@ -145,6 +145,15 @@
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">销售订单类型</label>
                                            <div class="layui-input-inline">
                                                <select name="HBillSubType" id="HBillSubType" lay-filter="HBillSubType" style="width: 180px; ">
                                                    <option style="color:blue;" selected="selected" value="0">普通单据</option>
                                                    <option style="color:blue;" value="1">返修单据</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -736,20 +745,49 @@
                    case "HPrice":                                                       //单价
                        //数据格式校验
                        temp = value + "";
                        if (!ref.test(temp) || temp == 0) {
                            //恢复数据到编辑前
                            obj.update({
                                HPrice: oldText
                            });
                            table.render(option);
                        if ($("#HBillSubType").val() == "0") {
                            if (!ref.test(temp) || temp == 0) {
                                //恢复数据到编辑前
                                obj.update({
                                    HPrice: oldText
                                });
                                table.render(option);

                            //刷新表格同时根据option中HisStockGoods值设置下拉列表
                            setSelectHisStockGoodsByTableRender();
                                //刷新表格同时根据option中HisStockGoods值设置下拉列表
                                setSelectHisStockGoodsByTableRender();

                            layer.msg("单价请输入大于0的数字!");
                            return;
                                layer.msg("单价请输入大于0的数字!");
                                return;
                            }
                        } else if ($("#HBillSubType").val() == "1") {
                            if (!ref.test(temp)) {
                                //恢复数据到编辑前
                                obj.update({
                                    HPrice: oldText
                                });
                                table.render(option);

                                //刷新表格同时根据option中HisStockGoods值设置下拉列表
                                setSelectHisStockGoodsByTableRender();

                                layer.msg("单价请输入不小于0的数字!");
                                return;
                            }
                        } else {
                            if (!ref.test(temp)) {
                                //恢复数据到编辑前
                                obj.update({
                                    HPrice: oldText
                                });
                                table.render(option);

                                //刷新表格同时根据option中HisStockGoods值设置下拉列表
                                setSelectHisStockGoodsByTableRender();

                                layer.msg("单价请输入不小于0的数字!");
                                return;
                            }
                        }


                        //数据校验合格，重算记录
                        var HQty = obj.data.HQty * 1;                   //数量
@@ -846,18 +884,48 @@
                    case "HTaxPrice":                                                       //数量
                        //数据格式校验
                        temp = value + "";
                        if (!ref.test(temp)) {
                            //恢复数据到编辑前
                            obj.update({
                                HTaxPrice: oldText
                            });
                            table.render(option);
                        if ($("#HBillSubType").val() == "0") {
                            if (!ref.test(temp) || temp == "0") {
                                //恢复数据到编辑前
                                obj.update({
                                    HTaxPrice: oldText
                                });
                                table.render(option);

                            //刷新表格同时根据option中HisStockGoods值设置下拉列表
                            setSelectHisStockGoodsByTableRender();
                                //刷新表格同时根据option中HisStockGoods值设置下拉列表
                                setSelectHisStockGoodsByTableRender();

                            layer.msg("含税单据请输入不小于0的数字!");
                            return;
                                layer.msg("含税单价请输入不小于0的数字!");
                                return;
                            }
                        } else if ($("#HBillSubType").val() == "1") {
                            if (!ref.test(temp)) {
                                //恢复数据到编辑前
                                obj.update({
                                    HTaxPrice: oldText
                                });
                                table.render(option);

                                //刷新表格同时根据option中HisStockGoods值设置下拉列表
                                setSelectHisStockGoodsByTableRender();

                                layer.msg("含税单价请输入不小于0的数字!");
                                return;
                            }
                        } else {
                            if (!ref.test(temp)) {
                                //恢复数据到编辑前
                                obj.update({
                                    HTaxPrice: oldText
                                });
                                table.render(option);

                                //刷新表格同时根据option中HisStockGoods值设置下拉列表
                                setSelectHisStockGoodsByTableRender();

                                layer.msg("含税单价请输入不小于0的数字!");
                                return;
                            }
                        }
                        //数据校验合格，重算记录
                        var HQty = obj.data.HQty * 1;                   //数量
@@ -1210,6 +1278,7 @@
                                , "HCurName": data.币别
                                , "HExRate": data.汇率
                                , "HEarnestRate": data.定金比例
                                , "HBillSubType": data.HBillSubType
                                , "HManagerID": data.HManagerID
                                , "HManagerName": data.主管
                                , "HSellSID": data.HSellSID
@@ -1626,6 +1695,11 @@
                    return false;
                }

                if ($("#HBillSubType").val() != "0" && $("#HBillSubType").val()!="1") {
                    layer.msg("请选择销售订单类型!");
                    return false;
                }

                //if ($("#HSellSID").val() == "0") {
                //    layer.msg("销售方式未选择!");
                //    return false;
@@ -1675,13 +1749,21 @@

                    //单价格式校验
                    temp = option.data[i]["HPrice"] + "";
                    if (temp == "0") {
                        layer.msg("第" + i + "行：单价不能为0！");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + i + "行：单价请输入大于0的数字！");
                        return false;
                    if ($("#HBillSubType").val() == "0") {
                        if (temp == "0") {
                            layer.msg("第" + i + "行：单价不能为0！");
                            return false;
                        } else if (!ref.test(temp)) {
                            layer.msg("第" + i + "行：单价请输入大于0的数字！");
                            return false;
                        }
                    } else if ($("#HBillSubType").val() == "1"){
                        if (!ref.test(temp)) {
                            layer.msg("第" + i + "行：单价请输入不小于0的数字！");
                            return false;
                        }
                    }
                    

                    //税率格式校验
                    temp = option.data[i]["HTaxRate"] + "";
@@ -1692,32 +1774,54 @@

                    //含税单价格式校验
                    temp = option.data[i]["HTaxPrice"] + "";
                    if (temp == "0") {
                        layer.msg("第" + i + "行：含税单价不能为0！");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + i + "行：含税单价请输入大于0的数字！");
                        return false;
                    if ($("#HBillSubType").val() == "0") {
                        if (temp == "0") {
                            layer.msg("第" + i + "行：含税单价不能为0！");
                            return false;
                        } else if (!ref.test(temp)) {
                            layer.msg("第" + i + "行：含税单价请输入大于0的数字！");
                            return false;
                        }
                    } else if ($("#HBillSubType").val() == "1"){
                        if (!ref.test(temp)) {
                            layer.msg("第" + i + "行：含税单价请输入不小于0的数字！");
                            return false;
                        }
                    }
                    

                    //金额格式校验
                    temp = option.data[i]["HMoney"] + "";
                    if (temp == "0") {
                        layer.msg("第" + i + "行：金额不能为0！");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + i + "行：金额请输入大于0的数字！");
                        return false;
                    if ($("#HBillSubType").val() == "0") {
                        if (temp == "0") {
                            layer.msg("第" + i + "行：金额不能为0！");
                            return false;
                        } else if (!ref.test(temp)) {
                            layer.msg("第" + i + "行：金额请输入大于0的数字！");
                            return false;
                        }
                    } else if ($("#HBillSubType").val() == "1") {
                        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;
                    if ($("#HBillSubType").val() == "0") {
                        if (temp == "0") {
                            layer.msg("第" + i + "行：价税合计不能为0！");
                            return false;
                        } else if (!ref.test(temp)) {
                            layer.msg("第" + i + "行：价税合计请输入大于0的数字！");
                            return false;
                        }
                    } else if ($("#HBillSubType").val() == "1") {
                        if (!ref.test(temp)) {
                            layer.msg("第" + i + "行：价税合计请输入不小于0的数字！");
                            return false;
                        }
                    }

                    if (option.data[i]["HDate"] == "") {