From 9003bd663cfeea9225a37e653afca4e8c698c990 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 15 三月 2025 13:58:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/systemManagement/correctiveAction/index.vue | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/views/CNAS/systemManagement/correctiveAction/index.vue b/src/views/CNAS/systemManagement/correctiveAction/index.vue
index b86b2a3..7a0e3d5 100644
--- a/src/views/CNAS/systemManagement/correctiveAction/index.vue
+++ b/src/views/CNAS/systemManagement/correctiveAction/index.vue
@@ -11,16 +11,10 @@
</span>
</div>
<div class="table">
- <div>
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <limsTable :column="tableColumn" :height="'calc(100vh - 17em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination"
- :page="page">
- </limsTable>
- </template>
- </TableCard>
- </div>
+ <limsTable :column="tableColumn" :height="'calc(100vh - 17em)'" :table-data="tableData"
+ :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination"
+ :page="page">
+ </limsTable>
</div>
<corrective-info v-if="correctiveInfo" ref="correctiveInfo"></corrective-info>
<ViewTestRecord v-if="viewTestRecordDialog" ref="viewTestRecordDialog"></ViewTestRecord>
@@ -28,10 +22,8 @@
</template>
<script>
-import TableCard from '@/components/TableCard/index.vue';
import limsTable from "@/components/Table/lims-table.vue";
import CorrectiveInfo from './components/correctiveInfo.vue';
-// import QualityInfo from '../do/a7-nonconforming-item/qualityInfo.vue';
import ViewTestRecord from './components/ViewTestRecord.vue';
import {
pageSuperviseDetailCorrect,
@@ -39,13 +31,12 @@
} from '@/api/cnas/systemManagement/correctiveAction.js'
export default {
- name: 'a8-corrective-action',
+ name: 'CorrectiveAction',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
// QualityInfo,
CorrectiveInfo,
limsTable,
- TableCard,
ViewTestRecord
},
data() {
--
Gitblit v1.9.3