diff --git a/src/api/common/index.ts b/src/api/common/index.ts index 51b90e0..9a03b1b 100644 --- a/src/api/common/index.ts +++ b/src/api/common/index.ts @@ -71,7 +71,7 @@ export function AuxiliaryReserve(ChangeParams: any) { export function AuxiliaryDessign(ChangeParams: any) { return request({ - url: '/api/Auxiliary/AuxiliaryDessign', + url: '/api/api/Auxiliary/auxiliaryDessign', method: 'post', data: ChangeParams, }); diff --git a/src/views/auxiliaryManage/auxiliaryOut/index.vue b/src/views/auxiliaryManage/auxiliaryOut/index.vue index f231e35..6c5b889 100644 --- a/src/views/auxiliaryManage/auxiliaryOut/index.vue +++ b/src/views/auxiliaryManage/auxiliaryOut/index.vue @@ -460,10 +460,6 @@ function confimStockUp () { } state.loading = true state.button_state = true - /* state.ReserveParams.SITENAME = localStorage.getItem("siteName") == null ? "SDK" : localStorage.getItem("siteName"); - state.ReserveParams.SHIPREQUESTNAME = state.queryParams.params.SHIPREQUESTNAME //单据 - state.ReserveParams.user = localStorage.getItem('userId') - state.ReserveParams.boxList = state.ShipList*/ AuxiliaryReserve({ commitDate : state.commitDate, USER : localStorage.get("userId"), @@ -472,23 +468,24 @@ function confimStockUp () { BOXLIST: state.ShipList }).then((res: any) => { if (res.success){ - state.button_state = false; - state.loading = false; handleQuery(); + ElMessageBox.alert('备货完成', '提示框', { + confirmButtonText: 'OK', + }) } else { - state.button_state = false; - state.loading = false; - ElMessageBox.alert(res.message, '', { + ElMessageBox.alert('备货失败,' + res.message, '', { confirmButtonText: 'OK', }) } }).catch((error: any) => { - ElMessageBox.alert(error, '提示框', { + ElMessageBox.alert('备货失败,' + error, '提示框', { confirmButtonText: 'OK', }) - state.loading = false - state.button_state = true + state.button_state = false; + state.loading = false; }); + state.button_state = false; + state.loading = false; } @@ -502,29 +499,33 @@ function cancelHandleFn() { } state.loading = true state.button_state = true - state.ReserveParams.SITENAME = localStorage.get("siteName") == null ? "SDK" : localStorage.get("siteName"); - state.ReserveParams.SHIPREQUESTNAME = state.queryParams.params.SHIPREQUESTNAME //单据 - state.ReserveParams.user = localStorage.getItem('userId') - state.ReserveParams.boxList = state.ShipList - AuxiliaryDessign(state.ReserveParams).then((res: any) => { + AuxiliaryDessign({ + commitDate : state.commitDate, + USER : localStorage.get("userId"), + SITENAME: localStorage.get('siteName') || 'SDK', + SHIPREQUESTNAME: state.queryParams.params.SHIPREQUESTNAME, + BOXLIST: state.ShipList + + }).then((res: any) => { if (res.success){ - state.button_state = false; - state.loading = false; handleQuery(); + ElMessageBox.alert('取消备货完成', '提示框', { + confirmButtonText: 'OK', + }) } else { - state.button_state = false; - state.loading = false; - ElMessageBox.alert(res.message, '', { + ElMessageBox.alert('取消备货失败,' + res.message, '', { confirmButtonText: 'OK', }) } }).catch((error: any) => { - ElMessageBox.alert(error, '提示框', { + ElMessageBox.alert('取消备货失败,' + error, '提示框', { confirmButtonText: 'OK', }) - state.loading = false - state.button_state = true + state.button_state = false; + state.loading = false; }); + state.button_state = false; + state.loading = false; } function resetQuery() {