diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue index 60946a271..db068544d 100644 --- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue @@ -242,7 +242,7 @@ handleClickAdd() { let organId = this.form.getFieldValue('organId') if(organId){ - this.$refs.debtBillList.show(organId, '出库', '销售', '客户', "0") + this.$refs.debtBillList.show(organId, '出库', '销售', '客户', "") this.$refs.debtBillList.title = "选择销售出库欠款单据" } else { this.$message.warning('请选择客户!'); diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue index 2eded369e..4f49b84a2 100644 --- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue @@ -246,7 +246,7 @@ handleClickAdd() { let organId = this.form.getFieldValue('organId') if(organId){ - this.$refs.debtBillList.show(organId, '入库', '采购', '供应商', "0") + this.$refs.debtBillList.show(organId, '入库', '采购', '供应商', "") this.$refs.debtBillList.title = "选择采购入库欠款单据" } else { this.$message.warning('请选择供应商!'); diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue index 4e9fa4846..b2a5df1e5 100644 --- a/jshERP-web/src/views/report/AccountReport.vue +++ b/jshERP-web/src/views/report/AccountReport.vue @@ -88,6 +88,9 @@ name:'', serialNo:'' }, + ipagination:{ + pageSizeOptions: ['10', '100', '200'] + }, allMonthAmount: '', allCurrentAmount: '', tabKey: "1", @@ -145,8 +148,8 @@ let aoa = [['名称', '编号', '期初金额', '本月发生额', '账户流水']] for (let i = 0; i < this.dataSource.length; i++) { let ds = this.dataSource[i] - let itemDevice = [ds.name, ds.serialNo, ds.initialAmount, ds.thisMonthAmount, ds.currentAmount] - aoa.push(itemDevice) + let item = [ds.name, ds.serialNo, ds.initialAmount, ds.thisMonthAmount, ds.currentAmount] + aoa.push(item) } openDownloadDialog(sheet2blob(aoa), '账户统计') } diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue index bd8b979bc..298271161 100644 --- a/jshERP-web/src/views/report/AllocationDetail.vue +++ b/jshERP-web/src/views/report/AllocationDetail.vue @@ -57,7 +57,8 @@ 查询 - 打印 + 打印 + 导出 @@ -91,7 +92,7 @@