From 219a54076fec35c9d6123ac4177233c512ed8b66 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 29 Jul 2024 16:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         | 43 +++++-----
 .../supplierinvoiceRequestMain.data.ts        | 34 +++-----
 ...pplierinvoiceRequestMainDifference.data.ts | 83 ++++++++++---------
 3 files changed, 78 insertions(+), 82 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index b1015fb30..044afb0cc 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -602,8 +602,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '创建时间',
-    field: 'createTime',
+    label: '供应商创建时间',
+    field: 'requestTime',
     isTable: true,
     sortTableDefault:1001,
     formatter: dateFormatter,
@@ -879,10 +879,13 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '供应商创建日期',
-    field: 'supplierDate',
+    label: '供应商创建时间',
+    field: 'requestTime',
     sort: 'custom',
-    
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1160,19 +1163,19 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isSearch: false,
     isDetail: true,
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    sortTableDefault:1000,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    isForm: false,
-    isTable: false,
-    isSearch: false,
-    isDetail: true,
-  }
+  // {
+  //   label: '创建时间',
+  //   field: 'createTime',
+  //   formatter: dateFormatter,
+  //   sortTableDefault:1000,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   isForm: false,
+  //   isTable: false,
+  //   isSearch: false,
+  //   isDetail: true,
+  // }
 ]))
 //表单校验
 export const SupplierinvoiceRecordMainRules = reactive({
@@ -1209,7 +1212,7 @@ export const SupplierinvoiceRecordMainRules = reactive({
   businessType: [
     { required: true, message: '请输入业务类型', trigger: 'blur' }
   ],
-  createTime: [
+  requestTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
   ],
   creator: [
@@ -1533,7 +1536,7 @@ export const SupplierinvoiceRecordDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物料代码', trigger: 'blur' }
   ],
-  createTime: [
+  requestTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
   ],
   creator: [
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index b60620f06..0e42b2e6d 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -724,8 +724,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '创建时间',
-    field: 'createTime',
+    label: '供应商创建时间',
+    field: 'requestTime',
     isTable:true,
     formatter: dateFormatter,
     sortTableDefault:1000,
@@ -1184,10 +1184,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '供应商创建日期',
-    field: 'supplierDate',
+    label: '供应商创建时间',
+    field: 'requestTime',
     sort: 'custom',
-    
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1465,19 +1468,6 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isSearch: false,
     isDetail: true,
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    sortTableDefault:1000,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    isForm: false,
-    isTable: false,
-    isSearch: false,
-    isDetail: true,
-  },
 
 ]))
 
@@ -1957,8 +1947,8 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
  
     //仅是主列表页面的筛选搜索条件
   {
-    label: '创建时间',
-    field: 'createTime',
+    label: '供应商创建时间',
+    field: 'requestTime',
     sort: 'custom',
     isDetail:false,
     isTable: false,
@@ -2003,8 +1993,8 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     hiddenInMain:true,
   },
   {
-    label: '创建时间',
-    field: 'createTime',
+    label: '供应商创建时间',
+    field: 'requestTime',
     hiddenInMain:true,
     isTable: false,
     table: {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index 3c0cf7b8f..195bd3187 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -658,28 +658,28 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    isForm:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
+  // {
+  //   label: '申请时间',
+  //   field: 'requestTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable:false,
+  //   isForm:false,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
   {
     label: '部门',
     field: 'departmentCode',
@@ -731,8 +731,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '创建时间',
-    field: 'createTime',
+    label: '供应商创建时间',
+    field: 'requestTime',
     isTable:true,
     formatter: dateFormatter,
     sortTableDefault:1000,
@@ -1200,10 +1200,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '供应商创建日期',
-    field: 'supplierDate',
+    label: '供应商创建时间',
+    field: 'requestTime',
     sort: 'custom',
-    
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1481,19 +1484,19 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isSearch: false,
     isDetail: true,
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    sortTableDefault:1000,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    isForm: false,
-    isTable: false,
-    isSearch: false,
-    isDetail: true,
-  },
+  // {
+  //   label: '创建时间',
+  //   field: 'createTime',
+  //   formatter: dateFormatter,
+  //   sortTableDefault:1000,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   isForm: false,
+  //   isTable: false,
+  //   isSearch: false,
+  //   isDetail: true,
+  // },
 
 ]))
 const singlePriceFormart = (row, column, cellValue) => {