From f219e4c1959f66056d5220e9ce24f5a4d0668196 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 16:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         | 67 ++++++++++---------
 .../supplierinvoiceRequestMain.data.ts        |  3 +
 2 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 5314ed1dd..b330cc01c 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -99,6 +99,39 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:5,
     isSearch: true
   },
+  {
+    label: '未税差额',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '价税合计差额',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
   {
     label: '系统税额',
     field: 'taxAmount',
@@ -335,7 +368,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       value:[],
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        dateFormat: 'YYYY-MM-DD',
         type: 'daterange',
         defaultTime: [new Date('1 '), new Date('1 ')]
       }
@@ -614,36 +648,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '未税差额',
-    field: 'beforeTaxDiffAmount',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    isForm:false,
-    isTableForm:false
-  },
-  {
-    label: '税额差异',
-    field: 'taxAmountDiff',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    isForm:false,
-    isTableForm:false
-  },
-  {
-    label: '价税合计差额',
-    field: 'totalTaxDiffAmount',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    isForm:false,
-    isTableForm:false
-  },
+  
 ]))
 
 //表单校验
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 7cb5c65d7..d2935dfe0 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -462,6 +462,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:5,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -478,6 +479,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:5,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -494,6 +496,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:5,
     isTableForm:false,
     form: {
       component: 'InputNumber',