diff --git a/src/api/StockIn/index.ts b/src/api/StockIn/index.ts index 72bb20c..fe56053 100644 --- a/src/api/StockIn/index.ts +++ b/src/api/StockIn/index.ts @@ -94,7 +94,7 @@ export function PurInSendERPByCharge(ChangeParams: any) { export function CommitMove(ChangeParams: any) { return request({ - url: '/api/location/CommitMove2', + url: '/api/api/location/CommitMove2', method: 'post', data: ChangeParams, }); diff --git a/src/api/StockOut/index.ts b/src/api/StockOut/index.ts index 16187df..fb2c6ef 100644 --- a/src/api/StockOut/index.ts +++ b/src/api/StockOut/index.ts @@ -109,7 +109,7 @@ export function Commit4CToERP(data: any) { * */ export function RejectsAndExpCheck(data: any) { return request({ - url: '/api/api/SaleOut/RejectsAndExpCheck', + url: '/api/SaleOut/RejectsAndExpCheck', method: 'post', data: data, }); diff --git a/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue b/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue index 3730543..3779e98 100644 --- a/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue +++ b/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue @@ -564,6 +564,14 @@ }) } function exportExcel() { + let paramsObjet = state.queryParams.params; + const parmlist = Object.keys(paramsObjet).filter((key: any) => key !== 'SITENAME') + const allEmpty = parmlist.every(el => !(paramsObjet as any)[el] || (paramsObjet as any)[el] == '') + if(allEmpty) { + proxy.$ElMessage.warning('最少有一个查询条件!'); + return; + } + state.queryParams.version = 'WEB00033' getQueryList(state.queryParams).then((res: any) => { if (res.data.length > 0) { @@ -572,7 +580,7 @@ proxy.$ElMessage.warning('当前查询没有数据可以导出'); } }); - } + } const getSummaries = (param: any) => { const { columns, data } = param diff --git a/src/views/stockOut/shipRequestReserve/index.vue b/src/views/stockOut/shipRequestReserve/index.vue index e1ba6e7..4aadacd 100644 --- a/src/views/stockOut/shipRequestReserve/index.vue +++ b/src/views/stockOut/shipRequestReserve/index.vue @@ -77,8 +77,8 @@ - +