From 48d5ab35c3fcdc6edca1278d1474a1b54a431191 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 21 八月 2024 16:00:33 +0800
Subject: [PATCH] bug修改
---
src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue b/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue
index ade8b00..6756fd2 100644
--- a/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue
+++ b/src/views/hazardousChemicals/electronicWarehouse/components/rawDetail.vue
@@ -44,7 +44,7 @@
<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,12 +54,12 @@
<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-if="scope.row.state === 0 || scope.row.state === 1">{{scope.row.remaining}}{{scope.row.hazmatBasic.unit}}</span>
<span v-else>—</span>
</template>
</el-table-column>
@@ -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"
--
Gitblit v1.9.2