From 51baf49bea5a7159bedd28cdadc5aec60b8cc930 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 16:34:59 +0800
Subject: [PATCH] 8.18
---
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html | 6 ++++++
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.html | 1 +
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html | 6 ++++++
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html | 38 --------------------------------------
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html | 2 --
ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js | 1 -
6 files changed, 13 insertions(+), 41 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.html
index 6d9f5ff..2cdda91 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.html
@@ -32,6 +32,7 @@
<option value="">全部</option>
<option value="2">出租车订单</option>
<option value="3">跨城出行订单</option>
+ <option value="4">同城小件物流</option>
</#SelectCon>
</div>
<div class="col-sm-3">
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 afe1eb7..f169955 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,6 +64,12 @@
跨城
</label>
</div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox4" type="checkbox" value="4" >
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ </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 a67be9f..b82f3d1 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,6 +64,12 @@
跨城
</label>
</div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} >
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ </div>
</fieldset>
</div>
</div>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html
index 047e4a8..bd13501 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html
@@ -17,9 +17,7 @@
</div>
<div class="col-sm-3">
<#SelectCon id="type" name="订单类型" >
- <option value="">全部</option>
<option value="4">同城物流</option>
- <option value="5">跨城物流</option>
</#SelectCon>
</div>
<div class="col-sm-3">
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html
index c84815f..96d9e38 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html
@@ -10,41 +10,7 @@
<div class="row">
<div class="col-sm-11">
- <div class="ibox-title">
- <h3>跨城小件物流价格设置:</h3>
- </div>
- <input type="hidden" id="kcId" name="kcId"
- @if(isNotEmpty(kcId)){
- value="${kcId}"
- @}else{
- value=""
- @}
- >
- <div class="form-group">
- <label class="col-sm-1 control-label"></label>
- <div class="col-sm-10">
- 普通小件价格为 <input type="text" oninput="checkIsYuan(this)"
- @if(isNotEmpty(json1)){
- value="${json1.num1}"
- @}else{
- value=""
- @}
- name="num101" id="num101" class="form-control newWidth" /> 元/件<br/>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-1 control-label"></label>
- <div class="col-sm-10">
- 贵重物品价格为 <input type="text" oninput="checkIsYuan(this)"
- @if(isNotEmpty(json1)){
- value="${json1.num2}"
- @}else{
- value=""
- @}
- name="num102" id="num102" class="form-control newWidth" /> 元/件<br/>
- </div>
- </div>
<div class="ibox-title">
<h3>同城小件物流价格设置:</h3>
@@ -328,11 +294,7 @@
var num101 = $("#num101").val();
var num102 = $("#num102").val();
if ("" == num101 || "" == num102){
- Feng.error("【跨城小件物流价格设置】输入框不能为空");
- return;
}else if (!regDouble.test(num101) || !regDouble.test(num102)){
- Feng.error("【跨城小件物流价格设置】输入框格式不正确");
- return;
}
//验证数据格式-同城小件物流价格设置
var tcId = $("#tcId").val();
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
index e467b22..64c0fd4 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
@@ -347,7 +347,6 @@
TOrderLogistics.resetSearch = function () {
$("#insertTime").val("");
$("#orderNum").val("");
- $("#type").val("");
$("#orderSource").val("");
$("#userName").val("");
$("#userPhone").val("");
--
Gitblit v1.7.1