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/tShop/tShop_info.js | 142 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 133 insertions(+), 9 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 8dd039a..50f4faf 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
@@ -148,6 +148,8 @@
var ajax = new $ax(Feng.ctxPath + "/tShop/saveImg", function(data){
if(data.code == 200){
Feng.success("保存成功")
+ TCarInfoDlg.close();
+
}
});
ajax.set("id",id);
@@ -176,22 +178,38 @@
}
let pCode = $("#pCode").val()
let cCode = $("#cCode").val()
+ let pCode1 = $("#pCode1").val()
+ let cCode1 = $("#cCode1").val()
let name = $("#name").val()
let phone = $("#phone").val()
- if(pCode=='' && $("#role")=="1"){
+ if(pCode=='' && $("#role")=="1" && OBJradio==2){
Feng.info("请选择省")
return;
}
- if(cCode=='' && $("#role")=="1"){
+ if(cCode=='' && $("#role")=="1" && OBJradio==2){
+ Feng.info("请选择市")
+ return;
+ }
+ if(pCode1=='' && $("#role")=="1" && OBJradio==1){
+ Feng.info("请选择省")
+ return;
+ }
+ if(cCode1=='' && $("#role")=="1" && OBJradio==12){
Feng.info("请选择市")
return;
}
if(name==''){
Feng.info("门店名称不能为空")
return;
+ }
+
+ var phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test(phone)) {
+ Feng.info("请输入合法手机号")
+ return ;
}
if(phone==''){
Feng.info("联系电话不能为空")
@@ -222,7 +240,15 @@
Feng.info("请输入店长姓名")
return;
}
+
+
let userPhone = $("#userPhone").val()
+ if (!phonePattern.test(userPhone)) {
+
+ Feng.info("请输入正确手机号")
+ return false;
+ }
+
if(userPhone==''){
Feng.info("请输入店长手机号")
@@ -288,6 +314,8 @@
ajax.set("ids",$("#ids").val());
ajax.set("type",OBJradio);
ajax.set("yyId",$("#account").val());
+ ajax.set("pCode1",pCode1);
+ ajax.set("cCode1",cCode1);
ajax.start();
}
var map = new AMap.Map('container', {
@@ -400,6 +428,8 @@
let pCode = $("#pCode").val()
let cCode = $("#cCode").val()
+ let cCode1 = $("#cCode1").val()
+ let pCode1 = $("#pCode1").val()
let account = $("#account").val()
var OBJradio= $("input[name='type']:checked").val();
if(OBJradio==2){
@@ -413,18 +443,32 @@
let name = $("#name").val()
let phone = $("#phone").val()
- if(pCode=='' && $("#role")=="1"){
+ if(pCode=='' && $("#role")=="1" && OBJradio==2){
Feng.info("请选择省")
return;
}
- if(cCode=='' && $("#role")=="1"){
+ if(cCode=='' && $("#role")=="1" && OBJradio==2){
Feng.info("请选择市")
return;
+ }
+ if(pCode1=='' && $("#role")=="1" && OBJradio==1){
+ Feng.info("请选择省")
+ return;
+ }
+ if(cCode1=='' && $("#role")=="1" && OBJradio==12) {
+ Feng.info("请选择市")
}
if(name==''){
Feng.info("门店名称不能为空")
return;
}
+
+ var phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test(phone)) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
+
if(phone==''){
Feng.info("联系电话不能为空")
return;
@@ -456,6 +500,11 @@
}
let userPhone = $("#userPhone").val()
+ if (!phonePattern.test(userPhone)) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
+
if(userPhone==''){
Feng.info("请输入店长手机号")
return;
@@ -477,12 +526,13 @@
}
}
+
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tShop/update", function(data){
if(data=="5001"){
Feng.error("该店长手机号已经存在！")
- }else
- if(data.code == 200){
+ }else if(data.code == 200){
if(language==1){
Feng.success("修改成功!");
}else if(language==2){
@@ -498,6 +548,7 @@
},function(data){
Feng.error("修改失败!" + data.responseJSON.message + "!");
});
+
ajax.set("provinceCode",pCode);
ajax.set("cityCode",cCode);
ajax.set("name",name);
@@ -516,6 +567,8 @@
ajax.set("ids",$("#ids").val());
ajax.set("type",OBJradio);
ajax.set("yyId",$("#account").val());
+ ajax.set("pCode1",pCode1);
+ ajax.set("cCode1",cCode1);
ajax.start();
}
@@ -549,6 +602,9 @@
var carPhoto = new $WebUpload("img");
carPhoto.setUploadBarId("progressBar");
carPhoto.init();
+ var carPhoto = new $WebUpload("welfarePicture");
+ carPhoto.setUploadBarId("progressBar");
+ carPhoto.init();
var drivingLicensePhoto = new $WebUpload("drivingLicensePhoto");
drivingLicensePhoto.setUploadBarId("progressBar");
drivingLicensePhoto.init();
@@ -574,7 +630,7 @@
$.each(data, function(k,v) {
content += "<option value='"+v.code+"'>"+v.name+"</option>";
});
- $("#cCode").empty().append(content);
+ $("#cCode1").empty().append(content);
}
});
ajax.set("oneId",oneId);
@@ -739,12 +795,33 @@
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);
}
});
ajax.set("oneId",oneId);
+ ajax.start();
+}
+TCarInfoDlg.oneChange1Next = function (e) {
+ console.log(111)
+ var oneId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tShop/onChange1", 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>";
+ });
+ $("#pCode").empty().append(content);
+ }
+ });
+ ajax.set("oneId",e);
ajax.start();
}
TCarInfoDlg.oneChange2 = function (e) {
@@ -760,7 +837,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>";
});
$("#cCode").empty().append(content);
}
@@ -768,3 +845,50 @@
ajax.set("oneId",oneId);
ajax.start();
}
+
+
+
+
+
+TCarInfoDlg.oneChangeNext1 = function (e) {
+ var oneId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/oneChangeNext", 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>";
+ });
+ $("#shopId").empty().append(content);
+ }
+ });
+ ajax.set("oneId",oneId);
+ ajax.start();
+}
+
+
+TCarInfoDlg.oneChangeNext3 = function (e) {
+ var oneId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/oneChangeNext", 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.code+"'>"+v.name+"</option>";
+ });
+ $("#shopId").empty().append(content);
+ }
+ });
+ ajax.set("oneId",oneId);
+ ajax.start();
+}
\ No newline at end of file
--
Gitblit v1.7.1