From cf622d6cb6c76f4cbee4be10288c22878d36a043 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 16 十月 2023 10:38:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 101 insertions(+), 2 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 790c8fa..0344d49 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
@@ -203,6 +203,12 @@
Feng.info("门店名称不能为空")
return;
}
+
+ var phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test(phone)) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
if(phone==''){
Feng.info("联系电话不能为空")
return;
@@ -232,7 +238,15 @@
Feng.info("请输入店长姓名")
return;
}
+
+
let userPhone = $("#userPhone").val()
+ if (!phonePattern.test(userPhone)) {
+
+ Feng.info("请输入正确手机号")
+ return false;
+ }
+
if(userPhone==''){
Feng.info("请输入店长手机号")
@@ -446,6 +460,13 @@
Feng.info("门店名称不能为空")
return;
}
+
+ var phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test(phone)) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
+
if(phone==''){
Feng.info("联系电话不能为空")
return;
@@ -477,6 +498,11 @@
}
let userPhone = $("#userPhone").val()
+ if (!phonePattern.test(userPhone)) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
+
if(userPhone==''){
Feng.info("请输入店长手机号")
return;
@@ -498,6 +524,8 @@
}
}
+
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tShop/update", function(data){
if(data=="5001"){
@@ -570,6 +598,9 @@
carPhoto.setUploadBarId("progressBar");
carPhoto.init();
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");
@@ -762,12 +793,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) {
@@ -783,7 +835,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);
}
@@ -791,3 +843,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