From 52cfd50f3a812bf1c0a4c3ef2f1e65fcf8579adb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 28 七月 2023 15:16:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/tCity/tCity_info.js | 126 +++++++++++++----------------------------
1 files changed, 41 insertions(+), 85 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCity/tCity_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tCity/tCity_info.js
index 400699d..fa3be08 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCity/tCity_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCity/tCity_info.js
@@ -116,6 +116,23 @@
let name = $("#name").val()
let phone = $("#phone").val()
+ if(pCode==''){
+ Feng.info("请选择省")
+ return;
+ }
+ if(cCode==''){
+ Feng.info("请选择市")
+ return;
+ }
+ if(name==''){
+ Feng.info("管理员姓名不能为空")
+ return;
+ }
+ if(phone==''){
+ Feng.info("管理员手机号不能为空")
+ return;
+ }
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tCity/add", function(data){
if(data.code == 200){
@@ -133,13 +150,7 @@
}
},function(data){
- if(language==1){
- Feng.error("添加失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to add!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
- }
+ Feng.error("添加失败!" + data.responseJSON.message + "!");
});
ajax.set(this.tCarInfoData);
ajax.set("provinceCode",pCode);
@@ -159,63 +170,30 @@
if(!this.validate()){
return ;
}
+ let pCode = $("#pCode").val()
+ let cCode = $("#cCode").val()
+ let name = $("#name").val()
+ let phone = $("#phone").val()
- var roleType = $("#roleType").val(); //1=平台 2=分公司 3=加盟商
- var companyType = $("input[name='companyType']:checked").val();
- if (1 == roleType){
- if (2 == companyType){
- var oneId = $("#oneId").val();
- if ("" == oneId){
- if(language==1){
- Feng.info("所属分公司不能为空!");
- }else if(language==2){
- Feng.info("The subordinate branch cannot be empty!");
- }else {
- Feng.info("Cabang subordinat tidak dapat kosong!");
- }
- return;
- }
- }
- }
- var serverBox =[];
- $('input[name="serverBox"]:checked').each(function(){
- serverBox.push($(this).val());
- });
- if (serverBox.length == 0){
- if(language==1){
- Feng.info("请选择经营业务");
- }else if(language==2){
- Feng.info("Please select business");
- }else {
- Feng.info("Pilih bisnis");
- }
+ if(pCode==''){
+ Feng.info("请选择省")
return;
}
- var carPhoto = $("#carPhoto").valueOf();
- if ("" == carPhoto){
- if(language==1){
- Feng.info("请上传车辆照片");
- }else if(language==2){
- Feng.info("Please upload a photo of the vehicle");
- }else {
- Feng.info("Silakan mengunggah foto kendaraan");
- }
+ if(cCode==''){
+ Feng.info("请选择市")
return;
}
- var drivingLicensePhoto = $("#drivingLicensePhoto").valueOf();
- if ("" == drivingLicensePhoto){
- if(language==1){
- Feng.info("请上传行驶证照片");
- }else if(language==2){
- Feng.info("Please upload a photo of your vehicle. Please upload a photo of your driving license");
- }else {
- Feng.info("Silakan mengunggah foto kendaraanmu. Silakan mengunggah foto dari lisensi mengemudi Anda");
- }
+ if(name==''){
+ Feng.info("管理员姓名不能为空")
+ return;
+ }
+ if(phone==''){
+ Feng.info("管理员手机号不能为空")
return;
}
//提交信息
- var ajax = new $ax(Feng.ctxPath + "/tCar/update", function(data){
- if(data.status == 200){
+ var ajax = new $ax(Feng.ctxPath + "/tCity/update", function(data){
+ if(data.code == 200){
if(language==1){
Feng.success("修改成功!");
}else if(language==2){
@@ -223,41 +201,19 @@
}else {
Feng.success("Mengubah dengan sukses!");
}
- window.parent.TCar.table.refresh();
+ window.parent.TCompetition.table.refresh();
TCarInfoDlg.close();
}else{
Feng.error(data.msg);
}
},function(data){
- if(language==1){
- Feng.error("修改失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to modify!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
- }
+ Feng.error("修改失败!" + data.responseJSON.message + "!");
});
- ajax.set(this.tCarInfoData);
- ajax.set("serverBox",serverBox.toString());
- ajax.set("zcModel",$("#zcModel").val());
- ajax.set("kcModel",$("#kcModel").val());
- ajax.set("roleType",roleType);
- if (1 == roleType){
- ajax.set("companyType",companyType);
- ajax.set("oneId",$("#oneId").val());
- ajax.set("twoId",$("#twoId").val());
- ajax.set("franchiseeId",0);
- } else if (2 == roleType) {
- ajax.set("franchiseeId",$("#franchiseeId").val());
- ajax.set("companyType",0);
- ajax.set("oneId",0);
- ajax.set("twoId",0);
- }else if (3 == roleType){
- ajax.set("franchiseeId",0);
- ajax.set("companyType",0);
- ajax.set("oneId",0);
- ajax.set("twoId",0);
- }
+ ajax.set("provinceCode",pCode);
+ ajax.set("cityCode",cCode);
+ ajax.set("name",name);
+ ajax.set("phone",phone);
+ ajax.set("id",$("#id").val());
ajax.start();
}
--
Gitblit v1.7.1