From 4f577780862a0a9abd19c2d416248749f7599d6d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 19:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    | 39 ++++++++++++++-----
 .../purchasereceiptRequestMain.data.ts        | 11 +++++-
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index c36b73763..74928cee4 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -134,8 +134,7 @@
     :showSearchTableQueryFields="showSearchTableQueryFields"
     @searchTableSuccess="searchTableSuccess"
   >
-  
-    <template v-for="name in Object.keys($slots)" :key="name" #[name]="{selections}">
+    <template v-for="name in Object.keys($slots)" :key="name" #[name]="{ selections }">
       <slot :name="name" :selections="selections"></slot>
     </template>
   </SearchTable>
@@ -843,18 +842,25 @@ const onChange = (field, cur) => {
 const onBlur = async (field, e) => {
   isExecute.value = false
   let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
- 
+
   if (formSchemaObj?.enterSearch) {
-   await  FormBlur(field, e, routeName.value, formRef.value, props.detailData, formSchemaObj, (list) => {
-       emit('searchTableSuccess', field, formSchemaObj.searchField, list, formRef.value, 'form')
-     })
+    await FormBlur(
+      field,
+      e,
+      routeName.value,
+      formRef.value,
+      props.detailData,
+      formSchemaObj,
+      (list) => {
+        emit('searchTableSuccess', field, formSchemaObj.searchField, list, formRef.value, 'form')
+      }
+    )
   } else {
     emit('onBlur', field, e)
   }
   isExecute.value = true
 }
 
-
 // 批量增加
 const batchAdd = async (val) => {
   const row = {}
@@ -921,8 +927,23 @@ const inputStringBlur = async (headerItem, val, row, index) => {
  * @param field 当前操作字段
  * @param e
  */
-const onEnter = (field, value, e) => {
-  emit('onEnter', field, value, e)
+const onEnter = async (field, value, e) => {
+  let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
+  if (formSchemaObj?.enterSearch && formSchemaObj?.isEnter ) {
+    await FormBlur(
+      field,
+      value,
+      routeName.value,
+      formRef.value,
+      props.detailData,
+      formSchemaObj,
+      (list) => {
+        emit('onEnter', field, value, e)
+      }
+    )
+  } else {
+    emit('onEnter', field, value, e)
+  }
 }
 
 // 修改盘点类型
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 15bb63b55..abb308c19 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -68,6 +68,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         searchDetailSchemas:PurchaseDetail.allSchemas,
         searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类
         searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法
+        isEnter:true,
         searchCondition: [{
           key:'status',
           value:'2',
@@ -80,7 +81,15 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
           action: '==', // 查询拼接条件
           isSearch: true, // 使用自定义拼接条件
           isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
-        }]
+        }],
+        verificationParams: [{
+          key: 'number',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
     isForm: true,