From 817f8b5f25e08499e7e90b38c002e74131d57c17 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 18 四月 2025 14:30:12 +0800
Subject: [PATCH] 修改

---
 src/views/hazardousChemicals/electronicWarehouse/components/proDetail.vue |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/hazardousChemicals/electronicWarehouse/components/proDetail.vue b/src/views/hazardousChemicals/electronicWarehouse/components/proDetail.vue
index 1e2249c..f908ed5 100644
--- a/src/views/hazardousChemicals/electronicWarehouse/components/proDetail.vue
+++ b/src/views/hazardousChemicals/electronicWarehouse/components/proDetail.vue
@@ -66,7 +66,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" >
         <template #default="scope">
           <el-button link type="primary" @click="viewFlow(scope.row)">取用记录</el-button>
-          <el-button link type="danger" v-if="scope.row.state === 0" @click="disCard(scope.row)">标签作废</el-button>
+<!--          <el-button link type="danger" v-if="scope.row.state === 0" @click="disCard(scope.row)">标签作废</el-button>-->
           <el-button link type="primary" @click="viewQR(scope.row)">查看二维码</el-button>
         </template>
       </el-table-column>
@@ -112,6 +112,8 @@
     state: null,
     pageNum: 1,
     pageSize: 10,
+    companyId: null
+
   },
   total: 0,
   dataList: [],
@@ -141,6 +143,7 @@
     backValue.value.pageSize =val.pageSize;
     data.queryParams.warehouseId =val.warehouseId
     data.queryParams.basicId =val.basicId
+    data.queryParams.companyId = val.companyId
   }
   await getList()
 })
@@ -157,6 +160,7 @@
 }
 const reset = () => {
   data.queryParams = {
+    companyId: data.queryParams.companyId,
     basicId: data.queryParams.basicId,
     warehouseId: data.queryParams.warehouseId,
     state: null,
@@ -205,8 +209,7 @@
 const viewFlow = (val) => {
   dialogVisible.value = true
   nextTick(() => {
-
-    flowRef.value.openDialog('pro',val)
+    flowRef.value.openDialog('pro',val,val.companyId)
   })
 
 }

--
Gitblit v1.9.2