From cc7e17bf067acc2b801b9baa0bc40ba753ecfa27 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Fri, 11 Oct 2024 10:52:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96mq=E6=B6=88=E6=81=AF=E9=87=8D?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 2 ++ src/locales/zh-CN.ts | 2 ++ src/views/infra/apiMqError/index.vue | 6 +++++- .../productreceiptRequestMain.data.ts | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index f38da5207..f8d4f5ebb 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -77,6 +77,8 @@ export default { confirmAccept: 'Confirm Accept', confirmGiveup: 'Confirm Giveup', confirmPublish: 'Confirm Publish', + retrySuccess: 'Retry successfully', + retryFinish: 'Retry Finished', }, error: { noPermission: `Sorry, you don't have permission to access this page.`, diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 06fac580b..cc5fee6ef 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -49,6 +49,8 @@ export default { delDataMessage: '是否删除数据?', delNoData: '请选择需要删除的数据', delSuccess: '删除成功', + retrySuccess: '重试成功', + retryFinish: '重试完成', index: '序号', status: '状态', createTime: '创建时间', diff --git a/src/views/infra/apiMqError/index.vue b/src/views/infra/apiMqError/index.vue index 594c6d67f..5601b0671 100644 --- a/src/views/infra/apiMqError/index.vue +++ b/src/views/infra/apiMqError/index.vue @@ -240,7 +240,11 @@ const searchFormClick = (searchData) => { const handleRetry = (row) => { ApiMqErrorApi.retry(row.id).then(res => { - message.success(t('common.retrySuccess')) + if(res){ + message.success(t('common.retrySuccess')) + }else{ + message.success(t('common.retryFinish')) + } getList() }) } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index dd1669767..8b9a18ceb 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -43,7 +43,7 @@ const queryParams = { const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const requestsettingData = data?.list[0] || {} export const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'}) -console.log('shiftList',shiftList) +console.log('shiftList', shiftList) // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' import { TableColumn } from '@/types/table'