From 306a55df294137d772ea5a327ba4ca7dbf49bc9c Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 28 Apr 2026 17:55:30 +0800 Subject: [PATCH] =?UTF-8?q?1.1.28=20=E5=BC=80=E7=A5=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=87=91=E9=A2=9D=E7=94=9F=E6=88=90=E5=8D=95?= =?UTF-8?q?=E4=BB=B7=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=87=91=E9=A2=9D(?= =?UTF-8?q?=E5=90=AB=E7=A8=8E)=20=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=81=E9=87=91=E9=A2=9D(=E4=B8=8D=E5=90=AB=E7=A8=8E)?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/oa/erp/contractInfo/types.ts | 5 + src/api/oa/erp/finInvoiceDetail/types.ts | 15 + src/api/oa/erp/finInvoiceInfo/index.ts | 2 +- src/api/oa/erp/finInvoiceInfo/types.ts | 35 +++ .../oa/erp/contractInfo/orderActivate.vue | 4 +- src/views/oa/erp/finInvoiceInfo/edit.vue | 294 +++++++++++++----- 6 files changed, 267 insertions(+), 88 deletions(-) diff --git a/src/api/oa/erp/contractInfo/types.ts b/src/api/oa/erp/contractInfo/types.ts index 3ca2f64..567a7f7 100644 --- a/src/api/oa/erp/contractInfo/types.ts +++ b/src/api/oa/erp/contractInfo/types.ts @@ -94,6 +94,11 @@ export interface ContractInfoVO { */ oneCustomerId: string | number; + /** + * 甲方公司名称 + */ + oneCustomerName?: string; + /** * 甲方授权代表 */ diff --git a/src/api/oa/erp/finInvoiceDetail/types.ts b/src/api/oa/erp/finInvoiceDetail/types.ts index b49da0f..0650f51 100644 --- a/src/api/oa/erp/finInvoiceDetail/types.ts +++ b/src/api/oa/erp/finInvoiceDetail/types.ts @@ -39,6 +39,11 @@ export interface FinInvoiceDetailVO { */ totalPrice: number; + /** + * 金额(不含税) + */ + totalPriceNoTax: number; + /** * 税率/征收率,默认13% */ @@ -92,6 +97,11 @@ export interface FinInvoiceDetailForm extends BaseEntity { */ totalPrice?: number; + /** + * 金额(不含税) + */ + totalPriceNoTax?: number; + /** * 税率/征收率,默认13% */ @@ -141,6 +151,11 @@ export interface FinInvoiceDetailQuery extends PageQuery { */ totalPrice?: number; + /** + * 金额(不含税) + */ + totalPriceNoTax?: number; + /** * 税率/征收率,默认13% */ diff --git a/src/api/oa/erp/finInvoiceInfo/index.ts b/src/api/oa/erp/finInvoiceInfo/index.ts index 44d1236..62c6460 100644 --- a/src/api/oa/erp/finInvoiceInfo/index.ts +++ b/src/api/oa/erp/finInvoiceInfo/index.ts @@ -89,7 +89,7 @@ export function getErpFinInvoiceInfoList (query) { * 查询开票信息详细 * @param invoiceId */ -export const getContractPaymentMethodList = (contractId: string | number): AxiosPromise => { +export const getContractPaymentMethodList = (contractId: string | number): AxiosPromise => { return request({ url: '/oa/erp/finInvoiceInfo/getContractPaymentMethodList/' + contractId, method: 'get' diff --git a/src/api/oa/erp/finInvoiceInfo/types.ts b/src/api/oa/erp/finInvoiceInfo/types.ts index 0741ba3..80ca085 100644 --- a/src/api/oa/erp/finInvoiceInfo/types.ts +++ b/src/api/oa/erp/finInvoiceInfo/types.ts @@ -141,6 +141,11 @@ export interface FinInvoiceInfoVO { */ remark: string; + /** + * 发票附件ID,多个以,隔开 + */ + ossId?: string; + /** * 提前开票原因 */ @@ -170,6 +175,21 @@ export interface FinInvoiceInfoVO { * 发起日期 */ issueDate?: string; + + /** + * 合同编号 + */ + contractCode?: string; + + /** + * 有无合同(1有 2无) + */ + contractFlag?: string; + + /** + * 开票明细列表 + */ + erpFinInvoiceDetailVoList?: Array; } export interface FinInvoiceInfoForm extends BaseEntity { @@ -313,6 +333,11 @@ export interface FinInvoiceInfoForm extends BaseEntity { */ remark?: string; + /** + * 发票附件ID,多个以,隔开 + */ + ossId?: string; + /** * 提前开票原因 */ @@ -343,6 +368,16 @@ export interface FinInvoiceInfoForm extends BaseEntity { */ issueDate?: string; + /** + * 合同编号 + */ + contractCode?: string; + + /** + * 有无合同(1有 2无) + */ + contractFlag?: string; + /** * 开票明细列表 */ diff --git a/src/views/oa/erp/contractInfo/orderActivate.vue b/src/views/oa/erp/contractInfo/orderActivate.vue index 1d2fc21..51800f1 100644 --- a/src/views/oa/erp/contractInfo/orderActivate.vue +++ b/src/views/oa/erp/contractInfo/orderActivate.vue @@ -181,7 +181,7 @@ - + diff --git a/src/views/oa/erp/finInvoiceInfo/edit.vue b/src/views/oa/erp/finInvoiceInfo/edit.vue index 2c0aa24..f4eb6af 100644 --- a/src/views/oa/erp/finInvoiceInfo/edit.vue +++ b/src/views/oa/erp/finInvoiceInfo/edit.vue @@ -18,7 +18,7 @@ - + @@ -166,7 +166,6 @@ prop="ossId" v-if="routeParams.type === 'update' || routeParams.type === 'view' || routeParams.type === 'approval'" > - 开票明细
- 新增明细 - 新增明细 + 删除
- + @@ -224,30 +237,53 @@ /> - + - + + + + - -