From 87acea240c2b233baa9607aca91d4b771d5c3b4a Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Thu, 14 Nov 2024 13:23:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9A=94=E7=A6=BB=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E3=80=81=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E3=80=81?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C1.=E5=BA=94=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BB=A3=E7=A0=81=E3=80=81=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E5=90=8D=E7=A7=B0=E3=80=81=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E6=89=B9=E6=AC=A12.=E4=BB=BB=E5=8A=A1=E7=9A=84?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=EF=BC=8C=E5=BA=94=E6=98=AF=E4=BB=8E=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveJobMain.data.ts              | 60 +++++++++----------
 .../inventorymoveRecordMainOKHOLD.data.ts     | 56 ++++++++---------
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
index 7431da07f..dfaf623f1 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -690,7 +690,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:10,
   },
   {
-    label: '批次',
+    label: '从批次',
     field: 'batch',
     sort: 'custom',
     table: {
@@ -698,34 +698,34 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:11,
   },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    isDetail: true,
-    table: {
-      width: 150,
-    },
-    sortTableDefault:12,
-  },
-  {
-    label: '供应商名称',
-    field: 'supplierName',
-    isDetail: true,
-    table: {
-      width: 180
-    },
-    sortTableDefault:13,
-  },
-  {
-    label: '供应商批次',
-    field: 'altBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:14,
-  },
+  // {
+  //   label: '供应商代码',
+  //   field: 'supplierCode',
+  //   sort: 'custom',
+  //   isDetail: true,
+  //   table: {
+  //     width: 150,
+  //   },
+  //   sortTableDefault:12,
+  // },
+  // {
+  //   label: '供应商名称',
+  //   field: 'supplierName',
+  //   isDetail: true,
+  //   table: {
+  //     width: 180
+  //   },
+  //   sortTableDefault:13,
+  // },
+  // {
+  //   label: '供应商批次',
+  //   field: 'altBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:14,
+  // },
   {
     label: '包装号',
     field: 'packingNumber',
@@ -902,7 +902,7 @@ export const InventorymoveJobDetailRules = reactive({
     { required: true, message: '请选择包装号', trigger: 'change' }
   ],
   batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
+    { required: true, message: '请输入从批次', trigger: 'blur' }
   ],
   inventoryStatus: [
     { required: true, message: '请选择库存状态', trigger: 'change' }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
index 5eef00b59..38a592344 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
@@ -502,34 +502,34 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:15,
   },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    isDetail: true,
-    table: {
-      width: 150,
-    },
-    sortTableDefault:16,
-  },
-  {
-    label: '供应商名称',
-    field: 'supplierName',
-    isDetail: true,
-    table: {
-      width: 180
-    },
-    sortTableDefault:17,
-  },
-  {
-    label: '供应商批次',
-    field: 'altBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:18,
-  },
+  // {
+  //   label: '供应商代码',
+  //   field: 'supplierCode',
+  //   sort: 'custom',
+  //   isDetail: true,
+  //   table: {
+  //     width: 150,
+  //   },
+  //   sortTableDefault:16,
+  // },
+  // {
+  //   label: '供应商名称',
+  //   field: 'supplierName',
+  //   isDetail: true,
+  //   table: {
+  //     width: 180
+  //   },
+  //   sortTableDefault:17,
+  // },
+  // {
+  //   label: '供应商批次',
+  //   field: 'altBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:18,
+  // },
   {
     label: '从包装号',
     field: 'fromPackingNumber',