From f88d2029c7b2c66fcf0a9dffdc55da75b939c2ea Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Tue, 12 Aug 2025 10:55:54 +0800
Subject: [PATCH] 修改

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

diff --git a/src/views/components/flowDetail.vue b/src/views/components/flowDetail.vue
index 6ddfec2..a20c893 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>
@@ -34,6 +36,7 @@
 import {ElMessage} from "element-plus";
 import {getAllProFlow, getFlowByCode} from "@/api/hazardousChemicals/productRecord";
 import { MoreFilled } from '@element-plus/icons-vue'
+import Cookies from "js-cookie";
 const busRef = ref();
 const length = ref()
 const title = ref('')
@@ -47,16 +50,16 @@
   dataList: [],
   active: null
 })
-
+const userInfo = ref()
 
 const openDialog = async (type, value) => {
+  userInfo.value = JSON.parse(Cookies.get('userInfo'))
   title.value = type;
   if(type === 'code'){
     state.form.code = value
   }else {
-    state.form = value
+    state.form = JSON.parse(JSON.stringify(value))
   }
-
   await getAllFlow()
 }
 
@@ -65,11 +68,13 @@
     let param = {}
     if(title.value == 'pro'){
       param = {
-        productId: state.form.id
+        productId: state.form.id,
+        companyId: userInfo.value.companyId
       }
     }else {
       param = {
-        productId: state.form.productId
+        productId: state.form.productId,
+        companyId: userInfo.value.companyId
       }
     }
     const res = await getAllProFlow(param)
@@ -79,7 +84,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,
@@ -99,11 +105,13 @@
     let param = {}
     if(title.value == 'raw'){
       param = {
-        hazmatId: state.form.id
+        hazmatId: state.form.id,
+        companyId: userInfo.value.companyId
       }
     }else {
       param = {
-        hazmatId: state.form.hazmatId
+        hazmatId: state.form.hazmatId,
+        companyId: userInfo.value.companyId
       }
     }
     const res = await getAllRawFlow(param)
@@ -113,7 +121,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,
@@ -131,7 +140,8 @@
     }
   }else if(title.value == 'code'){
     const param = {
-      code: state.form.code
+      code: state.form.code,
+      companyId: userInfo.value.companyId
     }
     const res = await getFlowByCode(param)
     if(res.code == 200){
@@ -141,7 +151,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,
@@ -156,7 +167,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