库存中的数量根据规格转换显示，入库修改后同步库存

src/views/psiManagement/wareHouse/WareHouseList.vue

@@ -398,11 +398,13 @@ export default {
 			})
 		},
 		stopUpdate(id) {
+			this.loading = true
 			this.wareHouseService.findById(id).then((data) => {
 				if (data.status !== '3') { // status的值不等于“撤回”，就弹出提示
 					this.$message.error('数据已发生改变或不存在，请刷新数据')
 					this.refreshList()
 				} else {
+					this.loading = false
 					this.$confirm(`确定要取消修改申请吗?`, '提示', {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
@@ -459,7 +461,7 @@ export default {
 						formTitle: `${data.taskName}`,
 						cUser: cUser,
 						title: `审批【${data.taskName || ''}】`,
-						routePath: '/materialManagement/wareHouse/WareHouseList',   // 数据处理后需要跳转的页面路径
+						routePath: '/psiManagement/wareHouse/WareHouseList',   // 数据处理后需要跳转的页面路径
 						wareHouseId: row.id
 					}
 				})
@@ -487,8 +489,8 @@ export default {
 		},
 		exportFile() {
 			const options = {
-				filename: `${this.moment(new Date()).format('YYYY-MM-DD')}入库申请数据导出`,
-				sheetName: '入库申请数据导出',
+				filename: `${this.moment(new Date()).format('YYYY-MM-DD')}入库数据导出`,
+				sheetName: '入库数据导出',
 				mode: 'all'
 			}
 			this.loading = true

src/views/psiManagement/wareHouseSummary/WareHouseHistory.vue

@@ -113,9 +113,16 @@
 									<span v-else>{{ scope.row.goodsName }}</span>
 								</template>
 							</vxe-column>
-							<vxe-column min-width="160" align="center" title="领用数量" field="collectNumber"></vxe-column>
-							<vxe-column min-width="160" align="center" title="当前库存"
-								field="currentInventory"></vxe-column>
+							<vxe-column min-width="160" align="center" title="领用数量" field="collectNumber">
+								<template #default="scope">
+									<span v-if="scope.row.collectNumber && scope.row.spec">{{
+										scope.row.collectNumber / scope.row.spec
+									}}</span>
+									<span v-else>--</span>
+								</template>
+							</vxe-column>
+							<vxe-column min-width="160" align="center" title="当前库存" field="currentInventory">
+							</vxe-column>
 							<vxe-column min-width="160" align="center" title="经办人" field="collectHandleBy"></vxe-column>
 							<vxe-column min-width="160" align="center" title="经办人部门"
 								field="collectHandleByOff"></vxe-column>

src/views/psiManagement/wareHouseSummary/WareHouseSummaryList.vue

@@ -62,7 +62,7 @@
 					<vxe-column min-width="160" align="center" title="领用量" field="borrowNumber">
 						<template #default="scope">
 							<span v-if="scope.row.borrowNumber">
-								{{ scope.row.borrowNumber }}
+								{{ 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.lossNumber / scope.row.spec }}
 							</span>
 							<span v-else>
 								0
@@ -290,8 +290,8 @@ export default {
 		},
 		exportFile() {
 			const options = {
-				filename: `${this.moment(new Date()).format('YYYY-MM-DD')}入库申请数据导出`,
-				sheetName: '入库申请数据导出',
+				filename: `${this.moment(new Date()).format('YYYY-MM-DD')}库存数据导出`,
+				sheetName: '库存数据导出',
 				mode: 'all'
 			}
 			this.loading = true