From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_edit.html | 313 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 274 insertions(+), 39 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_edit.html
index 75955b5..98bc0c8 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_edit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_edit.html
@@ -65,21 +65,18 @@
<div class="initialLevel col-sm-12 control-label form-group">
<div class="initialLevel col-sm-3 control-label form-group" >
- <span style="color:red">*</span>
<label class="control-label" >登录账号:</label>
<input id="account" name="account" type="text" maxlength="20" placeholder="请输入" style="height: 30px">
</div>
</div>
<div class="initialLevel col-sm-12 control-label form-group">
<div class="initialLevel col-sm-3 control-label form-group" >
- <span style="color:red">*</span>
<label class="control-label" >登录密码:</label>
<input id="password" name="password" type="password" maxlength="20" placeholder="请输入密码" style="height: 30px">
</div>
</div>
<div class="initialLevel col-sm-12 control-label form-group">
<div class="initialLevel col-sm-3 control-label form-group" >
- <span style="color:red">*</span>
<label class="control-label" >确认密码:</label>
<input id="rePassword" name="rePassword" type="password" maxlength="20" placeholder="请输入确认密码" style="height: 30px">
</div>
@@ -89,7 +86,162 @@
</div>
</div>
-
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div style="background-color: gray;height: 35px;line-height: 35px">
+ <label style="color: #0C0C0C">基础费用</label>
+ </div>
+ </div>
+ <hr/>
+ <input hidden id="array" value="${array}">
+ <div class="initialLevel col-sm-12 control-label form-group" id="rules" style="text-align: left" >
+ @if(null == 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" type="text" placeholder="00:00" style="height: 30px;width: 80px">
+ <span class="control-label" >——</span>
+ <input class="control-label" id="num2" name="num2" type="text" placeholder="00:00" style="height: 30px;width: 80px">
+ <span class="control-label" >代驾里程</span>
+ <input class="control-label" id="num3" name="num3" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里,起步价</span>
+ <input class="control-label" id="num4" name="num4" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元,超出里程每</span>
+ <input class="control-label" id="num5" name="num5" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里,收费</span>
+ <input class="control-label" id="num6" name="num6" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+
+ <span class="fa fa-plus" onclick="TBranchOfficeInfoDlg.addBox()"></span>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <span class="control-label" >长途里程</span>
+ <input class="control-label" id="num7" name="num7" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >——</span>
+ <input class="control-label" id="num8" name="num8" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里,收费</span>
+ <input class="control-label" id="num9" name="num9" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元,超出里程每</span>
+ <input class="control-label" id="num10" name="num10" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >公里,收费</span>
+ <input class="control-label" id="num11" name="num11" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+ </div>
+ </div>
+ @}
+ @if(null != array){
+ @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>
+ @}
+ </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">
+ <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">
+ <span class="control-label" >元</span>
+ </div>
+ </div>
+ @}
+ @}
+ </div>
+ <hr/>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div style="background-color: gray;height: 35px;line-height: 35px">
+ <label style="color: #0C0C0C">客服信息</label>
+ </div>
+ </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" >
+ <span class="control-label" >客服电话</span>
+ <input class="control-label" id="num22" name="num22" value="${serviceTel}" style="height: 30px;width: 150px">
+ </div>
+ </div>
+ <hr/>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div style="background-color: gray;height: 35px;line-height: 35px">
+ <label style="color: #0C0C0C">额外费用</label>
+ </div>
+ </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" >
+ <span class="control-label" >等待</span>
+ <input class="control-label" id="num12" name="num12" value="${ExtraCost != null ? ExtraCost.num1 : ''}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >分钟,收取</span>
+ <input class="control-label" id="num13" name="num13" value="${ExtraCost != null ? ExtraCost.num2 : ''}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元,超出</span>
+ <input class="control-label" id="num14" name="num14" value="${ExtraCost != null ? ExtraCost.num3 : ''}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >分钟,收取</span>
+ <input class="control-label" id="num15" name="num15" value="${ExtraCost != null ? 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="col-sm-1">
+ <input type="checkbox" class="js-switch1" id="isTaxiCar"
+ @if(isNotEmpty(zcOne)){
+ ${1 == zcOne ? 'checked=checked' : ''}
+ @}
+ />
+ </div>
+ <div class="initialLevel col-sm-10 control-label form-group" id="isTaxiCar_div" ${1 == zcOne ? '' : 'hidden'}>
+ <span class="control-label" >恶劣天气</span>
+ <input class="control-label" id="num16" name="num16" value="${ExtraCost != null ? 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 != null ? 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 != null ? 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 != null ? 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 != null ? ExtraCost.num9 : ''}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+ </div>
+ </div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="col-sm-1">
+ <input type="checkbox" class="js-switch2" id="holiday"
+ @if(isNotEmpty(zcTwo)){
+ ${1 == zcTwo ? 'checked=checked' : ''}
+ @}
+ />
+ </div>
+ <div class="initialLevel col-sm-10 control-label form-group" id="holiday_div" ${1 == zcTwo ? '' : 'hidden'}>
+ <span class="control-label" >节假日 每单加收</span>
+ <input class="control-label" id="num21" name="num21" value="${ExtraCost != null ? ExtraCost.num10 : ''}" type="number" min="0" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+ </div>
+ </div>
<div class="row btn-group-m-t">
<div class="col-sm-10" style="text-align: center">
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TBranchOfficeInfoDlg.close()"/>
@@ -100,41 +252,124 @@
</div>
</div>
</div>
-<!--<div class="ibox float-e-margins">
- <div class="ibox-content">
- <div class="form-horizontal">
-
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="id" name="主键" value="${item.id}" underline="true"/>
- <#input id="agentId" name="代理商id" value="${item.agentId}" underline="true"/>
- <#input id="principal" name="负责人姓名" value="${item.principal}" underline="true"/>
- <#input id="principalPhone" name="负责人电话" value="${item.principalPhone}" underline="true"/>
- <#input id="email" name="邮箱" value="${item.email}" underline="true"/>
- <#input id="provinceCode" name="代理区域省编号" value="${item.provinceCode}" underline="true"/>
- <#input id="provinceName" name="代理区域省名称" value="${item.provinceName}" />
- </div>
-
- <div class="col-sm-6">
- <#input id="cityCode" name="代理区域市编号" value="${item.cityCode}" underline="true"/>
- <#input id="cityName" name="代理区域市名称" value="${item.cityName}" underline="true"/>
- <#input id="districtCode" name="代理区域区编号" value="${item.districtCode}" underline="true"/>
- <#input id="districtName" name="代理区域区名称" value="${item.districtName}" underline="true"/>
- <#input id="status" name="状态（1=正常，2=冻结，3=删除）" value="${item.status}" underline="true"/>
- <#input id="createTime" name="添加时间" value="${item.createTime}" />
- </div>
- </div>
-
- <div class="row btn-group-m-t">
- <div class="col-sm-10">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TBranchOfficeInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TBranchOfficeInfoDlg.close()"/>
- </div>
- </div>
- </div>
-
- </div>
-</div>-->
<script src="${ctxPath}/static/modular/system/tBranchOffice/tBranchOffice_info.js"></script>
<script src="${ctxPath}/static/modular/system/tBranchOffice/tBranchOffice.js"></script>
+<script type="text/javascript">
+ var elem1 = document.querySelector(".js-switch1");
+ var init1 = new Switchery(elem1);
+ $('.js-switch1').change(function () {
+ if($(this).is(":checked")){
+ $('#isTaxiCar_div').show();
+ }else{
+ $('#isTaxiCar_div').hide()
+ }
+ })
+ var elem2 = document.querySelector(".js-switch2");
+ var init2 = new Switchery(elem2);
+ $('.js-switch2').change(function () {
+ if($(this).is(":checked")){
+ $('#holiday_div').show();
+ }else{
+ $('#holiday_div').hide()
+ }
+ })
+ $("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