From 9926cc18e1ea5efcab1e77518d6f0608ae788237 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Sat, 17 Aug 2024 00:27:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=97=E7=9A=84=E6=98=BE=E7=A4=BA=E5=92=8C=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/views/report/AccountReport.vue | 42 +++++++++-- .../src/views/report/AllocationDetail.vue | 36 ++++++++- jshERP-web/src/views/report/BuyInReport.vue | 37 ++++++++- .../src/views/report/CustomerAccount.vue | 41 ++++++++-- jshERP-web/src/views/report/InDetail.vue | 4 +- .../src/views/report/InMaterialCount.vue | 36 ++++++++- .../src/views/report/InOutStockReport.vue | 37 ++++++++- jshERP-web/src/views/report/MaterialStock.vue | 75 +++++++++++++------ jshERP-web/src/views/report/OutDetail.vue | 4 +- .../src/views/report/OutMaterialCount.vue | 36 ++++++++- .../src/views/report/RetailOutReport.vue | 37 ++++++++- jshERP-web/src/views/report/SaleOutReport.vue | 37 ++++++++- .../src/views/report/StockWarningReport.vue | 37 ++++++++- jshERP-web/src/views/report/VendorAccount.vue | 41 ++++++++-- 14 files changed, 434 insertions(+), 66 deletions(-) diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue index cd341cffa..364217233 100644 --- a/jshERP-web/src/views/report/AccountReport.vue +++ b/jshERP-web/src/views/report/AccountReport.vue @@ -46,9 +46,35 @@ :scroll="scroll" :loading="loading" @change="handleTableChange"> - - {{record.id?'流水':''}} - + + + + + + + + {{record.id?'流水':''}} + @@ -107,10 +133,13 @@ allMonthAmount: '', allCurrentAmount: '', tabKey: "1", - // 表头 - columns: [ + pageName: 'accountReport', + // 默认索引 + defDataIndex:['rowIndex','action','name','serialNo','initialAmount','thisMonthAmount','currentAmount'], + // 默认列 + defColumns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", + dataIndex: 'rowIndex', width:60, align:"center", slots: { title: 'customTitle' }, customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } @@ -132,6 +161,7 @@ }, created () { this.getAccountStatistics() + this.initColumnsSetting() }, methods: { getQueryParams() { diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue index 2ed8f7a43..2c1760066 100644 --- a/jshERP-web/src/views/report/AllocationDetail.vue +++ b/jshERP-web/src/views/report/AllocationDetail.vue @@ -107,6 +107,32 @@ :scroll="scroll" :loading="loading" @change="handleTableChange"> + + + + + + {{record.number}} @@ -185,10 +211,13 @@ operNumberTotalStr: '0', allPriceTotalStr: '0', tabKey: "1", - // 表头 - columns: [ + pageName: 'allocationDetail', + // 默认索引 + defDataIndex:['rowIndex','number','barCode','mname','standard','model','mUnit','operNumber','unitPrice','allPrice','dname','sname','operTime','newRemark'], + // 默认列 + defColumns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + dataIndex: 'rowIndex', width:40, align:"center", slots: { title: 'customTitle' }, customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } @@ -219,6 +248,7 @@ this.getDepotData() this.initSupplier() this.loadAllOrgaData() + this.initColumnsSetting() }, methods: { moment, diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue index f7a4eff62..bd9e3962d 100644 --- a/jshERP-web/src/views/report/BuyInReport.vue +++ b/jshERP-web/src/views/report/BuyInReport.vue @@ -89,6 +89,32 @@ :scroll="scroll" :loading="loading" @change="handleTableChange"> + + + + + + @@ -155,10 +181,14 @@ orgaTree: [], realityPriceTotal: '', tabKey: "1", - // 表头 - columns: [ + pageName: 'buyInReport', + // 默认索引 + defDataIndex:['rowIndex','barCode','materialName','materialStandard','materialModel','materialOther','materialUnit', + 'inSum','inSumPrice','outSum','outSumPrice','inOutSumPrice'], + // 默认列 + defColumns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + dataIndex: 'rowIndex', width:40, align:"center", slots: { title: 'customTitle' }, customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } @@ -184,6 +214,7 @@ this.initSupplier() this.getDepotData() this.loadAllOrgaData() + this.initColumnsSetting() }, methods: { moment, diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue index df1a8bad2..e7fcc945d 100644 --- a/jshERP-web/src/views/report/CustomerAccount.vue +++ b/jshERP-web/src/views/report/CustomerAccount.vue @@ -71,10 +71,37 @@ :scroll="scroll" :loading="loading" @change="handleTableChange"> + + + + + + {{record.id?'详情':''}} - + 期末应收 @@ -147,10 +174,13 @@ firstTotal: '', lastTotal: '', tabKey: "1", - // 表头 - columns: [ + pageName: 'customerAccount', + // 默认索引 + defDataIndex:['rowIndex','action','supplier','contacts','telephone','phoneNum','email','preNeed','debtMoney','backMoney','allNeed'], + // 默认列 + defColumns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + dataIndex: 'rowIndex', width:40, align:"center", slots: { title: 'customTitle' }, customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } @@ -167,7 +197,7 @@ {title: '本期欠款', dataIndex: 'debtMoney', sorter: (a, b) => a.debtMoney - b.debtMoney, width: 80}, {title: '本期收款', dataIndex: 'backMoney', sorter: (a, b) => a.backMoney - b.backMoney, width: 80}, {dataIndex: 'allNeed', sorter: (a, b) => a.allNeed - b.allNeed, width: 80, - slots: { title: 'customTitle' } + slots: { title: 'allNeedTitle' } } ], url: { @@ -177,6 +207,7 @@ }, created () { this.initSupplier() + this.initColumnsSetting() }, methods: { getQueryParams() { diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue index d62f207be..b83a88314 100644 --- a/jshERP-web/src/views/report/InDetail.vue +++ b/jshERP-web/src/views/report/InDetail.vue @@ -112,10 +112,10 @@