diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js index 2427834ab..5a91de994 100644 --- a/fe/PC/src/api/wms-api.js +++ b/fe/PC/src/api/wms-api.js @@ -754,10 +754,13 @@ export async function createImportExcelByFE(url,data) { } // 获取高拍仪 -export function getGrabimagePost(data) { +export function getGrabimagePost() { return request({ url: localStorage.getItem('grabimageURL'), method: 'get', + headers: { + responseType: 'html' + }, }) } @@ -765,7 +768,15 @@ export function getGrabimagePost(data) { export function postCloseJob(id,url) { return request({ url: baseURL + url + '/close-job/' + id, - method: 'post' + method: 'post', + }) +} + +// 三方库-完成申请 +export function postCompleteRequest(id,url) { + return request({ + url: baseURL + url + '/complete/' + id, + method: 'post', }) } diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue index 76026b770..c531e51e1 100644 --- a/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue +++ b/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue @@ -94,13 +94,13 @@ export default { this.defaultFilterBtn(),//筛选 ], DrawerButtonData: [ - // { - // type: 'danger', - // label: '中止', - // hide: () => { return this.hideButton([4])},//部分完成 - // name: "close", - // size: 'mini' - // }, + { + type: 'success', + label: '完成', + hide: () => { return this.hideButton([4])},//部分完成 + name: "close", + size: 'mini' + }, ], }; }, @@ -109,9 +109,9 @@ export default { }, methods:{ drawerbuttonHandle (val) { - // 中止 + // 完成 if(val == 'close'){ - this.$confirm('是否确定中止任务?', '提示', { + this.$confirm('是否确定完成任务?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', distinguishCancelAndClose: true, @@ -120,7 +120,7 @@ export default { }).then(() => { this.Loading.appMainLoading = true postCloseJob(this.propsData.id, this.URL).then(res => { - this.$successMsg('已中止任务') + this.$successMsg('已完成任务') this.Loading.appMainLoading = false getDetailed(this.propsData.id, this.URL).then(res => { this.propsData = res diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue index 4b625ae53..1687ebdb5 100644 --- a/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue +++ b/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue @@ -44,7 +44,7 @@