Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/api/wms/business/inputBlur.ts

@@ -416,6 +416,7 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
             if (list.value?.length == 0) {
               message.alert('暂无数据')
               formRef.setValues(setV)
+              callback([])
               return
             }
             if (arr1.length != list.value.length) {
@@ -425,6 +426,7 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
                 ...arr2.filter((item) => !arr1.includes(item))
               ].join(',')
               message.alert('代码' + str + '没有找到对应数据')
+              callback([])
               formRef.setValues(setV)
               return
             }

src/components/BasicForm/src/BasicForm.vue

@@ -1008,33 +1008,37 @@ const onChange = (field, cur) => {
  * @param field 当前操作字段
  * @param e
  */
-
+const isOnBlur = ref(true)
 const onBlur = async (field, e) => {
-  let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
+  // isOnBlur是false的时候证明先走了回车事件，可以不走失去焦点方法，true的时候直接走失去焦点事件
-  if (formSchemaObj?.enterSearch) {
+  if (isOnBlur.value) {//同时走失去焦点方法bug
-    await FormBlur(
+    let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
-      field,
+    if (formSchemaObj?.enterSearch) {
-      e,
+      await FormBlur(
-      routeName.value,
+        field,
-      formRef.value,
+        e,
-      props.detailData,
+        routeName.value,
-      formSchemaObj,
+        formRef.value,
-      (list) => {
+        props.detailData,
-        emit('searchTableSuccess', field, formSchemaObj.searchField, list, formRef.value, 'form')
+        formSchemaObj,
-      }
+        (list) => {
-    )
+          emit('searchTableSuccess', field, formSchemaObj.searchField, list, formRef.value, 'form')
+        }
+      )
 
-    if (props.isShowFooterButtton && !props.footButttondata) {
+      if (props.isShowFooterButtton && !props.footButttondata) {
-      Butttondata = [
+        Butttondata = [
-        defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formSaveBtn(null), // 保存
-        defaultButtons.formCloseBtn(null) // 关闭
+          defaultButtons.formCloseBtn(null) // 关闭
-      ]
+        ]
-      count.value++
+        count.value++
+      }
+        sureDisabled.value= false
+    } else {
+      emit('onBlur', field, e)
     }
-      sureDisabled.value= false
-  } else {
-    emit('onBlur', field, e)
   }
+
 }
 
 // 批量增加
@@ -1138,6 +1142,7 @@ const inputStringFcous= (headerItem) => {
 const onEnter = async (field, value, e) => {
   let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
   if (formSchemaObj?.enterSearch && formSchemaObj?.isEnter) {
+    isOnBlur.value = false//解决回车事件和失去焦点同时调用bug
     await FormBlur(
       field,
       value,
@@ -1146,7 +1151,10 @@ const onEnter = async (field, value, e) => {
       props.detailData,
       formSchemaObj,
       (list) => {
-        emit('onEnter', field, value, e)
+        isOnBlur.value = true
+        if (list.length != 0) {
+         emit('onEnter', field, value, e)
+        }
       }
     )
   } else {

src/components/Form/src/Form.vue

@@ -325,10 +325,11 @@ export default defineComponent({
           formItemSlotsSearchList[item.field] = () => {
           return (
             <>
-              <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={t(`ts.${item?.componentProps?.searchListPlaceholder}`).replace('ts.','') || ''} onKeyup={(event)=>{
+              <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={t(`ts.${item?.componentProps?.searchListPlaceholder}`).replace('ts.','') || ''}  onKeyup={(event)=>{
                   if(event.keyCode === 13){
                     //回车
                     emit('onEnter',item.field,formModel.value[item.field],event)
+                    event.target.blur();//回车之后自动失去焦点
                   }
               }}
               

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -68,6 +68,7 @@ export const PurchasePlanMain = useCrudSchemas(
       form: {
         labelMessage: '影响明细中物料代码，需在供应商物料中维护',
         componentProps: {
+          isEnter: true,
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择供应商代码', // 输入框占位文本