From ae36dc20aea3d2f74d893305d9f94a1845d8fa20 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Fri, 06 Sep 2024 10:17:50 +0800
Subject: [PATCH] 增加公司编号
---
src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue b/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue
index ade8b00..2c88aab 100644
--- a/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue
+++ b/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue
@@ -37,14 +37,14 @@
</div>
</div>
<!-- 表格数据 -->
- <el-table v-loading="loading" :data="data.dataList" :border="true">
+ <el-table v-loading="loading" :data="data.dataList" :border="true" :cell-style="cellStyle">
<el-table-column label="序号" type="index" align="center" width="80" />
<el-table-column label="品名" prop="hazmatBasic.name" align="center" />
<el-table-column label="产品编号" prop="hazmatBasic.productSn" align="center" />
<el-table-column label="CAS号" prop="hazmatBasic.cas" align="center" />
<el-table-column label="厂家" prop="hazmatBasic.manufacturer" align="center" />
<el-table-column label="供应商" prop="hazmatBasic.supplier" align="center" />
- <el-table-column label="批号" prop="batchNo" align="center" width="120" />
+ <el-table-column label="二维码编号" prop="code" align="center" width="120" />
<el-table-column label="危险性质" prop="hazmatBasic.hazmatCharacter" align="center" />
<el-table-column label="最小包装" prop="hazmatBasic.productSn" align="center" width="120">
<template #default="scope">
@@ -54,13 +54,13 @@
<el-table-column label="入库时间" prop="updateTime" align="center" />
<el-table-column label="当前状态" prop="state" align="center">
<template #default="scope">
- <span>{{scope.row.state ===0 ? '在库' : scope.row.state === 1 ? '领用归还在库' :scope.row.state === 2? '领用中': scope.row.state === 3 ? '已用完' : scope.row.state === 4 ? '标签作废' : ''}}</span>
+ <span>{{scope.row.state ===0 || scope.row.state === 1 ? '在库' : scope.row.state === 2 ? '领用中': scope.row.state === 3 ? '已用完' : scope.row.state === 4 ? '标签作废' : ''}}</span>
</template>
</el-table-column>
<el-table-column label="在库余量" prop="remaining" align="center" >
<template #default="scope">
- <span v-if="scope.row.state === 0">{{scope.row.remaining}}{{scope.row.hazmatBasic.unit}}</span>
- <span v-else>—</span>
+ <span>{{scope.row.remaining}}{{scope.row.hazmatBasic.unit}}</span>
+
</template>
</el-table-column>
<el-table-column label="所在仓库" prop="warehouseName" align="center" />
@@ -82,7 +82,7 @@
<viewQRcode ref="dialogRef" @getList="getList"></viewQRcode>
<el-dialog
v-model="dialogVisible"
- width="600px"
+ width="650px"
:before-close="handleClose"
:close-on-press-escape="false"
:close-on-click-modal="false"
@@ -219,6 +219,24 @@
dialogVisible.value = false
}
+const cellStyle = ({ row, column,rowIndex, columnIndex }) => {
+ let arr = []
+ if (data.dataList !== null) {
+ data.dataList.filter((item, index) => {
+ arr.push(item.basicId)
+ })
+ }
+ for (let i = 0; i <= arr.length; i++) {
+ if (arr[i] == row.basicId) {
+ if(row.remaining < row.hazmatBasic.metering){
+ if (columnIndex === 11 || columnIndex === 10){
+ return { color:' red' }
+ }
+ }
+ }
+ }
+};
+
</script>
<style scoped lang="scss">
--
Gitblit v1.9.2