From 1ea0d85b0fe2e7e4427fd484a9342d964c831b3d Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 06 八月 2025 15:15:00 +0800
Subject: [PATCH] 修改

---
 src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue b/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue
index af05a7c..f2233a0 100644
--- a/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue
+++ b/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue
@@ -64,6 +64,8 @@
         </template>
       </el-table-column>
       <el-table-column label="所在仓库" prop="warehouseName" align="center" />
+      <el-table-column label="存储柜" prop="cupboardName" align="center" />
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" >
         <template #default="scope">
           <el-button link type="primary" v-if="scope.row.state ===0 || scope.row.state === 1" @click="editNum(scope.row)">零头修改</el-button>
@@ -257,11 +259,16 @@
   }
   for (let i = 0; i <= arr.length; i++) {
     if (arr[i] == row.basicId) {
-      if(row.remaining < row.hazmatBasic.metering){
+      if(row.state === 3 && row.remaining < row.hazmatBasic.metering){
         if (columnIndex === 11 || columnIndex === 10){
           return { color:' red' }
         }
+      }else if(row.remaining < row.hazmatBasic.metering){
+        if (columnIndex === 11 || columnIndex === 10){
+          return { color: '#ff9900' }
+        }
       }
+
     }
   }
 };

--
Gitblit v1.9.2