From a69c3d19084fb24ad4959c7cd1d1c4e51c4bfdc5 Mon Sep 17 00:00:00 2001 From: hr121 <568127468@qq.com> Date: Sun, 27 Jul 2025 22:01:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=BD=E7=89=A9=E8=AE=A2=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=85=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dropdown.js | 12 + src/api/order.js | 46 +++ src/api/system/customer.js | 9 +- src/api/system/user.js | 13 +- src/views/order/loadOrder/index.vue | 353 +++++++++++++----- .../order/loadOrder/loadOrderDetail/index.vue | 128 ++++--- 6 files changed, 414 insertions(+), 147 deletions(-) create mode 100644 src/api/dropdown.js diff --git a/src/api/dropdown.js b/src/api/dropdown.js new file mode 100644 index 0000000..4e17e50 --- /dev/null +++ b/src/api/dropdown.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + +// 获取景区下拉值 +export function getScenicValue (data) { + return request({ + url: 'api/dataDropdown/obtainScenicList', + method: 'get', + data + }) +} + +export default { getScenicValue } diff --git a/src/api/order.js b/src/api/order.js index 5ef0252..b778008 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -1,5 +1,6 @@ import request from '@/utils/request' +// 获取订单列表 export function getOrderList(params) { return request({ url: 'api/order/allOrder', @@ -7,3 +8,48 @@ export function getOrderList(params) { params }) } + +// 根据id查询订单详情 +export function getOrderDetail(id) { + return request({ + url: `api/order/queryOrderDetail/${id}`, + method: 'get' + }) +} + +// 查询结算订单列表 +export function getSettleOrderList(params) { + return request({ + url: 'api/settlementOrder/allSettlementOrder', + method: 'get', + params + }) +} + +// 根据id查询结算订单详情 +export function getSettleOrderDetail(settlementOrderId) { + return request({ + url: `api/settlementOrder/querySettlementOrderDetail/${settlementOrderId}`, + method: 'get' + }) +} + +// 生成结算订单 +export function generateSettlementOrder(params) { + return request({ + url: 'api/settlementOrder/generateSettlementOrder', + method: 'post', + data: params + }) +} + +// 获取生成结算单确认列表 +// export function get + +// 更新结算单状态 +export function updateSettleOrderStatus(settlementOrderId, settlementOrderStatus) { + return request({ + url: `api/settlementOrder/updateSettlementOrderStatus/${settlementOrderId}/${settlementOrderStatus}`, + method: 'put', + }) +} diff --git a/src/api/system/customer.js b/src/api/system/customer.js index 9bd561d..0b6809f 100644 --- a/src/api/system/customer.js +++ b/src/api/system/customer.js @@ -32,4 +32,11 @@ export function edit(data) { }) } -export default { add, enable, del, edit } +export function allCustomer() { + return request({ + url: 'aerocraftAdminApi/cnCustomer/all', + method: 'get' + }) +} + +export default { add, enable, del, edit, allCustomer } diff --git a/src/api/system/user.js b/src/api/system/user.js index 47c4f68..8abc58f 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -4,7 +4,7 @@ import { encrypt } from '@/utils/rsaEncrypt' export function add(data) { data.password = encrypt(data.password) console.log(data); - + return request({ url: 'api/users', method: 'post', @@ -31,7 +31,7 @@ export function resetPwd(ids) { export function edit(data) { if(data.password) data.password = encrypt(data.password) console.log(data); - + return request({ url: 'api/users', method: 'put', @@ -71,5 +71,14 @@ export function updateEmail(form) { }) } +// 载物订单管理需要判断用户角色 /api/users +export function getUser(params) { + return request({ + url: 'api/users', + method: 'get', + params + }) +} + export default { add, edit, del, resetPwd } diff --git a/src/views/order/loadOrder/index.vue b/src/views/order/loadOrder/index.vue index f93ef0e..9c78801 100644 --- a/src/views/order/loadOrder/index.vue +++ b/src/views/order/loadOrder/index.vue @@ -3,28 +3,44 @@