From 4b468556e45e8ecbe83a9b7dd6e639cf75b8755f Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 15:35:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7--=E4=B8=BB?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleJobMain/index.vue | 6 +++--- .../productreceiptAssembleRecordMain/index.vue | 2 +- .../index.vue | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue index 3dfa825d1..3e4958241 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue @@ -261,11 +261,11 @@ const buttonTableClick = async (val, row) => { } ProductreceiptJobMainApi.executeProductreceiptMain(aaa) } else if (val == 'mainJobAba') { // 放弃 - ProductreceiptJobMainApi.abandonProductreceiptMain(row.id) + ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId) } else if (val == 'mainJobClo') { // 关闭 - ProductreceiptJobMainApi.closeProductreceiptMain(row.id) + ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) } else if (val == 'mainJobAcc') { // 承接 - ProductreceiptJobMainApi.acceptProductreceiptMain(row.id) + ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index a54d37524..661e9d905 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -222,7 +222,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.id + masterId: row.masterId } await getDetailListBom() } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 2517ae8ba..d78f717ab 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -294,7 +294,7 @@ const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 await message.confirm('确认要关闭吗？') tableObject.loading = true - ProductreceiptRequestMainApi.close(row.id).then(() => { + ProductreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -305,7 +305,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainReAdd') { // 重新添加 await message.confirm('确认要重新添加吗？') tableObject.loading = true - ProductreceiptRequestMainApi.reAdd(row.id).then(() => { + ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -316,7 +316,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainSubmit') { // 提交审批 await message.confirm('确认要提交审批吗？') tableObject.loading = true - ProductreceiptRequestMainApi.submit(row.id).then(() => { + ProductreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -327,7 +327,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainTurnDown') { // 驳回 await message.confirm('确认要驳回吗？') tableObject.loading = true - ProductreceiptRequestMainApi.refused(row.id).then(() => { + ProductreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -338,7 +338,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainApprove') { // 审批通过 await message.confirm('确认要审批通过吗？') tableObject.loading = true - ProductreceiptRequestMainApi.agree(row.id).then(() => { + ProductreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -362,7 +362,7 @@ const buttonTableClick = async (val, row) => { return } detatableData.params = { - masterId:row.id + masterId:row.masterId } await getDetailList() // 打开创建标签页面 @@ -431,7 +431,7 @@ const buttonTableClick = async (val, row) => { return } tableObject.loading = true - ProductreceiptRequestMainApi.handle(row.id).then(() => { + ProductreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -441,7 +441,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } else if (val == 'point') { // 标签打印 handlePoint(row) } @@ -614,7 +614,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.id + masterId: row.masterId } await getDetailListBom() }