diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 371bc9302..aad1ba65b 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1059,7 +1059,8 @@ export default { 发票附件:'Invoice Attachment', 货运单附件:'Attachment to the waybill', 发货单附件:'Dispatch note', - 对账单附件:'Statement of account', + 对账单附件: 'Statement of account', + 调差附件: 'Adjustment of account', 其他附件:'Other Attachment', 打印明细:'Print Detail', 打印全部发货单:'Print all invoices', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index a59588000..c75d7f9e3 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1065,7 +1065,8 @@ export default { 发票附件:'发票附件', 货运单附件:'货运单附件', 发货单附件:'发货单附件', - 对账单附件:'对账单附件', + 对账单附件: '对账单附件', + 调差附件: '调差附件', 其他附件:'其他附件', 打印明细:'打印明细', 打印全部发货单:'打印全部发货单', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 32a404957..0df20521c 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -108,6 +108,17 @@ queryField:'tableId', rowField:'annexMasterId', }], + },{ + label: t('ts.调差附件'), + prop: 'Annex', + tableName:'adjustmentAttachment', + showDownload:true, + hiddenDelete:true, + hiddenUpload:true, + queryParams:[{ + queryField:'tableId', + rowField:'annexMasterId', + }], },{ label: t('ts.其他附件'), prop: 'Annex', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 4f881e4f6..b563f792d 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -448,6 +448,7 @@ import { getAccessToken } from '@/utils/auth' import { ElMessageBox } from 'element-plus' import { getJmreportBaseUrl } from '@/utils/systemParam' import { accountantFormart } from '@/utils/formatter' +import * as FileApi from '@/api/wms/file' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' @@ -870,6 +871,16 @@ const buttonTableClick = async (val, row) => { } else if (val == 'purchase_mainPlanSub') { // 采购审批通过 // handleApp(row.id) + // 校验是否上传调差附件,、价差合计、返利未税金额、索赔税额有一项是0的时候或者调差附件未上传的时候要提示未 + + const fileList = await FileApi.getFileList({ + tableId: row.masterId || row.id, + tableName: 'adjustmentAttachment' + }) + if (row.differencePriceTotalMain || row.discountAmount1 || row.claimTaxAmount || !fileList || fileList.length == 0) { + message.alertWarning('请上传调差附件!') + return + } // 校验是否可以开票 const res = await checkInvoicingCalendar() if (res?.flag) { @@ -1142,6 +1153,12 @@ const detailAnnexTable = ref([ tableName: 'statement', fileSize: 20 }, + { + label: t('ts.调差附件'), + prop: 'Annex', + tableName: 'adjustmentAttachment', + fileSize: 20 + }, { label: t('ts.其他附件'), prop: 'Annex',