新增自动下线逻辑

This commit is contained in:
yan.y
2025-02-18 18:13:06 +08:00
parent 00f9642f2b
commit 3ba58dc671
18 changed files with 685 additions and 1 deletions
@@ -53,9 +53,12 @@
</th>
<th>主键ID</th>
<th>车牌号</th>
<th>车辆状态</th>
<th>下线时间段</th>
<th>护理人员信息</th>
<th>车辆排单列表</th>
<th>添加护理人员</th>
<th>车辆下线设置</th>
<th>操作</th>
</tr>
</thead>
@@ -65,6 +68,9 @@
<i class="layui-icon layui-icon-ok"></i></label></td>
<td th:text="${item.id}">主键ID</td>
<td th:text="${item.carNo}">车牌号</td>
<td th:if="${item.carStatus == 1 || item.carStatus == null}">上线</td>
<td th:if="${item.carStatus == 2}">下线</td>
<td th:text="${item.info}">下线时间段</td>
<td>
<a class="open-popup" data-title="护理人员信息" th:attr="data-url=@{'/orders/car/toCarUserInfos/'+${item.id}}" data-size="auto" href="#">护理人员信息</a>
</td>
@@ -75,6 +81,9 @@
<a class="open-popup" data-title="添加护理人员" th:attr="data-url=@{'/orders/car/toAddCarUserInfos/'+${item.id}}" data-size="auto" href="#">添加护理人员</a>
</td>
<td>
<a class="open-popup" data-title="车辆下线管理" th:attr="data-url=@{'/orders/car/toCarDownInfos/'+${item.id}}" data-size="auto" href="#">车辆下线管理</a>
</td>
<td>
<!-- <a class="open-popup" data-title="设置区域服务时间" th:attr="data-url=@{'/orders/car/toUpdateAreaTime/'+${item.id}}" data-size="auto" href="#">设置区域服务时间</a>-->
<a class="open-popup" data-title="编辑车辆" th:attr="data-url=@{'/orders/car/edit/'+${item.id}}" data-size="auto" href="#">编辑</a>
<a class="open-popup" data-title="详细信息" th:attr="data-url=@{'/orders/car/detail/'+${item.id}}" data-size="800,600" href="#">详细</a>
@@ -0,0 +1,49 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
</head>
<body>
<div class="layui-form timo-compile">
<form th:action="@{/orders/car/saveCarDownInfo}">
<input type="hidden" name="id" th:if="${car}" th:value="${car.id}">
<div class="layui-form-item">
<label class="layui-form-label">车牌号</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="carNo" readonly th:value="${car?.carNo}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下线开始时间</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" id="startDownTime" name="startDownTime" placeholder="请输入下线开始时间" th:value="${car?.startDownTime}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下线结束时间</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" id="endDownTime" name="endDownTime" placeholder="请输入下线结束时间" th:value="${car?.endDownTime}">
</div>
</div>
<div class="layui-form-item timo-finally">
<button class="layui-btn ajax-submit"><i class="fa fa-check-circle"></i> 保存</button>
<button class="layui-btn btn-secondary close-popup"><i class="fa fa-times-circle"></i> 关闭</button>
</div>
</form>
</div>
<script th:replace="/common/template :: script"></script>
<script>
layui.use(['laydate'], function () {
var laydate = layui.laydate;
// 渲染
laydate.render({
elem: '#startDownTime',
type: 'datetime'
});
laydate.render({
elem: '#endDownTime',
type: 'datetime'
});
})
</script>
</body>
</html>
@@ -0,0 +1,59 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
</head>
<body>
<div class="layui-form timo-compile">
<form th:action="@{/orders/recharge/save}">
<input type="hidden" name="id" th:if="${recharge}" th:value="${recharge.id}">
<div class="layui-form-item">
<label class="layui-form-label">充值活动名称</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="name" placeholder="请输入充值活动名称" th:value="${recharge?.name}" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">充值活动描述</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="desc" placeholder="请输入充值活动描述" th:value="${recharge?.desc}" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">支付金额</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="price" placeholder="请输入支付金额" th:value="${recharge?.price}" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">赠送金额</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" value="0" name="givePrice" placeholder="请输入赠送金额" th:value="${recharge?.givePrice}" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">充值到账金额</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="rechargePrice" placeholder="请输入充值到账金额" th:value="${recharge?.rechargePrice}" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">充值类型</label>
<div class="layui-input-inline">
<select class="timo-search-select" name="type" mo:dict="RECHARGE_TYPE" mo-selected="${recharge?.type}"></select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">赠送描述</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" value="无" name="give" placeholder="赠送描述" th:value="${recharge?.give}">
</div>
</div>
<div class="layui-form-item timo-finally">
<button class="layui-btn ajax-submit"><i class="fa fa-check-circle"></i> 保存</button>
<button class="layui-btn btn-secondary close-popup"><i class="fa fa-times-circle"></i> 关闭</button>
</div>
</form>
</div>
<script th:replace="/common/template :: script"></script>
</body>
</html>
@@ -0,0 +1,71 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"
xmlns:mo="http://www.thymeleaf.org">
<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
</head>
<body class="timo-layout-page">
<div class="layui-card">
<div class="layui-card-header timo-card-header">
<span><i class="fa fa-bars"></i> 充值管理</span>
<i class="layui-icon layui-icon-refresh refresh-btn"></i>
</div>
<div class="layui-card-body">
<div class="layui-row timo-card-screen">
<div class="pull-right screen-btn-group">
<button class="layui-btn open-popup" data-title="添加充值商品" th:attr="data-url=@{/orders/recharge/add}" data-size="auto">
<i class="fa fa-plus"></i> 添加</button>
<div class="btn-group">
<button class="layui-btn">操作<span class="caret"></span></button>
<dl class="layui-nav-child layui-anim layui-anim-upbit">
<dd><a class="ajax-status" th:href="@{/orders/coupons/status/delete}">删除</a></dd>
</dl>
</div>
</div>
</div>
<div class="timo-table-wrap">
<table class="layui-table timo-table">
<thead>
<tr>
<th class="timo-table-checkbox">
<label class="timo-checkbox"><input type="checkbox">
<i class="layui-icon layui-icon-ok"></i></label>
</th>
<th>充值ID</th>
<th>充值名称</th>
<th>充值描述</th>
<th>金额</th>
<th>赠送金额</th>
<th>充值到账金额</th>
<th>类型</th>
<th>赠送描述</th>
<th>创建时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr th:each="item:${list}">
<td><label class="timo-checkbox"><input type="checkbox" th:value="${item.id}">
<i class="layui-icon layui-icon-ok"></i></label></td>
<td th:text="${item.id}">充值ID</td>
<td th:text="${item.name}">充值名称</td>
<td th:text="${item.desc}">充值描述</td>
<td th:text="${item.price}">金额</td>
<td th:text="${item.givePrice}">赠送金额</td>
<td th:text="${item.rechargePrice}">充值到账金额</td>
<td th:text="${#dicts.rechargeType(item.type)}">类型</td>
<td th:text="${item.give}">赠送描述</td>
<td th:text="${item.createTime}">创建时间</td>
<td>
<a class="open-popup" data-title="编辑优惠券" th:attr="data-url=@{'/orders/recharge/edit/'+${item.id}}" data-size="auto" href="#">编辑</a>
<a class="ajax-get" data-msg="您是否确认删除" th:href="@{/orders/recharge/status/delete(ids=${item.id})}">删除</a>
</td>
</tr>
</tbody>
</table>
</div>
<div th:replace="/common/fragment :: page"></div>
</div>
</div>
<script th:replace="/common/template :: script"></script>
</body>
</html>