From 5b50db6fe7bfe2d3661c1d79fe381b76f5a3aaa5 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 12 Aug 2024 18:10:06 +0800 Subject: [PATCH] add tid1553 logic --- src/subpackage/order/js/api.js | 2 + .../modules/order_detail/end_billing_modal.vue | 50 +++- .../timekeeping/modules/order_list/deposit.vue | 8 + .../timekeeping/modules/order_list/person.vue | 6 +- .../pages/timekeeping/modules/order_list/site.vue | 12 + .../pages/timekeeping/order_detail/deposit.vue | 113 +++++--- .../pages/timekeeping/order_detail/person.vue | 78 +++++- .../order/pages/timekeeping/order_detail/site.vue | 284 +++++++++++++++++---- .../order/pages/timekeeping/order_list.vue | 15 +- 9 files changed, 458 insertions(+), 110 deletions(-) diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js index b3f11b2..00ca434 100644 --- a/src/subpackage/order/js/api.js +++ b/src/subpackage/order/js/api.js @@ -40,6 +40,8 @@ export const ORDER_API = { stadiumList: `${ORIGIN}/admin/stadium/list`, // 店铺列表 billingOrderList: `${ORIGIN}/admin/stadium/billing/order/list`, // 计时订单列表 billingOrderDetail: `${ORIGIN}/admin/stadium/billing/order/detail`, // 散客计时订单详情 + timeOrderEnd: `${ORIGIN}/admin/assistant/timeOrder/end`, //k-订单管理-订单计时结束 + timeOrderComplete:`${ORIGIN}/admin/assistant/timeOrder/complete`, //【20220208】k-订单管理-计时订单完结 } export default ORDER_API; \ No newline at end of file diff --git a/src/subpackage/order/pages/timekeeping/modules/order_detail/end_billing_modal.vue b/src/subpackage/order/pages/timekeeping/modules/order_detail/end_billing_modal.vue index 7885cfd..214c9ab 100644 --- a/src/subpackage/order/pages/timekeeping/modules/order_detail/end_billing_modal.vue +++ b/src/subpackage/order/pages/timekeeping/modules/order_detail/end_billing_modal.vue @@ -41,6 +41,9 @@ diff --git a/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue b/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue index 6f064f5..e41c60c 100644 --- a/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue +++ b/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue @@ -4,6 +4,7 @@ :status="order.status_text || ''" :price="order.pay_amount || ''" :price-show="true" + @click:item="toDetail" > @@ -49,6 +49,10 @@ export default { toDetail(){ let { order } = this; routeTo(`/subpackage/order/pages/timekeeping/order_detail/person?order_no=${order?.order_no || ''}&brand_id=${order?.brand_id || ''}`, 'nT'); + }, + endBilling(){ + let { order } = this; + routeTo(`/subpackage/order/pages/timekeeping/order_detail/person?order_no=${order?.order_no || ''}&brand_id=${order?.brand_id || ''}&is_end=1`, 'nT'); } } } diff --git a/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue b/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue index 0443607..aad4d99 100644 --- a/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue +++ b/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue @@ -5,6 +5,7 @@ :price="order.pay_amount || ''" :status-active="['待支付', '计费中','待使用', '使用中'].includes(order.status_text)" :price-show="['待支付', '待使用', '使用中', '已完成', '已失效', '已退款'].includes(order.status_text)" + @click:item="toDetail" >