From 01f38ebcc959ffc7545f66a6d7226c0ace1b455d Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 27 Aug 2024 14:22:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=9B=9E=E8=BD=AC=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/supplierinvoiceRecordMain/index.ts | 6 +++ src/locales/en-US.ts | 4 +- src/locales/zh-CN.ts | 4 +- .../supplierinvoiceRecordMain/index.vue | 37 +++++++++++++------ .../supplierinvoiceRecordMain.data.ts | 11 ++++-- 5 files changed, 46 insertions(+), 16 deletions(-) diff --git a/src/api/wms/supplierinvoiceRecordMain/index.ts b/src/api/wms/supplierinvoiceRecordMain/index.ts index 207089eb7..adf1adcd1 100644 --- a/src/api/wms/supplierinvoiceRecordMain/index.ts +++ b/src/api/wms/supplierinvoiceRecordMain/index.ts @@ -52,6 +52,12 @@ export const deleteSupplierinvoiceRecordMain = async (id: number) => { return await request.delete({ url: `/wms/supplierinvoice-record-main/delete?id=` + id }) } +// 发票回转 +export const reverseSupplierinvoiceRecordMain = async (data: SupplierinvoiceRecordMainVO) => { + return await request.post({ url: `/wms/supplierinvoice-record-main/reverse`, data }) +} + + // 导出供应商发票记录主 Excel export const exportSupplierinvoiceRecordMain = async (params) => { console.log(params) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index cc916eb4c..793259dc4 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1283,7 +1283,9 @@ export default { '确认撤销报工吗?': 'Are you sure to cancel the job application?', '收货数量不可以大于订单数量!': 'The received quantity cannot exceed the order quantity', 撤销报工成功:'Revocation of work report successful', - 生产日期不能小于:'The date of production cannot be less than' + 生产日期不能小于:'The date of production cannot be less than', + 发票回转:'Return of invoice', + 发票回转成功:'The invoice has been successfully forwarded' }, diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index b0ab60a46..30d9d58c2 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1279,7 +1279,9 @@ export default { '确认撤销报工吗?': "确认撤销报工吗?", '收货数量不可以大于订单数量!':'收货数量不可以大于订单数量', 撤销报工成功:'撤销报工成功', - 生产日期不能小于:'生产日期不能小于' + 生产日期不能小于:'生产日期不能小于', + 发票回转:'发票回转', + 发票回转成功:'发票回转成功' }, } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 8d2249c80..f5be107db 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -51,7 +51,7 @@ @searchTableSuccess="searchTableSuccess" --> { hasPermi: '', link: true, // 文本展现按钮 }, - // { - // label: t('ts.发票回转'), - // name: 'transfer', - // type: 'primary', - // icon: '', - // color: '', - // hasPermi: '', - // hide:!(row['status']==5&&!!row['voucherNumber']), - // link: true, // 文本展现按钮 - // } + { + label: t('ts.发票回转'), + name: 'transfer', + type: 'primary', + icon: '', + color: '', + hasPermi: 'wms:supplierinvoice-record-main:reverse', + hide:!(row['status']==5&&!!row['voucherNumber']), + link: true, // 文本展现按钮 + } ] } /** 添加/修改操作 */ @@ -270,6 +270,21 @@ const buttonTableClick = async (val, row) => { } } +//发票回转 +const submitForm = async (formType, data) => { + data.reverseInvoiceJournal = 'APINVCOR' + data.adjustmentJournal = 'APADJ' + console.log('发票回转',formType, data) + loadStart() + try{ + await SupplierinvoiceRecordMainApi.reverseSupplierinvoiceRecordMain(data) + message.success(t('ts.发票回转成功')) + basicFormRef.value.dialogVisible = false + } finally { + loadDone() + } +} + // 获取部门 用于详情 部门回显 const { wsCache } = useCache() /** 详情操作 */ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index d90484bbf..045c96aca 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1,6 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import { accountantFormart } from '@/utils/formatter' +import dayjs from 'dayjs' /** * @returns {Array} 供应商发票记录主表 @@ -1646,7 +1647,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive