From 4e06a3d65953e79b5a5bf1b64b982fcc3482e086 Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Mon, 23 Dec 2024 15:02:14 +0800
Subject: [PATCH] =?UTF-8?q?YT-1744=E3=80=90=E5=BA=93=E5=AD=98=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E7=94=B3=E8=AF=B7=E3=80=91=E5=A2=9E=E5=8A=A0=E5=88=B0?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=9A=84=E9=80=89=E6=8B=A9=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=BD=93=E5=A4=A9=EF=BC=8C=E5=8F=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E9=9D=9E=E5=BF=85=E5=A1=AB=E9=A1=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRequestMainMOVE/index.vue    |  2 +
 .../inventorymoveRequestMain.data.ts          | 37 +++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
index b98e2a26d..fecfaaad5 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
@@ -95,6 +95,7 @@ import * as LocationApi  from '@/api/wms/location'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import * as ruleApi  from '@/api/wms/rule/index'
+import { formatTime } from '@/utils/index'
 const { loadStart, loadDone } = usePageLoading()
 // 库存转移申请
 // 只有库存转移申请在使用的
@@ -327,6 +328,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['uom'] = item['uom']
           newRow['qty'] = item['qty']
           newRow['toInventoryStatus'] = item['inventoryStatus']//库存移动申请
+          newRow['toBatch'] = formatTime(new Date(), 'yyyyMMdd')
           tableData.value.push(newRow)
         })
       }else if (formField == 'toLocationCode') {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
index caf3af137..87aed3ab1 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
@@ -588,22 +588,27 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
-  // {
-  //   label: '到批次',
-  //   field: 'toBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: true,
-  //   isForm: false,
-  //   tableForm: {
-  //     disabled: true,
-  //     placeholder: '请选择从批次',
-  //     valueFormat: 'YYYYMMDD',
-  //     format: 'YYYYMMDD',
-  //   },
-  // },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false,
+      type:'FormDate',
+      placeholder: '请选择到批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
+    form: {
+      componentProps: {
+        disabled: false,
+        valueFormat: 'YYYYMMDD',
+      }
+    }
+  },
   {
     label: '从包装号',
     field: 'fromPackingNumber',