Merge remote-tracking branch 'origin/master'

liujie

2023-08-16 5cb1979f05446792cc33a8cb6b7aaae906da5a70

 management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js

@@ -40,40 +40,11 @@
                }
            }
        },
        emergencyPhone: {
        num22: {
            validators: {
                notEmpty: {
                    message: '代理商抽成不能为空'
                    message: '客服电话不能为空'
                }
            }
        },
        account: {
            validators: {
                notEmpty: {
                    message: '登录账号不能为空'
                }
            }
        },
        password: {
            validators: {
                notEmpty: {
                    message:  '登录密码不能为空'
                },
                identical: {
                    field: 'rePassword',
                    message: '两次密码不一致'
                },
            }
        },
        rePassword: {
            validators: {
                notEmpty: {
                    message: '密码不能为空'
                },
                identical: {
                    field: 'password',
                    message: '两次密码不一致'
                },
            }
        }
    }
@@ -162,7 +133,21 @@
    if(!this.validate()){
        return ;
    }

    let account = $('#account').val();
    let password = $('#password').val();
    let rePassword = $('#rePassword').val();
    if(null == account || '' == account){
        Feng.error("账号不能为空");
        return
    }
    if(null == password || '' == password){
        Feng.error("密码不能为空");
        return
    }
    if(null == rePassword || '' == rePassword || password != rePassword){
        Feng.error("密码不一致");
        return
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/add", function(data){
        if(data.code == 500){
@@ -176,6 +161,43 @@
    },function(data){
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    var json1=[];
    for (let i = 0; i < $('input[name="num1"]').length; i++) {
        var arr = {}
        arr['num1'] = $($('input[name="num1"]')[i]).val();
        arr['num2'] = $($('input[name="num2"]')[i]).val();
        arr['num3'] = Number($($('input[name="num3"]')[i]).val());
        arr['num4'] = Number($($('input[name="num4"]')[i]).val());
        arr['num5'] = Number($($('input[name="num5"]')[i]).val());
        arr['num6'] = Number($($('input[name="num6"]')[i]).val());
        arr['num7'] = Number($($('input[name="num7"]')[i]).val());
        arr['num8'] = Number($($('input[name="num8"]')[i]).val());
        arr['num9'] = Number($($('input[name="num9"]')[i]).val());
        arr['num10'] = Number($($('input[name="num10"]')[i]).val());
        arr['num11'] = Number($($('input[name="num11"]')[i]).val());
        json1.push(arr)
    }
    var ExtraCost = {};
    ExtraCost['num1'] = Number($('#num12').val());
    ExtraCost['num2'] = Number($('#num13').val());
    ExtraCost['num3'] = Number($('#num14').val());
    ExtraCost['num4'] = Number($('#num15').val());
    ExtraCost['num5'] = Number($('#num16').val());
    ExtraCost['num6'] = Number($('#num17').val());
    ExtraCost['num7'] = Number($('#num18').val());
    ExtraCost['num8'] = Number($('#num19').val());
    ExtraCost['num9'] = Number($('#num20').val());
    ExtraCost['num10'] = Number($('#num21').val());
    var reqData = {};
    reqData['ChargeStandard'] = json1;
    reqData['ExtraCost'] = ExtraCost;
    // ajax.set("content",JSON.stringify(reqData));
    // ajax.set("type",5);
    this.tBranchOfficeInfoData.systemPriceType = 5;
    this.tBranchOfficeInfoData.systemPriceContent = JSON.stringify(reqData);
    this.tBranchOfficeInfoData.holiday = $('#holiday').is(":checked") ? 1 : 0;
    this.tBranchOfficeInfoData.isTaxiCar = $('#isTaxiCar').is(":checked") ? 1 : 0;
    this.tBranchOfficeInfoData.serviceTel = $('#num22').val();
    ajax.set(this.tBranchOfficeInfoData);
    ajax.start();
}
@@ -188,9 +210,27 @@
    this.clearData();
    this.collectData();

    if(!this.validate()){
        return ;
    var branchOfficeName = $('#branchOfficeName').val();
    var principal = $('#principal').val();
    var principalPhone = $('#principalPhone').val();
    var area = $('#area').val();
    if(null == branchOfficeName || '' == branchOfficeName){
        Feng.error("分公司名称不能为空");
        return
    }
    if(null == principal || '' == principal){
        Feng.error("负责人姓名不能为空");
        return
    }
    if(null == principalPhone || '' == principalPhone){
        Feng.error("联系电话不能为空");
        return
    }
    if(null == area || '' == area){
        Feng.error("代理区域不能为空");
        return
    }


    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/update", function(data){
@@ -205,10 +245,103 @@
    },function(data){
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    var json1=[];
    for (let i = 0; i < $('input[name="num1"]').length; i++) {
        var arr = {}
        arr['num1'] = $($('input[name="num1"]')[i]).val();
        arr['num2'] = $($('input[name="num2"]')[i]).val();
        arr['num3'] = Number($($('input[name="num3"]')[i]).val());
        arr['num4'] = Number($($('input[name="num4"]')[i]).val());
        arr['num5'] = Number($($('input[name="num5"]')[i]).val());
        arr['num6'] = Number($($('input[name="num6"]')[i]).val());
        arr['num7'] = Number($($('input[name="num7"]')[i]).val());
        arr['num8'] = Number($($('input[name="num8"]')[i]).val());
        arr['num9'] = Number($($('input[name="num9"]')[i]).val());
        arr['num10'] = Number($($('input[name="num10"]')[i]).val());
        arr['num11'] = Number($($('input[name="num11"]')[i]).val());
        json1.push(arr)
    }
    var ExtraCost = {};
    ExtraCost['num1'] = Number($('#num12').val());
    ExtraCost['num2'] = Number($('#num13').val());
    ExtraCost['num3'] = Number($('#num14').val());
    ExtraCost['num4'] = Number($('#num15').val());
    ExtraCost['num5'] = Number($('#num16').val());
    ExtraCost['num6'] = Number($('#num17').val());
    ExtraCost['num7'] = Number($('#num18').val());
    ExtraCost['num8'] = Number($('#num19').val());
    ExtraCost['num9'] = Number($('#num20').val());
    ExtraCost['num10'] = Number($('#num21').val());
    var reqData = {};
    reqData['ChargeStandard'] = json1;
    reqData['ExtraCost'] = ExtraCost;
    // ajax.set("content",JSON.stringify(reqData));
    // ajax.set("type",5);
    this.tBranchOfficeInfoData.systemPriceType = 5;
    this.tBranchOfficeInfoData.systemPriceContent = JSON.stringify(reqData);
    this.tBranchOfficeInfoData.holiday = $('#holiday').is(":checked") ? 1 : 0;
    this.tBranchOfficeInfoData.isTaxiCar = $('#isTaxiCar').is(":checked") ? 1 : 0;
    this.tBranchOfficeInfoData.serviceTel = $('#num22').val();
    ajax.set(this.tBranchOfficeInfoData);
    ajax.start();
}


TBranchOfficeInfoDlg.addBox = function (){
    var i = $('input[name="num1"]').length + 1;
    var a ="<div>\n" +
        "                                <div class=\"initialLevel col-sm-12 control-label form-group\"  >\n" +
        "                                    <span class=\"control-label\" >时间段</span>\n" +
        "                                    <input class=\"control-label\" id=\"num1-"+i+"\" name=\"num1\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\">\n" +
        "                                    <span class=\"control-label\" >——</span>\n" +
        "                                    <input class=\"control-label\" id=\"num2-"+i+"\" name=\"num2\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\">\n" +
        "                                    <span class=\"control-label\" >代驾里程</span>\n" +
        "                                    <input class=\"control-label\" id=\"num3-"+i+"\" name=\"num3\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
        "                                    <span class=\"control-label\" >公里,起步价</span>\n" +
        "                                    <input class=\"control-label\" id=\"num4-"+i+"\" name=\"num4\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
        "                                    <span class=\"control-label\" >元,超出里程每</span>\n" +
        "                                    <input class=\"control-label\" id=\"num5-"+i+"\" name=\"num5\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
        "                                    <span class=\"control-label\" >公里,收费</span>\n" +
        "                                    <input class=\"control-label\" id=\"num6-"+i+"\" name=\"num6\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
        "                                    <span class=\"control-label\" >元</span>\n" +
        "                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class=\"fa fa-remove\" onclick=\"TBranchOfficeInfoDlg.delBox(this)\"></span>\n" +
        "                                </div>\n" +
        "                                <div class=\"initialLevel col-sm-12 control-label form-group\"  >\n" +
        "                                    <span class=\"control-label\" >长途里程</span>\n" +
        "                                    <input class=\"control-label\" id=\"num7-"+i+"\" name=\"num7\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
        "                                    <span class=\"control-label\" >——</span>\n" +
        "                                    <input class=\"control-label\" id=\"num8-"+i+"\" name=\"num8\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
        "                                    <span class=\"control-label\" >公里,收费</span>\n" +
        "                                    <input class=\"control-label\" id=\"num9-"+i+"\" name=\"num9\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
        "                                    <span class=\"control-label\" >元,超出里程每</span>\n" +
        "                                    <input class=\"control-label\" id=\"num10-"+i+"\" name=\"num10\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
        "                                    <span class=\"control-label\" >公里,收费</span>\n" +
        "                                    <input class=\"control-label\" id=\"num11-"+i+"\" name=\"num11\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
        "                                    <span class=\"control-label\" >元</span>\n" +
        "                                </div>\n" +
        "                            </div>"
    $("#rules").append($(a))
    // laydate.render({
    //     elem: '#num1-'+i,
    //     type: 'time',
    //     format: 'HH:mm',
    //     range: false,
    //     lang:'zn'
    // });
    // laydate.render({
    //     elem: '#num2-'+i,
    //     type: 'time',
    //     format: 'HH:mm',
    //     range: false,
    //     lang:'zn'
    // });
}
TBranchOfficeInfoDlg.delBox = function (o) {
    $(o).parent("div").parent("div").remove()
};



$(function() {
    Feng.initValidator("branchOfficeInfoForm", TBranchOfficeInfoDlg.validateFields);
});