From da1fa559f12ffc533beb6369bc6485ca303aad07 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Thu, 25 Jun 2026 15:11:39 +0800
Subject: [PATCH] 中科大支线—环境修改
---
src/views/components/flowDetail.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/views/components/flowDetail.vue b/src/views/components/flowDetail.vue
index c8133fb..6fecfaa 100644
--- a/src/views/components/flowDetail.vue
+++ b/src/views/components/flowDetail.vue
@@ -3,7 +3,7 @@
<div v-if="state.dataList.length>0">
<div class="title">
<span style="margin-right: 5px">{{state.form.name}}( {{state.form.productSn}} )</span>
- <span>二维码识别号:{{state.form.code}} </span>
+ <span>试剂编码:{{state.form.code}} </span>
</div>
<div class="content" >
<el-timeline style="max-width: 600px">
@@ -36,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('')
@@ -49,17 +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 = JSON.parse(JSON.stringify(value))
}
-
await getAllFlow()
}
@@ -68,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)
@@ -103,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)
@@ -117,7 +121,7 @@
return {
...item,
unit:item.hazmatBasic.unit,
- stateName: item.state ==0 ?'入库': item.state ==1 ? '取用' :item.state ==2 ? '归还': item.state ==3 ? '标签作废' : item.state ==4 ? '用尽登记':item.state ==5 ? '销售' : '',
+ 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',
@@ -136,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){
@@ -146,7 +151,7 @@
return {
...item,
unit:item.hazmatBasic.unit,
- stateName: item.state ==0 ?'入库': item.state ==1 ? '取用' :item.state ==2 ? '归还': item.state ==3 ? '标签作废' : item.state ==4 ? '用尽登记':item.state ==5 ? '销售' : '',
+ 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',
--
Gitblit v1.9.2