From 1ea0d85b0fe2e7e4427fd484a9342d964c831b3d Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Wed, 06 Aug 2025 15:15:00 +0800
Subject: [PATCH] 修改
---
src/views/hazardousChemicals/electronicWarehouse/components/rawTable.vue | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/src/views/hazardousChemicals/electronicWarehouse/components/rawTable.vue b/src/views/hazardousChemicals/electronicWarehouse/components/rawTable.vue
index 0be5cc3..2ce5fb6 100644
--- a/src/views/hazardousChemicals/electronicWarehouse/components/rawTable.vue
+++ b/src/views/hazardousChemicals/electronicWarehouse/components/rawTable.vue
@@ -36,11 +36,35 @@
</template>
</el-table-column>
<!-- <el-table-column label="批号" prop="batchNo" align="center" width="120" />-->
- <el-table-column label="当前库存" prop="stock" align="center" width="120" />
- <el-table-column label="不完整归还" prop="missStock" align="center" width="120" />
- <el-table-column label="安全库存" prop="hazmatBasic.safeNum" align="center" width="120" />
- <el-table-column label="所在仓库" prop="warehouseName" align="center" >
+ <el-table-column label="当前库存" prop="stock" align="center" width="120">
+ <template #default="scope">
+ <el-tooltip
+ v-if="scope.row.stock +scope.row.missStock < scope.row.hazmatBasic.safeNum"
+ class="box-item"
+ effect="light"
+ :content="`当前库存小于安全库存（${scope.row.hazmatBasic.safeNum}）`"
+ placement="top"
+ >
+ <span style="cursor: pointer">{{scope.row.stock}}</span>
+ </el-tooltip>
+ </template>
</el-table-column>
+ <el-table-column label="不完整归还" prop="missStock" align="center" width="120" >
+ <template #default="scope">
+ <el-tooltip
+ v-if="scope.row.stock +scope.row.missStock < scope.row.hazmatBasic.safeNum"
+ class="box-item"
+ effect="light"
+ :content="`当前库存小于安全库存（${scope.row.hazmatBasic.safeNum}）`"
+ placement="top"
+ >
+ <span style="cursor: pointer">{{scope.row.missStock}}</span>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ <el-table-column label="安全库存" prop="hazmatBasic.safeNum" align="center" width="120" />
+ <el-table-column label="所在仓库" prop="warehouseName" align="center" />
+ <el-table-column label="存储柜" prop="cupboardName" align="center" />
<el-table-column label="创建时间" prop="hazmatBasic.createTime" align="center" width="120" />
<!-- <el-table-column label="状态" prop="state" align="center">-->
<!-- <template #default="scope">-->
@@ -117,11 +141,6 @@
const res = await getRawList(data.queryParams)
if(res.code == 200){
data.dataList = res.data.list
- data.dataList.forEach(item => {
- if(item.stock+item.missStock < item.hazmatBasic.safeNum){
- selectValue.value.push(item)
- }
- })
data.total = res.data.total
}else{
ElMessage.warning(res.message)
@@ -182,17 +201,18 @@
const cellStyle = ({ row, column,rowIndex, columnIndex }) => {
let arr = []
- if (selectValue.value !== null) {
- selectValue.value.filter((item, index) => {
+ if (data.dataList !== null) {
+ data.dataList.filter((item, index) => {
arr.push(item.basicId)
})
}
for (var i = 0; i <= arr.length; i++) {
- if (arr[i] == row.basicId) {
- if (columnIndex === 8 || columnIndex === 9 || columnIndex === 10){
- return { backgroundColor: '#FFD7CC !important',color:' red' }
+ if (arr[i] === row.basicId) {
+ if(row.stock + row.missStock < row.hazmatBasic.safeNum){
+ if (columnIndex === 8 || columnIndex === 9){
+ return { backgroundColor: '#FFD7CC !important',color:' red' }
+ }
}
-
}
}
};
--
Gitblit v1.9.2