Merge remote-tracking branch 'remotes/origin/intex_online20250408' into intex

src/views/wms/basicDataManage/supplierManage/supplierDeliCount/supplierDeliCount.data.ts

@@ -42,10 +42,10 @@ export const SupplierDeliCount = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '计算便次日期',
+    label: '计算便次开始时间',
     field: 'currentDeliDate',
     sort: 'custom',
-    formatter: dateFormatter2,
+    formatter: dateFormatter,
     isForm: false,
   },
   {

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)), //发票未税金额 = 模具未税金额+供应商维护未税金额（如果有索赔总额，需要减去索赔总额）-返利未税金额

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -1342,7 +1342,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '代开发票未税金额',
+    label: '待开发票未税金额',
     field: 'purchaseAmountTotalMain',
     formatter: accountantFormart,
     sortTableDefault: 6,