Browse Source

Merge remote-tracking branch 'remotes/origin/intex_online20250522' into intex

intex_online20250528
songguoqiang 1 month ago
parent
commit
6dfdcc2cbe
  1. 5
      src/api/wms/demandforecastingDetail/index.ts
  2. 5
      src/api/wms/demandforecastingMain/index.ts
  3. 1
      src/locales/en-US.ts
  4. 1
      src/locales/zh-CN.ts
  5. 13
      src/utils/disposition/defaultButtons.ts
  6. 18
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
  7. 20
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
  8. 18
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts

5
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 }) 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) => { export const getPreviewPlan = async (params) => {
return await request.get({ url: `/wms/demandforecasting-detail/preview`, params }) return await request.get({ url: `/wms/demandforecasting-detail/preview`, params })

5
src/api/wms/demandforecastingMain/index.ts

@ -185,3 +185,8 @@ export const batchPublish = async(ids: string) => {
return await request.post({ url: `/wms/demandforecasting-main/batchPublish`, data }) return await request.post({ url: `/wms/demandforecasting-main/batchPublish`, data })
} }
//更新要货预测
export const updateDemandforecaste = async (data) => {
return await request.post({ url: `/wms/demandforecasting-detail/queryQADDemandforecasting`,data })
}

1
src/locales/en-US.ts

@ -1334,5 +1334,6 @@ export default {
:'Batch retry', :'Batch retry',
:'All retry', :'All retry',
:'Export the statement of account', :'Export the statement of account',
:'Update the order forecast',
}, },
} }

1
src/locales/zh-CN.ts

@ -1333,6 +1333,7 @@ export default {
:'批量重试', :'批量重试',
:'全部重试', :'全部重试',
:'导出对账单', :'导出对账单',
:'更新要货预测',
}, },
} }

13
src/utils/disposition/defaultButtons.ts

@ -1571,6 +1571,19 @@ export function invoicedExportBtn(option: any) {
hasPermi: '' hasPermi: ''
}) })
} }
// 主列表-更新要货预测QAD信息
export function mainUpdataForecastBtn(option: any) {
return __defaultBtnOption(option, {
label: t(`ts.更新要货预测`).replace('ts.', ''),
name: 'updataForecast',
hide: false,
type: 'primary',
color: '',
link: false, // 文本展现按钮
hasPermi: ''
})
}
// 默认按钮规则 // 默认按钮规则
function __defaultBtnOption(option: any, specific: any) { function __defaultBtnOption(option: any, specific: any) {
return { return {

18
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@ -245,7 +245,7 @@ hiddenSearchHigh:true,
searchField: 'detailVersion', // 查询弹窗赋值字段 searchField: 'detailVersion', // 查询弹窗赋值字段
searchTitle: '版本号', // 查询弹窗标题 searchTitle: '版本号', // 查询弹窗标题
searchAllSchemas: Version.allSchemas, // 查询弹窗所需类 searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法 searchPage: DemandforecastingDetailApi.queryScpVersion, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [{
key: 'supplierCodes', key: 'supplierCodes',
value: 'supplierCode', value: 'supplierCode',
@ -294,13 +294,21 @@ hiddenSearchHigh:true,
isForm: false, isForm: false,
search: { search: {
component: 'DatePicker', component: 'DatePicker',
value: [dayjs(), dayjs().subtract(-3,'month')],
componentProps: { componentProps: {
valueFormat: 'YYYY-MM-DD', clearable:false,
type: 'daterange', type: 'month',
defaultTime: [new Date('1 '), new Date('1 ')] 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: '操作', label: '操作',

20
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@ -177,6 +177,7 @@ defaultButtons.defaultFreshBtn(null), // 刷新
// defaultButtons.defaultFilterBtn(null), // // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
defaultButtons.mainListSelectionOrderPubBtn(null), // defaultButtons.mainListSelectionOrderPubBtn(null), //
defaultButtons.mainUpdataForecastBtn(null), //
] ]
// //
@ -200,6 +201,8 @@ const buttonBaseClick = async (val, item) => {
selectionPlan() selectionPlan()
} else if (val == 'mainOrderSelectionPub') { // } else if (val == 'mainOrderSelectionPub') { //
handleSelectionPublish() handleSelectionPublish()
} else if (val == 'updataForecast') { // QAD
updateDemandforecaste()
} else { // } else { //
console.log('其他按钮', item) console.log('其他按钮', item)
} }
@ -397,6 +400,23 @@ const handleSelectionPublish = async ()=>{
// }) // })
} }
//QAD
const updateDemandforecaste = async ()=>{
let submitData = {
"supplierCodes":"",
"itemCodes":""
}
tableObject.loading = true
try {
let res = await DemandforecastingMainApi.updateDemandforecaste(submitData)
console.log('更新结果',res)
message.success(t('更新成功'))
} finally{
tableObject.loading = false
}
}

18
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts

@ -137,7 +137,7 @@ hiddenSearchHigh:true,
searchField: 'detailVersion', // 查询弹窗赋值字段 searchField: 'detailVersion', // 查询弹窗赋值字段
searchTitle: '版本号', // 查询弹窗标题 searchTitle: '版本号', // 查询弹窗标题
searchAllSchemas: Version.allSchemas, // 查询弹窗所需类 searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法 searchPage: DemandforecastingDetailApi.queryScpVersion, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [{
key: 'supplierCodes', key: 'supplierCodes',
value: 'supplierCode', value: 'supplierCode',
@ -200,14 +200,22 @@ hiddenSearchHigh:true,
isTable:false, isTable:false,
isForm: false, isForm: false,
search: { search: {
value: [dayjs(), dayjs().subtract(-3,'month')],
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
valueFormat: 'YYYY-MM-DD', clearable:false,
type: 'daterange', type: 'month',
defaultTime: [new Date('1 '), new Date('1 ')] valueFormat: 'YYYY-MM',
} }
}, },
// search: {
// value: [dayjs(), dayjs().subtract(-3,'month')],
// component: 'DatePicker',
// componentProps: {
// valueFormat: 'YYYY-MM-DD',
// type: 'daterange',
// defaultTime: [new Date('1 '), new Date('1 ')]
// }
// },
} }
])) ]))

Loading…
Cancel
Save