From cd45ac2fa0097de2fd9bf637fc5a23593be1aef0 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 10 十月 2023 16:20:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js |   61 +++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 7 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..b85b9b0 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
@@ -176,16 +176,26 @@
     }
     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;
     }
@@ -288,6 +298,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 +412,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,13 +427,20 @@
     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("门店名称不能为空")
@@ -481,8 +502,7 @@
     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 +518,7 @@
     },function(data){
         Feng.error("修改失败!" + data.responseJSON.message + "!");
     });
+
     ajax.set("provinceCode",pCode);
     ajax.set("cityCode",cCode);
     ajax.set("name",name);
@@ -516,6 +537,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 +572,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 +600,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);
@@ -747,6 +773,27 @@
     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) {
     console.log(111)
     var oneId=$(e).val();

--
Gitblit v1.7.1