From ff47a496cea8df5e98f65278369edc094f8d196e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 25 Dec 2024 16:29:55 +0800 Subject: [PATCH] =?UTF-8?q?YT-1769=E3=80=90=E9=87=87=E8=B4=AD=E7=B4=A2?= =?UTF-8?q?=E8=B5=94=E3=80=9112-23=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 5 ++-- src/locales/zh-CN.ts | 1 + src/utils/disposition/defaultButtons.ts | 12 ++++++++ .../purchaseClaimRequest/index.vue | 29 +++++++++++++------ 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index cbb323a08..bdf1a1b97 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1321,8 +1321,7 @@ export default { 创建开票申请: 'Create an invoice request?', 详情:'Detail', 退回:'Return', - 作废成功:'Invalid successfully' + 作废成功: 'Invalid successfully', + '索赔金额不能为0,请修改后提交。': 'The claim amount cannot be 0, please modify and submit.' }, - - } diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 1bd7512ce..9a2207db5 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1322,6 +1322,7 @@ export default { 创建开票申请: '创建开票申请', 作废成功:'作废成功', 退回: '退回', + '索赔金额不能为0,请修改后提交。':'索赔金额不能为0,请修改后提交。' }, } diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 5cdbd0bf8..f2752f177 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -1480,6 +1480,18 @@ export function mainSendBackBtn(option: any) { hasPermi: '' }) } +// 主列表-查看明细 +export function mainSeeDetailBtn(option: any) { + return __defaultBtnOption(option, { + label: t(`ts.查看明细`).replace('ts.', ''), + name: 'seeDetail', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} // 默认按钮规则 function __defaultBtnOption(option: any, specific: any) { return { diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue index 72e858f79..2b5b54577 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue @@ -267,6 +267,7 @@ const butttondata = (row, $index) => { return [] } return [ + defaultButtons.mainSeeDetailBtn(null), // 查看明细 defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseClaimRequest:sub' @@ -296,7 +297,10 @@ const butttondata = (row, $index) => { // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { - if (val == 'edit') { + if (val == 'seeDetail') { + // 查看明细 + openDetail(row, '单据号', row.number) + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'mainPlanSub') { @@ -304,7 +308,7 @@ const buttonTableClick = async (val, row) => { handleSub(row.masterId) } else if (val == 'mainPlanApp') { // 审批通过 - handleAgree(row.masterId) + handleAgree(row) } else if (val == 'mainPlanTur') { // 审批驳回 handleReject(row.masterId) @@ -361,13 +365,17 @@ const handleSub = async (masterId: number) => { } /** 审批通过按钮操作 */ -const handleAgree = async (masterId: number) => { +const handleAgree = async (row: any) => { + if (row.isApproved==1) { + message.error(t('ts.索赔金额不能为0,请修改后提交。')) + return + } try { // 关闭的二次确认 await message.confirm(t('ts.是否审批通过所选中数据?')) tableObject.loading = true // 发起关闭 - await PurchaseClaimRequestMainApi.agreePurchaseClaimRequestMain(masterId) + await PurchaseClaimRequestMainApi.agreePurchaseClaimRequestMain(row.masterId) message.success(t('ts.审批通过成功!')) tableObject.loading = false // 刷新列表 @@ -484,6 +492,7 @@ const flag = ref(false) // 主子数据 提交 const submitForm = async (formType, submitData) => { + flag.value=false let data = { ...submitData } if (data.masterId) { data.id = data.masterId @@ -510,11 +519,11 @@ const submitForm = async (formType, submitData) => { flag.value = true return } - if (obj.claimAmount == 0) { - message.error(`索赔金额不能为0!`) - flag.value = true - return - } + // if (obj.claimAmount == 0) { + // message.error(`索赔金额不能为0!`) + // flag.value = true + // return + // } }) if (flag.value) { return @@ -586,10 +595,12 @@ const submitFormDetail = async (formType, data) => { console.log(detailRef.value.formRef.dialogVisible) detailFormRef.value.dialogVisible = false detailRef.value.updateList() + getList() } catch { detailFormRef.value.formLoading = false } } + /** 初始化 **/ onMounted(async () => { getList()