From 368b525db5f3f4f82b13c074341708a46b9a4111 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 11 三月 2025 09:11:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev

---
 src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
index 3eb9521..9e063f1 100644
--- a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
@@ -15,7 +15,6 @@
 </template>
 
 <script>
-import ValueTable from "@/components/Table/value-table.vue";
 import UnPassRetestResult from "./unPassRetestResult.vue";
 import limsTable from "@/components/Table/lims-table.vue";
 import {getRetestResult, selectSampleAndProductByOrderId} from "@/api/business/rawMaterialOrder";
@@ -23,7 +22,7 @@
 export default {
   name: "dataLookVisible",
   // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
-  components: {limsTable, UnPassRetestResult, ValueTable},
+  components: {limsTable, UnPassRetestResult},
   props: {
     dataDialogVisible: {
       type: Boolean,
@@ -139,7 +138,7 @@
         this.entity.id = this.dataLookInfo.quarterOrderId
       }
       this.tableLoading = true
-      const params = {...this.entity}
+      const params = {...this.entity, ...this.page}
       selectSampleAndProductByOrderId(params).then(res => {
         this.tableLoading = false
         if (res.code === 200) {

--
Gitblit v1.9.3