From 22e7433b674bd1fd81c3d6fd3bf45b6014e9b384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 24 Mar 2023 23:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=92=8C=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=A2=9E=E5=8A=A0=E9=87=8D=E9=87=8F=E7=9A=84=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/mixins/JeecgListMixin.js | 2 +- .../src/views/bill/dialog/BillDetail.vue | 5 ++ jshERP-web/src/views/report/MaterialStock.vue | 56 +++++++++++-------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index 2cdd637f..e067b126 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -446,7 +446,7 @@ export const JeecgListMixin = { let numKey = 'rowIndex' let totalRow = { [numKey]: '合计' } //需要合计的列 - let parseCols = 'initialStock,currentStock,currentStockPrice,initialAmount,thisMonthAmount,currentAmount,inSum,inSumPrice,' + + 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,' + 'needDebt,realNeedDebt,finishDebt,debt' diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue index 1d2911ba..51bfb727 100644 --- a/jshERP-web/src/views/bill/dialog/BillDetail.vue +++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue @@ -1084,6 +1084,7 @@ { title: '数量', dataIndex: 'operNumber'}, { title: '单价', dataIndex: 'unitPrice'}, { title: '金额', dataIndex: 'allPrice'}, + { title: '重量', dataIndex: 'weight'}, { title: '备注', dataIndex: 'remark'} ], retailBackColumns: [ @@ -1103,6 +1104,7 @@ { title: '数量', dataIndex: 'operNumber'}, { title: '单价', dataIndex: 'unitPrice'}, { title: '金额', dataIndex: 'allPrice'}, + { title: '重量', dataIndex: 'weight'}, { title: '备注', dataIndex: 'remark'} ], purchaseOrderColumns: [ @@ -1252,6 +1254,7 @@ { title: '数量', dataIndex: 'operNumber'}, { title: '单价', dataIndex: 'unitPrice'}, { title: '金额', dataIndex: 'allPrice'}, + { title: '重量', dataIndex: 'weight'}, { title: '备注', dataIndex: 'remark'} ], otherOutColumns: [ @@ -1271,6 +1274,7 @@ { title: '数量', dataIndex: 'operNumber'}, { title: '单价', dataIndex: 'unitPrice'}, { title: '金额', dataIndex: 'allPrice'}, + { title: '重量', dataIndex: 'weight'}, { title: '备注', dataIndex: 'remark'} ], allocationOutColumns: [ @@ -1288,6 +1292,7 @@ { title: '数量', dataIndex: 'operNumber'}, { title: '单价', dataIndex: 'unitPrice'}, { title: '金额', dataIndex: 'allPrice'}, + { title: '重量', dataIndex: 'weight'}, { title: '备注', dataIndex: 'remark'} ], assembleColumns: [ diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue index d0ac2b3d..80e52a06 100644 --- a/jshERP-web/src/views/report/MaterialStock.vue +++ b/jshERP-web/src/views/report/MaterialStock.vue @@ -7,7 +7,7 @@
- + - - - - - - - + - - - - 隐藏 - 显示 - - - - - + + 查询 打印 导出 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + - + - 总库存：{{currentStock}}，总库存金额：{{currentStockPrice}} + 总库存：{{currentStock}}，总库存金额：{{currentStockPrice}}，总重量：{{currentWeight}} +
@@ -167,7 +173,8 @@ {title: '库存', dataIndex: 'currentStock', sorter: (a, b) => a.currentStock - b.currentStock, width: 60, scopedSlots: { customRender: 'customRenderStock' } }, - {title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice, width: 80} + {title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice, width: 80}, + {title: '重量', dataIndex: 'currentWeight', sorter: (a, b) => a.currentWeight - b.currentWeight, width: 60} ], url: { list: "/material/getListWithStock" @@ -233,6 +240,7 @@ this.tableAddTotalRow(this.columns, this.dataSource) this.currentStock = res.data.currentStock; this.currentStockPrice = res.data.currentStockPrice; + this.currentWeight = res.data.currentWeight; } if(res.code===510){ this.$message.warning(res.data) @@ -250,11 +258,11 @@ this.$refs.materialInOutList.disableSubmit = false; }, exportExcel() { - let aoa = [['条码', '名称', '规格', '型号', '颜色', '类别', '单位', '单价', '初始库存', '库存', '库存金额']] + let aoa = [['条码', '名称', '规格', '型号', '颜色', '类别', '单位', '单价', '初始库存', '库存', '库存金额', '重量']] for (let i = 0; i < this.dataSource.length; i++) { let ds = this.dataSource[i] let item = [ds.mBarCode, ds.name, ds.standard, ds.model, ds.color, ds.categoryName, ds.unitName, - ds.purchaseDecimal, ds.initialStock, ds.currentStock, ds.currentStockPrice] + ds.purchaseDecimal, ds.initialStock, ds.currentStock, ds.currentStockPrice, ds.currentWeight] aoa.push(item) } openDownloadDialog(sheet2blob(aoa), '商品库存')