From 9e738e1bc1003ad2f9424052f68e016832d8f5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 13 Oct 2021 23:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=8A=A5=E8=A1=A8=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E5=80=BC=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=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/mixins/JeecgListMixin.js | 1 - jshERP-web/src/views/report/AccountReport.vue | 8 ++++---- jshERP-web/src/views/report/AllocationDetail.vue | 6 +++--- jshERP-web/src/views/report/BuyInReport.vue | 8 ++++---- jshERP-web/src/views/report/InDetail.vue | 6 +++--- jshERP-web/src/views/report/InMaterialCount.vue | 4 ++-- jshERP-web/src/views/report/InOutStockReport.vue | 12 ++++++------ jshERP-web/src/views/report/MaterialStock.vue | 8 ++++---- jshERP-web/src/views/report/OutDetail.vue | 6 +++--- jshERP-web/src/views/report/OutMaterialCount.vue | 4 ++-- jshERP-web/src/views/report/SaleOutReport.vue | 10 +++++----- jshERP-web/src/views/report/StockWarningReport.vue | 6 +++--- 12 files changed, 39 insertions(+), 40 deletions(-) diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index 1abff0bd0..256305d05 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -127,7 +127,6 @@ export const JeecgListMixin = { return filterObj(param); }, getQueryField() { - //TODO 字段权限控制 var str = "id,"; this.columns.forEach(function (value) { str += "," + value.dataIndex; diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue index ffe68f233..cdc4ca9f4 100644 --- a/jshERP-web/src/views/report/AccountReport.vue +++ b/jshERP-web/src/views/report/AccountReport.vue @@ -107,10 +107,10 @@ } }, { title: '名称', dataIndex: 'name', width: 100}, - { title: '编号', dataIndex: 'serialNo', width: 150, align: "center"}, - { title: '期初金额', dataIndex: 'initialAmount', width: 100, align: "center"}, - { title: '本月发生额', dataIndex: 'thisMonthAmount', width: 100, align: "center"}, - { title: '当前余额', dataIndex: 'currentAmount', width: 100, align: "center"}, + { 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: 200, scopedSlots: { customRender: 'action' } } diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue index b1aec6b15..20875c942 100644 --- a/jshERP-web/src/views/report/AllocationDetail.vue +++ b/jshERP-web/src/views/report/AllocationDetail.vue @@ -153,9 +153,9 @@ {title: '规格', dataIndex: 'standard', width: 50}, {title: '型号', dataIndex: 'model', width: 50}, {title: '单位', dataIndex: 'mUnit', width: 50}, - {title: '数量', dataIndex: 'operNumber', width: 60}, - {title: '单价', dataIndex: 'unitPrice', width: 60}, - {title: '金额', dataIndex: 'allPrice', width: 60}, + {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, + {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60}, + {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60}, {title: '调出仓库', dataIndex: 'dname', width: 80}, {title: '调入仓库', dataIndex: 'sname', width: 80}, {title: '调拨日期', dataIndex: 'operTime', width: 80}, diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue index 2bf50adbe..cb6d192cb 100644 --- a/jshERP-web/src/views/report/BuyInReport.vue +++ b/jshERP-web/src/views/report/BuyInReport.vue @@ -99,10 +99,10 @@ {title: '型号', dataIndex: 'materialModel', width: 80}, {title: '扩展信息', dataIndex: 'materialOther', width: 150}, {title: '单位', dataIndex: 'materialUnit', width: 80}, - {title: '进货数量', dataIndex: 'inSum', width: 80}, - {title: '进货金额', dataIndex: 'inSumPrice', width: 80}, - {title: '退货数量', dataIndex: 'outSum', width: 80}, - {title: '退货金额', dataIndex: 'outSumPrice', width: 80} + {title: '进货数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum, width: 80}, + {title: '进货金额', dataIndex: 'inSumPrice', sorter: (a, b) => a.inSumPrice - b.inSumPrice, width: 80}, + {title: '退货数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum, width: 80}, + {title: '退货金额', dataIndex: 'outSumPrice', sorter: (a, b) => a.outSumPrice - b.outSumPrice, width: 80} ], url: { list: "/depotItem/buyIn", diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue index 1adee5194..12086eabd 100644 --- a/jshERP-web/src/views/report/InDetail.vue +++ b/jshERP-web/src/views/report/InDetail.vue @@ -145,9 +145,9 @@ {title: '规格', dataIndex: 'standard', width: 50}, {title: '型号', dataIndex: 'model', width: 50}, {title: '单位', dataIndex: 'mUnit', width: 50}, - {title: '数量', dataIndex: 'operNumber', width: 60}, - {title: '单价', dataIndex: 'unitPrice', width: 60}, - {title: '金额', dataIndex: 'allPrice', width: 60}, + {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, + {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60}, + {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60}, {title: '供应商', dataIndex: 'sname', width: 80}, {title: '仓库', dataIndex: 'dname', width: 80}, {title: '入库日期', dataIndex: 'operTime', width: 80}, diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue index b3544453c..6ab62548f 100644 --- a/jshERP-web/src/views/report/InMaterialCount.vue +++ b/jshERP-web/src/views/report/InMaterialCount.vue @@ -135,8 +135,8 @@ {title: '型号', dataIndex: 'model', width: 100}, {title: '类型', dataIndex: 'categoryName', width: 120}, {title: '单位', dataIndex: 'materialUnit', width: 120}, - {title: '入库数量', dataIndex: 'numSum', width: 120}, - {title: '入库金额', dataIndex: 'priceSum', width: 120} + {title: '入库数量', dataIndex: 'numSum', sorter: (a, b) => a.numSum - b.numSum, width: 120}, + {title: '入库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum, width: 120} ], url: { list: "/depotHead/findInOutMaterialCount", diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue index 90b6e8c85..58000d63a 100644 --- a/jshERP-web/src/views/report/InOutStockReport.vue +++ b/jshERP-web/src/views/report/InOutStockReport.vue @@ -121,12 +121,12 @@ {title: '型号', dataIndex: 'materialModel', width: 80}, {title: '扩展信息', dataIndex: 'materialOther', width: 120}, {title: '单位', dataIndex: 'unitName', width: 80}, - {title: '单价', dataIndex: 'unitPrice', width: 60}, - {title: '上月结存数量', dataIndex: 'prevSum', width: 80}, - {title: '入库数量', dataIndex: 'inSum', width: 60}, - {title: '出库数量', dataIndex: 'outSum', width: 60}, - {title: '本月结存数量', dataIndex: 'thisSum', width: 80}, - {title: '结存金额', dataIndex: 'thisAllPrice', width: 60} + {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60}, + {title: '上月结存数量', dataIndex: 'prevSum', sorter: (a, b) => a.prevSum - b.prevSum, width: 80}, + {title: '入库数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum, width: 60}, + {title: '出库数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum, width: 60}, + {title: '本月结存数量', dataIndex: 'thisSum', sorter: (a, b) => a.thisSum - b.thisSum, width: 80}, + {title: '结存金额', dataIndex: 'thisAllPrice', sorter: (a, b) => a.thisAllPrice - b.thisAllPrice, width: 60} ], url: { list: "/depotItem/findByAll", diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue index 3e98ca668..af261418a 100644 --- a/jshERP-web/src/views/report/MaterialStock.vue +++ b/jshERP-web/src/views/report/MaterialStock.vue @@ -130,10 +130,10 @@ {title: '颜色', dataIndex: 'color', width: 80}, {title: '类别', dataIndex: 'categoryName', width: 80}, {title: '单位', dataIndex: 'unitName', width: 60}, - {title: '单价', dataIndex: 'purchaseDecimal', width: 60}, - {title: '初始库存', dataIndex: 'initialStock', width: 60}, - {title: '当前库存', dataIndex: 'currentStock', width: 60}, - {title: '当前库存金额', dataIndex: 'currentStockPrice', width: 80}, + {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' } } diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue index acfeaf260..aec8e0377 100644 --- a/jshERP-web/src/views/report/OutDetail.vue +++ b/jshERP-web/src/views/report/OutDetail.vue @@ -145,9 +145,9 @@ {title: '规格', dataIndex: 'standard', width: 50}, {title: '型号', dataIndex: 'model', width: 50}, {title: '单位', dataIndex: 'mUnit', width: 50}, - {title: '数量', dataIndex: 'operNumber', width: 60}, - {title: '单价', dataIndex: 'unitPrice', width: 60}, - {title: '金额', dataIndex: 'allPrice', width: 60}, + {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, + {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, + {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '客户', dataIndex: 'sname', width: 80}, {title: '仓库', dataIndex: 'dname', width: 80}, {title: '出库日期', dataIndex: 'operTime', width: 80}, diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue index ff5a7ae7f..a7cadb1f2 100644 --- a/jshERP-web/src/views/report/OutMaterialCount.vue +++ b/jshERP-web/src/views/report/OutMaterialCount.vue @@ -135,8 +135,8 @@ {title: '型号', dataIndex: 'model', width: 100}, {title: '类型', dataIndex: 'categoryName', width: 120}, {title: '单位', dataIndex: 'materialUnit', width: 120}, - {title: '出库数量', dataIndex: 'numSum', width: 120}, - {title: '出库金额', dataIndex: 'priceSum', width: 120} + {title: '出库数量', dataIndex: 'numSum', sorter: (a, b) => a.numSum - b.numSum, width: 120}, + {title: '出库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum, width: 120} ], url: { list: "/depotHead/findInOutMaterialCount", diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue index 47bc61658..0bd54d86b 100644 --- a/jshERP-web/src/views/report/SaleOutReport.vue +++ b/jshERP-web/src/views/report/SaleOutReport.vue @@ -99,11 +99,11 @@ {title: '型号', dataIndex: 'materialModel', width: 80}, {title: '扩展信息', dataIndex: 'materialOther', width: 150}, {title: '单位', dataIndex: 'materialUnit', width: 80}, - {title: '销售数量', dataIndex: 'outSum', width: 80}, - {title: '销售金额', dataIndex: 'outSumPrice', width: 80}, - {title: '退货数量', dataIndex: 'inSum', width: 80}, - {title: '退货金额', dataIndex: 'inSumPrice', width: 80}, - {title: '实际销售金额', dataIndex: 'outInSumPrice', width: 80} + {title: '销售数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum, width: 80}, + {title: '销售金额', dataIndex: 'outSumPrice', sorter: (a, b) => a.outSumPrice - b.outSumPrice, width: 80}, + {title: '退货数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum, width: 80}, + {title: '退货金额', dataIndex: 'inSumPrice', sorter: (a, b) => a.inSumPrice - b.inSumPrice, width: 80}, + {title: '实际销售金额', dataIndex: 'outInSumPrice', sorter: (a, b) => a.outInSumPrice - b.outInSumPrice, width: 100} ], url: { list: "/depotItem/saleOut" diff --git a/jshERP-web/src/views/report/StockWarningReport.vue b/jshERP-web/src/views/report/StockWarningReport.vue index bd23777ae..20af60a59 100644 --- a/jshERP-web/src/views/report/StockWarningReport.vue +++ b/jshERP-web/src/views/report/StockWarningReport.vue @@ -105,9 +105,9 @@ {title: '型号', dataIndex: 'mmodel', width: 80}, {title: '扩展信息', dataIndex: 'materialOther', width: 150}, {title: '单位', dataIndex: 'materialUnit', width: 80}, - {title: '安全存量', dataIndex: 'safetystock', width: 80}, - {title: '当前库存', dataIndex: 'currentNumber', width: 80}, - {title: '建议入库量', dataIndex: 'linjieNumber', width: 80} + {title: '安全存量', dataIndex: 'safetystock', sorter: (a, b) => a.safetystock - b.safetystock, width: 80}, + {title: '当前库存', dataIndex: 'currentNumber', sorter: (a, b) => a.currentNumber - b.currentNumber, width: 80}, + {title: '建议入库量', dataIndex: 'linjieNumber', sorter: (a, b) => a.linjieNumber - b.linjieNumber, width: 80} ], url: { list: "/depotItem/findStockWarningCount"