Merge remote-tracking branch 'origin/hella_online_20240803' into hella_online_20240803

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)
 }

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: '库存余额信息',

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=>{