景聚庭库存导出与历史详情等查询功能调整

src/views/psiManagement/wareHouseSummary/WareHouseHistory.vue

@@ -273,10 +273,12 @@ export default {
 		view3(id) {
 			this.$refs.updateLossInfoForm.init('view', id)
 		},
-		init(tradeName, detailId) {
+		init(wareHouseType, tradeName, detailId) {
 			this.activeNameTop = 'wareHouse'
 			this.visible = true
+			this.wareHouseType = wareHouseType
 			this.tradeName = tradeName
+			this.searchForm.wareHouseType = wareHouseType
 			this.searchForm.tradeName = tradeName
 			this.searchForm2.tradeName = tradeName
 			this.searchForm3.goodsName = tradeName

src/views/psiManagement/wareHouseSummary/WareHouseSummaryList.vue

@@ -61,8 +61,8 @@
 					<vxe-column min-width="160" align="center" title="总量" field="allNumber"></vxe-column>
 					<vxe-column min-width="160" align="center" title="领用量" field="borrowNumber">
 						<template #default="scope">
-							<span v-if="scope.row.notSurplusStock">
-								{{ scope.row.notSurplusStock / scope.row.spec }}
+							<span v-if="scope.row.borrowNumber">
+								{{ calcDivide(scope.row.borrowNumber, scope.row.spec) }}
 							</span>
 							<span v-else>
 								0
@@ -73,7 +73,7 @@
 					<vxe-column min-width="160" align="center" title="报损量" field="lossNumber">
 						<template #default="scope">
 							<span v-if="scope.row.lossNumber">
-								{{ scope.row.lossNumber / scope.row.spec }}
+								{{ calcDivide(scope.row.lossNumber, scope.row.spec) }}
 							</span>
 							<span v-else>
 								0
@@ -228,11 +228,17 @@ export default {
 		this.refreshList()
 	},
 	methods: {
+		// 除法计算：四舍五入，最多保留4位小数，能除尽则不补多余0
+		calcDivide(a, b) {
+			if (!a || !b) return 0
+			return parseFloat((a / b).toFixed(4))
+		},
 		// 查看
 		view(row) {
 			// this.$refs.wareHouseHistoryPopup.init()
 			let detailId = this.commonJS.isNotEmpty(this.searchForm.supplierId) ? row.id : ''
-			this.$refs.wareHouseHistory.init(row.tradeName, detailId)
+			console.log(row)
+			this.$refs.wareHouseHistory.init(row.wareHouseType,row.tradeName, detailId)
 		},
 		// 修改商品名称
 		edit(tradeName, type, typeName) {