From adf76f841a890299a4c68826b3b1716f69351dd1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 09 八月 2023 19:32:16 +0800
Subject: [PATCH] 修改bug和日志时间
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html | 210 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 177 insertions(+), 33 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html
index c26285f..ea216bb 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html
@@ -24,19 +24,17 @@
<div name="rulesForm">
<div class="initialLevel col-sm-12 control-label form-group" >
<span class="control-label" >时间段</span>
- <input class="control-label" id="num1" name="num1" value="${ChargeStandard.num1}" type="text" placeholder="00:00" style="height: 30px;width: 80px">
+ <input class="control-label time-item" id="num1" name="num1" value="${ChargeStandard.num1}" type="text" placeholder="00:00" style="height: 30px;width: 80px" readonly>
<span class="control-label" >——</span>
- <input class="control-label" id="num2" name="num2" value="${ChargeStandard.num2}" type="text" placeholder="00:00" style="height: 30px;width: 80px">
+ <input class="control-label time-item" id="num2" name="num2" value="${ChargeStandard.num2}" type="text" placeholder="00:00" style="height: 30px;width: 80px" readonly>
<span class="control-label" >代驾里程</span>
- <input class="control-label" id="num3" name="num3" value="${ChargeStandard.num3}" type="number" style="height: 30px;width: 80px">
- <span class="control-label" >——</span>
- <input class="control-label" id="num4" name="num4" value="${ChargeStandard.num4}" type="number" style="height: 30px;width: 80px">
+ <input class="control-label" id="num3" name="num3" value="${ChargeStandard.num3}" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >公里,起步价</span>
- <input class="control-label" id="num5" name="num5" value="${ChargeStandard.num5}" type="number" style="height: 30px;width: 80px">
+ <input class="control-label" id="num4" name="num4" value="${ChargeStandard.num4}" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元,超出里程每</span>
- <input class="control-label" id="num6" name="num6" value="${ChargeStandard.num6}" type="number" style="height: 30px;width: 80px">
+ <input class="control-label" id="num5" name="num5" value="${ChargeStandard.num5}" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >公里,收费</span>
- <input class="control-label" id="num7" name="num7" value="${ChargeStandard.num7}" type="number" style="height: 30px;width: 80px">
+ <input class="control-label" id="num6" name="num6" value="${ChargeStandard.num6}" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元</span>
@if(ChargeStandard.key == 0){
@@ -47,16 +45,16 @@
@}
</div>
<div class="initialLevel col-sm-12 control-label form-group" >
- <span class="control-label" >代驾里程</span>
- <input class="control-label" id="num8" name="num8" value="${ChargeStandard.num8}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >长途里程</span>
+ <input class="control-label" id="num7" name="num7" value="${ChargeStandard.num7}" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >——</span>
- <input class="control-label" id="num9" name="num9" value="${ChargeStandard.num9}" type="number" style="height: 30px;width: 80px">
- <span class="control-label" >公里,起步价</span>
- <input class="control-label" id="num10" name="num10" value="${ChargeStandard.num10}" type="number" style="height: 30px;width: 80px">
- <span class="control-label" >元,超出里程每</span>
- <input class="control-label" id="num11" name="num11" value="${ChargeStandard.num11}" type="number" style="height: 30px;width: 80px">
+ <input class="control-label" id="num8" name="num8" value="${ChargeStandard.num8}" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >公里,收费</span>
- <input class="control-label" id="num12" name="num12" value="${ChargeStandard.num12}" type="number" style="height: 30px;width: 80px">
+ <input class="control-label" id="num9" name="num9" value="${ChargeStandard.num9}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元,超出里程每</span>
+ <input class="control-label" id="num10" name="num10" value="${ChargeStandard.num10}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里,收费</span>
+ <input class="control-label" id="num11" name="num11" value="${ChargeStandard.num11}" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元</span>
</div>
</div>
@@ -74,27 +72,37 @@
<div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-12 control-label form-group" >
<span class="control-label" >等待</span>
- <input class="control-label" id="num13" name="num13" value="${ExtraCost.num1}" type="text" placeholder="00:00" style="height: 30px;width: 80px">
+ <input class="control-label" id="num12" name="num12" value="${ExtraCost.num1}" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >分钟,收取</span>
- <input class="control-label" id="num14" name="num14" value="${ExtraCost.num2}" type="text" placeholder="00:00" style="height: 30px;width: 80px">
- <span class="control-label" >元,超出</span>
- <input class="control-label" id="num15" name="num15" value="${ExtraCost.num3}" type="number" style="height: 30px;width: 80px">
- <span class="control-label" >分钟,收取</span>
- <input class="control-label" id="num16" name="num16" value="${ExtraCost.num4}" type="number" style="height: 30px;width: 80px">
+ <input class="control-label" id="num13" name="num13" value="${ExtraCost.num2}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元,超出收取</span>
+ <input class="control-label" id="num15" name="num15" value="${ExtraCost.num4}" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/分钟</span>
</div>
+ <input hidden id="zcOne" value="${zcOne}">
<div class="initialLevel col-sm-12 control-label form-group" >
- <span class="control-label" >恶劣天气</span>
- <input class="control-label" id="num17" name="num17" value="${ExtraCost.num5}" type="number" style="height: 30px;width: 80px">
- <span class="control-label" >公里以内,加收</span>
- <input class="control-label" id="num18" name="num18" value="${ExtraCost.num6}" type="number" style="height: 30px;width: 80px">
- <span class="control-label" >元,超出</span>
- <input class="control-label" id="num19" name="num19" value="${ExtraCost.num7}" type="number" style="height: 30px;width: 80px">
- <span class="control-label" >公里,收取订单的</span>
- <input class="control-label" id="num20" name="num20" value="${ExtraCost.num8}" type="number" style="height: 30px;width: 80px">
- <span class="control-label" >倍计费,最高收取</span>
- <input class="control-label" id="num21" name="num21" value="${ExtraCost.num9}" type="number" style="height: 30px;width: 80px">
- <span class="control-label" >元</span>
+ <div class="col-sm-1">
+ <input type="checkbox" class="js-switch1" id="isTaxiCar"
+ @if(isNotEmpty(zcOne)){
+ ${1 == zcOne ? 'checked=checked' : ''}
+ @}
+ />
+ </div>
+ @if(1 == zcOne){
+ <div class="initialLevel col-sm-10 control-label form-group" >
+ <span class="control-label" >恶劣天气</span>
+ <input class="control-label" id="num16" name="num16" value="${ExtraCost.num5}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里以内,加收</span>
+ <input class="control-label" id="num17" name="num17" value="${ExtraCost.num6}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元,超出</span>
+ <input class="control-label" id="num18" name="num18" value="${ExtraCost.num7}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里,收取订单的</span>
+ <input class="control-label" id="num19" name="num19" value="${ExtraCost.num8}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >倍计费,最高收取</span>
+ <input class="control-label" id="num20" name="num20" value="${ExtraCost.num9}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+ </div>
+ @}
</div>
</div>
@@ -113,4 +121,140 @@
</div>
<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig.js"></script>
<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig_info.js"></script>
+<script type="text/javascript">
+ lay('.time-item').each(function(){
+ laydate.render({
+ elem: this,
+ type: 'time',
+ format: 'HH:mm',
+ range: false,
+ lang:'zn',
+ trigger: 'click'
+ });
+ });
+
+ var elem1 = document.querySelector(".js-switch1");
+ var init1 = new Switchery(elem1);
+
+
+ $("#isTaxiCar").change(function(){
+ var ajax = new $ax(Feng.ctxPath + "/tSystemConfig/openOrClose", function (data) {
+ Feng.success("修改成功!");
+ location.reload()
+ TSystemConfig.table.refresh();
+ }, function (data) {
+ Feng.error("修改失败!" + data.responseJSON.message + "!");
+ });
+ console.log($("#zcOne").val())
+ if(1 == $("#zcOne").val()){
+ ajax.set("num1",0);
+ }else {
+ ajax.set("num1",1);
+ }
+ ajax.start();
+ })
+
+ $("input[name=num3]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num4]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num5]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num6]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num7]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num8]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num9]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num10]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num11]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num12]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+
+
+ $("input[name=num13]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num14]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num15]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num16]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num17]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num18]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num19]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+ $("input[name=num20]").bind('input',function(){
+ var value = $(this).val()
+ regexp(value)
+ })
+
+
+ /*function regexp(value){
+ var reg=/^[1-9]\d*$/;//由 1-9开头 的正则表达式
+ //先判断是否为整数 在判断 是否在 1-总页 整数范围之内
+ if(reg.test(value)){
+ if(parseInt(value) <= 0){
+ Feng.error("请输入大于0的正整数");
+ return;
+ }
+ }else{
+ Feng.error("请输入大于0的正整数");
+ return;
+ }
+ }*/
+ function regexp(value){
+ var reg=/^(\d+.?)?\d{0,2}$/;//由 1-9开头 的正则表达式 整数 两位小数
+ //先判断是否为整数 在判断 是否在 1-总页 整数范围之内
+ if(reg.test(value)){
+ if(value == 0){
+ Feng.error("请输入大于0的整数或保留两位小数");
+ return;
+ }
+ }else{
+ Feng.error("请输入整数或保留两位小数");
+ return;
+ }
+ }
+</script>
@}
--
Gitblit v1.7.1