From f3ef1b92bb4ccb26e09e3bf39f2317b33e139e2f Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Wed, 9 Apr 2025 15:18:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97=E4=BE=BF=E6=AC=A1=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierDeliCount/supplierDeliCount.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/supplierManage/supplierDeliCount/supplierDeliCount.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierDeliCount/supplierDeliCount.data.ts index 4465901fd..47d0245ab 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierDeliCount/supplierDeliCount.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplierDeliCount/supplierDeliCount.data.ts @@ -42,10 +42,10 @@ export const SupplierDeliCount = useCrudSchemas(reactive([ isForm: false, }, { - label: '计算便次日期', + label: '计算便次开始时间', field: 'currentDeliDate', sort: 'custom', - formatter: dateFormatter2, + formatter: dateFormatter, isForm: false, }, { From 0671364fd34c0dece3330c61c9582ed99140a908 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Wed, 9 Apr 2025 19:35:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=20=E7=A8=8E=E9=A2=9D=E5=B0=BE=E5=B7=AE=20=E7=A8=8E?= =?UTF-8?q?=E9=A2=9D=E5=B0=BE=E5=B7=AE=20=20=E4=BB=B7=E7=A8=8E=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E5=B0=BE=E5=B7=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 5c9edc18a..7b65481c2 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -118,9 +118,9 @@ afterTaxAmount: amount + taxAmount, // 3、系统价税合计：系统未税金额+系统税额-索赔总额 invoiceAmountMain: amount - claimAmount, // 发票总额：供应商维护未税金额-索赔总额 adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额 - 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)),//价税合计尾差 = 发票价税合计 - 材料款价税合计 - 模具价税合计 - 返利价税合计 - 索赔价税合计 + 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)), //发票未税金额 = 模具未税金额+供应商维护未税金额（如果有索赔总额，需要减去索赔总额）-返利未税金额 @@ -153,9 +153,9 @@ afterTaxAmount: amount + taxAmount, // 3、系统价税合计：系统未税金额+系统税额-索赔总额 invoiceAmountMain: amount - claimAmount, // 发票总额：供应商维护未税金额-索赔总额 adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额 - 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)),//价税合计尾差 = 发票价税合计 - 材料款价税合计 - 模具价税合计 - 返利价税合计 - 索赔价税合计 + 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)), //发票未税金额 = 模具未税金额+供应商维护未税金额（如果有索赔总额，需要减去索赔总额）-返利未税金额 From dc85d4d392cc0b37fd778db542952e81db10a26b Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 9 Apr 2025 23:09:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 166c8ef87..5734722c2 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1342,7 +1342,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive