From 88d56c7c74be121a11e3760e4fc7a058ea2f6c47 Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期四, 26 十月 2023 10:45:30 +0800 Subject: [PATCH] 10.26.2 --- cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js | 137 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 108 insertions(+), 29 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..0620273 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==""){ @@ -261,9 +266,9 @@ ajax.set("cityCode",cCode); ajax.set("storeId",shopIdString); ajax.set("name",name); - ajax.set("sTime",startTime); - ajax.set("eTime",endTime); - ajax.set("rEndTime",registerEndTime); + ajax.set("startTime",startTime); + ajax.set("endTime",endTime); + ajax.set("registerEndTime",registerEndTime); ajax.set("registerCondition",registerCondition); ajax.set("startAge",startAge); ajax.set("endAge",endAge); @@ -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,11 +400,11 @@ 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); - ajax.set("rEndTime",registerEndTime); + ajax.set("startTime",startTime); + ajax.set("endTime",endTime); + ajax.set("registerEndTime",registerEndTime); ajax.set("startAge",startAge); ajax.set("endAge",endAge); ajax.set("cashPrice",cashPrice); @@ -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) @@ -491,9 +502,77 @@ $("#cCode").empty().append(content); } }); - ajax.set("oneId",oneId); + + if (typeof(oneId) == "undefined" || oneId == "undefined") { + ajax.set("oneId",0); + }else{ + ajax.set("oneId",oneId);} ajax.start(); } + + +TCarInfoDlg.oneChangeYys = function(e){ + + var oneId= $("input[name='pt']:checked").val() + + console.log("===========oneId=========="+oneId) + var SelectValue=""; + if(SelectValue=='0' ){ + oneId=0 + } + // var ajax = new $ax(Feng.ctxPath + "/tSite/getChangeOne", function(data){ + // if(data!=null){ + // // var content1 = '<option value="0">平台</option>'; + + // + // + // var content='<option value="">选择门店</option>'; + // $.each(data, function(k,v) { + // content += "<option value='"+v.id+"'>"+v.name+"</option>"; + // }); + // $("#shopId").empty().append(content); + // } + // }); + + + + var ajax = new $ax(Feng.ctxPath + "/tShop/onChange1", function(data){ + if(data!=null){ + if (typeof(oneId) != "undefined") { + $("#account").prop('disabled', true); + } + 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.code+"'>"+v.name+"</option>"; + }); + $("#pCode").empty().append(content); + } + }); + ajax.set("oneId",0); + ajax.start(); + + + if (typeof(oneId) == "undefined"){ + console.log("===============") + + var button = document.getElementById("account"); + button.removeAttribute("disabled"); + + } + + ajax.set("oneId",oneId); + ajax.start(); + + + +}; + TCarInfoDlg.oneChange1 = function (e) { @@ -509,7 +588,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.operatorId+"'>"+v.name+"</option>"; }); $("#pCode").empty().append(content); } -- Gitblit v1.7.1