From 5d04261295c93ba7577f72e2015b5eed0412a1dc Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 26 Jun 2024 18:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereceiptJobMain/index.ts | 4 +-- src/locales/en-US.ts | 3 +- src/locales/zh-CN.ts | 1 + .../purchasereceiptJobMain/index.vue | 33 +++++++++++++++---- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index 25f05c601..79e546090 100644 --- a/src/api/wms/purchasereceiptJobMain/index.ts +++ b/src/api/wms/purchasereceiptJobMain/index.ts @@ -136,6 +136,6 @@ export const acceptPurchasereceiptJobMain = (id: number) => { } // 拒收采购收货任务主 -export const refusalPurchasereceiptJobMain = (id: number) => { - return request.put({ url: '/wms/purchasereceipt-job-main/refusal?id=' + id }) +export const refusalPurchasereceiptJobMain = (data) => { + return request.post({ url: '/wms/purchasereceipt-job-main/refusal',data}) } diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index ec715bc6f..19f98f6c5 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1137,7 +1137,8 @@ export default { '驳回原因不能为空,且不超过60字':'The reason for rejection cannot be empty and cannot exceed 60 words', 批量发布:'Batch release', '重新生成标签会删除上次生成的标签,是否确认继续?':'Regenerating labels will delete the last generated label. Are you sure you want to continue?', - '确 认':'Confirm' + '确 认':'Confirm', + 请输入拒收原因:'Please enter the reason for rejection' }, diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index f7586d6ea..3b9c17161 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1138,6 +1138,7 @@ export default { 批量发布:'批量发布', '重新生成标签会删除上次生成的标签,是否确认继续?':'重新生成标签会删除上次生成的标签,是否确认继续?', '确 认':'确 认', + 请输入拒收原因:'请输入拒收原因' }, } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 58a8a2000..4843c49c6 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -249,8 +249,8 @@ const buttonTableClick = async (val, row) => { // 查看质检报告 checkQualityReport(row) } else if(val == 'mainJobRefusal'){ - handleRefusal(row.masterId) - getList() + // handleRefusal(row.masterId) + resonSubmit(row) } } // 查看质检报告 @@ -270,12 +270,33 @@ const handleClose = async (id: number) => { await getList() } catch {} } - +const resonSubmit = async (row)=>{ + + ElMessageBox.prompt(t('ts.请输入拒收原因'), t('ts.提示'), { + confirmButtonText: t('common.ok'), + cancelButtonText: t('common.cancel'), + inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格 + inputErrorMessage: t(`ts.${'驳回原因不能为空,且不超过256字'}`), + inputType:'textarea', + inputValidator:(value)=>{ + if(value.length>60||value.length==0){ + return false + }else{ + return true + } + } + }).then(({ value }) => { + // 驳回原因 + handleRefusal(row.masterId,value) + }) + .catch(() => { + }) + } /** 拒收按钮操作 */ -const handleRefusal = async (id: number) => { +const handleRefusal = async (id: number,refuseReason:string) => { + // refuseReason try { - await message.confirm(t('common.confirmRefusal')) - await PurchasereceiptJobMainApi.refusalPurchasereceiptJobMain(id) + await PurchasereceiptJobMainApi.refusalPurchasereceiptJobMain({id,refuseReason}) message.success(t('common.refusalSuccess')) await getList() } catch {}