From 093924c320a7591e93a605ac3c85d478266972e3 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 3 Jun 2024 17:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      |  4 ++
 .../supplierinvoiceRequestMain.data.ts        | 47 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index e73881f59..bda6f6835 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -747,7 +747,11 @@ const genRecords = async (id: number) => {
 
           // 单据打印
           handleDocumentPrint(res)
+        }).catch(err=>{
+          console.log("发起处理",err)
+          getLoading?.close()
         })
+
       }
     }).catch(err => {
       console.log("自检报告校验异常",err)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 1ed0e3075..a5ca1b66f 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import { accountantFormart } from '@/utils/formatter'
 
 import * as SupplierApi from '@/api/wms/supplier'
@@ -138,6 +138,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:1,
     isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -169,6 +170,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180,
     },
+    sortTableDefault:2,
     isForm: false
   },
   {
@@ -177,6 +179,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
     dictClass: 'string',
     isTable: true,
+    sortTableDefault:10,
     isForm:false,
     sort: 'custom',
     table: {
@@ -801,6 +804,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         disabled: true
       }
     },
+    sortTableDefault:7,
     table: {
       width: 150
     },
@@ -865,10 +869,10 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '物流收货单号',
     field: 'recvBillNum',
-    hiddenInMain:true,
     table: {
       width: 150
     },
+    sortTableDefault:9,
     form: {
       componentProps: {
         disabled: true
@@ -899,6 +903,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:8,
     form: {
       componentProps: {
         disabled: true
@@ -1036,6 +1041,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:3,
     form: {
       componentProps: {
         disabled: true
@@ -1045,6 +1051,43 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
+  {
+    label: '物料描述',
+    field: 'itemDesc',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货时间',
+    field: 'planArriveTime',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter2,
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货数量',
+    field: 'arrivalQty',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
   {
     label: '物料名称',
     field: 'itemName',