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/warehouseManage/components/proDetail.vue |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/hazardousChemicals/warehouseManage/components/proDetail.vue b/src/views/hazardousChemicals/warehouseManage/components/proDetail.vue
index d6219a6..11322f4 100644
--- a/src/views/hazardousChemicals/warehouseManage/components/proDetail.vue
+++ b/src/views/hazardousChemicals/warehouseManage/components/proDetail.vue
@@ -68,7 +68,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>
@@ -116,6 +116,7 @@
     state: null,
     pageNum: 1,
     pageSize: 10,
+    companyId: null
   },
   total: 0,
   dataList: [],
@@ -143,7 +144,8 @@
     const val = JSON.parse(route.query.val)
     backValue.value.pageNum =val.pageNum;
     backValue.value.pageSize =val.pageSize;
-    data.queryParams.entryId =val.entryId
+    data.queryParams.entryId =val.entryId;
+    data.queryParams.companyId = val.companyId
   }
   await getList()
 })
@@ -160,10 +162,11 @@
 }
 const reset = () => {
   data.queryParams = {
-    entryId: null,
+    entryId: data.queryParams.entryId,
     state: null,
     pageNum: 1,
     pageSize: 10,
+    companyId: data.queryParams.companyId
   }
   getList()
 }
@@ -187,7 +190,7 @@
   dialogVisible.value = true
   nextTick(() => {
 
-    flowRef.value.openDialog('pro',val)
+    flowRef.value.openDialog('pro',val,val.companyId)
   })
 
 }

--
Gitblit v1.9.2