From 2da87bd73a1327633904f57c7880f7c3b326d4c1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 20 八月 2025 15:23:49 +0800
Subject: [PATCH] 8.22后台

---
 ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js |   95 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 87 insertions(+), 8 deletions(-)

diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js
index 196951d..8335f5c 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js
@@ -354,6 +354,32 @@
     if(b){
         return
     }
+
+
+    var checkbox3 = $('#checkbox3').prop('checked');
+    var checkbox4 = $('#checkbox4').prop('checked');
+    if (checkbox4) {
+        var tcx = $("input[name='tcx']:checked").val();
+        if (1 == tcx){
+            var tcxPercent = $("#tcxPercent").val();
+            if ("" == tcxPercent){
+                Feng.info("同城小件物流比例抽成不能为空!");
+                return;
+            }else if (!regDouble.test(tcxPercent)) {
+                Feng.info("同城小件物流比例抽成格式不正确!");
+                return;
+            }
+        }else if (2 == tcx){
+            var tcxMoney = $("#tcxMoney").val();
+            if ("" == tcxMoney){
+                Feng.info("同城小件物流固定金额抽成不能为空!");
+                return;
+            }else if (!regDouble.test(tcxMoney)) {
+                Feng.info("同城小件物流固定金额抽成格式不正确!");
+                return;
+            }
+        }
+    }
     //提交信息
     var ajax = new $ax(Feng.ctxPath + "/tCompany/addFranchisee", function(data){
         if ("error" == data){
@@ -368,6 +394,23 @@
     });
     ajax.set(FranchiseeInfoDlg.franchiseeInfoData);
     ajax.set("isTaxi",1);
+    if (checkbox3){
+        ajax.set("isCross",1);
+    }else{
+        ajax.set("isCross",2);
+    }
+    if (checkbox4){
+        var tcx = $("input[name='tcx']:checked").val();
+        ajax.set("isSameLogisticsFixedOrProportional",tcx);
+        if (1 == tcx){
+            ajax.set("sameLogisticsMoney",$("#tcxPercent").val());
+        }else if (2 == tcx) {
+            ajax.set("sameLogisticsMoney",$("#tcxMoney").val());
+        }
+        ajax.set("isSameLogistics",1);
+    }else{
+        ajax.set("isSameLogistics",2);
+    }
     ajax.set("account",$("#account").val());
     ajax.set("password",$("#password").val());
     ajax.set("content",content);
@@ -596,7 +639,33 @@
         return
     }
 
-    //提交信息
+    var checkbox2 = $('#checkbox2').prop('checked');
+    var checkbox3 = $('#checkbox3').prop('checked');
+    var checkbox4 = $('#checkbox4').prop('checked');
+    if (checkbox4) {
+        var tcx = $("input[name='tcx']:checked").val();
+        if (1 == tcx){
+            var tcxPercent = $("#tcxPercent").val();
+            if ("" == tcxPercent){
+                Feng.info("同城小件物流比例抽成不能为空!");
+                return;
+            }else if (!regDouble.test(tcxPercent)) {
+                Feng.info("同城小件物流比例抽成格式不正确!");
+                return;
+            }
+        }else if (2 == tcx){
+            var tcxMoney = $("#tcxMoney").val();
+            if ("" == tcxMoney){
+                Feng.info("同城小件物流固定金额抽成不能为空!");
+                return;
+            }else if (!regDouble.test(tcxMoney)) {
+                Feng.info("同城小件物流固定金额抽成格式不正确!");
+                return;
+            }
+        }
+    }
+
+    //提交信息1
     var ajax = new $ax(Feng.ctxPath + "/tCompany/updateFranchisee", function(data){
         if ("error" == data){
             Feng.error("登录账户已存在,请重新输入");
@@ -610,17 +679,27 @@
     });
     ajax.set(FranchiseeInfoDlg.franchiseeInfoData);
     if (checkbox2){
-        var cz = $("input[name='cz']:checked").val()
-        ajax.set("isTaxiFixedOrProportional",cz);
-        if (1 == cz){
-            ajax.set("taxiMoney",$("#czPercent").val());
-        }else if (2 == cz) {
-            ajax.set("taxiMoney",$("#czMoney").val());
-        }
         ajax.set("isTaxi",1);
     }else{
         ajax.set("isTaxi",2);
     }
+    if (checkbox3){
+        ajax.set("isCross",1);
+    }else{
+        ajax.set("isCross",2);
+    }
+    if (checkbox4){
+        var tcx = $("input[name='tcx']:checked").val();
+        ajax.set("isSameLogisticsFixedOrProportional",tcx);
+        if (1 == tcx){
+            ajax.set("sameLogisticsMoney",$("#tcxPercent").val());
+        }else if (2 == tcx) {
+            ajax.set("sameLogisticsMoney",$("#tcxMoney").val());
+        }
+        ajax.set("isSameLogistics",1);
+    }else{
+        ajax.set("isSameLogistics",2);
+    }
     ajax.set("account",$("#account").val());
     ajax.set("password",$("#password").val());
     ajax.set("userId",$("#userId").val());

--
Gitblit v1.7.1