From 5d491dc7e04ec42249e8433b38dd2bafcb79fed6 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 20 Aug 2024 10:17:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?HL-5421=20=E4=BF=AE=E6=94=B9=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E9=9A=94=E7=A6=BB=E7=94=B3=E8=AF=B7=E7=9A=84=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=A1=A8=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E9=A1=B5=EF=BC=8C=E4=BB=A5=E4=BE=BF=E4=BA=8E=E5=BF=AB?=
 =?UTF-8?q?=E9=80=9F=E6=9F=A5=E7=9C=8B=E5=B7=B2=E9=80=89=E6=8B=A9=E7=9A=84?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=BA=93=E5=AD=98=E7=9A=84=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRequestMainOKHOLD/index.vue              | 8 ++++++++
 .../inventorymoveRequestMain.data.ts                      | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index f3cd23330..edd2f3133 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -90,6 +90,7 @@ import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as LocationApi  from '@/api/wms/location'
 import { formatDate } from '@/utils/formatTime'
+import dayjs from 'dayjs'
 
 // 库存转移申请
 defineOptions({ name: 'InventorymoveRequestMain' })
@@ -615,6 +616,13 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
+  if(type=='create'){
+    InventorymoveRequestMain.allSchemas.formSchema.forEach(item =>{
+      if(item.field == 'dueTime') {
+        item.value = dayjs().add(1, 'hour')
+      }
+    })
+  }
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
 }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
index 6f6e21b82..ba810d477 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
@@ -584,7 +584,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     tableForm:{
       multiple:true,
-      isInpuFocusShow: true, // 开启查询弹窗
+      disabled:true,
+      isInpuFocusShow: false, // 开启查询弹窗
       searchListPlaceholder: '请选择从包装号',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',

From dcbee8966b44028868e1dbd6a0377567bae67752 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 20 Aug 2024 10:26:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?HL-5491M=E5=9E=8B=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B2=A1=E6=9C=89=E6=9F=A5=E5=88=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=88=E5=9B=A0=E4=B8=BA=E5=88=97=E8=A1=A8=E6=9C=89?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E8=AE=A2=E5=8D=95=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E8=A1=8C=E5=8F=AF=E4=BB=A5=E6=94=B6=E8=B4=A7=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=20=E8=AE=A2=E5=8D=95=E6=95=B0-=E5=B7=B2?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=95=B0-=E7=94=B3=E8=AF=B7=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E9=87=8F=EF=BC=89=E8=BF=99=E6=A0=B7=E7=9A=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E8=BF=94=E5=9B=9E=EF=BC=8C=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=8F=90=E7=A4=BA=E8=AF=A5=E8=AE=A2=E5=8D=95=E5=B7=B2?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=94=B3=E8=AF=B7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestOrderMTypeMain/index.vue            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
index 44b1f1c94..b59b95f10 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
@@ -534,6 +534,10 @@ const getSearchTableData = async (number,isEnter=false)=>{
     item.width = item.table?.width || 150
   })
   tableData.value = []
+  if(tableObject.tableList.length==0){
+    message.error(`此订单${number}已存在M类型申请的数据`)
+    return
+  }
   updateTableData(tableObject.tableList)
   const itemCodes = []
   tableObject.tableList.forEach(row=>{