From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
index 81c4baa..c829dac 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,
@@ -63,7 +62,7 @@
} else if (params == 3) {
return '涓嶅垽瀹�'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
@@ -74,7 +73,7 @@
} else if (params == 3) {
return ''
} else {
- return ''
+ return null
}
}
},
@@ -91,7 +90,7 @@
this.getRetestResult(row);
},
disabled: (row, index) => {
- return row.insResult!==0
+ return row.insResult!=0
}
},
]
@@ -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