From d098e2e3a16837ad0a61c1a2df93b27c7d16bfd2 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Fri, 06 Sep 2024 17:10:29 +0800
Subject: [PATCH] 批量导入

---
 src/views/components/flowDetail.vue |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/components/flowDetail.vue b/src/views/components/flowDetail.vue
index a49ca9d..c8133fb 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>
@@ -54,7 +56,8 @@
   if(type === 'code'){
     state.form.code = value
   }else {
-    state.form = value
+
+    state.form = JSON.parse(JSON.stringify(value))
   }
 
   await getAllFlow()
@@ -79,7 +82,8 @@
           return {
             ...item,
             unit: item.productBasic.unit,
-            description: `${item.updateTime} ${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,
@@ -113,7 +117,8 @@
           return {
             ...item,
             unit:item.hazmatBasic.unit,
-            description: `${item.updateTime} ${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 ? '销售' : '',
+            description: `${item.updateTime}  ${item.user.departName ? item.user.departName +'部门'  : ''}   ${item.user.name}  进行了 `,
             size: 'large',
             type: 'primary',
             icon: MoreFilled,
@@ -141,7 +146,8 @@
             return {
               ...item,
               unit:item.hazmatBasic.unit,
-              description: `${item.updateTime} ${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 ? '销售' : '',
+              description: `${item.updateTime}  ${item.user.departName ? item.user.departName +'部门'  : ''}   ${item.user.name}  进行了 `,
               size: 'large',
               type: 'primary',
               icon: MoreFilled,
@@ -156,7 +162,8 @@
             return {
               ...item,
               unit:item.productBasic.unit,
-              description: `${item.updateTime} ${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