diff --git a/src/api/wms/unplannedissueRecordDetail/index.ts b/src/api/wms/unplannedissueRecordDetail/index.ts index a8dd317ea..b72dd7835 100644 --- a/src/api/wms/unplannedissueRecordDetail/index.ts +++ b/src/api/wms/unplannedissueRecordDetail/index.ts @@ -33,8 +33,33 @@ export const getUnplannedissueRecordDetailPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} + const dataTypeCondition = { + 'column':'detailDataType', + 'action':'==', + 'value':'1' + } + data.filters.push(dataTypeCondition) return await request.post({ url: '/wms/unplannedissue-record-detail/senior', data }) } else { + params.detailDataType='1' + return await request.get({ url: `/wms/unplannedissue-record-detail/page`, params }) + } +} + +// 查询备件领用出库记录子列表 +export const getUnplannedissueRecordDetailPageSpare = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + const dataTypeCondition = { + 'column':'detailDataType', + 'action':'==', + 'value':'2' + } + data.filters.push(dataTypeCondition) + return await request.post({ url: '/wms/unplannedissue-record-detail/senior', data }) + } else { + params.detailDataType='2' return await request.get({ url: `/wms/unplannedissue-record-detail/page`, params }) } } diff --git a/src/api/wms/unplannedissueRequestDetail/index.ts b/src/api/wms/unplannedissueRequestDetail/index.ts index e5105fcb8..be5249f00 100644 --- a/src/api/wms/unplannedissueRequestDetail/index.ts +++ b/src/api/wms/unplannedissueRequestDetail/index.ts @@ -28,8 +28,33 @@ export const getUnplannedissueRequestDetailPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} + const dataTypeCondition = { + 'column':'detailDataType', + 'action':'==', + 'value':'1' + } + data.filters.push(dataTypeCondition) return await request.post({ url: '/wms/unplannedissue-request-detail/senior', data }) } else { + params.detailDataType='1' + return await request.get({ url: `/wms/unplannedissue-request-detail/page`, params }) + } +} + +// 查询计划外出库申请子列表 +export const getUnplannedissueRequestDetailPageSpare = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + const dataTypeCondition = { + 'column':'detailDataType', + 'action':'==', + 'value':'2' + } + data.filters.push(dataTypeCondition) + return await request.post({ url: '/wms/unplannedissue-request-detail/senior', data }) + } else { + params.detailDataType='2' return await request.get({ url: `/wms/unplannedissue-request-detail/page`, params }) } } diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue index ecd7970e8..aa75d9df5 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue @@ -85,7 +85,7 @@ const updataTableColumns = (val) => { } const { tableObject, tableMethods } = useTable({ - getListApi: UnplannedissueRecordDetailApi.getUnplannedissueRecordDetailPage // 备件领用分页接口 + getListApi: UnplannedissueRecordDetailApi.getUnplannedissueRecordDetailPageSpare // 备件领用分页接口 }) // 获得表格的各种操作 diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index 49e076f5d..68c9961d9 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -143,7 +143,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { const Echo = [] const { tableObject, tableMethods } = useTable({ - getListApi: UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPage // 分页接口 + getListApi: UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPageSpare // 分页接口 }) // 获得表格的各种操作 diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts index 7e3150d63..560f83e02 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts @@ -45,7 +45,6 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ field: 'status', dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', - isSearch: true, isForm: false, isTable: true, sort: 'custom', @@ -116,7 +115,6 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true, isForm: false, }, { @@ -126,7 +124,6 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true, isForm: false, }, { diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 3d2e2e4fa..4b9128250 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -161,6 +161,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { value: 'UnplannedDeliver', componentProps: { @@ -174,6 +175,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ field: 'departmentCode', sort: 'custom', isForm: false, + sortTableDefault: 1001, table: { width: 150 }, @@ -198,7 +200,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -219,7 +221,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -241,7 +243,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isForm: false, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -306,6 +308,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable:false, isForm: false, }, { @@ -315,6 +318,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -337,6 +341,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable:false, isForm: false, }, { @@ -346,6 +351,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -396,6 +402,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive label: '单据号', field: 'number', sort: 'custom', + hiddenInMain:true, table: { width: 180 }, @@ -579,6 +586,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', + sortTableDefault: 1002, table: { width: 180 }, @@ -598,6 +606,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive label: '创建者', field: 'creator', sort: 'custom', + sortTableDefault: 1003, table: { width: 150 }, @@ -624,6 +633,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive valueFormat: 'x', } }, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -634,6 +644,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -647,6 +658,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive fixed: 'right' }, isTableForm:false, + hiddenInMain:true, } ]))