From d25a974a305d8b8c70121e693fd50f3a9b0c51bd Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 12 Apr 2024 08:31:28 +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=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=97=B6=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    | 41 ++++++++++++-------
 src/components/Form/src/Form.vue              | 16 ++++++--
 .../supplierdeliver/purchaseMain/index.vue    |  7 +++-
 .../purchaseMain/purchaseMain.data.ts         |  1 +
 4 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index bcd2d6326..53d983090 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -17,6 +17,7 @@
       @opensearchTable="opensearchTable"
       @onChange="onChange"
       @onBlur="onBlur"
+      @onEnter="onEnter"
     >
       <template #crontab="formSchema" v-if="fromeWhere == 'countPlan'">
         <crontab v-model="formSchema.crontab" />
@@ -467,7 +468,19 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     }
   }
 }
-defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
+// 添加数据
+const handleAddTable = () => {
+  if(props.isOpenSearchTable){
+    const tableFormKeys = {}
+    tableAllSchemas.value.tableFormColumns.forEach(item => {
+      tableFormKeys[item.field] = item.default ? item.default : ''
+    })
+    inpuFocus(tableAllSchemas.value.tableFormColumns[props.indexTableColumn],tableFormKeys,0)
+  }else{
+    emit('handleAddTable')
+  }
+  
+}
 
 /** 弹窗按钮 */
 let Butttondata:any = []
@@ -576,6 +589,7 @@ const emit = defineEmits([
   'inputStringBlur',
   'onChange',
   'onBlur',
+  'onEnter',
   'inputNumberChange',
   'formFormDateChange',
   'footButtonClick'
@@ -622,19 +636,9 @@ const handleTableSelect = (row, column, event) => {
 const handleDeleteTable = (row, index) => {
   emit('handleDeleteTable', row, index,formRef.value)
 }
-// 添加数据
-const handleAddTable = () => {
-  if(props.isOpenSearchTable){
-    const tableFormKeys = {}
-    tableAllSchemas.value.tableFormColumns.forEach(item => {
-      tableFormKeys[item.field] = item.default ? item.default : ''
-    })
-    inpuFocus(tableAllSchemas.value.tableFormColumns[props.indexTableColumn],tableFormKeys,0)
-  }else{
-    emit('handleAddTable')
-  }
-  
-}
+
+
+
 // 输入框聚焦
 const inpuFocus = (headerItem, row, index) => {
   
@@ -669,6 +673,14 @@ const onChange = (field, cur) => {
 const onBlur = (field, e) => {
   emit('onBlur', field, e)
 }
+/**
+ * 回车事件
+ * @param field 当前操作字段
+ * @param e 
+ */
+const onEnter = (field, e) => {
+  emit('onEnter', field, e)
+} 
 
 // 修改盘点类型
 const selectChange = (field, val) => {
@@ -692,6 +704,7 @@ const buttonOperationClick = (row, label, index)=> {
 const inputStringBlur = (headerItem, row, index)=> {
   emit("inputStringBlur", headerItem, row, index);
 }
+defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable}) // 提供 open 方法，用于打开弹窗
 
 </script>
 <style lang="scss" scoped>
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 5a89a11a8..6dfbcc921 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -54,7 +54,7 @@ export default defineComponent({
     vLoading: propTypes.bool.def(false),
     labelPosition: propTypes.string.def('left'),
   },
-  emits: ['register','opensearchTable', 'onChange', 'onBlur'],
+  emits: ['register','opensearchTable', 'onChange', 'onBlur','onEnter'],
   setup(props, { slots, expose, emit }) {
     // element form 实例
     const elFormRef = ref<ComponentRef<typeof ElForm>>()
@@ -245,7 +245,12 @@ export default defineComponent({
           return (
             <>
               <ElTooltip placement="top"  content={formModel.value[item.field]} >
-                <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true}  v-slots={{
+                <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={item?.componentProps?.enterSearch?false:true} onKeyup={(event)=>{
+                  if(event.keyCode === 13){
+                    //回车
+                    emit('onEnter',item.field,event)
+                  }
+              }} v-slots={{
                   suffix: () => (
                     <ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{
                       if(Array.isArray(formModel.value[item.field])){
@@ -274,7 +279,12 @@ export default defineComponent({
           formItemSlotsSearchList[item.field] = () => {
           return (
             <>
-              <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true} v-slots={{
+              <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} onKeyup={(event)=>{
+                  if(event.keyCode === 13){
+                    //回车
+                    emit('onEnter',item.field,event)
+                  }
+              }} disabled={item?.componentProps?.enterSearch?false:true} v-slots={{
                   suffix: () => (
                     <ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{
                       if(Array.isArray(formModel.value[item.field])){
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index c0b802e5a..14bf83b86 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -63,7 +63,9 @@
     @handleDeleteTable="handleDeleteTable" 
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
-    @onChange="onChangeQty" />
+    @onChange="onChangeQty"
+    @onEnter="onEnter"
+    />
 
   <!-- 详情 -->
   <Detail ref="detailRef" 
@@ -515,6 +517,9 @@ import TableDetail from '@/components/TableDetail/src/TableDetail.vue'
 
   }
 
+  const onEnter = (field)=>{
+    formRef.value.handleAddTable()
+  }
   /** 初始化 **/
   onMounted(async () => {
     getList()
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index e98b99bea..2184f8b78 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -33,6 +33,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       labelMessage: '影响明细中物料代码，需在供应商物料中维护',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段