From 98554a353856fc4bbc1e4af9ae12ea6d78f1bb99 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 19 十月 2023 15:33:11 +0800
Subject: [PATCH] 10.18.2

---
 cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js |   76 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
index 66d6083..1897dd6 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
@@ -402,8 +402,8 @@
     ajax.set("cityCode",cCode);
     ajax.set("storeId",shopIdString);
     ajax.set("name",name);
-    ajax.set("sTime",startTime);
-    ajax.set("eTime",endTime);
+    ajax.set("startTime",startTime);
+    ajax.set("endTime",endTime);
     ajax.set("rEndTime",registerEndTime);
     ajax.set("startAge",startAge);
     ajax.set("endAge",endAge);
@@ -502,9 +502,77 @@
             $("#cCode").empty().append(content);
         }
     });
-    ajax.set("oneId",oneId);
+
+    if (typeof(oneId) == "undefined" || oneId == "undefined") {
+        ajax.set("oneId",0);
+    }else{
+    ajax.set("oneId",oneId);}
     ajax.start();
 }
+
+
+TCarInfoDlg.oneChangeYys = function(e){
+
+    var oneId= $("input[name='pt']:checked").val()
+
+    console.log("===========oneId=========="+oneId)
+    var SelectValue="";
+    if(SelectValue=='0' ){
+        oneId=0
+    }
+    // var ajax = new $ax(Feng.ctxPath + "/tSite/getChangeOne", function(data){
+    //     if(data!=null){
+    //         // var content1 = '<option value="0">平台</option>';
+
+    //
+    //
+    //         var content='<option value="">选择门店</option>';
+    //         $.each(data, function(k,v) {
+    //             content += "<option value='"+v.id+"'>"+v.name+"</option>";
+    //         });
+    //         $("#shopId").empty().append(content);
+    //     }
+    // });
+
+
+
+    var ajax = new $ax(Feng.ctxPath + "/tShop/onChange1", function(data){
+        if(data!=null){
+            if (typeof(oneId) != "undefined") {
+                $("#account").prop('disabled', true);
+            }
+            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>";
+            });
+            $("#pCode").empty().append(content);
+        }
+    });
+    ajax.set("oneId",0);
+    ajax.start();
+
+
+    if (typeof(oneId) == "undefined"){
+        console.log("===============")
+
+        var button = document.getElementById("account");
+        button.removeAttribute("disabled");
+
+    }
+
+    ajax.set("oneId",oneId);
+    ajax.start();
+
+
+
+};
+
 
 
 TCarInfoDlg.oneChange1 = function (e) {
@@ -520,7 +588,7 @@
                 var content='<option value="">Pilih franchisee Anda</option>';
             }
             $.each(data, function(k,v) {
-                content += "<option value='"+v.code+"'>"+v.name+"</option>";
+                content += "<option value='"+v.operatorId+"'>"+v.name+"</option>";
             });
             $("#pCode").empty().append(content);
         }

--
Gitblit v1.7.1