diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index 843330c3..1e2ea62c 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -453,7 +453,7 @@ export const JeecgListMixin = { //需要合计的列 let parseCols = 'initialStock,currentStock,currentStockPrice,currentWeight,initialAmount,thisMonthAmount,currentAmount,inSum,inSumPrice,' + 'inOutSumPrice,outSum,outSumPrice,outInSumPrice,operNumber,allPrice,numSum,priceSum,prevSum,thisSum,thisAllPrice,changeAmount,' + - 'allPrice,taxMoney,currentNumber,lowSafeStock,highSafeStock,lowCritical,highCritical,preNeed,debtMoney,backMoney,allNeed,' + + 'allPrice,taxMoney,currentNumber,lowCritical,highCritical,preNeed,debtMoney,backMoney,allNeed,' + 'needDebt,realNeedDebt,finishDebt,debt' columns.forEach(column => { let { key, dataIndex } = column diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue index 49f52529..58ffe771 100644 --- a/jshERP-web/src/views/report/AllocationDetail.vue +++ b/jshERP-web/src/views/report/AllocationDetail.vue @@ -184,7 +184,7 @@ title: '单据编号', dataIndex: 'number', width: 100, scopedSlots: { customRender: 'numberCustomRender' }, }, - {title: '条码', dataIndex: 'barCode', width: 80}, + {title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 80}, {title: '名称', dataIndex: 'mname', width: 120, ellipsis:true}, {title: '规格', dataIndex: 'standard', width: 60, ellipsis:true}, {title: '型号', dataIndex: 'model', width: 60, ellipsis:true}, diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue index 33a298a8..37083a13 100644 --- a/jshERP-web/src/views/report/BuyInReport.vue +++ b/jshERP-web/src/views/report/BuyInReport.vue @@ -157,7 +157,7 @@ return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', width: 160}, + {title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 160}, {title: '名称', dataIndex: 'materialName', width: 160, ellipsis:true}, {title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true}, {title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true}, diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue index 9d117da4..903613e3 100644 --- a/jshERP-web/src/views/report/CustomerAccount.vue +++ b/jshERP-web/src/views/report/CustomerAccount.vue @@ -151,10 +151,10 @@ {title: '手机号码', dataIndex: 'telephone', width: 100}, {title: '联系电话', dataIndex: 'phoneNum', width: 100}, {title: '电子邮箱', dataIndex: 'email', width: 100}, - {title: '期初应收', dataIndex: 'preNeed', width: 80}, - {title: '本期欠款', dataIndex: 'debtMoney', width: 80}, - {title: '本期收款', dataIndex: 'backMoney', width: 80}, - {dataIndex: 'allNeed', width: 80, + {title: '期初应收', dataIndex: 'preNeed', sorter: (a, b) => a.preNeed - b.preNeed, width: 80}, + {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' } } ], diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue index 54f9312e..15330720 100644 --- a/jshERP-web/src/views/report/InDetail.vue +++ b/jshERP-web/src/views/report/InDetail.vue @@ -186,7 +186,7 @@ title: '单据编号', dataIndex: 'number', width: 100, scopedSlots: { customRender: 'numberCustomRender' }, }, - {title: '条码', dataIndex: 'barCode', width: 80}, + {title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 80}, {title: '名称', dataIndex: 'mname', width: 120, ellipsis:true}, {title: '规格', dataIndex: 'standard', width: 60, ellipsis:true}, {title: '型号', dataIndex: 'model', width: 60, ellipsis:true}, diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue index ba1252f3..9de7211d 100644 --- a/jshERP-web/src/views/report/InMaterialCount.vue +++ b/jshERP-web/src/views/report/InMaterialCount.vue @@ -151,7 +151,7 @@ return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', width: 120}, + {title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 120}, {title: '名称', dataIndex: 'mName', width: 120, ellipsis:true}, {title: '规格', dataIndex: 'standard', width: 100, ellipsis:true}, {title: '型号', dataIndex: 'model', width: 100, ellipsis:true}, diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue index f3424a42..6db4c764 100644 --- a/jshERP-web/src/views/report/InOutStockReport.vue +++ b/jshERP-web/src/views/report/InOutStockReport.vue @@ -153,7 +153,7 @@ return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', width: 100}, + {title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 100}, {title: '名称', dataIndex: 'materialName', width: 120, ellipsis:true}, {title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true}, {title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true}, diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue index d11649a0..4ced6231 100644 --- a/jshERP-web/src/views/report/OutDetail.vue +++ b/jshERP-web/src/views/report/OutDetail.vue @@ -186,7 +186,7 @@ title: '单据编号', dataIndex: 'number', width: 100, scopedSlots: { customRender: 'numberCustomRender' }, }, - {title: '条码', dataIndex: 'barCode', width: 80}, + {title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 80}, {title: '名称', dataIndex: 'mname', width: 120, ellipsis:true}, {title: '规格', dataIndex: 'standard', width: 60, ellipsis:true}, {title: '型号', dataIndex: 'model', width: 60, ellipsis:true}, diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue index d523c8f7..83dd9a21 100644 --- a/jshERP-web/src/views/report/OutMaterialCount.vue +++ b/jshERP-web/src/views/report/OutMaterialCount.vue @@ -151,7 +151,7 @@ return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', width: 120}, + {title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 120}, {title: '名称', dataIndex: 'mName', width: 120, ellipsis:true}, {title: '规格', dataIndex: 'standard', width: 100, ellipsis:true}, {title: '型号', dataIndex: 'model', width: 100, ellipsis:true}, diff --git a/jshERP-web/src/views/report/RetailOutReport.vue b/jshERP-web/src/views/report/RetailOutReport.vue index 5e423133..1b8ae4c0 100644 --- a/jshERP-web/src/views/report/RetailOutReport.vue +++ b/jshERP-web/src/views/report/RetailOutReport.vue @@ -157,7 +157,7 @@ return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', width: 160}, + {title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 160}, {title: '名称', dataIndex: 'materialName', width: 160, ellipsis:true}, {title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true}, {title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true}, diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue index 8075876b..9fbd1c77 100644 --- a/jshERP-web/src/views/report/SaleOutReport.vue +++ b/jshERP-web/src/views/report/SaleOutReport.vue @@ -157,7 +157,7 @@ return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', width: 160}, + {title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 160}, {title: '名称', dataIndex: 'materialName', width: 160, ellipsis:true}, {title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true}, {title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true}, diff --git a/jshERP-web/src/views/report/StockWarningReport.vue b/jshERP-web/src/views/report/StockWarningReport.vue index 4f73bdef..6b7d4399 100644 --- a/jshERP-web/src/views/report/StockWarningReport.vue +++ b/jshERP-web/src/views/report/StockWarningReport.vue @@ -115,7 +115,7 @@ } }, {title: '仓库', dataIndex: 'depotName', width: 100, ellipsis:true}, - {title: '条码', dataIndex: 'barCode', width: 100}, + {title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 100}, {title: '名称', dataIndex: 'mname', width: 100, ellipsis:true}, {title: '规格', dataIndex: 'mstandard', width: 80, ellipsis:true}, {title: '型号', dataIndex: 'mmodel', width: 80, ellipsis:true}, diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue index 6c52a881..52a4e1d6 100644 --- a/jshERP-web/src/views/report/VendorAccount.vue +++ b/jshERP-web/src/views/report/VendorAccount.vue @@ -151,10 +151,10 @@ {title: '手机号码', dataIndex: 'telephone', width: 100}, {title: '联系电话', dataIndex: 'phoneNum', width: 100}, {title: '电子邮箱', dataIndex: 'email', width: 100}, - {title: '期初应付', dataIndex: 'preNeed', width: 80}, - {title: '本期欠款', dataIndex: 'debtMoney', width: 80}, - {title: '本期付款', dataIndex: 'backMoney', width: 80}, - {dataIndex: 'allNeed', width: 80, + {title: '期初应付', dataIndex: 'preNeed', sorter: (a, b) => a.preNeed - b.preNeed, width: 80}, + {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' } } ],