diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index cec35d9fd..53edc52cb 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -16,6 +16,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, isSearch: false }, + { label: '发票申请单号', field:'requestNumber', @@ -286,9 +287,6 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ component: 'InputNumber', } }, - - - { label: '索赔金额', field: 'claimAmount', @@ -747,6 +745,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ // width: 150 // }, // }, + { + label: '发票总额', + field: 'invoiceAmountMain', + formatter: accountantFormart, + table: { + width: 160 + }, + sortTableDefault: 12, + }, { label: '索赔总额', field: 'claimAmount', @@ -1350,9 +1357,14 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive { claimDetailsList.value = await PurchaseClaimRequestDetailApi.getPurchaseClaimRequestDetailList(supplierCode) formRef.value.formRef.formModel.claimAmount = claimDetailsList.value.map(item => item.claimAmount).reduce((prev, item) => prev + item).toFixed(5) - + formRef.value.formRef.formModel.invoiceAmountMain = (Number(formRef.value.formRef.formModel.amount) -Number(formRef.value.formModel.claimAmount)).toFixed(2) // 发票总额:供应商维护未税金额-索赔总额 } // 编辑的时候获取索赔明细 const claimDetailsForUpdate = async (supplierCode,id) => { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 8c0eb4cc9..9bc43307c 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -270,6 +270,26 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( precision: 2, } }, + { + label: '发票总额', + field: 'invoiceAmountMain', + formatter: accountantFormart, + sortTableDefault: 3, + table: { + width: 160 + }, + form: { + component: 'InputNumber', + componentProps: { + precision: 2, + disabled: true, + } + }, + tableForm: { + type: 'InputNumber', + precision: 2, + }, + }, { label: '税率(%)', field: 'taxRate', @@ -1591,7 +1611,26 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive