Browse Source

弹窗查询组件 优化 筛选参数添加弹窗列表条件

master
陈薪名 9 months ago
parent
commit
6ef5c4dd80
  1. 9
      src/api/wms/productionlineitem/index.ts
  2. 19
      src/components/SearchTable/src/SearchTable.vue
  3. 8
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

9
src/api/wms/productionlineitem/index.ts

@ -23,7 +23,14 @@ export const getProductionlineitemPage = async (params) => {
// 查询生产线物料关系列表——根据 生产线 物品类型为原料和半成品 // 查询生产线物料关系列表——根据 生产线 物品类型为原料和半成品
export const getProductionlineitemPageByItemtype = async (params) => { export const getProductionlineitemPageByItemtype = async (params) => {
return await request.get({ url: `/wms/productionlineitem/pageByItemtype`, params }) if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/productionlineitem/pageByItemtypeSenior', data })
} else {
return await request.get({ url: `/wms/productionlineitem/pageByItemtype`, params })
}
} }
// 查询生产线物料关系详情 // 查询生产线物料关系详情

19
src/components/SearchTable/src/SearchTable.vue

@ -87,14 +87,29 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
if (searchCondition) tableObjectRef.value.params = searchCondition; if (searchCondition) tableObjectRef.value.params = searchCondition;
// //
const { getList, setSearchParams } = tableMethods const { getList } = tableMethods
setSearchParamsRef.value = setSearchParams // setSearchParamsRef.value = setSearchParams
setSearchParamsRef.value = tableObject.params
getListRef.value = getList getListRef.value = getList
getList() getList()
} }
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
// console.log(99, rowRef.value)
// console.log(100, searchData)
// console.log(101, tableObjectRef.value.params)
// 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]
})
});
}
tableObjectRef.value.params = { tableObjectRef.value.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters

8
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@ -546,6 +546,10 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
key: 'locationCode', key: 'locationCode',
value: 'fromLocationCode', value: 'fromLocationCode',
isMainValue: true isMainValue: true
},{
key: 'inventoryStatus',
value: 'OK',
isMainValue: false
}] }]
} }
}, },
@ -560,6 +564,10 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
key: 'locationCode', key: 'locationCode',
value: 'fromLocationCode', value: 'fromLocationCode',
isMainValue: true isMainValue: true
},{
key: 'inventoryStatus',
value: 'OK',
isMainValue: false
}] }]
}, },
}, },

Loading…
Cancel
Save