From f58cca364b731eac2d60a440ffaa804be3cd43fd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 30 六月 2023 10:32:28 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html | 142 +++++++++++++++++++++++++++++------------------
1 files changed, 88 insertions(+), 54 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 18f040d..c82b1d4 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
@@ -17,44 +17,82 @@
</div>
<hr/>
- <input hidden id="array" value="${array}">
+ <input hidden id="array" value="">
<div class="initialLevel col-sm-12 control-label form-group" id="rules" style="text-align: left" >
- @for(ChargeStandard in array){
- <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">
- <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">
- <span class="control-label" >代驾里程</span>
- <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="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="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="num6" name="num6" value="${ChargeStandard.num6}" type="number" min="0" style="height: 30px;width: 80px">
- <span class="control-label" >元</span>
-
- @if(ChargeStandard.key == 0){
- <span class="fa fa-plus" onclick="TSystemConfig.addBox()"></span>
- @}
- @if(ChargeStandard.key == 1){
- <span class="fa fa-remove" onclick="TSystemConfig.delBox(this)"></span>
+ <button onclick="TSystemConfig.addTime()" style="padding: 5px 10px;font-size: 16px;background-color: #0086f6;color: #fff;border: none;border-radius: 5px;">添加时间段</button>
+ <div class="rulesForm" style="border: 1px solid #888888;padding-top: 10px;display: grid;margin: 10px 0px">
+ <span style="position: absolute;right: 30px;color: #0086f6;font-size: 16px;">默认</span>
+ <div class="prices">
+ @for(obj in defaule.num3){
+ <div class="initialLevel col-sm-12 control-label form-group price">
+ <span class="control-label" >代驾里程</span>
+ <input class="control-label" id="num1" name="num1" value="${obj.num1}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里，至</span>
+ <input class="control-label" id="num2" name="num2" value="${obj.num2}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里，收费</span>
+ <input class="control-label" id="num3" name="num3" value="${obj.num3}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+ @if(obj.index == 0){
+ <span class="fa fa-plus" onclick="TSystemConfig.addBox(this)"></span>
+ @}else{
+ <span class="fa fa-remove" onclick="TSystemConfig.delBox(this)"></span>
+ @}
+ </div>
@}
</div>
<div class="initialLevel col-sm-12 control-label form-group" >
<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">
+ <input class="control-label" id="num4" name="num4" value="${defaule.num4}" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >——</span>
- <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="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">
+ <input class="control-label" id="num5" name="num5" value="${defaule.num5}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里，费用</span>
+ <input class="control-label" id="num6" name="num6" value="${defaule.num6}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元，超出里程每</span>
+ <input class="control-label" id="num7" name="num7" value="${defaule.num7}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里，收费</span>
+ <input class="control-label" id="num8" name="num8" value="${defaule.num8}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+ </div>
+ </div>
+ @for(o in array){
+ <div class="rulesForm" style="border: 1px solid #888888;padding-top: 10px;display: grid;margin: 10px 0px">
+ <div class="initialLevel col-sm-12 control-label form-group" id='time' >
+ <span class="control-label" >时间段</span>
+ <input class="control-label time-item" id="num1" name="num1" type="text" value="${o.num1}" placeholder="00:00" style="height: 30px;width: 80px" readonly>
+ <span class="control-label" >——</span>
+ <input class="control-label time-item" id="num2" name="num2" type="text" value="${o.num2}" placeholder="00:00" style="height: 30px;width: 80px" readonly>
+ <span class="fa fa-remove" style='position: absolute;right: 20px;color: red;font-size: 20px;' onclick="TSystemConfig.delTime(this)"></span>
+ </div>
+ <div class="prices">
+ @for(obj in o.num3){
+ <div class="initialLevel col-sm-12 control-label form-group price">
+ <span class="control-label" >代驾里程</span>
+ <input class="control-label" id="num1" name="num1" value="${obj.num1}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里，至</span>
+ <input class="control-label" id="num2" name="num2" value="${obj.num2}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里，收费</span>
+ <input class="control-label" id="num3" name="num3" value="${obj.num3}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+ @if(obj.index == 0){
+ <span class="fa fa-plus" onclick="TSystemConfig.addBox(this)"></span>
+ @}else{
+ <span class="fa fa-remove" onclick="TSystemConfig.delBox(this)"></span>
+ @}
+ </div>
+ @}
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <span class="control-label" >长途里程</span>
+ <input class="control-label" id="num4" name="num4" value="${o.num4}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >——</span>
+ <input class="control-label" id="num5" name="num5" value="${o.num5}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里，费用</span>
+ <input class="control-label" id="num6" name="num6" value="${o.num6}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元，超出里程每</span>
+ <input class="control-label" id="num7" name="num7" value="${o.num7}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里，收费</span>
+ <input class="control-label" id="num8" name="num8" value="${o.num8}" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元</span>
</div>
</div>
@@ -69,20 +107,20 @@
</div>
<hr/>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-12 control-label form-group" id="wait" style="text-align: left" >
<div class="initialLevel col-sm-12 control-label form-group" >
<span class="control-label" >等待</span>
<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>
+ <span class="control-label" >分钟，收取</span>
<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>
+ <span class="control-label" >元，超出</span>
<input class="control-label" id="num14" name="num14" value="${ExtraCost.num3}" type="number" min="0" style="height: 30px;width: 80px">
- <span class="control-label" >分钟,收取</span>
+ <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" >
+ <div class="initialLevel col-sm-12 control-label form-group" id="weather">
<div class="col-sm-1">
<input type="checkbox" class="js-switch1" id="isTaxiCar"
@if(isNotEmpty(zcOne)){
@@ -94,13 +132,13 @@
<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>
+ <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>
+ <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>
+ <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>
+ <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>
@@ -124,20 +162,16 @@
<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">
- // laydate.render({
- // elem: 'input[name=num1]',
- // type: 'time',
- // format: 'HH:mm',
- // range: false,
- // lang:'zn'
- // });
- // laydate.render({
- // elem: 'input[name=num2]',
- // type: 'time',
- // format: 'HH:mm',
- // range: false,
- // lang:'zn'
- // });
+ 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);
--
Gitblit v1.7.1