diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts index e900faf38..9347bc48e 100644 --- a/src/api/wms/demandforecastingDetail/index.ts +++ b/src/api/wms/demandforecastingDetail/index.ts @@ -126,6 +126,11 @@ export const queryVersion = async (params) => { return await request.get({ url: `/wms/demandforecasting-detail/queryVersion`, params }) } +// 查询SCP版本号 +export const queryScpVersion = async (params) => { + return await request.get({ url: `/wms/demandforecasting-detail/queryScpVersion`, params }) +} + // 预览要货计划 export const getPreviewPlan = async (params) => { return await request.get({ url: `/wms/demandforecasting-detail/preview`, params }) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index 28a9da76c..49bd1e137 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -245,7 +245,7 @@ hiddenSearchHigh:true, searchField: 'detailVersion', // 查询弹窗赋值字段 searchTitle: '版本号', // 查询弹窗标题 searchAllSchemas: Version.allSchemas, // 查询弹窗所需类 - searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法 + searchPage: DemandforecastingDetailApi.queryScpVersion, // 查询弹窗所需分页方法 searchCondition: [{ key: 'supplierCodes', value: 'supplierCode', @@ -294,13 +294,21 @@ hiddenSearchHigh:true, isForm: false, search: { component: 'DatePicker', - value: [dayjs(), dayjs().subtract(-3,'month')], componentProps: { - valueFormat: 'YYYY-MM-DD', - type: 'daterange', - defaultTime: [new Date('1 '), new Date('1 ')] + clearable:false, + type: 'month', + valueFormat: 'YYYY-MM', } }, + // search: { + // component: 'DatePicker', + // value: [dayjs(), dayjs().subtract(-3,'month')], + // componentProps: { + // valueFormat: 'YYYY-MM-DD', + // type: 'daterange', + // defaultTime: [new Date('1 '), new Date('1 ')] + // } + // }, }, { label: '操作', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts index ace19b85e..91958aad8 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts @@ -137,7 +137,7 @@ hiddenSearchHigh:true, searchField: 'detailVersion', // 查询弹窗赋值字段 searchTitle: '版本号', // 查询弹窗标题 searchAllSchemas: Version.allSchemas, // 查询弹窗所需类 - searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法 + searchPage: DemandforecastingDetailApi.queryScpVersion, // 查询弹窗所需分页方法 searchCondition: [{ key: 'supplierCodes', value: 'supplierCode',