diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue index db8239bf..93e2f7c5 100644 --- a/jshERP-web/src/views/report/AccountReport.vue +++ b/jshERP-web/src/views/report/AccountReport.vue @@ -117,14 +117,14 @@ return (t !== '合计') ? (parseInt(index) + 1) : t } }, + { title: '账户流水', dataIndex: 'action', align:"center", width: 120, + scopedSlots: { customRender: 'action' } + }, { title: '名称', dataIndex: 'name', width: 150}, { title: '编号', dataIndex: 'serialNo', width: 150}, { title: '期初金额', dataIndex: 'initialAmount', sorter: (a, b) => a.initialAmount - b.initialAmount, width: 100}, { title: '本月发生额', dataIndex: 'thisMonthAmount', sorter: (a, b) => a.thisMonthAmount - b.thisMonthAmount, width: 100}, - { title: '当前余额', dataIndex: 'currentAmount', sorter: (a, b) => a.currentAmount - b.currentAmount, width: 100}, - { title: '账户流水', dataIndex: 'action', align:"center", width: 120, - scopedSlots: { customRender: 'action' } - } + { title: '当前余额', dataIndex: 'currentAmount', sorter: (a, b) => a.currentAmount - b.currentAmount, width: 100} ], url: { list: "/account/list", diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue index 2151a1a5..8138ddad 100644 --- a/jshERP-web/src/views/report/CustomerAccount.vue +++ b/jshERP-web/src/views/report/CustomerAccount.vue @@ -136,6 +136,9 @@ return (t !== '合计') ? (parseInt(index) + 1) : t } }, + {title: '欠款详情', dataIndex: 'action', align:"center", width: 80, + scopedSlots: { customRender: 'action' } + }, {title: '客户', dataIndex: 'supplier', width: 150, ellipsis:true}, {title: '联系人', dataIndex: 'contacts', width: 100, ellipsis:true}, {title: '手机号码', dataIndex: 'telephone', width: 100}, @@ -144,10 +147,7 @@ {title: '期初应收', dataIndex: 'preNeed', width: 80}, {title: '本期欠款', dataIndex: 'debtMoney', width: 80}, {title: '本期收款', dataIndex: 'backMoney', width: 80}, - {title: '期末应收', dataIndex: 'allNeed', width: 80}, - {title: '欠款详情', dataIndex: 'action', align:"center", width: 80, - scopedSlots: { customRender: 'action' } - } + {title: '期末应收', dataIndex: 'allNeed', width: 80} ], url: { list: "/depotHead/getStatementAccount", diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue index 2fc706ba..91486475 100644 --- a/jshERP-web/src/views/report/MaterialStock.vue +++ b/jshERP-web/src/views/report/MaterialStock.vue @@ -146,6 +146,9 @@ return (t !== '合计') ? (parseInt(index) + 1) : t } }, + {title: '库存流水', dataIndex: 'action', align:"center", width: 100, + scopedSlots: { customRender: 'action' } + }, {title: '条码', dataIndex: 'mBarCode', width: 80}, {title: '名称', dataIndex: 'name', width: 140, ellipsis:true}, {title: '规格', dataIndex: 'standard', width: 80, ellipsis:true}, @@ -156,10 +159,7 @@ {title: '单价', dataIndex: 'purchaseDecimal', sorter: (a, b) => a.purchaseDecimal - b.purchaseDecimal, width: 60}, {title: '初始库存', dataIndex: 'initialStock', sorter: (a, b) => a.initialStock - b.initialStock, width: 60}, {title: '库存', dataIndex: 'currentStock', sorter: (a, b) => a.currentStock - b.currentStock, width: 60}, - {title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice, width: 80}, - {title: '库存流水', dataIndex: 'action', align:"center", width: 100, - scopedSlots: { customRender: 'action' } - } + {title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice, width: 80} ], url: { list: "/material/getListWithStock" diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue index 03b2a7c0..8f31de06 100644 --- a/jshERP-web/src/views/report/VendorAccount.vue +++ b/jshERP-web/src/views/report/VendorAccount.vue @@ -136,6 +136,9 @@ return (t !== '合计') ? (parseInt(index) + 1) : t } }, + {title: '欠款详情', dataIndex: 'action', align:"center", width: 80, + scopedSlots: { customRender: 'action' } + }, {title: '供应商', dataIndex: 'supplier', width: 150, ellipsis:true}, {title: '联系人', dataIndex: 'contacts', width: 100, ellipsis:true}, {title: '手机号码', dataIndex: 'telephone', width: 100}, @@ -144,10 +147,7 @@ {title: '期初应付', dataIndex: 'preNeed', width: 80}, {title: '本期欠款', dataIndex: 'debtMoney', width: 80}, {title: '本期付款', dataIndex: 'backMoney', width: 80}, - {title: '期末应付', dataIndex: 'allNeed', width: 80}, - {title: '欠款详情', dataIndex: 'action', align:"center", width: 80, - scopedSlots: { customRender: 'action' } - } + {title: '期末应付', dataIndex: 'allNeed', width: 80} ], url: { list: "/depotHead/getStatementAccount",