From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
index c5fa4e7..d1035a6 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
@@ -102,11 +102,10 @@
}
TCarInfoDlg.addSubmit3 = function() {
var ajax = new $ax(Feng.ctxPath + "/tShop/addDevice", function(data){
- window.parent.TCompetition.table.refresh();
+ console.log("调用方法")
TCarInfoDlg.close();
});
ajax.set("id",$("#id"));
- ajax.set("siteId",$("#site"));
ajax.set("device",$("#device"));
ajax.start();
}
@@ -228,27 +227,30 @@
let name = $("#name").val()
let phone = $("#phone").val()
var elementById = document.getElementById("radio1");
- if (elementById.checked) {
- if (pCode == '' && $("#role").val() == "1") {
- Feng.info("请选择省")
- return;
+ if (elementById != null){
+ if (elementById.checked) {
+ if (pCode == '' && $("#role").val() == "1") {
+ Feng.info("请选择省")
+ return;
+ }
+ if (cCode == '' && $("#role").val() == "1") {
+ Feng.info("请选择市")
+ return;
+ }
}
- if (cCode == '' && $("#role").val() == "1") {
- Feng.info("请选择市")
- return;
+ if (!elementById.checked){
+ if(pCode1=='' && $("#role").val()=="1"){
+ Feng.info("请选择省")
+ return;
+ }
+ if(cCode1=='' && $("#role").val()=="1"){
+ Feng.info("请选择市")
+ return;
+ }
}
}
- if (!elementById.checked){
- if(pCode1=='' && $("#role").val()=="1"){
- Feng.info("请选择省")
- return;
- }
- if(cCode1=='' && $("#role").val()=="1"){
- Feng.info("请选择市")
- return;
- }
- }
+
if(name==''){
Feng.info("门店名称不能为空")
return;
@@ -405,8 +407,7 @@
}
});
});
-
-}
+};
//地图点击事件
function showInfoClick(){
map.on('click', function (e) {
--
Gitblit v1.7.1