From 274c746c818dcda50cdc469df0b44154b1ff8750 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Mon, 1 Jul 2024 11:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=20=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         |  2 +
 .../supplierinvoiceRequestMain.data.ts        | 46 +++++++++++++------
 .../supplierinvoiceInvoiced.data.ts           |  2 +
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index a0db79bc5..1501942e8 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -730,6 +730,8 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '单据类型',
     field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 265581d6c..e4ab779b8 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -576,20 +576,20 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
-  {
-    label: '采购审批人',
-    field: 'procurementCreatorName',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:true,
-    isDetail: false,
-    isTableForm: false,
-    isForm:false,
-    isSearch:false,
-    sortTableDefault:12
-  },
+  // {
+  //   label: '采购审批人',
+  //   field: 'procurementCreatorName',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable:true,
+  //   isDetail: true,
+  //   isTableForm: false,
+  //   isForm:false,
+  //   isSearch:false,
+  //   sortTableDefault:12
+  // },
   {
     label: '过账日期',
     field: 'postingDate',
@@ -730,6 +730,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isForm: true,
     isTable:false,
+    isDetail:false,
     form: {
       component: 'Select',
       api: () => procurementCreators.list,
@@ -757,6 +758,21 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       // }
     }
   },
+
+  {
+    label: '采购审批人',
+    field: 'procurementCreatorName',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:true,
+    isDetail: true,
+    isTableForm: false,
+    isForm:false,
+    isSearch:false,
+    sortTableDefault:12
+  },
  
   {
     label: '采购审批时间',
@@ -1334,6 +1350,8 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '单据类型',
     field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
     table: {
       width: 150
     },
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
index d6da58d98..90bc1fa9e 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
@@ -112,6 +112,8 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据类型',
     field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     form: {
       component: 'SelectV2'