From a830a73fd10a21e3793c79a35be4e532de124c6f Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期二, 17 十月 2023 17:25:16 +0800 Subject: [PATCH] 10.17.1 --- cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js | 55 +++++++++++++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 22 deletions(-) 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 6653ae6..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 @@ -174,6 +174,11 @@ return; } var shopId = $("#shopId").val(); + + if(shopId==""){ + Feng.info("请选择门店"); + return; + } var shopIdString = shopId.join(","); var name = $("#name").val(); if(name==""){ @@ -305,6 +310,12 @@ return; } var shopId = $("#shopId").val(); + if(shopId==""){ + Feng.info("请选择门店"); + return; + } + var shopIdString = shopId.join(","); + var name = $("#name").val(); if(name==""){ Feng.info("请输入赛事名称"); @@ -389,7 +400,7 @@ ajax.set("id",$("#id").val()); ajax.set("provinceCode",pCode); ajax.set("cityCode",cCode); - ajax.set("storeId",shopId); + ajax.set("storeId",shopIdString); ajax.set("name",name); ajax.set("sTime",startTime); ajax.set("eTime",endTime); @@ -430,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) @@ -509,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