From f1ec85f268b3dfd206cb756bd19ed1594c4bff7e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:43:19 +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 | 248 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 174 insertions(+), 74 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 862075b..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
@@ -100,7 +100,15 @@
.set('registerDate')
.set('commercialType');
}
-
+TCarInfoDlg.addSubmit3 = function() {
+ var ajax = new $ax(Feng.ctxPath + "/tShop/addDevice", function(data){
+ console.log("调用方法")
+ TCarInfoDlg.close();
+ });
+ ajax.set("id",$("#id"));
+ ajax.set("device",$("#device"));
+ ajax.start();
+}
TCarInfoDlg.oneChange = function (e) {
console.log(111)
var oneId=$(e).val();
@@ -120,6 +128,30 @@
}
});
ajax.set("oneId",oneId);
+ ajax.start();
+}
+TCarInfoDlg.oneChange9 = function (e) {
+ console.log(111)
+ var oneId=$(e).val();
+ var operatorId = $("#account").val();
+ var ajax = new $ax(Feng.ctxPath + "/tShop/getCityYys", 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>";
+ });
+ $("#cCode1").empty().append(content);
+ $("#cCode").empty().append(content);
+ }
+ });
+ ajax.set("province",oneId);
+ ajax.set("operatorId",operatorId);
ajax.start();
}
TCarInfoDlg.oneChangeNext = function (e) {
@@ -148,6 +180,8 @@
var ajax = new $ax(Feng.ctxPath + "/tShop/saveImg", function(data){
if(data.code == 200){
Feng.success("保存成功")
+ TCarInfoDlg.close();
+
}
});
ajax.set("id",id);
@@ -159,6 +193,17 @@
* 提交添加
*/
TCarInfoDlg.addSubmit = function() {
+
+ const textarea = document.getElementById('introduce');
+ const text = textarea.value;
+
+ if (text.length > 1000) {
+ console.log('The text is longer than 1000 characters.');
+ Feng.error("门店介绍要求小于1000字")
+ return
+ } else {
+ console.log('The text is not longer than 1000 characters.');
+ }
this.clearData();
this.collectData();
@@ -179,26 +224,33 @@
let pCode1 = $("#pCode1").val()
let cCode1 = $("#cCode1").val()
-
let name = $("#name").val()
let phone = $("#phone").val()
+ var elementById = document.getElementById("radio1");
+ if (elementById != null){
+ if (elementById.checked) {
+ if (pCode == '' && $("#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(pCode=='' && $("#role")=="1" && OBJradio==2){
- Feng.info("请选择省")
- return;
- }
- 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;
@@ -226,9 +278,9 @@
Feng.info("请填写营业时间")
return;
}
- let intro = $("#intro").val()
+ let introduce = $("#introduce").val()
- if(intro==''){
+ if(introduce==''){
Feng.info("请填写门店介绍")
return;
}
@@ -276,23 +328,11 @@
var ajax = new $ax(Feng.ctxPath + "/tShop/add", function(data){
if(data=="5001"){
Feng.error("该店长手机号已经存在！")
- }else
- if(data.code == 200){
- if(language==1){
- Feng.success("添加成功!");
- }else if(language==2){
- Feng.success("Successfully added!");
- }else {
- Feng.success("Sangat berhasil ditambah!");
- }
+ }else{
+ Feng.success("添加成功!");
window.parent.TCompetition.table.refresh();
TCarInfoDlg.close();
- }else{
- Feng.error(data.msg);
}
-
- },function(data){
- Feng.error("添加失败!" + data.responseJSON.message + "!");
});
ajax.set(this.tCarInfoData);
ajax.set("provinceCode",pCode);
@@ -302,7 +342,7 @@
ajax.set("cityManagerId",null);
ajax.set("address",address);
ajax.set("time",time);
- ajax.set("introduce",intro);
+ ajax.set("introduce",introduce);
ajax.set("userName",userName);
ajax.set("userPhone",userPhone);
ajax.set("coverDrawing",img);
@@ -323,7 +363,8 @@
var marker;
//搜索地图
TCarInfoDlg.searchByStationName = function(e,type){
- var keyword="成都";
+ console.log("调用")
+ var keyword="";
if(type==2){
keyword = $(e).parent().prev().find("input").val();
}else {
@@ -366,8 +407,7 @@
}
});
});
-
-}
+};
//地图点击事件
function showInfoClick(){
map.on('click', function (e) {
@@ -418,6 +458,17 @@
*/
TCarInfoDlg.editSubmit = function() {
+ const textarea = document.getElementById('introduce');
+ const text = textarea.value;
+
+ if (text.length > 1000) {
+ console.log('The text is longer than 1000 characters.');
+ Feng.error("门店介绍要求小于1000字")
+ return
+ } else {
+ console.log('The text is not longer than 1000 characters.');
+ }
+
this.clearData();
this.collectData();
if(!this.validate()){
@@ -441,19 +492,19 @@
let name = $("#name").val()
let phone = $("#phone").val()
- if(pCode=='' && $("#role")=="1" && OBJradio==2){
+ if(pCode=='' && $("#role").val()=="1" && OBJradio==2){
Feng.info("请选择省")
return;
}
- if(cCode=='' && $("#role")=="1" && OBJradio==2){
+ if(cCode=='' && $("#role").val()=="1" && OBJradio==2){
Feng.info("请选择市")
return;
}
- if(pCode1=='' && $("#role")=="1" && OBJradio==1){
+ if(pCode1=='' && $("#role").val()=="1" && OBJradio==1){
Feng.info("请选择省")
return;
}
- if(cCode1=='' && $("#role")=="1" && OBJradio==12) {
+ if(cCode1=='' && $("#role").val()=="1" && OBJradio==12) {
Feng.info("请选择市")
}
if(name==''){
@@ -484,9 +535,9 @@
Feng.info("请填写营业时间")
return;
}
- let intro = $("#intro").val()
+ let introduce = $("#introduce").val()
- if(intro==''){
+ if(introduce==''){
Feng.info("请填写门店介绍")
return;
}
@@ -524,6 +575,8 @@
}
}
+
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tShop/update", function(data){
if(data=="5001"){
@@ -552,7 +605,7 @@
ajax.set("cityManagerId",account);
ajax.set("address",address);
ajax.set("time",time);
- ajax.set("introduce",intro);
+ ajax.set("introduce",introduce);
ajax.set("userName",userName);
ajax.set("userPhone",userPhone);
ajax.set("coverDrawing",img);
@@ -613,24 +666,29 @@
* 选择分公司后执行
*/
TCarInfoDlg.oneChange = function (e) {
- var oneId=$(e).val();
- var ajax = new $ax(Feng.ctxPath + "/tCity/onChange", 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>';
+ if ($("#objectType").val()==2){
+
+ }else{
+ var oneId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tCity/onChange", 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>";
+ });
+ $("#cCode1").empty().append(content);
}
- $.each(data, function(k,v) {
- content += "<option value='"+v.code+"'>"+v.name+"</option>";
- });
- $("#cCode1").empty().append(content);
- }
- });
- ajax.set("oneId",oneId);
- ajax.start();
+ });
+ ajax.set("oneId",oneId);
+ ajax.start();
+ }
+
}
/**
@@ -791,7 +849,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);
}
@@ -823,22 +881,63 @@
TCarInfoDlg.oneChange2 = function (e) {
console.log(111)
var oneId=$(e).val();
- var ajax = new $ax(Feng.ctxPath + "/tShop/onChange2", 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>';
+ var elementById = document.getElementById("radio1");
+ // 如果选中了运营商门店 那就查询这个运营商下的市
+ if (elementById.checked){
+ var operatorId = $("#account").val();
+ console.log("我看看运营商id")
+ var ajax = new $ax(Feng.ctxPath + "/tShop/getCityYys", 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>";
+ });
+ $("#cCode1").empty().append(content);
+ $("#cCode").empty().append(content);
}
+ });
+ ajax.set("province",oneId);
+ ajax.set("operatorId",operatorId);
+ ajax.start();
+ }else{
+ var ajax = new $ax(Feng.ctxPath + "/tShop/onChange2", 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>";
+ });
+ $("#cCode").empty().append(content);
+ }
+ });
+ ajax.set("oneId",oneId);
+ ajax.start();
+ }
+
+}
+TCarInfoDlg.oneChange3 = function (e) {
+ var operatorId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tShop/getProvinceYys", function(data){
+ if(data!=null){
+ var content='<option value="">选择市</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);
+ $("#pCode").empty().append(content);
}
});
- ajax.set("oneId",oneId);
+ ajax.set("operatorId",operatorId);
ajax.start();
}
@@ -846,6 +945,7 @@
+
TCarInfoDlg.oneChangeNext1 = function (e) {
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tCompetition/oneChangeNext", function(data){
--
Gitblit v1.7.1