Browse Source

WMS 报废出库目前没有根据业务类型筛选数据,应该走业务类型 YT-1391

intex_online20241205
叶佳兴 2 months ago
parent
commit
70fb9e8014
  1. 13
      src/api/wms/warehouse/index.ts
  2. 3
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
  3. 24
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

13
src/api/wms/warehouse/index.ts

@ -22,6 +22,19 @@ export const getWarehousePage = async (params) => {
} }
} }
// 查询仓库列表
export const getWarehouseByBusinessTypeSenior = async (params) => {
delete params.isSearch
const data = {...params}
return request.post({ url: '/wms/warehouse/getWarehouseByBusinessTypeSenior', data })
}
// 查询仓库列表
export const getWarehouseByBusinessTypePage = async (params) => {
return await request.get({ url: `/wms/warehouse/page`, params })
}
// 校验仓库 // 校验仓库
export const verifyWarehouse = async (params) => { export const verifyWarehouse = async (params) => {
return await request.get({ url: `/wms/warehouse/ListByCode`, params }) return await request.get({ url: `/wms/warehouse/ListByCode`, params })

3
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@ -568,14 +568,13 @@ const openForm = async (type: string, row?: any) => {
by: 'ASC', by: 'ASC',
filters: [ filters: [
{ column: 'available', action: '==', value: 'TRUE' }, { column: 'available', action: '==', value: 'TRUE' },
{ column: 'type', action: '==', value: 'SCRAP' }
], ],
pageNo: 1, pageNo: 1,
pageSize: 500, pageSize: 500,
sort: '' sort: ''
} }
params.isSearch = true params.isSearch = true
WarehouseApi.getWarehousePage(params).then((res) => { WarehouseApi.getWarehouseByBusinessTypeSenior(params).then((res) => {
if (res.list?.length > 0) { if (res.list?.length > 0) {
nextTick(() => { nextTick(() => {
formRef.value.formRef.setValues({ formRef.value.formRef.setValues({

24
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@ -635,18 +635,18 @@ export const ScrapRequestMain = useCrudSchemas(
searchField: 'code', searchField: 'code',
searchTitle: '仓库信息', searchTitle: '仓库信息',
searchAllSchemas: Warehouse.allSchemas, searchAllSchemas: Warehouse.allSchemas,
searchPage: WarehouseApi.getWarehousePage, searchPage: WarehouseApi.getWarehouseByBusinessTypePage,
searchCondition: [ searchCondition: [
{ {
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}, },
{ // {
key: 'type', // key: 'type',
value: Scrap.outAreaTypes, // value: Scrap.outAreaTypes,
isMainValue: false // isMainValue: false
} // }
], ],
verificationParams: [ verificationParams: [
{ {
@ -668,18 +668,18 @@ export const ScrapRequestMain = useCrudSchemas(
searchField: 'code', // 查询弹窗赋值字段 searchField: 'code', // 查询弹窗赋值字段
searchTitle: '仓库信息', // 查询弹窗标题 searchTitle: '仓库信息', // 查询弹窗标题
searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 searchPage: WarehouseApi.getWarehouseByBusinessTypePage, // 查询弹窗所需分页方法
searchCondition: [ searchCondition: [
{ {
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}, },
{ // {
key: 'type', // key: 'type',
value: Scrap.outAreaTypes, // value: Scrap.outAreaTypes,
isMainValue: false // isMainValue: false
} // }
], ],
verificationParams: [ verificationParams: [
{ {

Loading…
Cancel
Save