From c446e55858729f01bbfacc215bbb5a3900f0c0bb Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Thu, 7 Aug 2025 13:58:31 +0800
Subject: [PATCH] =?UTF-8?q?YT-2401=E3=80=8A=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=E3=80=8B=E3=80=8A=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8=E8=AE=B0=E5=BD=95=E3=80=8B?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         | 75 ++++++++++++++++++
 .../supplierinvoiceRequestMain.data.ts        | 79 ++++++++++++++++++-
 2 files changed, 152 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index f26424a63..859b24aa0 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -1697,6 +1697,39 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     isDetail: false,
     isTable: true,
   },
+  {
+    label: '受入号',
+    field: 'receivedNumber',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '车型',
+    field: 'project',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '到货时间',
     field: 'planArriveTime',
@@ -1874,6 +1907,48 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       precision: 2,
     }
   },
+  {
+    label: '金额（税额）',
+    field: 'singleAndAllocateTaxAmount',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
+  {
+    label: '金额（合计金额） ',
+    field: 'singleAndAllocateTotal',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
   {
     label: '模具分摊单价',
     field: 'allocationPrice',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 0fb855217..2ae52982c 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1003,7 +1003,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 5,
+        precision: 2,
         disabled: true,
       }
     },
@@ -2135,7 +2135,39 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isDetail: false,
     isTable: true,
   },
-
+  {
+    label: '受入号',
+    field: 'receivedNumber',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '车型',
+    field: 'project',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   //仅是主列表页面的筛选搜索条件
   {
     label: '收货日期',
@@ -2236,6 +2268,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '发票金额',
     field: 'contractAmountTotal',
+    formatter: singlePriceFormart,
     table: {
       width: 150
     },
@@ -2329,6 +2362,48 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       precision: 2,
     }
   },
+  {
+    label: '金额（税额）',
+    field: 'singleAndAllocateTaxAmount',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
+  {
+    label: '金额（合计金额） ',
+    field: 'singleAndAllocateTotal',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
   {
     label: '模具分摊单价',
     field: 'allocationPrice',