From da1046dd3f35127d23388121185cc084c44cc554 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 28 Aug 2024 14:27:53 +0800
Subject: [PATCH] =?UTF-8?q?HL-5499=20SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E5=8A=9F=E8=83=BD=E9=80=BB=E8=BE=91=E8=AF=A6?=
 =?UTF-8?q?=E8=A7=81=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         | 149 +++++++++++++-----
 .../supplierinvoiceRequestMain.data.ts        |  15 +-
 ...pplierinvoiceRequestMainDifference.data.ts |  15 +-
 3 files changed, 136 insertions(+), 43 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 8dbfe3f4f..bc62d2bc5 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -674,19 +674,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   isTable: false,
   //   isForm: false,
   // },
+  
   {
-    label: '回转凭证号',
-    field: 'transferNumber',
-    sort: 'custom',
-    table: {
-      width: 200,
-    },
-    sortTableDefault:11,
-    isTable:true,
-    isForm: false
-  },
-  {
-    label: '回转日期',
+    label: '回转时间',
     field: 'reversepostingdate',
     formatter: dateFormatter2,
     detail: {
@@ -699,29 +689,41 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:11,
   },
   {
-    label: '冲销日记帐',
-    field: 'reverseInvoiceJournal',
+    label: '说明',//回转说明	
+    field: 'tcCInvoiceRemark',
     sortTableDefault:11,
     table: {
       width: 150
     },
   },
   {
-    label: '调整账代码',
-    field: 'adjustmentJournal',
-    sortTableDefault:11,
+    label: '回转凭证号',
+    field: 'transferNumber',
+    sort: 'custom',
     table: {
-      width: 150
+      width: 200,
     },
-  },
-  {
-    label: '回转说明',
-    field: 'tcCInvoiceRemark',
     sortTableDefault:11,
-    table: {
-      width: 150
-    },
+    isTable:true,
+    isForm: false
   },
+  // {
+  //   label: '冲销日记帐',
+  //   field: 'reverseInvoiceJournal',
+  //   sortTableDefault:11,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '调整账代码',
+  //   field: 'adjustmentJournal',
+  //   sortTableDefault:11,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+
   {
     label: '采购审批时间',
     field: 'procurementCreateTime',
@@ -874,7 +876,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isForm: false,
     isSearch: false,
     isTable: false,
-    isDetail: false,
+    isDetail: true,
   },
   {
     label: '供应商信息',
@@ -883,7 +885,15 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isForm: false,
     isSearch: false,
     isTable: false,
-    isDetail: false,
+    isDetail: true,
+  },
+  {
+    label: '价差',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
   },
   {
     label: 'SCP系统数据',
@@ -1012,15 +1022,6 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isSearch: false,
     isDetail: true,
   },
-  {
-    label: '',
-    field: '',
-    sortTableDefault: 6,
-    isForm: false,
-    isTable: false,
-    isSearch: false,
-    isDetail: true,
-  },
   // {
   //   label: '尾差',
   //   field: 'totalDifference',
@@ -1030,6 +1031,16 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
   //   isSearch: false,
   //   isDetail: false,
   // },
+  {
+    label: '尾差',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  
   {
     label: '采购价格审批人',
     field: 'procurementCreatorName',
@@ -1228,7 +1239,71 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isSearch: false,
     isDetail: true,
   },
-  
+  {
+    label: '回转凭证号',
+    field: 'transferNumber',
+    sort: 'custom',
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '回转时间',
+    field: 'reversepostingdate',
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '说明', //回转说明	
+    field: 'tcCInvoiceRemark',
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 2724c3b56..f3bc0e34b 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1132,7 +1132,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isForm: false,
     isSearch: false,
     isTable: false,
-    isDetail: false,
+    isDetail: true,
   },
   {
     label: '供应商信息',
@@ -1141,7 +1141,16 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isForm: false,
     isSearch: false,
     isTable: false,
-    isDetail: false,
+    isDetail: true,
+  },
+  {
+    label: '价差',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
   },
   {
     label: 'SCP系统数据',
@@ -1271,7 +1280,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '',
+    label: '尾差',
     field: '',
     sortTableDefault: 6,
     isForm: false,
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index fa48f1f35..a7b68590f 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -1146,7 +1146,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isForm: false,
     isSearch: false,
     isTable: false,
-    isDetail: false,
+    isDetail: true,
   },
   {
     label: '供应商信息',
@@ -1155,7 +1155,16 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isForm: false,
     isSearch: false,
     isTable: false,
-    isDetail: false,
+    isDetail: true,
+  },
+  {
+    label: '价差',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
   },
   {
     label: 'SCP系统数据',
@@ -1285,7 +1294,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '',
+    label: '尾差',
     field: '',
     sortTableDefault: 6,
     isForm: false,