diff --git a/src/api/qms/inspectionQ2/index.ts b/src/api/qms/inspectionQ2/index.ts index f1e245047..a89604a84 100644 --- a/src/api/qms/inspectionQ2/index.ts +++ b/src/api/qms/inspectionQ2/index.ts @@ -81,3 +81,7 @@ export const finishQ2 = async (id: number) => { export const getEmail = () => { return request.get({ url: `/qms/inspectionQ2/getEmail`}) } + +export const sendQ2 = async (id: number) => { + return await request.get({ url: `/qms/inspectionQ2/send?id=` + id }) +} diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 268e4400e..d06beb311 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -452,6 +452,18 @@ export function mainListFinishBtn(option: any) { }) } +export function mainListSendBtn(option: any) { + return __defaultBtnOption(option, { + label: t(`ts.发送邮件`).replace('ts.', ''), + name: 'send', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} + // 主列表-作废按钮 export function mainListCancelBtn(option: any) { return __defaultBtnOption(option, { diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 930bf64d7..a246fd85d 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -651,7 +651,10 @@ const butttondata = (row) => { defaultButtons.mainListFinishBtn({ hide: isShowMainButton(row, ['0']), hasPermi: 'qms:Q2:finish' - }) // 完成 + }), // 完成 + defaultButtons.mainListSendBtn({ + hide: isShowMainButton(row, ['0']), + }) // 发送邮件 ] } @@ -667,6 +670,9 @@ const buttonTableClick = async (val, row) => { // 删除 handleFinish(row.id) } + else if (val == 'send') { + handleSend(row.id) + } } const handleFinish = async (id: number) => { @@ -678,6 +684,19 @@ const handleFinish = async (id: number) => { } catch {} } +const handleSend = async (id: number) => { + try { + // 发送邮件的二次确认 + await message.confirm('确认发送邮件吗?') + // 发送邮件 + await Q2Api.sendQ2(id) + message.success(t('邮件发送成功')) + // message.success(t('common.success')) + // 刷新列表 + // await getList() + } catch {} +} + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 4112c30fd..1270b5928 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -868,7 +868,7 @@ export const Q2 = useCrudSchemas( isForm: false, isDetail: false, table: { - width: 150, + width: 230, fixed: 'right' } } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue index 52309d68a..023b5a04c 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue @@ -163,7 +163,7 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain( + const data = await RuleApi.exportRule( queryParams ) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) @@ -182,7 +182,7 @@ const handleImport = () => { const HeadButttondata = [ defaultButtons.defaultAddBtn(null), // 新增 defaultButtons.defaultImportBtn(null), // 导入 - // defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-request-main:export' }), // 导出 + defaultButtons.defaultExportBtn( null), // 导出 ] // 导入附件弹窗所需的参数