From 4d049a3c73cbfb4391185fdb5ecca0d4fac9faa2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 04 三月 2025 10:48:18 +0800
Subject: [PATCH] 修改检验值中无对应的数据展示
---
src/components/Table/lims-table.vue | 5 ++++-
src/views/business/productOrder/components/add.vue | 3 +++
src/views/business/inspectionTask/components/EditInspectionItem.vue | 31 ++++++++++++-------------------
src/views/business/inspectionTask/index.vue | 4 +++-
4 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index c63f778..aed6f4c 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -261,6 +261,9 @@
},
mounted() {
this.calculateSpanInfo();
+ this.$nextTick(() => {
+ this.$refs.multipleTable.doLayout();
+ });
},
methods: {
getWidth(row) {
@@ -443,7 +446,7 @@
}
>>>.el-table__body-wrapper::-webkit-scrollbar {
- height: 14px;
+ height: 10px;
/* 璁剧疆婊氬姩鏉″搴� */
}
</style>
diff --git a/src/views/business/inspectionTask/components/EditInspectionItem.vue b/src/views/business/inspectionTask/components/EditInspectionItem.vue
index c3116f0..b38e59c 100644
--- a/src/views/business/inspectionTask/components/EditInspectionItem.vue
+++ b/src/views/business/inspectionTask/components/EditInspectionItem.vue
@@ -6,20 +6,15 @@
width="80%"
@close="editInspectionDia = false"
>
- <TableCard :showTitle="false">
- <template v-slot:table>
- <lims-table
- :column="editColumn"
- :table-data="editTableData"
- :table-loading="editLoading"
- :page="page"
- height="600"
- style="padding: 0 15px"
- @pagination="pagination"
- >
- </lims-table>
- </template>
- </TableCard>
+ <lims-table
+ :column="editColumn"
+ :table-data="editTableData"
+ :table-loading="editLoading"
+ :page="page"
+ height="560"
+ @pagination="pagination"
+ >
+ </lims-table>
</el-dialog>
<el-dialog :visible.sync="editAskDia" title="淇敼" width="50%">
<el-form ref="form" :model="editForm" label-width="100px">
@@ -60,7 +55,6 @@
</template>
<script>
-import TableCard from "@/components/TableCard/index.vue";
import limsTable from "@/components/Table/lims-table.vue";
import {
selectSampleAndProductByOrderId,
@@ -69,7 +63,7 @@
export default {
name: "EditInspectionItem",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { TableCard, limsTable },
+ components: { limsTable },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
@@ -187,9 +181,8 @@
})
.then((res) => {
this.editLoading = false;
- if (res.code === 201) return;
- this.editTableData = res.data.body.records;
- this.page.total = res.data.body.total;
+ this.editTableData = res.data.records;
+ this.page.total = res.data.total;
})
.catch(() => {
this.editLoading = false;
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 47597ee..2e094e1 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -522,13 +522,15 @@
if (obj) {
return this.insResultList.find((m) => m.value == params).label;
} else {
- return ''
+ return null
}
},
formatType: (params) => {
let obj = this.insResultList.find((m) => m.value == params)
if (obj) {
return this.insResultList.find((m) => m.value == params).type;
+ } else {
+ return null
}
},
},
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 09deea7..ccd6a25 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -1706,6 +1706,9 @@
this.productList = row.insProduct
this.productList0 = JSON.parse(JSON.stringify(this.productList))
this.$refs.sampleTable.setCurrentRow(row)
+ this.$nextTick(() => {
+ this.$refs.productTable.doLayout();
+ });
setTimeout(() => {
this.productList.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
--
Gitblit v1.9.3