clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

发单管理待付款及已发布查询

This commit is contained in:
donqi 2023-06-01 23:18:06 +08:00
parent 3a829cae26
commit 7b0169e4bc
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ghy-admin/src/main/resources/templates/order/pc-master.html
View File

@ -61,16 +61,15 @@
<form id="order-form" class="m"> <form id="order-form" class="m">
<input type="hidden" id="deptId" name="deptId"> <input type="hidden" id="deptId" name="deptId">
<input type="hidden" id="parentId" name="parentId"> <input type="hidden" id="parentId" name="parentId">
<input type="hidden" id="orderStatus" name="orderStatus"/>
<div> <div>
<select id="allOrServing"> <select id="allOrServing">
<option value="">全部</option> <option value="">全部</option>
<option value="">在途</option> <option value="">在途</option>
</select> </select>
<a class="btn btn-default btn-outline"> <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 0, sysPayStatus: 0, orderMode: '02'})">
待付款 待付款
</a> </a>
<a class="btn btn-default btn-outline"> <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 0, workerId: -1})">
已发布 已发布
</a> </a>
<a class="btn btn-default btn-outline"> <a class="btn btn-default btn-outline">
@ -79,19 +78,19 @@
<a class="btn btn-default btn-outline"> <a class="btn btn-default btn-outline">
未排班 未排班
</a> </a>
<a class="btn btn-default btn-outline" onclick="searchByOrderStatus(2)"> <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 2})">
待上门 待上门
</a> </a>
<a class="btn btn-default btn-outline" onclick="searchByOrderStatus(3)"> <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 3})">
进行中 进行中
</a> </a>
<a class="btn btn-default btn-outline" onclick="searchByOrderStatus(4)"> <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 4})">
确认审核 确认审核
</a> </a>
<a class="btn btn-default btn-outline" onclick="searchByOrderStatus(5)"> <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 5})">
完成 完成
</a> </a>
<a class="btn btn-default btn-outline" onclick="searchByOrderStatus(6)"> <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 6})">
关闭 关闭
</a> </a>
<a class="btn btn-default btn-outline" onclick=""> <a class="btn btn-default btn-outline" onclick="">
@ -305,6 +304,7 @@
var editFlag = [[${@permission.hasPermi('order:order:edit')}]]; var editFlag = [[${@permission.hasPermi('order:order:edit')}]];
var prefix = ctx + "order/master"; var prefix = ctx + "order/master";
var customParams = {};
$(function () { $(function () {
var panehHidden = false; var panehHidden = false;
@ -414,6 +414,7 @@
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
queryParams: queryParams,
sortName: "createTime", sortName: "createTime",
sortOrder: "desc", sortOrder: "desc",
modalName: "订单", modalName: "订单",
@ -520,6 +521,12 @@
$.table.init(options); $.table.init(options);
} }
function queryParams(params) {
var search = $.table.queryParams(params);
Object.assign(search, customParams)
return search;
}
function detail(id) { function detail(id) {
var url = "order/goods?orderId=" + id; var url = "order/goods?orderId=" + id;
$.modal.open("商品信息", url); $.modal.open("商品信息", url);
@ -539,8 +546,8 @@
}); });
} }
function searchByOrderStatus(orderStatus) { function searchOrderList(params) {
$('#orderStatus').val(orderStatus); customParams = params;
$.table.search(); $.table.search();
} }

2
ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
View File

@ -141,4 +141,6 @@ public class OrderMaster extends BaseEntity {
private Integer timeoutFineTimes; private Integer timeoutFineTimes;
private String orderMode; private String orderMode;
private Integer sysPayStatus;
} }

6
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -135,6 +135,12 @@
AND ( (om.order_mode in ('01','03','04')) AND ( (om.order_mode in ('01','03','04'))
OR (om.order_mode = '02' and fm.pay_status = 1) ) OR (om.order_mode = '02' and fm.pay_status = 1) )
</if> </if>
<if test="sysPayStatus != null">
AND fm.pay_status = #{sysPayStatus}
</if>
<if test="orderMode != null and orderMode != ''">
AND om.order_mode = #{orderMode}
</if>
<if test="goodsCategoryId != null"> <if test="goodsCategoryId != null">
AND g.dept_goods_category_id = #{goodsCategoryId} AND g.dept_goods_category_id = #{goodsCategoryId}
</if> </if>