From f2969bee2faf7ccc36aed1596ffb00ae3f4ee7f2 Mon Sep 17 00:00:00 2001 From: panxinyu-YUYwp Date: Thu, 29 Oct 2026 09:34:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/project/projectAnnualFee.js | 4 + src/api/project/projectContract.js | 8 + src/api/project/projectMessage.js | 18 + src/api/project/projectPayment.js | 6 + src/api/project/projectQuotation.js | 16 + src/views/modules/billing/billing-request.vue | 15 +- src/views/modules/finance/billing-invoice.vue | 12 +- .../modules/finance/invoice-management.vue | 35 +- src/views/modules/project/project-message.vue | 2492 +++++++++++++++++ 9 files changed, 2592 insertions(+), 14 deletions(-) create mode 100644 src/api/project/projectAnnualFee.js create mode 100644 src/api/project/projectContract.js create mode 100644 src/api/project/projectMessage.js create mode 100644 src/api/project/projectPayment.js create mode 100644 src/api/project/projectQuotation.js create mode 100644 src/views/modules/project/project-message.vue diff --git a/src/api/project/projectAnnualFee.js b/src/api/project/projectAnnualFee.js new file mode 100644 index 0000000..bbae72c --- /dev/null +++ b/src/api/project/projectAnnualFee.js @@ -0,0 +1,4 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +export const annualFeeSave = data => createAPI(`/projectInfo/cusAnnannualFeeSave`, 'post', data) +export const annualRenewalList = data => createAPI(`/projectInfo/findAllAnnualRenewalData`, 'post', data) diff --git a/src/api/project/projectContract.js b/src/api/project/projectContract.js new file mode 100644 index 0000000..9d0bcbd --- /dev/null +++ b/src/api/project/projectContract.js @@ -0,0 +1,8 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +export const contractList = data => createAPI(`/projectInfo/findAllContractData`, 'post', data) +export const contractSave = data => createAPI(`/projectInfo/addContractSave`, 'post', data) +export const contractDelete = data => createAPI(`/projectInfo/delProjectContract`, 'post', data) +export const contractArchive = data => createAPI(`/projectInfo/archiveContractSave`, 'post', data) +export const contractSendSave = data => createAPI(`/projectInfo/contractSendSave`, 'post', data) +export const contractResponseSave = data => createAPI(`/projectInfo/contractResponseSave`, 'post', data) diff --git a/src/api/project/projectMessage.js b/src/api/project/projectMessage.js new file mode 100644 index 0000000..8f51647 --- /dev/null +++ b/src/api/project/projectMessage.js @@ -0,0 +1,18 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 项目信息分页查询(老 /proInfo/findProjectInfoData) +export const projectInfoData = data => createAPI(`/projectInfo/findProjectInfoData`, 'post', data) + +// 项目信息新增/编辑保存(老 /proInfo/projectInfoSave) +export const projectInfoSave = data => createAPI(`/projectInfo/projectInfoSave`, 'post', data) + +// 项目信息删除(老 /proInfo/projectInfoDel) +export const projectInfoDelete = data => createAPI(`/projectInfo/projectInfoDel`, 'post', data) + +// 项目状态下拉(老 /proInfo/valueListItem?type=PS)。后端是 @RequestParam,type 必须走 query string +export const projectStatusList = () => createAPI(`/invoice/valueList?type=PS`, 'post') + +// 客户下拉(老 /proInfo/customerName 没搬,复用案件页在用的那个) +export const projectCustomerList = () => createAPI(`/projectInfo/getCustomerList`, 'get') +// 项目日期修改(老 /proInfo/updateProjectData) +export const projectDateSave = data => createAPI(`/projectInfo/updateProjectData`, 'post', data) diff --git a/src/api/project/projectPayment.js b/src/api/project/projectPayment.js new file mode 100644 index 0000000..8cea657 --- /dev/null +++ b/src/api/project/projectPayment.js @@ -0,0 +1,6 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +export const paymentPlanList = data => createAPI(`/projectInfo/findPaymentPlanData`, 'post', data) +export const paymentPlanSave = data => createAPI(`/projectInfo/paymentPlanSave`, 'post', data) +// 收款计划发起开票申请(老 /proInfo/billingApplySave,后端要写 refer_id1/refer_type1='收款计划' 防重) +export const paymentApplySave = data => createAPI(`/projectInfo/billingApplySave`, 'post', data) diff --git a/src/api/project/projectQuotation.js b/src/api/project/projectQuotation.js new file mode 100644 index 0000000..de35e8d --- /dev/null +++ b/src/api/project/projectQuotation.js @@ -0,0 +1,16 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 报价列表(老 /proInfo/findAllQuotationData) +export const quotationList = data => createAPI(`/projectInfo/findAllQuotationData`, 'post', data) + +// 报价新增/编辑(老 /proInfo/projectQuotationSave) +export const quotationSave = data => createAPI(`/projectInfo/projectQuotationSave`, 'post', data) + +// 报价发出(老 /proInfo/quotationSendSendSave) +export const quotationSend = data => createAPI(`/projectInfo/quotationSendSendSave`, 'post', data) + +// 报价结果(老 /proInfo/quotationResultSave) +export const quotationResult = data => createAPI(`/projectInfo/quotationResultSave`, 'post', data) + +// 报价删除(老 /proInfo/projectQuoResultdel) +export const quotationDelete = data => createAPI(`/projectInfo/projectQuoResultdel`, 'post', data) diff --git a/src/views/modules/billing/billing-request.vue b/src/views/modules/billing/billing-request.vue index 8325013..6091741 100644 --- a/src/views/modules/billing/billing-request.vue +++ b/src/views/modules/billing/billing-request.vue @@ -48,7 +48,9 @@ - + + + @@ -117,7 +119,8 @@ + style="font-size:12px; height:30px; text-align:right" + @input="v => applyForm.amount = String(v).replace(/[^\d.]/g, '')" @change="onAmountChange"> @@ -296,7 +299,11 @@ export default { if (v == null || v === '') return '' return Number(v) === 0.06 ? '6' : '13' }, - + moneyText(v) { + if (v == null || v === '') return '' + let n = Number(v) + return isNaN(n) ? '' : n.toFixed(2) + }, initData() { this.fetchApplyList() this.fetchCustomerOptions() @@ -407,7 +414,7 @@ export default { this.applyForm.shipMethod = row.shipMethod this.applyForm.billingProject = row.billingProject if (row.billingRate != null) this.applyForm.billingRate = String(row.billingRate) - this.applyForm.amount = row.amount == null ? '' : String(row.amount) + this.applyForm.amount = this.moneyText(row.amount) this.applyForm.receiver = row.receiver this.applyForm.receiverPhone = row.receiverPhone this.applyForm.receiverAddr = row.receiverAddr diff --git a/src/views/modules/finance/billing-invoice.vue b/src/views/modules/finance/billing-invoice.vue index 5c5bd2e..f4544cb 100644 --- a/src/views/modules/finance/billing-invoice.vue +++ b/src/views/modules/finance/billing-invoice.vue @@ -47,7 +47,9 @@ - + + + @@ -284,7 +286,11 @@ export default { if (v == null || v === '') return '' return Number(v) === 0.06 ? '6' : '13' }, - + moneyText(v) { + if (v == null || v === '') return '' + let n = Number(v) + return isNaN(n) ? '' : n.toFixed(2) + }, fetchApplyList() { this.searchData.page = this.pageIndex this.searchData.limit = this.pageSize @@ -339,7 +345,7 @@ export default { this.invoiceForm.billingInfoId = row.billingInfoId this.invoiceForm.companyName = row.billingCompanyName this.invoiceForm.projectName = row.projectName - this.invoiceForm.invoiceAmount = row.amount == null ? '' : String(row.amount) + this.invoiceForm.invoiceAmount = this.moneyText(row.amount) this.invoiceForm.invoiceItem = row.billingProject this.invoiceForm.sendMethod = row.shipMethod this.invoiceForm.customerName = row.customerName diff --git a/src/views/modules/finance/invoice-management.vue b/src/views/modules/finance/invoice-management.vue index f6edd45..4b34430 100644 --- a/src/views/modules/finance/invoice-management.vue +++ b/src/views/modules/finance/invoice-management.vue @@ -66,12 +66,18 @@ - + + + - - + + + + + + @@ -335,11 +341,11 @@ export default { '开票项目': 'invoiceItem', '开票日期': { field: 'invoiceDate', callback: (v) => (v || '').substring(0, 10) }, '发票号码': 'invoiceNo', - '开票金额': 'invoiceAmount', + '开票金额': { field: 'invoiceAmount', callback: (v) => this.excelMoney(v) }, '税率': { field: 'taxRate', callback: (v) => (v == null || v === '' ? '' : Number((Number(v) * 100).toFixed(2))) }, - '未税金额': 'untaxedAmount', - '已付金额': 'paidAmount', - '未付金额': { callback: (row) => this.unpaidAmount(row) }, + '未税金额': { field: 'untaxedAmount', callback: (v) => this.excelMoney(v) }, + '已付金额': { field: 'paidAmount', callback: (v) => this.excelMoney(v) }, + '未付金额': { callback: (row) => this.excelMoney(this.unpaidAmount(row)) }, '计划收款日期': { field: 'planPayDate', callback: (v) => (v || '').substring(0, 10) }, '开票人': 'receiver', '寄送方式': 'sendMethod', @@ -451,6 +457,16 @@ export default { if (v == null || v === '') return '' return Number((Number(v) * 100).toFixed(2)) }, + moneyText(v) { + if (v == null || v === '') return '' + let n = Number(v) + return isNaN(n) ? '' : n.toFixed(2) + }, + excelMoney(v) { + if (v == null || v === '') return '' + let n = Number(v) + return isNaN(n) ? '' : '="' + n.toFixed(2) + '"' + }, unpaidAmount(row) { return ((Number(row.invoiceAmount) || 0) - (Number(row.paidAmount) || 0)).toFixed(2) }, @@ -593,6 +609,8 @@ export default { this.invoiceForm.sendDate = this.d10(row.sendDate) this.invoiceForm.planPayDate = this.d10(row.planPayDate) this.invoiceForm.cancelledDate = row.cancelledDate || null + this.invoiceForm.invoiceAmount = this.moneyText(row.invoiceAmount) + this.invoiceForm.untaxedAmount = this.moneyText(row.untaxedAmount) if (row.taxRate != null) this.invoiceForm.taxRate = String(row.taxRate) if (row.customerId) this.fetchCompanyNameOptions(row.customerId) this.showInvoiceModal = true @@ -708,6 +726,9 @@ export default { // 并把三个日期和 taxRate 归一化,详情要显示的就是这些 this.editInvoice(row) this.detailMode = true + this.invoiceForm.invoiceAmount = this.moneyText(row.invoiceAmount) + this.invoiceForm.untaxedAmount = this.moneyText(row.untaxedAmount) + this.invoiceForm.paidAmount = this.moneyText(row.paidAmount) }, // 老 addExpress(row) 的预填:公司=companyName,地址=sendAddr,收件人=custReceiver,电话=custReceiverPhone diff --git a/src/views/modules/project/project-message.vue b/src/views/modules/project/project-message.vue new file mode 100644 index 0000000..3ee5c98 --- /dev/null +++ b/src/views/modules/project/project-message.vue @@ -0,0 +1,2492 @@ + + + + +