From ea2e322e4564a177b49ad38fda2d42780632ea0d Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期一, 16 十月 2023 11:07:26 +0800 Subject: [PATCH] 10.16 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 3 +-- cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html | 2 +- cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js | 42 +++++++++++++++++++++--------------------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java index 351f22d..58c8bb9 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java @@ -177,8 +177,7 @@ try { if(ToolUtil.isNotEmpty(competition.getProvinceCode())) { System.out.println("=============="+competition); - TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, competition.getProvinceCode())); - System.out.println("==========="+one); + TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getProvinceCode())); competition.setProvince(one.getName()); TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getCityCode())); competition.setCity(one1.getName()); diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html index 94dd640..3489d9d 100644 --- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html @@ -65,7 +65,7 @@ <div class="form-group" id="provinceCode"> <label class="col-sm-3 control-label">所在省:</label> <div class="col-sm-9"> - <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange2(this)"> + <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange(this)"> </select> </div> </div> diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js index 1618198..94dde40 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js @@ -441,26 +441,26 @@ /** * 选择分公司后执行 */ -TCarInfoDlg.oneChange = function (e) { - var oneId=$(e).val(); - var ajax = new $ax(Feng.ctxPath + "/tDriver/oneChange", function(data){ - if(data!=null){ - if(language==1){ - var content='<option value="">选择所属加盟商</option>'; - }else if(language==2){ - var content='<option value="">Choose your franchisee</option>'; - }else { - var content='<option value="">Pilih franchisee Anda</option>'; - } - $.each(data, function(k,v) { - content += "<option value='"+v.id+"'>"+v.name+"</option>"; - }); - $("#twoId").empty().append(content); - } - }); - ajax.set("oneId",oneId); - ajax.start(); -} +// TCarInfoDlg.oneChange = function (e) { +// var oneId=$(e).val(); +// var ajax = new $ax(Feng.ctxPath + "/tDriver/oneChange", function(data){ +// if(data!=null){ +// if(language==1){ +// var content='<option value="">选择所属加盟商</option>'; +// }else if(language==2){ +// var content='<option value="">Choose your franchisee</option>'; +// }else { +// var content='<option value="">Pilih franchisee Anda</option>'; +// } +// $.each(data, function(k,v) { +// content += "<option value='"+v.id+"'>"+v.name+"</option>"; +// }); +// $("#twoId").empty().append(content); +// } +// }); +// ajax.set("oneId",oneId); +// ajax.start(); +// } TCarInfoDlg.oneChange2 = function (e) { console.log(111) @@ -520,7 +520,7 @@ var content='<option value="">Pilih franchisee Anda</option>'; } $.each(data, function(k,v) { - content += "<option value='"+v.id+"'>"+v.name+"</option>"; + content += "<option value='"+v.code+"'>"+v.name+"</option>"; }); $("#pCode").empty().append(content); } -- Gitblit v1.7.1