From 0dd37d509b9f62a0bc313fbeccd3ca5c7cd36e55 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Wed, 19 Feb 2025 08:31:46 +0800
Subject: [PATCH] 特性、分类信息等修改

---
 src/views/components/flowDetail.vue |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/components/flowDetail.vue b/src/views/components/flowDetail.vue
index a0dcc6e..00b2bce 100644
--- a/src/views/components/flowDetail.vue
+++ b/src/views/components/flowDetail.vue
@@ -17,6 +17,8 @@
               :hollow="item.hollow"
           >
             {{ item.description }}
+            <span style="color: #03752e;font-weight: 600" v-if="item.num > 0">{{item.stateName}}</span>&nbsp;
+            <span style="color: #f6828e;font-weight: 600" v-else>{{item.stateName}}</span>&nbsp;
             <span style="color: #03752e" v-if="item.num > 0">{{item.num >0 ? '+' + item.num: item.num}}{{item.unit}}</span>
             <span style="color: #f6828e" v-else>{{item.num}}{{item.unit}}</span>
           </el-timeline-item>
@@ -80,7 +82,8 @@
           return {
             ...item,
             unit: item.productBasic.unit,
-            description: `${item.updateTime}   ${item.user.departName ? item.user.departName +'部门'  : ''}   ${item.user.name}  进行了  ${item.state == 0 ? '批量导入' : item.state == 3 ? '标签作废' : '销售'}`,
+            stateName: item.state ==0 ?'入库': item.state ==1 ? '取用' :item.state ==2 ? '归还': item.state ==3 ? '标签作废' : item.state ==4 ? '用尽登记':item.state ==5 ? '销售' : '',
+            description: `${item.updateTime}   ${item.user.departName ? item.user.departName +'部门'  : ''}   ${item.user.name}  进行了 `,
             size: 'large',
             type: 'primary',
             icon: MoreFilled,
@@ -114,7 +117,8 @@
           return {
             ...item,
             unit:item.hazmatBasic.unit,
-            description: `${item.updateTime}  ${item.user.departName ? item.user.departName +'部门'  : ''}   ${item.user.name}  进行了  ${item.state ==0?'批量导入': item.state ==1?'取用' :item.state ==2?'归还':item.state ==3?'标签作废' :''}`,
+            stateName: item.state ==0 ?'入库': item.state ==1 ? '取用' :item.state ==2 ? '归还': item.state ==3 ? '标签作废' : item.state ==4 ? '用尽登记':item.state ==5 ? '销售' : item.state ==6? '零头入库':'',
+            description: `${item.updateTime}  ${item.user.departName ? item.user.departName +'部门'  : ''}   ${item.user.name}  进行了 `,
             size: 'large',
             type: 'primary',
             icon: MoreFilled,
@@ -142,7 +146,8 @@
             return {
               ...item,
               unit:item.hazmatBasic.unit,
-              description: `${item.updateTime}  ${item.user.departName ? item.user.departName +'部门'  : ''}   ${item.user.name}  进行了  ${item.state ==0?'批量导入': item.state ==1?'取用' :item.state ==2?'归还':item.state ==3?'标签作废' :''}`,
+              stateName: item.state ==0 ?'入库': item.state ==1 ? '取用' :item.state ==2 ? '归还': item.state ==3 ? '标签作废' : item.state ==4 ? '用尽登记':item.state ==5 ? '销售' : item.state ==6? '零头入库':'',
+              description: `${item.updateTime}  ${item.user.departName ? item.user.departName +'部门'  : ''}   ${item.user.name}  进行了 `,
               size: 'large',
               type: 'primary',
               icon: MoreFilled,
@@ -157,7 +162,8 @@
             return {
               ...item,
               unit:item.productBasic.unit,
-              description: `${item.updateTime}  ${item.user.departName? item.user.departName  +'部门'  : ''}   ${item.user.name}  进行了  ${item.state == 0 ? '批量导入' : item.state == 3 ? '标签作废' : '销售'}`,
+              stateName: item.state ==0 ?'入库': item.state ==1 ? '取用' :item.state ==2 ? '归还': item.state ==3 ? '标签作废' : item.state ==4 ? '用尽登记':item.state ==5 ? '销售' : '',
+              description: `${item.updateTime}  ${item.user.departName? item.user.departName  +'部门'  : ''}   ${item.user.name}  进行了 `,
               size: 'large',
               type: 'primary',
               icon: MoreFilled,

--
Gitblit v1.9.2