diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue index 66cbfde72..299c1070b 100644 --- a/src/components/SearchTable/src/SearchTable.vue +++ b/src/components/SearchTable/src/SearchTable.vue @@ -67,6 +67,7 @@ const typeRef = ref() const rowRef = ref() const allSchemasRef = ref() const multipleBol = ref(false) +const searchConditionRef = ref() const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any ) => { searchDialogVisible.value = true formFieldRef.value = formField @@ -84,6 +85,7 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s getListApi: getPage.value // 分页接口 }) tableObjectRef.value = tableObject + searchConditionRef.value = searchCondition if (searchCondition) tableObjectRef.value.params = searchCondition; // 获得表格的各种操作 @@ -98,16 +100,24 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s const searchFormClick = (searchData) => { // console.log(99, rowRef.value) // console.log(100, searchData) - // console.log(101, tableObjectRef.value.params) - + // console.log(101, searchConditionRef.value) // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters - if (tableObjectRef.value.params) { - Object.keys(tableObjectRef.value.params).forEach(key => { - searchData.filters.push({ - action: "==", - column: key, - value: tableObjectRef.value.params[key] - }) + if (searchConditionRef.value) { + Object.keys(searchConditionRef.value).forEach(key => { + if (searchData.filters) { + searchData.filters.push({ + action: "==", + column: key, + value: searchConditionRef.value[key] + }) + // } + } else { + searchData.filters = [{ + action: "==", + column: key, + value: searchConditionRef.value[key] + }] + } }); } tableObjectRef.value.params = { diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index 7dc06c185..bbd5757bc 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -17,7 +17,10 @@ import * as TeamApi from '@/api/wms/team' import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data' import * as ProductionlineitemApi from '@/api/wms/productionlineitem' -import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data' +// import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/bom/bom.data' + +// import * as BomApi from '@/api/wms/bom' +import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data' import * as WorkStationApi from '@/api/wms/workstation' import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data' @@ -392,8 +395,8 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物品代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 - searchTitle: '生产线物品关系信息【原料】【半成品】', // 查询弹窗标题 - searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 + searchTitle: '物品清单信息', // 查询弹窗标题 + searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类 searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法 searchCondition: [{ key:'productionLineCode', @@ -406,8 +409,8 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ isInpuFocusShow: true, searchListPlaceholder: '请选择物品代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 - searchTitle: '生产线物品关系信息【原料】【半成品】', // 查询弹窗标题 - searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 + searchTitle: '物品清单信息', // 查询弹窗标题 + searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类 searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法 searchCondition: [{ key:'productionLineCode',