From f9d4a8626e3f76c94d4f87a8ab3dba6c3afc5be9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 20 八月 2025 15:20:21 +0800
Subject: [PATCH] 8.22后台
---
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html | 32 +++++
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html | 40 ++++++
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html | 30 ++++
ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js | 94 ++++++++++++++-
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html | 38 ++++++
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html | 40 ++++++
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html | 40 ++++++
7 files changed, 302 insertions(+), 12 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
index f169955..acd066a 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
@@ -64,11 +64,37 @@
跨城
</label>
</div>
- <div class="checkbox checkbox-success">
- <input name="checkbox" id="checkbox4" type="checkbox" value="4" >
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" value="4" onclick="TCompanyInfoDlg.checkbox4()">
<label for="checkbox4">
同城小件物流
</label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx1" value="1" checked="">
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxPercent" name="tcxPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx2" value="2">
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxMoney" name="tcxMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
</div>
</fieldset>
</div>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
index 4f6b489..2d639ce 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
@@ -45,6 +45,38 @@
跨城
</label>
</div>
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" value="4" onclick="FranchiseeInfoDlg.checkbox4()">
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx1" value="1" checked="">
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxPercent" name="tcxPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx2" value="2">
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxMoney" name="tcxMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</fieldset>
</div>
</div>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
index 0d946a9..b0d751b 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
@@ -105,6 +105,46 @@
跨城
</label>
</div>
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" disabled value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''}>
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx1" disabled value="1" ${1 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="tcxPercent" name="tcxPercent" disabled
+ @if(1 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx2" disabled value="2" ${2 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="tcxMoney" name="tcxMoney" disabled
+ @if(2 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</fieldset>
</div>
</div>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
index bfb4130..d6a3507 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
@@ -37,6 +37,46 @@
跨城
</label>
</div>
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" disabled value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} >
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" disabled name="tcx" id="tcx1" value="1" ${1 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="tcxPercent" name="tcxPercent"
+ @if(1 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" disabled name="tcx" id="tcx2" value="2" ${2 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="tcxMoney" name="tcxMoney"
+ @if(2 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</fieldset>
</div>
</div>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
index b82f3d1..1db39a1 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
@@ -64,11 +64,45 @@
跨城
</label>
</div>
- <div class="checkbox checkbox-success">
- <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} >
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox4()">
<label for="checkbox4">
同城小件物流
</label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx1" value="1" ${1 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxPercent" name="tcxPercent"
+ @if(1 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx2" value="2" ${2 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxMoney" name="tcxMoney"
+ @if(2 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
</div>
</fieldset>
</div>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
index 12f2ab3..7fcaa26 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
@@ -45,6 +45,46 @@
跨城
</label>
</div>
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox4()">
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx1" value="1" ${1 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxPercent" name="tcxPercent"
+ @if(1 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx2" value="2" ${2 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxMoney" name="tcxMoney"
+ @if(2 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</fieldset>
</div>
</div>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
index 16ccc2d..c7aa561 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
@@ -206,6 +206,31 @@
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/add", function(data){
if ("error" == data){
@@ -220,6 +245,23 @@
});
ajax.set(TCompanyInfoDlg.tCompanyInfoData);
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("subArr",JSON.stringify(subArr));
ajax.set("account",$("#account").val());
ajax.set("password",$("#password").val());
@@ -291,6 +333,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;
+ }
+ }
+ }
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tCompany/update", function(data){
if ("error" == data){
@@ -305,18 +374,27 @@
});
ajax.set(TCompanyInfoDlg.tCompanyInfoData);
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("subArr",JSON.stringify(subArr));
ajax.set("account",$("#account").val());
ajax.set("password",$("#password").val());
--
Gitblit v1.7.1