From 645667125d6bcfaa2ec97a380f16d8f4bff25e19 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Fri, 11 Jul 2025 11:23:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E5=AE=8C?= =?UTF-8?q?=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/api/claimAndRefund/return.js | 8 + .../return/receive/component/handlePage.vue | 144 ++++++++++++------ 2 files changed, 102 insertions(+), 50 deletions(-) diff --git a/sgzb-ui/src/api/claimAndRefund/return.js b/sgzb-ui/src/api/claimAndRefund/return.js index 1ca6f767..10966289 100644 --- a/sgzb-ui/src/api/claimAndRefund/return.js +++ b/sgzb-ui/src/api/claimAndRefund/return.js @@ -253,3 +253,11 @@ export function endBack(data) { }) } +// 单据完结 +export function endBackOver(data) { + return request({ + url: 'base/backReceive/endBackOver', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue index 2533ada2..effc76c8 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue @@ -78,6 +78,9 @@ 完成退料 + 单据完结 @@ -244,7 +247,7 @@ v-if=" !isView && scope.row.manageType == '0' && - scope.row.num > 0 + scope.row.backStatus == 0 " > 编码退料 @@ -257,7 +260,7 @@ !isView && (scope.row.manageType == '1' || scope.row.manageType == '2') && - scope.row.num > 0 + scope.row.backStatus == 0 " > 数量退料 @@ -740,6 +743,7 @@ import { endBack, revoke, endBackBeforeQueryApi, + endBackOver, } from '@/api/claimAndRefund/return' import { getTypeList } from '@/api/store/warehousing' import { equipmentTypeTree } from '@/api/store/tools' @@ -959,7 +963,7 @@ export default { this.$tab.closeOpenPage({ path: '/claimAndRefund/returnIn' }) }, //完成退料接收 - async completeBack() { + completeBack() { // let param1 = { // parentId: this.queryParams.id, // } @@ -969,41 +973,74 @@ export default { this.$message.error('请勾选需要退料的数据！') return } - - let typeId = '' - let badId = '' - this.selChangeList.map((e) => { - typeId += e.modelId + ',' + // 二次确认 + this.$confirm('是否确定要完成退料？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(async () => { + let typeId = '' + let badId = '' + this.selChangeList.map((e) => { + typeId += e.modelId + ',' + }) + this.selChangeList.map((e) => { + badId += e.badId + ',' + }) + + // if (true) return + const { data: res } = await endBackBeforeQueryApi({ + typeId, + id: this.queryParams.id, + }) + + if (res == 0) { + this.$message.error( + '当前存在未退料机具，请处理之后再点击完成退料！', + ) + return + } + let param = { + createBy: this.createBy, + parentId: this.queryParams.id, + taskId: this.queryParams.taskId, + typeId, + badId, + } + endBack(param).then((response) => { + if (response.code == 200) { + this.$modal.msgSuccess('操作成功') + // this.back() + // this.$emit('goBackPage') + this.getList() + } + }) }) - this.selChangeList.map((e) => { - badId += e.badId + ',' - }) - - // if (true) return - const { data: res } = await endBackBeforeQueryApi({ - typeId, - id: this.queryParams.id, - }) - - if (res == 0) { - this.$message.error( - '当前存在未退料机具，请处理之后再点击完成退料！', - ) + }, + // 单据完结 + invoicesEnd() { + if (this.selChangeList.length < 1) { + this.$message.error('请勾选需要退料的数据！') return } - let param = { - createBy: this.createBy, - parentId: this.queryParams.id, - taskId: this.queryParams.taskId, - typeId, - badId, - } - endBack(param).then((response) => { - if (response.code == 200) { - this.$modal.msgSuccess('操作成功') - // this.back() - // this.$emit('goBackPage') + // 二次确认 + this.$confirm('是否确定要单据完结？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(async () => { + const params = this.selChangeList.map(item => { + return { + id: item.id, + typeId: item.typeId, + } + }) + + try { + const res = await endBackOver(params) this.getList() + } catch (error) { + console.log('🚀 ~ invoicesEnd ~ error:', error) } }) }, @@ -1132,23 +1169,30 @@ export default { // handleBackup(row) { // console.log(row) - let param = { - parentId: row.id, - typeId: row.modelId, - manageType: row.manageType, - createBy: this.createBy, - } - if (row.maTypeDetails && row.maTypeDetails.length > 0) { - param.typeIds = row.maTypeDetails.map((item) => { - return item.modelId - }) - } - console.log(param) - revoke(param).then((response) => { - if (response.code == 200) { - this.$modal.msgSuccess('操作成功') - this.handleQuery() + // 二次确认 + this.$confirm('是否确定要撤回？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let param = { + parentId: row.id, + typeId: row.modelId, + manageType: row.manageType, + createBy: this.createBy, } + if (row.maTypeDetails && row.maTypeDetails.length > 0) { + param.typeIds = row.maTypeDetails.map((item) => { + return item.modelId + }) + } + console.log(param) + revoke(param).then((response) => { + if (response.code == 200) { + this.$modal.msgSuccess('操作成功') + this.handleQuery() + } + }) }) }, //编码退料查询