diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 600fe3a30..5c9edc18a 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -89,7 +89,14 @@ taxAmountDiff = 0, rebateTax = 0, claimAmount = 0, - moldUntaxedAmount = 0 + moldUntaxedAmount = 0, + moldTaxAmount = 0, + claimTaxAmount = 0, + adTaxAmount = 0, + afterTaxAmount = 0, + moldTaxTotal = 0, + rebateTotal = 0, + claimTaxTotal = 0, } = formModel // 2、系统税额：每条数据的合同价格X可开票数量，计算结果取两位小数之后*税率的计算结果，再保留2位。所有子表数据再求和 if (formType == 'update') { @@ -104,13 +111,16 @@ updateOriginFormModel(formModel) } formRef.value.setValues({ + claimTaxAmount: Number(Number(claimAmount * taxRate * 0.01).toFixed(2)),//索赔税额 = 索赔未税金额 * 税率 + claimTaxTotal :Number(Number(Number(claimAmount) + Number(claimTaxAmount)).toFixed(2)),//索赔价税合计 = 索赔未税金额 + 索赔税额 + moldTaxTotal :Number(Number(Number(moldUntaxedAmount) + Number(moldTaxAmount)).toFixed(2)),//模具价税合计 = 模具未税金额 + 模具税额 moldTaxAmount: Number(Number(moldUntaxedAmount * taxRate * 0.01).toFixed(2)),//模具税额 = 模具未税金额 * 税率 afterTaxAmount: amount + taxAmount, // 3、系统价税合计：系统未税金额+系统税额-索赔总额 invoiceAmountMain: amount - claimAmount, // 发票总额：供应商维护未税金额-索赔总额 adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额 - beforeTaxDiffAmount: beforeTaxAmount - amount, //未税差额：未税金额-系统未税金额 - taxAmountDiff: totalTaxAmount - taxAmount, // 税额差异：税额-系统税额 - totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // 价税合计差额=未税差额+税额差异 + beforeTaxDiffAmount : Number(Number(Number(beforeTaxAmount) - Number(amount)-Number(moldUntaxedAmount) - Number(discountAmount1)- Number(claimAmount)).toFixed(2)), //未税尾差 = 发票未税金额 - 材料款未税金额 - 模具未税金额- 返利未税金额 - 索赔未税金额 + taxAmountDiff :Number(Number(Number(totalTaxAmount) - Number(taxAmount) - Number(moldTaxAmount) - Number(rebateTax) - Number(claimTaxAmount)).toFixed(2)),//税额尾差 = 发票税额 - 材料款税额 - 模具税额 - 返利税额 - 索赔税额 + totalTaxDiffAmount:Number(Number(Number(adTaxAmount) - Number(afterTaxAmount) - Number(moldTaxTotal) - Number(rebateTotal) - Number(claimTaxTotal)).toFixed(2)),//价税合计尾差 = 发票价税合计 - 材料款价税合计 - 模具价税合计 - 返利价税合计 - 索赔价税合计 rebateTax: Number(Number(discountAmount1 * taxRate * 0.01).toFixed(2)), rebateTotal: rebateTax + discountAmount1, beforeTaxAmount : Number(Number(Number(moldUntaxedAmount) + Number(amount)-Number(claimAmount) - Number(discountAmount1)).toFixed(2)), //发票未税金额 = 模具未税金额+供应商维护未税金额（如果有索赔总额，需要减去索赔总额）-返利未税金额 @@ -135,14 +145,17 @@ updateOriginFormModel(formModel) } formRef.value.setValues({ + claimTaxAmount: Number(Number(claimAmount * taxRate * 0.01).toFixed(2)),//索赔税额 = 索赔未税金额 * 税率 + claimTaxTotal :Number(Number(Number(claimAmount) + Number(claimTaxAmount)).toFixed(2)),//索赔价税合计 = 索赔未税金额 + 索赔税额 + moldTaxTotal :Number(Number(Number(moldUntaxedAmount) + Number(moldTaxAmount)).toFixed(2)),//模具价税合计 = 模具未税金额 + 模具税额 moldTaxAmount: Number(Number(moldUntaxedAmount * taxRate * 0.01).toFixed(2)),//模具税额 = 模具未税金额 * 税率 taxAmount: taxAmount_, afterTaxAmount: amount + taxAmount, // 3、系统价税合计：系统未税金额+系统税额-索赔总额 invoiceAmountMain: amount - claimAmount, // 发票总额：供应商维护未税金额-索赔总额 adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额 - beforeTaxDiffAmount: beforeTaxAmount - amount, //未税差额：未税金额-系统未税金额 - taxAmountDiff: totalTaxAmount - taxAmount, // 税额差异：税额-系统税额 - totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // 价税合计差额=未税差额+税额差异 + beforeTaxDiffAmount : Number(Number(Number(beforeTaxAmount) - Number(amount)-Number(moldUntaxedAmount) - Number(discountAmount1)- Number(claimAmount)).toFixed(2)), //未税尾差 = 发票未税金额 - 材料款未税金额 - 模具未税金额- 返利未税金额 - 索赔未税金额 + taxAmountDiff :Number(Number(Number(totalTaxAmount) - Number(taxAmount) - Number(moldTaxAmount) - Number(rebateTax) - Number(claimTaxAmount)).toFixed(2)),//税额尾差 = 发票税额 - 材料款税额 - 模具税额 - 返利税额 - 索赔税额 + totalTaxDiffAmount:Number(Number(Number(adTaxAmount) - Number(afterTaxAmount) - Number(moldTaxTotal) - Number(rebateTotal) - Number(claimTaxTotal)).toFixed(2)),//价税合计尾差 = 发票价税合计 - 材料款价税合计 - 模具价税合计 - 返利价税合计 - 索赔价税合计 rebateTax: Number(Number(discountAmount1 * taxRate * 0.01).toFixed(2)), rebateTotal: rebateTax + discountAmount1, beforeTaxAmount : Number(Number(Number(moldUntaxedAmount) + Number(amount)-Number(claimAmount) - Number(discountAmount1)).toFixed(2)), //发票未税金额 = 模具未税金额+供应商维护未税金额（如果有索赔总额，需要减去索赔总额）-返利未税金额 diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index b17290dfc..166c8ef87 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -256,7 +256,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, { - label: '供应商维护未税金额', + label: '材料款未税金额', // 供应商维护未税金额 field: 'amount', formatter: accountantFormart, table: { @@ -275,14 +275,34 @@ 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: 'invoiceAmountMain', + label: '模具未税金额', + field: 'moldUntaxedAmount', formatter: accountantFormart, - sortTableDefault: 3, table: { width: 160 }, + sortTableDefault:8, form: { component: 'InputNumber', componentProps: { @@ -293,11 +313,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( tableForm: { type: 'InputNumber', precision: 2, - }, + } }, { - label: '模具未税金额', - field: 'moldUntaxedAmount', + label: '模具税额', + field: 'moldTaxAmount', formatter: accountantFormart, table: { width: 160 @@ -316,8 +336,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( } }, { - label: '模具税额', - field: 'moldTaxAmount', + label: '模具价税合计', + field: 'moldTaxTotal', formatter: accountantFormart, table: { width: 160 @@ -394,7 +414,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( // isTableForm:false // }, { - label: '供应商维护税额', + label: '材料款税额',//'供应商维护税额', field: 'taxAmount', formatter: accountantFormart, table: { @@ -414,7 +434,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( } }, { - label: '供应商维护价税合计', + label: '材料款价税合计',//'供应商维护价税合计', field: 'afterTaxAmount', formatter: accountantFormart, table: { @@ -955,7 +975,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( } }, { - label: '索赔总额', + label: '索赔未税金额',//'索赔总额', field: 'claimAmount', sort: 'custom', table: { @@ -976,6 +996,46 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, }, + { + label: '索赔税额', + field: 'claimTaxAmount', + formatter: accountantFormart, + table: { + width: 160 + }, + sortTableDefault:8, + form: { + component: 'InputNumber', + componentProps: { + precision: 2, + disabled: true, + } + }, + tableForm: { + type: 'InputNumber', + precision: 2, + } + }, + { + label: '索赔价税合计', + field: 'claimTaxTotal', + formatter: accountantFormart, + table: { + width: 160 + }, + sortTableDefault:8, + form: { + component: 'InputNumber', + componentProps: { + precision: 2, + disabled: true, + } + }, + tableForm: { + type: 'InputNumber', + precision: 2, + } + }, { label: '采购审批时间', field: 'procurementCreateTime', @@ -1282,7 +1342,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive {