From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
index 6c0455b..c829dac 100644
--- a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
@@ -90,7 +90,7 @@
this.getRetestResult(row);
},
disabled: (row, index) => {
- return row.insResult!==0
+ return row.insResult!=0
}
},
]
@@ -138,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