diff --git a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html index 5623da4a..8abb6c3e 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -586,7 +586,9 @@ contentType: 'application/json', success: function (result) { if (result.code == web_status.SUCCESS) { - $.modal.msgSuccess("提交成功") + $.modal.confirm('发单成功，是否前往发单管理？', function() { + $.modal.parentTab('发单管理', 'order/master/pc'); + }) } else { $.modal.msgError("请求失败") } diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html index 8c32b207..9111233d 100644 --- a/ghy-admin/src/main/resources/templates/order/pc-master.html +++ b/ghy-admin/src/main/resources/templates/order/pc-master.html @@ -50,6 +50,12 @@ .long-input { width: 400px; } + + .active-condition-btn { + background-color: #1c84c6; + border-color: #1c84c6; + color: #fff; + } @@ -61,56 +67,50 @@
-
+
- + 待付款 - + 已发布 - + 未约时 - + 未排班 - + 待上门 - + 进行中 - + 确认审核 - + 完成 - + 关闭 - + 今日待上门 - + 明日待上门 - + 售后 - + 急报中 - - 退单 - - - 售后纠纷 -
@@ -122,42 +122,6 @@
-
- 创建时间： -
- - -
- 至 -
- - -
-
-
- 服务时间： -
- - -
- 至 -
- - -
-
-
- 完成时间： -
- - -
- 至 -
- - -
-
类别筛选：
@@ -167,61 +131,6 @@
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - -
-
- - - - -
-
- - -
@@ -233,41 +142,6 @@ class="fa fa-refresh"> 重置
-
- - 新订单 - - - 接单超时 - - - 约单超时 - - - 排单超时 - - - 无法排单 - - - 待上门超时 - - - 进行超时 - - - 售后超时 - - - 客诉中 - - - 审核中 - - - 一票价未改价 - -
@@ -546,6 +420,12 @@ }); } + function selectConditionBtn(e, params) { + $('.condition-btn .btn').removeClass('active-condition-btn'); + $(e).addClass('active-condition-btn'); + searchOrderList(params) + } + function searchOrderList(params) { customParams = params; $.table.search(); diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 66b35d78..7bb03c12 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -181,7 +181,7 @@ AND om.timeout_ = #{timeout} - AND om.ic_call = #{isCall} + AND om.is_call = #{isCall} order by om.create_time @@ -246,7 +246,7 @@ AND om.id in (${orderMasterIds}) - AND om.ic_call = #{isCall} + AND om.is_call = #{isCall}