From 6b49371d22bcbe52fcd5f168dada9478e26f7df3 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 6 Sep 2024 10:10:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E6=96=B0=E5=8A=A0=E4=B8=89=E4=B8=AA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5hella=E4=BB=A3=E7=A0=81=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain/index.vue       | 12 +++++
 .../supplierinvoiceRecordMain.data.ts         |  9 ++++
 .../supplierinvoiceRequestMain/index.vue      | 19 +++++++-
 .../supplierinvoiceRequestMain.data.ts        | 47 ++++++++++++++++++-
 .../index.vue                                 | 12 +++++
 ...pplierinvoiceRequestMainDifference.data.ts |  9 ++++
 6 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index d60e64faf..ff49c7c11 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -138,6 +138,18 @@
     :apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDeatilPage"
     @buttonBaseClick="detailButtonBaseClick"
   >
+    <!-- 价税合计尾差 -->
+    <template #Descriptions_totalTaxDiffAmount="{ row }">
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利合计:{{ row['rebateTotal'] }})</span></span>
+    </template>
+    <!-- 未税尾差 -->
+    <template #Descriptions_beforeTaxDiffAmount="{ row }">
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利未税:{{ row['discountAmount1'] }})</span></span>
+    </template>
+    <!-- 税额尾差 -->
+    <template #Descriptions_taxAmountDiff="{ row }">
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利税额:{{ row['rebateTax'] }})</span></span>
+    </template>
     <template #differencePrice="{row}">
       <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
     </template>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 3183fa5b7..459b0be99 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -1218,6 +1218,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isTable: false,
     isSearch: false,
     isDetail: true,
+    detail:{
+      slotFilter: true
+    }
   },
   {
     label: '财务过账日期',
@@ -1251,6 +1254,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isTable: false,
     isSearch: false,
     isDetail: true,
+    detail:{
+      slotFilter: true
+    }
   },
   {
     label: '回转凭证号',
@@ -1277,6 +1283,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isTable: false,
     isSearch: false,
     isDetail: true,
+    detail:{
+      slotFilter: true
+    }
   },
  
   {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 79d9eca42..5d60bb7fd 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -86,7 +86,8 @@
           totalTaxAmount = 0,
           discountAmount1 = 0,
           beforeTaxDiffAmount = 0,
-          taxAmountDiff = 0
+          taxAmountDiff = 0,
+          rebateTax=0
         } = formModel
         // 2、系统税额：每条数据的合同价格X可开票数量，计算结果取两位小数之后*税率的计算结果，再保留2位。所有子表数据再求和
         if (formType == 'update') {
@@ -131,7 +132,9 @@
             adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额
             beforeTaxDiffAmount: beforeTaxAmount - amount - discountAmount1, //未税差额：未税金额-系统未税金额-折扣金额
             taxAmountDiff: totalTaxAmount - taxAmount, // 税额差异：税额-系统税额
-            totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff // 价税合计差额=未税差额+税额差异
+            totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // 价税合计差额=未税差额+税额差异
+            rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)),
+            rebateTotal:rebateTax+discountAmount1
           })
         }
       }
@@ -309,6 +312,18 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     @handleMainFefresh="handleMainFefresh"
   >
+    <!-- 价税合计尾差 -->
+    <template #Descriptions_totalTaxDiffAmount="{ row }">
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利合计:{{ row['rebateTotal'] }})</span></span>
+    </template>
+    <!-- 未税尾差 -->
+    <template #Descriptions_beforeTaxDiffAmount="{ row }">
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利未税:{{ row['discountAmount1'] }})</span></span>
+    </template>
+    <!-- 税额尾差 -->
+    <template #Descriptions_taxAmountDiff="{ row }">
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利税额:{{ row['rebateTax'] }})</span></span>
+    </template>
     <template #differencePrice="{ row }">
       <span :class="{ 'red-text': row.differencePrice != 0 }">{{ row.differencePrice }}</span>
     </template>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 060b95ccd..becf3987b 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -434,7 +434,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   }
   // },
   {
-    label: '折扣金额',
+    label: '返利未税金额',
     field: 'discountAmount1',
     formatter: accountantFormart,
     table: {
@@ -470,6 +470,40 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isTableForm:false,
   },
+  {
+    label: '返利税额',
+    field: 'rebateTax',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
+  },
+  {
+    label: '返利价税合计',
+    field: 'rebateTotal',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
+  },
   {
     label: '发票税额',
     field: 'totalTaxAmount',
@@ -579,7 +613,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         precision: 2,
         disabled: true,
       }
-    },
+    }
   },
   
   // {
@@ -1473,6 +1507,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isTable: false,
     isSearch: false,
     isDetail: true,
+    detail:{
+      slotFilter: true
+    }
   },
   {
     label: '财务过账日期',
@@ -1506,6 +1543,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isTable: false,
     isSearch: false,
     isDetail: true,
+    detail:{
+      slotFilter: true
+    }
   },
   
   {
@@ -1541,6 +1581,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isTable: false,
     isSearch: false,
     isDetail: true,
+    detail:{
+      slotFilter: true
+    }
   },
   
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
index 35170828b..80dc5acd5 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
@@ -120,6 +120,18 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     @handleMainFefresh="handleMainFefresh"
   >
+    <!-- 价税合计尾差 -->
+    <template #Descriptions_totalTaxDiffAmount="{ row }">
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利合计:{{ row['rebateTotal'] }})</span></span>
+    </template>
+    <!-- 未税尾差 -->
+    <template #Descriptions_beforeTaxDiffAmount="{ row }">
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利未税:{{ row['discountAmount1'] }})</span></span>
+    </template>
+    <!-- 税额尾差 -->
+    <template #Descriptions_taxAmountDiff="{ row }">
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利税额:{{ row['rebateTax'] }})</span></span>
+    </template>
     <template #differencePrice="{row}">
       <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
     </template>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index 5bdc5ec06..93482a5c1 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -1489,6 +1489,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isTable: false,
     isSearch: false,
     isDetail: true,
+    detail:{
+      slotFilter: true
+    }
   },
   {
     label: '财务过账日期',
@@ -1522,6 +1525,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isTable: false,
     isSearch: false,
     isDetail: true,
+    detail:{
+      slotFilter: true
+    }
   },
   {
     label: '参考凭证描述',
@@ -1556,6 +1562,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isTable: false,
     isSearch: false,
     isDetail: true,
+    detail:{
+      slotFilter: true
+    }
   },