From e415223f6ae86792bd86e534b1458fb33823d7c4 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Tue, 30 Jul 2024 09:33:27 +0800
Subject: [PATCH] =?UTF-8?q?WMS=20=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1=E4=B8=AD=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=80=BC=E3=80=82=E7=BB=B4=E4=BF=AE=E5=A4=87?=
 =?UTF-8?q?=E4=BB=B6=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1=E5=92=8C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=B8=AD=E7=9A=84=E5=8C=85=E8=A3=85=E5=8F=B7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=88=A0=E9=99=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparereceiptJobMain.data.ts               | 24 +++++++++----------
 .../sparereceiptRecordMain.data.ts            | 18 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
index ae6b43255..2be57709a 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
@@ -614,18 +614,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面
-    field: 'toBatch',
-    sort: 'custom',
-    isForm:false,
-    isTableForm:false,
-    table: {
-      width: 150
-    },
-    sortTableDefault:1001,
-  },
-  {
-    label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面
-    field: 'toPackingNumber',
+    field: 'batch',
     sort: 'custom',
     isForm:false,
     isTableForm:false,
@@ -634,6 +623,17 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:1001,
   },
+  // {
+  //   label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面
+  //   field: 'toPackingNumber',
+  //   sort: 'custom',
+  //   isForm:false,
+  //   isTableForm:false,
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:1001,
+  // },
 ]))
 
 //表单校验
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
index 82c49c547..c5f111858 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
@@ -417,15 +417,15 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:12,
   },
-  {
-    label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:16,
-  },
+  // {
+  //   label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
+  //   field: 'fromPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:16,
+  // },
   {
     label: '检验申请单号',
     field: 'inspectNumber',