From 9fab4b9cf10eea39f90c6c26e5977b09dee9650f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 10 Nov 2023 17:27:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=20=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=20=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E6=A0=B7?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 21 +++++++++++++++---- src/components/Form/src/Form.vue | 8 +++---- .../SearchTable/src/SearchTable.vue | 3 ++- .../preparetoissueMain.data.ts | 20 ++++++++++++++++-- 4 files changed, 41 insertions(+), 11 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 668c001f3..26def832d 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -125,13 +125,25 @@ const formSchema = ref(props.formAllSchemas?.formSchema) // formField form表单中的字段 // searchField 查询列表中的字段 // type 发起事件位置 type=tableForm 是明细中发起的 否则 为主表发起的 +// searchCondition 查询条件 const searchTableRef = ref() -const opensearchTable = (formField, searchField, searchTitle, searchAllSchemas, searchPage, type, row) => { +const opensearchTable = (formField, searchField, searchTitle, searchAllSchemas, searchPage, type, row, searchCondition) => { + const _searchCondition = {} + // 判断查询条件中，是否存在指向主表的数据 + if (searchCondition && searchCondition.length > 0) { + searchCondition.forEach(item => { + // 查询条件为主表某字段，需要赋值主表数据 + if (item.isMainValue) { + _searchCondition[item.key] = formRef.value.formModel[item.value] + } else { + _searchCondition[item.key] = item.value + } + }) + } const _searchTableTitle = searchTitle const _searchTableAllSchemas = searchAllSchemas const _searchTablePage = searchPage - console.log(_searchTablePage) - searchTableRef.value.open(_searchTableTitle, _searchTableAllSchemas, _searchTablePage, formField, searchField, type, row) + searchTableRef.value.open(_searchTableTitle, _searchTableAllSchemas, _searchTablePage, formField, searchField, type, row, _searchCondition) } // 弹层确定返回所选数据 // val ： 弹层列表row 数据 @@ -302,7 +314,8 @@ const inpuFocus = (headerItem, row, index) => { headerItem.tableForm.searchAllSchemas, headerItem.tableForm.searchPage, 'tableForm', - row + row, + headerItem.tableForm.searchCondition ) } diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index c11dc9c42..d9430aca4 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -120,9 +120,8 @@ export default defineComponent({ return unref(elFormRef) as ComponentRef } - const opensearchTable = (field, searchField,searchTitle,searchAllSchemas, searchPage) => { - console.log(124, field) - emit('opensearchTable',field, searchField, searchTitle, searchAllSchemas, searchPage) + const opensearchTable = (field, searchField,searchTitle,searchAllSchemas, searchPage, searchCondition) => { + emit('opensearchTable',field, searchField, searchTitle, searchAllSchemas, searchPage, searchCondition) } expose({ @@ -233,7 +232,8 @@ export default defineComponent({ item.field, item?.componentProps?.searchField, item?.componentProps?.searchTitle, item?.componentProps?.searchAllSchemas, - item?.componentProps?.searchPage + item?.componentProps?.searchPage, + item?.componentProps?.searchCondition )}}/> ) diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue index 0be8ec29b..1575a41a9 100644 --- a/src/components/SearchTable/src/SearchTable.vue +++ b/src/components/SearchTable/src/SearchTable.vue @@ -64,7 +64,7 @@ const searchFieldRef = ref() const typeRef = ref() const rowRef = ref() const allSchemasRef = ref() -const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any, type: any, row: any ) => { +const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any, type: any, row: any, searchCondition:any ) => { searchDialogVisible.value = true formFieldRef.value = formField searchFieldRef.value = searchField @@ -80,6 +80,7 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s getListApi: getPage.value // 分页接口 }) tableObjectRef.value = tableObject + if (searchCondition) tableObjectRef.value.params = searchCondition // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods setSearchParamsRef.value = setSearchParams diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index 6dddfdfb9..dee166718 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -385,7 +385,18 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '生产线物品关系信息', // 查询弹窗标题 searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 - searchPage: ProductionlineitemApi.getProductionlineitemPage // 查询弹窗所需分页方法 + searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'productionLineCode', + value:'prodLine', + isMainValue: true + }//, //条件，例：isMainValue: true,表示查询条件是主表的字段的值 productionLineCode：查询列表中字段 prodLine：指主表某字段 + // { + // key:'available', + // value:'TRUE', + // isMainValue: false + // } + ] // 条件，例：isMainValue: false,表示查询条件不是主表的字段的值 available：查询列表中字段 TRUE：指查询具体值 } }, tableForm:{ @@ -394,7 +405,12 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '生产线物品关系信息', // 查询弹窗标题 searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 - searchPage: ProductionlineitemApi.getProductionlineitemPage // 查询弹窗所需分页方法 + searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'productionLineCode', + value:'prodLine', + isMainValue: true + }] }, }, {