From 44e78691a77e9f6ed33f795d6d8db9c0bf81ac20 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 20 Oct 2021 09:11:03 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/form/InstallmentForm.vue | 2 +- .../modules/ExpenditureContractModule.vue | 2 +- .../revenueContract/modules/RevenueContractModule.vue | 2 +- .../arriveAndInvoicing/modules/ArriveModule.vue | 2 +- .../arriveAndInvoicing/modules/InvoicingModule.vue | 2 +- .../meetManage/modules/BatchInvocieModal.vue | 2 +- .../modules/BatchIncomePaymentModule.vue | 2 +- .../packManagement/modules/BatchInvoicingModule.vue | 2 +- .../packManagement/modules/PackCompanyModule.vue | 2 +- .../modules/GeneralProjectModule.vue | 2 +- .../modules/WorkingGroupMemberUnitModule.vue | 2 +- .../modules/WorkingGroupProjectModule.vue | 2 +- .../WholeInstituteStatisticsList.vue | 7 +++---- .../WorkingGroupPaymentStatisticsDetail.vue | 2 +- .../WorkingGroupPaymentStatisticsList.vue | 11 +++++++---- 15 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/components/form/InstallmentForm.vue b/src/components/form/InstallmentForm.vue index 72bd58a..491bf9f 100644 --- a/src/components/form/InstallmentForm.vue +++ b/src/components/form/InstallmentForm.vue @@ -161,7 +161,7 @@ export default { if (money(value)) { callback() } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } if (rules.field.indexOf('accountsReceivableAmount') > -1) { callback('请输入金额') diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index 204373c..0568089 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -641,7 +641,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } switch (rules.field) { case 'contractAmount': diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index 9150a6d..5fac175 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -754,7 +754,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } switch (rules.field) { case 'contractAmount': diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue index 4e56274..4c5157e 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue @@ -157,7 +157,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入到账金额') } diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue index c07c7d5..1c4666a 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue @@ -197,7 +197,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入到账金额') } diff --git a/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue b/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue index 95c19e0..991835c 100644 --- a/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue +++ b/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue @@ -174,7 +174,7 @@ export default { if(value && money(value)){ callback() }else { - callback('请输入正确格式的金额,') + callback('请输入合法的金额数字,最多2位小数,10位正数') } }, /* diff --git a/src/views/packManagement/modules/BatchIncomePaymentModule.vue b/src/views/packManagement/modules/BatchIncomePaymentModule.vue index 3894591..e008840 100644 --- a/src/views/packManagement/modules/BatchIncomePaymentModule.vue +++ b/src/views/packManagement/modules/BatchIncomePaymentModule.vue @@ -313,7 +313,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入来款金额') } diff --git a/src/views/packManagement/modules/BatchInvoicingModule.vue b/src/views/packManagement/modules/BatchInvoicingModule.vue index 9a9b750..886722e 100644 --- a/src/views/packManagement/modules/BatchInvoicingModule.vue +++ b/src/views/packManagement/modules/BatchInvoicingModule.vue @@ -409,7 +409,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入开票金额') } diff --git a/src/views/packManagement/modules/PackCompanyModule.vue b/src/views/packManagement/modules/PackCompanyModule.vue index 8314de3..e0785ef 100644 --- a/src/views/packManagement/modules/PackCompanyModule.vue +++ b/src/views/packManagement/modules/PackCompanyModule.vue @@ -271,7 +271,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入打包费用总计') }, diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue index 102309d..65b0377 100644 --- a/src/views/projectManagement/modules/GeneralProjectModule.vue +++ b/src/views/projectManagement/modules/GeneralProjectModule.vue @@ -510,7 +510,7 @@ export default { if (money(value)) { callback() } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入应收金额') } diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index da52e1e..d63c3c6 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -597,7 +597,7 @@ export default { callback() return } - callback('请输入正确格式的金额，金额格式为不超过十位整数，保留两位小数') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入应收金额') }, diff --git a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue index ad3ea0d..7d5340b 100644 --- a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue @@ -333,7 +333,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback() }, diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index e5eba1d..e4d83c0 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -96,6 +96,7 @@
+ @@ -132,7 +132,6 @@ :dataSource="footerDataSource" :showHeader="false" :pagination="false" - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" class="j-table-force-nowrap footer-table"> @@ -243,7 +242,7 @@ export default { title: '序号', dataIndex: 'title', align: 'center', - width: 60, + width: 60 }, { title: '来款项目', align: 'center', @@ -469,7 +468,7 @@ export default { } console.log('导出参数', param) downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param) - }, + } } } diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue index 8e32309..e48897f 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue @@ -73,6 +73,7 @@
+ diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue index e9a7cd7..1ff0b0f 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue @@ -34,7 +34,8 @@ - 查询 + 查询 重置 @@ -45,12 +46,15 @@
- 导出 + 导出 +
+ @@ -252,7 +255,7 @@ export default { } this.footerDataSource = [obj] if (res.result.pageList.total) { - this.ipagination.total = res.result.pageList.total + this.ipagination.total = res.result.pageList.total //清空列表选中 this.onClearSelected() } else {