From b44a8a62783e53fe63c41fdc73d19507c923bc84 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 25 Apr 2025 17:08:49 +0800 Subject: [PATCH 1/5] =?UTF-8?q?YT-2540=E3=80=8A=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=E3=80=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=AD=E3=80=90=E8=B4=A2=E5=8A=A1=E9=80=9A=E8=BF=87=E3=80=91?= =?UTF-8?q?=E3=80=90=E8=B4=A2=E5=8A=A1=E9=A9=B3=E5=9B=9E=E3=80=91=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=94=BE=E5=88=B0=E6=9B=B4=E5=A4=9A=E9=87=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain/index.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 6cec35446..33c948e02 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -819,15 +819,6 @@ const butttondata = (row, $index) => { hasPermi: 'wms:supplierinvoice-request-main:financeApp', link: true // 文本展现按钮 }, - { - label: t('ts.财务驳回'), - name: 'finance_mainPlanTur', - hide: isShowMainButton(row, ['4']), - type: 'danger', - color: '', - link: true, // 文本展现按钮 - hasPermi: 'wms:supplierinvoice-request-main:financeRej' - }, defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update', hide: isShowMainButton(row, ['1', '3', '6', '7']) @@ -851,6 +842,14 @@ const butttondata = (row, $index) => { color: '', link: true, // 文本展现按钮 hasPermi: '' + },{ + label: t('ts.财务驳回'), + name: 'finance_mainPlanTur', + hide: isShowMainButton(row, ['4']), + type: 'danger', + color: '', + link: true, // 文本展现按钮 + hasPermi: 'wms:supplierinvoice-request-main:financeRej' } ,{ label: t('导出对账单明细'), @@ -860,7 +859,8 @@ const butttondata = (row, $index) => { color: '', link: true, // 文本展现按钮 hasPermi: 'wms:supplierinvoice-request-main:export_statement_detail' - } + }, + ] } From 547c1ac2e9567424c202883902a5aa3448f8c2bc Mon Sep 17 00:00:00 2001 From: zhang_li Date: Sat, 26 Apr 2025 12:40:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?YT-2543=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E5=88=9B=E5=BB=BA=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=95=8C=E9=9D=A2=EF=BC=9A1=E3=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=EF=BC=9A?= =?UTF-8?q?=E5=B7=B2=E5=88=86=E6=91=8A=E6=A8=A1=E5=85=B7=E6=9C=AA=E7=A8=8E?= =?UTF-8?q?=E9=87=91=E9=A2=9D=EF=BC=8C=E5=B7=B2=E5=88=86=E6=91=8A=E6=A8=A1?= =?UTF-8?q?=E5=85=B7=E7=A8=8E=E9=A2=9D=E3=80=81=E6=A8=A1=E5=85=B7=E7=A8=8E?= =?UTF-8?q?=E9=A2=9D=E5=B7=AE=E5=BC=82=E4=B8=89=E4=B8=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B52=E3=80=81=E5=8E=BB=E6=8E=89=E6=A8=A1?= =?UTF-8?q?=E5=85=B7=E6=9C=AA=E7=A8=8E=E5=B0=BE=E5=B7=AE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA3=E3=80=81=E4=B8=8A=E8=BF=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=AE=A1=E7=AE=97=E5=85=AC=E5=BC=8F=E5=A6=82=E4=B8=8B?= =?UTF-8?q?=EF=BC=9A=E5=B7=B2=E5=88=86=E6=91=8A=E6=A8=A1=E5=85=B7=E6=9C=AA?= =?UTF-8?q?=E7=A8=8E=E9=87=91=E9=A2=9D=3D=EF=BC=88=E5=B7=B2=E5=88=86?= =?UTF-8?q?=E6=91=8A=E5=93=81=E7=95=AA=E6=95=B0=E9=87=8F*=E5=88=86?= =?UTF-8?q?=E6=91=8A=E5=8D=95=E4=BB=B7=EF=BC=89=E4=BF=9D=E7=95=99=E4=B8=A4?= =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0=20=E5=90=8E=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E5=BC=84=E6=B1=82=E5=92=8C=E5=B7=B2=E5=88=86=E6=91=8A=E6=A8=A1?= =?UTF-8?q?=E5=85=B7=E7=A8=8E=E9=A2=9D=3D=EF=BC=88=EF=BC=88=E5=B7=B2?= =?UTF-8?q?=E5=88=86=E6=91=8A=E5=93=81=E7=95=AA=E6=95=B0=E9=87=8F*?= =?UTF-8?q?=E5=88=86=E6=91=8A=E5=8D=95=E4=BB=B7=EF=BC=89=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E4=B8=A4=E4=BD=8D=E5=B0=8F=E6=95=B0*=E7=A8=8E=E7=8E=87?= =?UTF-8?q?=EF=BC=89=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E5=90=8E=E6=B1=87=E6=80=BB=E6=B1=82=E5=92=8C=E6=A8=A1=E5=85=B7?= =?UTF-8?q?=E6=9C=AA=E7=A8=8E=E5=B7=AE=E5=BC=82=3D=E5=B7=B2=E5=88=86?= =?UTF-8?q?=E6=91=8A=E6=A8=A1=E5=85=B7=E6=9C=AA=E7=A8=8E=E9=87=91=E9=A2=9D?= =?UTF-8?q?-=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A=E6=9C=AA=E7=A8=8E?= =?UTF-8?q?=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerSaleInvoiceBasicForm.vue | 31 ++++++++----- .../customerSaleInvoiceRequestMain.data.ts | 46 +++++++++++++++++-- 2 files changed, 62 insertions(+), 15 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue index 0f96a15ff..18ab4b2cb 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue @@ -42,7 +42,9 @@ taxAmountDiff = 0, rebateTax = 0, moldUntaxedAmount=0, - materialsUntaxedAmount=0 + materialsUntaxedAmount=0, + alreadyMoldUntaxedAmount=0 + } = formModel // 2、系统税额：每条数据的合同价格X可开票数量，计算结果取两位小数之后*税率的计算结果，再保留2位。所有子表数据再求和 if (formType == 'update') { @@ -62,9 +64,8 @@ let moldTaxAmount = Number(Number(moldUntaxedAmount) * Number(taxRate) * 0.01).toFixed(2) // 6、主数据材料税额 materialsTaxAmount = 材料未税金额*税率/100 保留两位小数 let materialsTaxAmount = Number(Number(materialsUntaxedAmount) * Number(taxRate) * 0.01).toFixed(2) - // 所有明细行模具分摊单价*数量保留两位小数之后累加 - let allAmount = tableData.reduce((prev, item) =>prev + Number((Number(item['allocationPrice'])*Number(item['qty'])).toFixed(2)),0).toFixed(2) - + // 8、主数据模具税额 alreadyMoldTaxAmount = （已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和 + let alreadyMoldTaxAmount = tableData.reduce((prev, item) => prev + Number((Number(item['allocationPrice']) * Number(item['qty']) * Number(taxRate) * 0.01).toFixed(2)), 0).toFixed(2) formRef.value.setValues({ // 主数据税额 taxAmount:mainTaxAmount, @@ -78,9 +79,8 @@ materialsTaxAmount: materialsTaxAmount, // 主数据-材料含税金额= 材料未税金额+材料税额 materialsTaxTotal: (Number(materialsUntaxedAmount) + Number(materialsTaxAmount)).toFixed(2), - - // 主数据模具未税尾差 allocationDifferenceBeforeTax : 模具未税金额 减去 系统明细中品番数量*模具单价 保留两位小数后汇总金额 - // allocationDifferenceBeforeTax: (Number(moldUntaxedAmount) - Number(allAmount)).toFixed(2), + // 主数据已分摊模具税额 + alreadyMoldTaxAmount: alreadyMoldTaxAmount, }) } } @@ -100,9 +100,11 @@ let materialsUntaxedAmount = tableData.reduce((prev, item) =>prev + Number((Number(item['price'])*Number(item['qty'])).toFixed(2)),0).toFixed(2) // 6、主数据材料税额 materialsTaxAmount = 材料未税金额*税率/100 保留两位小数 let materialsTaxAmount = Number(Number(materialsUntaxedAmount) * Number(taxRate) * 0.01).toFixed(2) - // 所有明细行模具分摊单价*数量保留两位小数之后累加 - let allAmount = tableData.reduce((prev, item) =>prev + Number((Number(item['allocationPrice'])*Number(item['qty'])).toFixed(2)),0).toFixed(2) - + //  7、已分摊模具未税金额=（已分摊品番数量*分摊单价）保留两位小数 后汇总弄求和 + let alreadyMoldUntaxedAmount = tableData.reduce((prev, item) =>prev + Number((Number(item['allocationPrice'])*Number(item['qty'])).toFixed(2)),0).toFixed(2) + // 8、主数据模具税额 alreadyMoldTaxAmount = （已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和 + let alreadyMoldTaxAmount = tableData.reduce((prev, item) => prev + Number((Number((Number(item['allocationPrice']) * Number(item['qty'])).toFixed(2)) * Number(taxRate) * 0.01).toFixed(2)), 0).toFixed(2) + const sumObject = { // 主数据未税金额 beforeTaxAmount:mainBeforeTaxAmount, @@ -122,8 +124,13 @@ materialsTaxAmount: materialsTaxAmount, // 主数据-材料含税金额= 材料未税金额+材料税额 materialsTaxTotal: (Number(materialsUntaxedAmount) + Number(materialsTaxAmount)).toFixed(2), - // 主数据模具未税尾差 allocationDifferenceBeforeTax : 模具未税金额 减去 系统明细中品番数量*模具单价 保留两位小数后汇总金额 - allocationDifferenceBeforeTax: (Number(moldUntaxedAmount) - Number(allAmount)).toFixed(2), + + // 主数据已分摊模具未税金额 + alreadyMoldUntaxedAmount: alreadyMoldUntaxedAmount, + // 主数据已分摊模具税额 + alreadyMoldTaxAmount: alreadyMoldTaxAmount, + // 主数据模具模具税额差异=已分摊模具未税金额-模具分摊未税金额 + moldMoldTaxAmountDiff: (Number(alreadyMoldUntaxedAmount) - Number(moldUntaxedAmount)).toFixed(2), } formRef.value.setValues(sumObject) } diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts index 859670da0..ab2bb7d20 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts @@ -290,9 +290,49 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ disabled: true, } }, - }, { - label: '模具未税尾差', - field: 'allocationDifferenceBeforeTax', + }, + // { + // label: '模具未税尾差', + // field: 'allocationDifferenceBeforeTax', + // formatter: accountantFormart, + // table: { + // width: 160 + // }, + // form: { + // componentProps: { + // disabled: true, + // } + // }, + // }, + { + label: '已分摊模具未税金额', + field: 'alreadyMoldUntaxedAmount', + formatter: accountantFormart, + table: { + width: 160 + }, + form: { + componentProps: { + disabled: true, + } + }, + }, + { + label: '已分摊模具税额', + field: 'alreadyMoldTaxAmount', + formatter: accountantFormart, + table: { + width: 160 + }, + form: { + componentProps: { + disabled: true, + } + }, + }, + { + label: '模具税额差异', + field: 'moldMoldTaxAmountDiff', formatter: accountantFormart, table: { width: 160 From ed3f8c6ba45b0c7b862fd4a79c6d51d18ae79fd4 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Sat, 26 Apr 2025 12:50:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=8C=E4=B8=8A=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E9=9C=80=E6=94=B9=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E6=A8=A1=E5=85=B7=E6=9C=AA=E7=A8=8E=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerSaleInvoiceBasicForm.vue | 4 ++-- .../customerSaleInvoiceRequestMain.data.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue index 18ab4b2cb..ef9bb83b7 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue @@ -129,8 +129,8 @@ alreadyMoldUntaxedAmount: alreadyMoldUntaxedAmount, // 主数据已分摊模具税额 alreadyMoldTaxAmount: alreadyMoldTaxAmount, - // 主数据模具模具税额差异=已分摊模具未税金额-模具分摊未税金额 - moldMoldTaxAmountDiff: (Number(alreadyMoldUntaxedAmount) - Number(moldUntaxedAmount)).toFixed(2), + // 主数据模具未税差异=已分摊模具未税金额-模具分摊未税金额 + moldTaxAmountDiff: (Number(alreadyMoldUntaxedAmount) - Number(moldUntaxedAmount)).toFixed(2), } formRef.value.setValues(sumObject) } diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts index ab2bb7d20..cfa61efed 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts @@ -331,8 +331,8 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ }, }, { - label: '模具税额差异', - field: 'moldMoldTaxAmountDiff', + label: '模具未税差异', + field: 'moldTaxAmountDiff', formatter: accountantFormart, table: { width: 160 From 8d05428397813091c40f2918030843d11c1ed7df Mon Sep 17 00:00:00 2001 From: zhang_li Date: Sat, 26 Apr 2025 14:08:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E4=B8=8D?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRequestMain/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue index c327618fc..3f2c1072f 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue @@ -61,6 +61,7 @@ @buttonBaseClick="detailButtonBaseClick" @searchTableSuccessDetail="searchTableSuccessDetail" + @handleMainFefresh='handleMainFefresh' >