From 79bd6b57dd59b2b9d2557aeaca2bb28f909699a1 Mon Sep 17 00:00:00 2001 From: hr121 <568127468@qq.com> Date: Thu, 31 Jul 2025 19:07:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86html2pdf=E5=BA=93,?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=BB=93=E7=AE=97=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=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 --- package.json | 1 + src/api/dropdown.js | 9 +- src/api/order.js | 16 +- src/api/system/customer.js | 10 +- src/views/aircraft/index.vue | 2 +- src/views/order/loadOrder/index.vue | 4 +- .../settlementOrder/generateOrder/index.vue | 245 ++++++++++--- src/views/order/settlementOrder/index.vue | 91 +++-- .../settlementOrder/orderDetail/index.vue | 331 +++++++++++------- .../orderDetail/settlementPdf.vue | 233 ++++++++++++ 10 files changed, 746 insertions(+), 196 deletions(-) create mode 100644 src/views/order/settlementOrder/orderDetail/settlementPdf.vue diff --git a/package.json b/package.json index 6a8d6f8..00f0559 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "element-ui": "^2.15.14", "file-saver": "1.3.8", "fuse.js": "3.4.4", + "html2pdf.js": "^0.10.3", "js-beautify": "^1.10.2", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", diff --git a/src/api/dropdown.js b/src/api/dropdown.js index 4e17e50..6b6a6d5 100644 --- a/src/api/dropdown.js +++ b/src/api/dropdown.js @@ -9,4 +9,11 @@ export function getScenicValue (data) { }) } -export default { getScenicValue } +// 获取用户名称下拉 +export function getUserNameValue (userType) { + return request({ + url: `api/dataDropdown/obtainUserListByType/${userType}`, + method: 'get', + }) +} +export default { getScenicValue, getUserNameValue } diff --git a/src/api/order.js b/src/api/order.js index b778008..e05a050 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -44,7 +44,13 @@ export function generateSettlementOrder(params) { } // 获取生成结算单确认列表 -// export function get +export function getGenerateSettleOrderConfirmList(params) { + return request({ + url: '/api/settlementOrder/generateSettlementOrderConfirmList', + method: 'post', + data: params + }) +} // 更新结算单状态 export function updateSettleOrderStatus(settlementOrderId, settlementOrderStatus) { @@ -53,3 +59,11 @@ export function updateSettleOrderStatus(settlementOrderId, settlementOrderStatus method: 'put', }) } + +// 打印结算单数据 +export function printSettleOrderData(settlementOrderId) { + return request({ + url: `api/settlementOrder/printSettlementOrder/${settlementOrderId}`, + method: 'get', + }) +} diff --git a/src/api/system/customer.js b/src/api/system/customer.js index 0b6809f..ff7c7eb 100644 --- a/src/api/system/customer.js +++ b/src/api/system/customer.js @@ -39,4 +39,12 @@ export function allCustomer() { }) } -export default { add, enable, del, edit, allCustomer } +// 查询单个客户信息 +export function getCustomerId(id) { + return request({ + url: `aerocraftAdminApi/cnCustomer/${id}`, + method: 'get' + }) +} + +export default { add, enable, del, edit, allCustomer, getCustomerId } diff --git a/src/views/aircraft/index.vue b/src/views/aircraft/index.vue index d7ae6d1..6e7d753 100644 --- a/src/views/aircraft/index.vue +++ b/src/views/aircraft/index.vue @@ -517,7 +517,7 @@ export default { if (response) { // 确保有total字段 if (response.total !== undefined) { - this.page.total = response.total; + this.page.total = Number(response.total); } // 确保records数组存在且是数组类型 if (response && Array.isArray(response)) { diff --git a/src/views/order/loadOrder/index.vue b/src/views/order/loadOrder/index.vue index 9c78801..c0ffe51 100644 --- a/src/views/order/loadOrder/index.vue +++ b/src/views/order/loadOrder/index.vue @@ -144,7 +144,7 @@ export default { this.getScenics(); this.getPilots(); this.getCustomers(); - this.getList(); + // this.getList(); }, data() { return { @@ -207,7 +207,7 @@ export default { id: record.id, }; }); - this.page.total = response.total || 0; + this.page.total = Number(response.total) || 0; }) .finally(() => { this.loading = false; diff --git a/src/views/order/settlementOrder/generateOrder/index.vue b/src/views/order/settlementOrder/generateOrder/index.vue index 008722b..739083c 100644 --- a/src/views/order/settlementOrder/generateOrder/index.vue +++ b/src/views/order/settlementOrder/generateOrder/index.vue @@ -8,12 +8,12 @@
景区: - +
@@ -56,19 +56,29 @@ - + + + @@ -123,9 +133,26 @@
+ diff --git a/src/views/order/settlementOrder/orderDetail/settlementPdf.vue b/src/views/order/settlementOrder/orderDetail/settlementPdf.vue new file mode 100644 index 0000000..8c927d4 --- /dev/null +++ b/src/views/order/settlementOrder/orderDetail/settlementPdf.vue @@ -0,0 +1,233 @@ + + + + +