From be159c547faff0c16e0ced80ea8e054d2f167747 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sat, 12 Oct 2024 16:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6157=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRecordSpareMain.data.ts     | 78 +++++++++----------
 1 file changed, 35 insertions(+), 43 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
index 52c0fb402..18dc75e79 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
@@ -77,17 +77,14 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   //   isTable: false
   // },
-  // {
-  //   label: '供应商代码',
-  //   field: 'supplierCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   sortTableDefault: 1,
-  //   sortSearchDefault:2,
-  //   isSearch: true
-  // },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '从月台代码',
   //   field: 'fromDockCode',
@@ -334,8 +331,8 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '原因',
-    field: 'remark',
+    label: '退货原因',
+    field: 'mainRemark',
     sort: 'custom',
     table: {
       width: 150
@@ -456,6 +453,22 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     hiddenInMain: true,
     isSearch: false
   },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -710,25 +723,6 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   //   sortTableDefault: 1010,
   //   hiddenInMain: true
   // },
- 
-  // {
-  //   label: '订单号',
-  //   field: 'poNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   sortTableDefault: 4,
-  // },
-  // {
-  //   label: '订单行',
-  //   field: 'poLine',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   sortTableDefault: 5,
-  // },
 
   // {
   //   label: '原因',
@@ -743,7 +737,6 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   //   sortTableDefault: 1013,
   //   hiddenInMain: true
   // },
-  
   // {
   //   label: '数量',
   //   field: 'qty',
@@ -833,16 +826,15 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   //     width: 150
   //   },
   // },
-  // {
-  //   label: '原因',
-  //   field: 'remark',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   sortTableDefault: 1007,
-  //   hiddenInMain: true
-  // },
+  {
+    label: '原因',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 1007,
+  },
   {
     label: '创建者',
     field: 'creator',