From 4334710e35f65841322dffd57fcf387a96a88bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 25 Oct 2023 15:54:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=20=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B5=20table=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue     | 13 +++++++------
 src/components/Detail/src/Detail.vue           |  4 ++--
 src/components/SearchTable/src/SearchTable.vue | 10 ++++++----
 src/components/TableForm/src/TableForm.vue     | 11 +++++------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 4e46f2b85..10167df33 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -210,18 +210,19 @@ const formSchema = ref(props.formAllSchemas.formSchema)
 /** 弹层操作 */
 // formField form表单中的字段
 // searchField 查询列表中的字段 
+// type 发起事件位置 type=tableForm 是明细中发起的 否则 为主表发起的 
 const searchTableRef = ref()
-const opensearchTable = (formField, searchField) => {
+const opensearchTable = (formField, searchField, type, row) => {
   const _searchTableParamsObject:any = props.searchTableParams.find((item:any) => (item.formField == formField))
   const _searchTableTitle = _searchTableParamsObject.searchTableTitle
   const _searchTableAllSchemas = _searchTableParamsObject.searchTableAllSchemas
   const _searchTablePage = _searchTableParamsObject.searchTablePage
-  searchTableRef.value.open(_searchTableTitle, _searchTableAllSchemas, _searchTablePage, formField, searchField)
+  searchTableRef.value.open(_searchTableTitle, _searchTableAllSchemas, _searchTablePage, formField, searchField, type, row)
 }
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
-const searchTableSuccess = (formField,searchField, val) => {
-  emit('searchTableSuccess', formField, searchField, val, formRef.value )
+const searchTableSuccess = (formField,searchField, val, type, row) => {
+  emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row )
 }
 
 /** 打开弹窗 */
@@ -357,8 +358,8 @@ const handleAddTable = () => {
   emit('handleAddTable')
 }
 // 输入框聚焦
-const inpuFocus = (headerItem) => {
-  opensearchTable()
+const inpuFocus = (headerItem, row, index) => {
+  opensearchTable(headerItem.field, 'poNumber', 'tableForm', row)
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 6c6e9b64a..6601c8f7e 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -155,7 +155,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     tableId: row.id,
     tableName: tableName,
   }
-  getList() // 加载明细列表
+  if(!props.isBasic) getList() // 加载明细列表
   isShowDrawer.value = true
   if (row) {
     detailLoading.value = true
@@ -190,8 +190,8 @@ const remarksSubmitScuess = async (remark) => {
 // 获取变更记录
 const getChangeRecordList = async () => {
   changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
-  
 }
+
 const { tableObject, tableMethods } = useTable({
   getListApi: props.detailApi?.getDetasListPage // 在主表API中添加根据主表ID获取明细列表分页方法
 })
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index c725e0672..139627b9a 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -39,13 +39,17 @@ const searchSchema = ref()
 const tableColumns = ref()
 const formFieldRef = ref()
 const searchFieldRef = ref()
-const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any ) => {
+const typeRef = ref()
+const rowRef = ref()
+const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any, type: any, row: any ) => {
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField
   searchSchema.value = allSchemas.searchSchema
   tableColumns.value = allSchemas.tableColumns
   getPage.value = getApiPage
+  typeRef.value = type
+  rowRef.value = row
   // dialogTitle.value = t('action.' + type)
   dialogTitle.value = titleName
   const {tableObject, tableMethods } = useTable({
@@ -75,11 +79,9 @@ const submitForm = async () => {
     return
   }
   try {
-    
     searchDialogVisible.value = false
     // 发送操作成功的事件
-    emit('searchTableSuccess', formFieldRef.value, searchFieldRef.value, selections)
-    searchDialogVisible.value = false
+    emit('searchTableSuccess', formFieldRef.value, searchFieldRef.value, selections, typeRef.value, rowRef.value)
   } finally {
     formLoading.value = false
   }
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 695b2ea96..13528fd99 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -40,12 +40,12 @@
       />
       <el-table-column 
         v-slot="{ row }" 
-        v-for="headerItem in tableFields" 
+        v-for="(headerItem,index) in tableFields" 
         :key="headerItem"
         :fixed="headerItem.tableForm?.fixed" 
         :label="headerItem.label" :prop="headerItem.field"
         :align="headerItem?.tableForm?.align || 'center'" 
-        :sortable="headerItem?.tableForm?.sortable || ''"
+        :sortable="headerItem?.tableForm?.sortable || false"
         :width="headerItem?.tableForm?.width || '200'" 
         :min-width="headerItem?.tableForm?.minWidth || 'auto'">
         <el-form 
@@ -65,7 +65,7 @@
               :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
               :disabled="itemIsDisabled(headerItem, row)" 
               style="width: 100%;" 
-              @focus="inpuFocus(headerItem)"
+              @click="inpuFocus(headerItem,row,index)"
             />
           </el-form-item>
           <!-- 金额输入框 -->
@@ -387,10 +387,9 @@ const handleAddTable = () => {
   emit('handleAddTable')
 }
 // 输入框聚焦
-const inpuFocus = (headerItem)=>{
-  
+const inpuFocus = (headerItem, row, index)=>{
   if(headerItem?.tableForm?.isInpuFocusShow){
-   emit('inpuFocus')
+   emit('inpuFocus', headerItem, row, index)
   }
 }