给报表里面的数值增加排序功能

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;

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' }
           }

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},

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",

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},

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",

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",

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' }
           }

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},

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",

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"

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"