Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-24 503bc89c55d675a27b689419aa906a070ca5cb03

 ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js

@@ -275,6 +275,29 @@
        }
    }
    var checkbox6 = $('#checkbox6').prop('checked');
    var checkbox7 = $('#checkbox7').prop('checked');
    if (checkbox7) {
        var jsj = $("input[name='jsj']:checked").val();
        if (1 == jsj){
            var jsjPercent = $("#jsjPercent").val();
            if ("" == jsjPercent){
                Feng.info("接送机比例抽成不能为空!");
                return;
            }else if (!regDouble.test(jsjPercent)) {
                Feng.info("接送机比例抽成格式不正确!");
                return;
            }
        }else if (2 == jsj){
            var jsjMoney = $("#jsjMoney").val();
            if ("" == jsjMoney){
                Feng.info("接送机固定金额抽成不能为空!");
                return;
            }else if (!regDouble.test(jsjMoney)) {
                Feng.info("接送机固定金额抽成格式不正确!");
                return;
            }
        }
    }

    var isNeedFerry = $("input[name='isNeedFerry']:checked").val();
    //提交信息
@@ -347,6 +370,18 @@
        ajax.set("isCharter",1);
    }else{
        ajax.set("isCharter",2);
    }
    if (checkbox7){
        var jsj = $("input[name='jsj']:checked").val();
        ajax.set("isTransferFixedOrProportional",jsj);
        if (1 == jsj){
            ajax.set("transferMoney",$("#jsjPercent").val());
        }else if (2 == jsj) {
            ajax.set("transferMoney",$("#jsjMoney").val());
        }
        ajax.set("isTransfer",1);
    }else{
        ajax.set("isTransfer",2);
    }
    ajax.set("isNeedFerry",isNeedFerry);
    ajax.set("account",$("#account").val());
@@ -466,7 +501,29 @@
        }
    }
    var checkbox6 = $('#checkbox6').prop('checked');

    var checkbox7 = $('#checkbox7').prop('checked');
    if (checkbox7) {
        var jsj = $("input[name='jsj']:checked").val();
        if (1 == jsj){
            var jsjPercent = $("#jsjPercent").val();
            if ("" == jsjPercent){
                Feng.info("接送机比例抽成不能为空!");
                return;
            }else if (!regDouble.test(jsjPercent)) {
                Feng.info("接送机比例抽成格式不正确!");
                return;
            }
        }else if (2 == jsj){
            var jsjMoney = $("#jsjMoney").val();
            if ("" == jsjMoney){
                Feng.info("接送机固定金额抽成不能为空!");
                return;
            }else if (!regDouble.test(jsjMoney)) {
                Feng.info("接送机固定金额抽成格式不正确!");
                return;
            }
        }
    }
    var isNeedFerry = $("input[name='isNeedFerry']:checked").val();
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCompany/updateFranchisee", function(data){
@@ -539,6 +596,18 @@
    }else{
        ajax.set("isCharter",2);
    }
    if (checkbox7){
        var jsj = $("input[name='jsj']:checked").val();
        ajax.set("isTransferFixedOrProportional",jsj);
        if (1 == jsj){
            ajax.set("transferMoney",$("#jsjPercent").val());
        }else if (2 == jsj) {
            ajax.set("transferMoney",$("#jsjMoney").val());
        }
        ajax.set("isTransfer",1);
    }else{
        ajax.set("isTransfer",2);
    }
    ajax.set("isNeedFerry",isNeedFerry);
    ajax.set("account",$("#account").val());
    ajax.set("password",$("#password").val());
@@ -604,3 +673,12 @@
        $("#bcDiv").hide();
    }
}
//接送机
FranchiseeInfoDlg.checkbox7 = function () {
    var checkbox7 = $('#checkbox7').prop('checked');
    if (checkbox7){
        $("#jsjDiv").show();
    } else {
        $("#jsjDiv").hide();
    }
}