From 4bd9ecdb092c88d050e58d5a150b62e5e90b65b0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 14 三月 2025 16:10:14 +0800
Subject: [PATCH] 删除无用代码
---
src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableList.vue | 75 +++-----
src/views/CNAS/process/method/methodVerification/index.vue | 15 -
src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue | 35 +---
src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue | 17 -
src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableProject.vue | 85 ++++------
/dev/null | 71 --------
src/views/performance/manHour/workTimeStatistics.vue | 28 +--
src/views/CNAS/systemManagement/customerSatisfaction/index.vue | 25 +--
src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableOverview.vue | 67 +++++---
src/components/index/scroll-paging.vue | 1
src/views/CNAS/process/method/standardMethodsChange/index.vue | 13 -
src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue | 17 -
src/views/CNAS/systemManagement/correctiveAction/index.vue | 17 -
src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue | 3
14 files changed, 154 insertions(+), 315 deletions(-)
diff --git a/src/components/TableCard/index.vue b/src/components/TableCard/index.vue
deleted file mode 100644
index 67f98a5..0000000
--- a/src/components/TableCard/index.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
- <div class="table_card">
- <div v-if="showTitle" class="title">
- <span style="font-weight: bold">{{ title }}</span>
- </div>
- <div>
- <slot name="tab"></slot>
- </div>
- <div v-if="showForm" class="table_card_form">
- <slot name="form"></slot>
- </div>
- <div>
- <slot name="table"></slot>
- </div>
- </div>
-</template>
-<script>
-export default {
- props: {
- title: {
- type: String,
- default: '鏍囬'
- },
- showTitle: {
- type: Boolean,
- default: true
- },
- showForm: {
- type: Boolean,
- default: true
- }
- },
- data() {
- return {};
- }
-};
-</script>
-<style scoped>
-.table_card {
- text-align: left;
-}
-
-.title {
- position: relative;
- font-size: 18px;
- color: #333;
- font-weight: 400;
- padding-left: 10px;
- margin-left: 15px;
-}
-
-.title::before {
- position: absolute;
- left: 0;
- top: 4px;
- content: '';
- width: 4px;
- height: 18px;
- background-color: #3A7BFA;
- border-radius: 2px;
-}
-
-.table_card_form {
- display: flex;
- justify-content: space-between;
- height: 34px;
- padding: 0 15px;
- margin-bottom: 10px;
-}
-
-</style>
diff --git a/src/components/index/scroll-paging.vue b/src/components/index/scroll-paging.vue
index 9b460cc..ba5e511 100644
--- a/src/components/index/scroll-paging.vue
+++ b/src/components/index/scroll-paging.vue
@@ -66,7 +66,6 @@
}
},
loadMore(){
- console.log('婊氬姩浜�',this.isLoding)
if (this.isLoding) return
this.isLoding = true
setTimeout(() => {
diff --git a/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableList.vue b/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableList.vue
index d6d0f60..8e5ef0f 100644
--- a/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableList.vue
+++ b/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableList.vue
@@ -1,39 +1,31 @@
<template>
<div>
- <TableCard :showTitle="false">
- <template slot="form">
- <div class="action-box">
- <div></div>
- <div class="flex">
- <el-button icon="el-icon-plus" size="small" type="primary" @click="showDialog(undefined)">
- 鏂板缓
- </el-button>
- <el-button icon="el-icon-upload2" size="small" @click="exportExcel">
- 瀵煎嚭Excel
- </el-button>
- </div>
- </div>
+ <div class="flex">
+ <el-button icon="el-icon-plus" size="small" type="primary" @click="showDialog(undefined)">
+ 鏂板缓
+ </el-button>
+ <el-button icon="el-icon-upload2" size="small" @click="exportExcel">
+ 瀵煎嚭Excel
+ </el-button>
+ </div>
+ <limsTable :column="columns" :currentChange="rowClick" :height="'25vh'" :highlightCurrentRow="true"
+ :isSelection="false" :rowStyle="tableRowStyle" :table-data="tableData" rowKey="id"
+ style="margin-top: 18px;">
+ <template v-slot:consumablesTypeSlot="{ row }">
+ {{ findType(row.consumablesType) }}
</template>
- <template v-slot:table>
- <limsTable :column="columns" :currentChange="rowClick" :height="'25vh'" :highlightCurrentRow="true"
- :isSelection="false" :rowStyle="tableRowStyle" :table-data="tableData" rowKey="id"
- style="margin-top: 18px; padding: 0 15px;">
- <template v-slot:consumablesTypeSlot="{ row }">
- {{ findType(row.consumablesType) }}
- </template>
- <template v-slot:operation="scope">
- <el-button size="small" type="text" @click="showDialog(scope.row)">缂栬緫</el-button>
- <el-button size="small" style="color: #f56c6c" type="text" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
- </template>
- </limsTable>
- <div class="pagination">
- <div></div>
- <el-pagination :page-size="pagination.pageSize" :page-sizes="[10, 20, 30, 40]" :total="pagination.total"
- layout="total, sizes, prev, pager, next, jumper" @current-change="handleCurrent" @size-change="handleSize">
- </el-pagination>
- </div>
+ <template v-slot:operation="scope">
+ <el-button size="small" type="text" @click="showDialog(scope.row)">缂栬緫</el-button>
+ <el-button size="small" style="color: #f56c6c" type="text" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
</template>
- </TableCard>
+ </limsTable>
+ <div class="pagination">
+ <div></div>
+ <el-pagination :page-size="pagination.pageSize" :page-sizes="[10, 20, 30, 40]" :total="pagination.total"
+ background
+ layout="total, sizes, prev, pager, next, jumper" @current-change="handleCurrent" @size-change="handleSize">
+ </el-pagination>
+ </div>
<el-divider></el-divider>
<div>
<ConsumableProject ref="consumableProject"></ConsumableProject>
@@ -43,7 +35,6 @@
</template>
<script>
-import TableCard from './index.vue';
import Edit from "./Edit.vue"
import limsTable from '@/components/Table/lims-table.vue'
import {
@@ -55,9 +46,7 @@
export default {
dicts: ["consumables_type"],
- components: {
- TableCard, limsTable, Edit, ConsumableProject
- },
+ components: {limsTable, Edit, ConsumableProject},
props: {
contentsId: {
type: Number,
@@ -192,10 +181,10 @@
this.$refs.consumableProject.fetchListId(row)
},
tableRowStyle({ row }) {
- if (row.currentAmount <= row.lowerLimit) {
+ if(row.currentAmount <= row.lowerLimit) {
return { background: '#ffcaca' }
} else {
- return {}
+ return { background: '#fff' }
}
}
}
@@ -205,15 +194,7 @@
<style scoped>
.flex {
- display: flex;
-}
-
-.action-box {
- width: 100%;
- padding-top: 10px;
- display: flex;
- align-items: center;
- justify-content: space-between;
+ text-align: right;
}
.pagination {
diff --git a/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableOverview.vue b/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableOverview.vue
index 6ac65b9..7ed6298 100644
--- a/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableOverview.vue
+++ b/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableOverview.vue
@@ -1,37 +1,33 @@
<template>
- <div>
- <el-row class="card-box">
- <el-col :span="4" v-for="(item, index) in cardList" :key="index">
- <CardPanel
- :isActive="isActive"
- :data="item"
- :index="index"
- @handleCard="handleCard"
- />
- </el-col>
- <el-col :span="24" v-if="cardList.length==0" style="color: #909399;font-size: 14px;text-align: center;margin-top: 20px;">鏆傛棤鏁版嵁</el-col>
- </el-row>
- <TableCard title="鑰楁潗淇℃伅" :showForm="false" style="margin-top: 5px">
- <template v-slot:table>
- <limsTable
- style="margin-top: 18px; padding: 0 15px;"
- :height="'20vh'"
- :column="columns"
- :table-data="tableData"
- >
- </limsTable>
- </template>
- </TableCard>
- </div>
+ <div>
+ <el-row class="card-box">
+ <el-col :span="4" v-for="(item, index) in cardList" :key="index">
+ <CardPanel
+ :isActive="isActive"
+ :data="item"
+ :index="index"
+ @handleCard="handleCard"
+ />
+ </el-col>
+ <el-col :span="24" v-if="cardList.length==0" style="color: #909399;font-size: 14px;text-align: center;margin-top: 20px;">鏆傛棤鏁版嵁</el-col>
+ </el-row>
+ <div class="title">鑰楁潗淇℃伅</div>
+ <limsTable
+ style="margin-top: 18px; padding: 0 15px;"
+ :height="'20vh'"
+ :column="columns"
+ :table-data="tableData"
+ >
+ </limsTable>
+ </div>
</template>
<script>
import CardPanel from './CardPanel.vue';
-import TableCard from './index.vue';
import { procurementSuppliesList } from "@/api/cnas/externalService/serviceAndSupplyPro/serviceAndSupplyPro"
import limsTable from '@/components/Table/lims-table.vue'
export default {
- components: { CardPanel, TableCard, limsTable },
+ components: { CardPanel, limsTable },
props: {
contentsId: {
type: Number,
@@ -110,6 +106,25 @@
}
</script>
<style scoped>
+.title {
+ position: relative;
+ font-size: 18px;
+ color: #333;
+ font-weight: 400;
+ padding-left: 10px;
+ margin-left: 15px;
+}
+
+.title::before {
+ position: absolute;
+ left: 0;
+ top: 4px;
+ content: '';
+ width: 4px;
+ height: 18px;
+ background-color: #3A7BFA;
+ border-radius: 2px;
+}
.card-box {
width: 100%;
padding-left: 5px;
diff --git a/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableProject.vue b/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableProject.vue
index 1f2ed15..9dd50d2 100644
--- a/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableProject.vue
+++ b/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableProject.vue
@@ -1,51 +1,42 @@
<template>
<div>
- <TableCard :showTitle="false">
- <template slot="form">
- <div class="action-box">
- <div></div>
- <div class="flex">
- <el-button icon="el-icon-plus" size="small" type="primary" @click="showDialog">
- 娣诲姞椤圭洰
- </el-button>
- <el-button icon="el-icon-upload2" size="small" @click="exportExcel">
- 瀵煎嚭
- </el-button>
- </div>
- </div>
+ <div class="flex">
+ <el-button icon="el-icon-plus" size="small" type="primary" @click="showDialog">
+ 娣诲姞椤圭洰
+ </el-button>
+ <el-button icon="el-icon-upload2" size="small" @click="exportExcel">
+ 瀵煎嚭
+ </el-button>
+ </div>
+ <limsTable
+ :column="columns"
+ :height="'25vh'"
+ :isSelection="true"
+ :table-data="tableData"
+ style="margin-top: 18px;"
+ >
+ <template v-slot:operation="scope">
+ <el-button size="small" type="text" @click="deleteData(scope.row)">鍒犻櫎</el-button>
</template>
- <template v-slot:table>
- <limsTable
- :column="columns"
- :height="'25vh'"
- :isSelection="true"
- :table-data="tableData"
- style="margin-top: 18px; padding: 0 15px;"
- >
- <template v-slot:operation="scope">
- <el-button size="small" type="text" @click="deleteData(scope.row)">鍒犻櫎</el-button>
- </template>
- </limsTable>
- <div class="pagination">
- <div></div>
- <el-pagination
- :page-size="pagination.pageSize"
- :page-sizes="[10, 20, 30, 40]"
- :total="pagination.total"
- layout="total, sizes, prev, pager, next, jumper"
- @current-change="handleCurrent"
- @size-change="handleSize"
- >
- </el-pagination>
- </div>
- </template>
- </TableCard>
+ </limsTable>
+ <div class="pagination">
+ <div></div>
+ <el-pagination
+ background
+ :page-size="pagination.pageSize"
+ :page-sizes="[10, 20, 30, 40]"
+ :total="pagination.total"
+ layout="total, sizes, prev, pager, next, jumper"
+ @current-change="handleCurrent"
+ @size-change="handleSize"
+ >
+ </el-pagination>
+ </div>
<AddProject ref="AddProjectRef" @submit="fetchData"/>
</div>
</template>
<script>
-import TableCard from './index.vue';
import limsTable from '@/components/Table/lims-table.vue'
import Edit from "./Edit.vue"
import AddProject from './AddProject.vue';
@@ -55,9 +46,7 @@
} from "@/api/cnas/externalService/serviceAndSupplyPro/serviceAndSupplyPro";
export default {
- components: {
- TableCard, limsTable, Edit, AddProject
- },
+ components: {limsTable, Edit, AddProject},
data() {
return {
columns: [
@@ -144,15 +133,7 @@
<style scoped>
.flex {
- display: flex;
-}
-
-.action-box {
- width: 100%;
- padding-top: 10px;
- display: flex;
- align-items: center;
- justify-content: space-between;
+ text-align: right;
}
.pagination {
diff --git a/src/views/CNAS/externalService/serviceAndSupplyPro/component/index.vue b/src/views/CNAS/externalService/serviceAndSupplyPro/component/index.vue
deleted file mode 100644
index 67f98a5..0000000
--- a/src/views/CNAS/externalService/serviceAndSupplyPro/component/index.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
- <div class="table_card">
- <div v-if="showTitle" class="title">
- <span style="font-weight: bold">{{ title }}</span>
- </div>
- <div>
- <slot name="tab"></slot>
- </div>
- <div v-if="showForm" class="table_card_form">
- <slot name="form"></slot>
- </div>
- <div>
- <slot name="table"></slot>
- </div>
- </div>
-</template>
-<script>
-export default {
- props: {
- title: {
- type: String,
- default: '鏍囬'
- },
- showTitle: {
- type: Boolean,
- default: true
- },
- showForm: {
- type: Boolean,
- default: true
- }
- },
- data() {
- return {};
- }
-};
-</script>
-<style scoped>
-.table_card {
- text-align: left;
-}
-
-.title {
- position: relative;
- font-size: 18px;
- color: #333;
- font-weight: 400;
- padding-left: 10px;
- margin-left: 15px;
-}
-
-.title::before {
- position: absolute;
- left: 0;
- top: 4px;
- content: '';
- width: 4px;
- height: 18px;
- background-color: #3A7BFA;
- border-radius: 2px;
-}
-
-.table_card_form {
- display: flex;
- justify-content: space-between;
- height: 34px;
- padding: 0 15px;
- margin-bottom: 10px;
-}
-
-</style>
diff --git a/src/views/CNAS/process/method/methodVerification/index.vue b/src/views/CNAS/process/method/methodVerification/index.vue
index 01543a8..59fda20 100644
--- a/src/views/CNAS/process/method/methodVerification/index.vue
+++ b/src/views/CNAS/process/method/methodVerification/index.vue
@@ -18,14 +18,10 @@
</div>
<div class="table">
<div>
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" :page="page"
- @pagination="pagination">
- </limsTable>
- </template>
- </TableCard>
+ <limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
+ :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" :page="page"
+ @pagination="pagination">
+ </limsTable>
</div>
</div>
<formDIa v-if="formDIa" ref="formDIa" :operationType="operationType" @closeDia="closeDia"></formDIa>
@@ -34,14 +30,13 @@
<script>
import limsTable from '@/components/Table/lims-table.vue'
-import TableCard from '@/views/CNAS/externalService/serviceAndSupplyPro/component/index.vue';
import formDIa from './component/formDIa.vue';
import { delMethodVerify, exportMethodVerify, pagesMethodVerify } from '@/api/cnas/process/method/methodVerification'
export default {
name: 'MethodVerification',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { TableCard, limsTable, formDIa },
+ components: { limsTable, formDIa },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
diff --git a/src/views/CNAS/process/method/standardMethodsChange/index.vue b/src/views/CNAS/process/method/standardMethodsChange/index.vue
index 1f593e2..b2e5528 100644
--- a/src/views/CNAS/process/method/standardMethodsChange/index.vue
+++ b/src/views/CNAS/process/method/standardMethodsChange/index.vue
@@ -17,21 +17,14 @@
</div>
</div>
<div class="table">
- <div>
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'"
- @pagination="pagination" :page="page" :tableLoading="tableLoading"></lims-table>
- </template>
- </TableCard>
- </div>
+ <lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'"
+ @pagination="pagination" :page="page" :tableLoading="tableLoading"></lims-table>
</div>
<formDIaChange v-if="formDIa" ref="formDIa" :operationType="operationType" @closeDia="closeDia"></formDIaChange>
</div>
</template>
<script>
-import TableCard from '@/views/CNAS/externalService/serviceAndSupplyPro/component/index.vue';
import formDIaChange from './component/formDIaChange.vue';
import limsTable from '@/components/Table/lims-table.vue'
import {
@@ -43,7 +36,7 @@
export default {
name: 'StandardMethodschange',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { limsTable, formDIaChange, TableCard },
+ components: { limsTable, formDIaChange },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
diff --git a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
index e7341e3..9263338 100644
--- a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
+++ b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
@@ -35,22 +35,14 @@
</el-radio-group>
</div>
<div v-if="tabIndex === '0'">
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <lims-table :column="tableColumn" :height="'calc(100vh - 26em)'" :table-data="tableData"
- :table-loading="tableLoading" :page="page" @pagination="pagination">
- </lims-table>
- </template>
- </TableCard>
+ <lims-table :column="tableColumn" :height="'calc(100vh - 26em)'" :table-data="tableData"
+ :table-loading="tableLoading" :page="page" @pagination="pagination">
+ </lims-table>
</div>
<div v-if="tabIndex === '1'">
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <lims-table :column="oldTableColumn" :height="'calc(100vh - 20em)'" :table-data="oldTableData"
- :table-loading="oldTableLoading" :page="oldPage" @pagination="oldPagination">
- </lims-table>
- </template>
- </TableCard>
+ <lims-table :column="oldTableColumn" :height="'calc(100vh - 20em)'" :table-data="oldTableData"
+ :table-loading="oldTableLoading" :page="oldPage" @pagination="oldPagination">
+ </lims-table>
</div>
</div>
<!-- 鍘嗗彶妗ｆ鎵瑰噯寮规-->
@@ -77,14 +69,10 @@
<FormDialog v-if="formDialog" ref="formDialog" @closeDia="closeDia"></FormDialog>
<EditFormDia v-if="editFormDialog" ref="editFormDialog" @closeEditDia="closeEditDia"></EditFormDia>
<el-dialog :visible.sync="viewRocordDia" title="璇︽儏" width="80%" @close="approvalDialog = false">
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <limsTable :column="tableColumn1" :height="'calc(100vh - 26em)'" :table-data="tableData1"
- :table-loading="tableLoading1" style="padding: 0 15px;margin-bottom: 16px" :page="page1"
- @pagination="pagination1">
- </limsTable>
- </template>
- </TableCard>
+ <limsTable :column="tableColumn1" :height="'calc(100vh - 26em)'" :table-data="tableData1"
+ :table-loading="tableLoading1" style="padding: 0 15px;margin-bottom: 16px" :page="page1"
+ @pagination="pagination1">
+ </limsTable>
</el-dialog>
</div>
</div>
@@ -92,21 +80,18 @@
<script>
import limsTable from '@/components/Table/lims-table.vue'
-import TableCard from '@/views/CNAS/externalService/serviceAndSupplyPro/component/index.vue';
import FormDialog from './component/FormDialog.vue';
import EditFormDia from './component/EditFormDia.vue';
import {
addSearchNewArchived, exportMethodSearchNew,
pageMethodSearchNew, pageSearchNewArchived, pageSearchNewBackups, ratifySearchNewArchivedr
} from '@/api/cnas/process/method/standardNoveltyRetrieval'
-import {selectUserCondition} from "@/api/performance/class";
export default {
name: 'StandardNoveltyRetrieval',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
FormDialog,
- TableCard,
limsTable,
EditFormDia
},
diff --git a/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue b/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
index 8a979df..ac7825b 100644
--- a/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
+++ b/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
@@ -15,16 +15,10 @@
</div>
</div>
<div class="table">
- <div>
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <limsTable :column="tableColumn" :height="'calc(100vh - 19em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" :page="page"
- @pagination="pagination">
- </limsTable>
- </template>
- </TableCard>
- </div>
+ <limsTable :column="tableColumn" :height="'calc(100vh - 19em)'" :table-data="tableData"
+ :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" :page="page"
+ @pagination="pagination">
+ </limsTable>
</div>
</div>
<form-dia v-if="formDia" ref="formDia" @closeDia="closeDia"></form-dia>
@@ -33,7 +27,6 @@
<script>
import limsTable from "@/components/Table/lims-table.vue";
-import TableCard from '@/components/TableCard/index.vue';
import FormDia from './components/formDia.vue';
import {
pageInconsistentDistribution,
@@ -44,7 +37,7 @@
export default {
name: 'NonconformingDistribution',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { FormDia, TableCard, limsTable },
+ components: { FormDia, limsTable },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
diff --git a/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue b/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
index 8e2336c..cd98d2a 100644
--- a/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
+++ b/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
@@ -12,16 +12,10 @@
</span>
</div>
<div class="table">
- <div>
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <limsTable :column="tableColumn" :height="'calc(100vh - 19em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" :page="page"
- @pagination="pagination">
- </limsTable>
- </template>
- </TableCard>
- </div>
+ <limsTable :column="tableColumn" :height="'calc(100vh - 19em)'" :table-data="tableData"
+ :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" :page="page"
+ @pagination="pagination">
+ </limsTable>
</div>
</div>
<quality-info v-if="qualityInfo" ref="qualityInfo"></quality-info>
@@ -30,7 +24,6 @@
<script>
import limsTable from "@/components/Table/lims-table.vue";
-import TableCard from '@/components/TableCard/index.vue';
import QualityInfo from './components/qualityInfo.vue';
import {
pageSuperviseDetailAccording,
@@ -40,7 +33,7 @@
export default {
name: 'NonconformingItem',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { QualityInfo, TableCard, limsTable },
+ components: { QualityInfo, limsTable },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
diff --git a/src/views/CNAS/systemManagement/correctiveAction/index.vue b/src/views/CNAS/systemManagement/correctiveAction/index.vue
index 844673b..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,
@@ -45,7 +37,6 @@
// QualityInfo,
CorrectiveInfo,
limsTable,
- TableCard,
ViewTestRecord
},
data() {
diff --git a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
index 59be536..3368ce3 100644
--- a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
+++ b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
@@ -31,23 +31,15 @@
</el-radio-group>
</div>
<div v-if="tabIndex === '0'">
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <limsTable :column="tableColumn" :height="'calc(100vh - 22em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination"
- :page="page">
- </limsTable>
- </template>
- </TableCard>
+ <limsTable :column="tableColumn" :height="'calc(100vh - 22em)'" :table-data="tableData"
+ :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination"
+ :page="page">
+ </limsTable>
</div>
<div v-if="tabIndex === '1'">
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <limsTable :column="tableColumn1" :height="'calc(100vh - 22em)'" :table-data="tableData1"
- :table-loading="tableLoading1" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination0">
- </limsTable>
- </template>
- </TableCard>
+ <limsTable :column="tableColumn1" :height="'calc(100vh - 22em)'" :table-data="tableData1"
+ :table-loading="tableLoading1" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination0">
+ </limsTable>
</div>
</div>
</div>
@@ -60,7 +52,6 @@
</template>
<script>
-import TableCard from '@/components/TableCard/index.vue';
import limsTable from "@/components/Table/lims-table.vue";
import FormDialog from './components/formDialog.vue';
import filePreview from '@/components/Preview/filePreview.vue'
@@ -74,7 +65,7 @@
export default {
name: 'CustomerSatisfaction',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { filePreview, FormDialog, limsTable, TableCard },
+ components: { filePreview, FormDialog, limsTable },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue
index bc317a8..c0c2d4c 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue
@@ -23,7 +23,6 @@
</template>
<script>
-import TableCard from '@/components/TableCard/index.vue';
import limsTable from "@/components/Table/lims-table.vue";
import CorrectiveActionDIa from './correctiveActionDIa.vue';
import ViewTestRecord from './ViewTestRecord.vue';
@@ -35,7 +34,7 @@
export default {
name: 'correctiveAction',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { CorrectiveActionDIa, limsTable, TableCard, ViewTestRecord },
+ components: { CorrectiveActionDIa, limsTable, ViewTestRecord },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
diff --git a/src/views/performance/manHour/workTimeStatistics.vue b/src/views/performance/manHour/workTimeStatistics.vue
index 21dff0b..8f7dc37 100644
--- a/src/views/performance/manHour/workTimeStatistics.vue
+++ b/src/views/performance/manHour/workTimeStatistics.vue
@@ -37,20 +37,16 @@
</div>
</div>
<div class="table">
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <limsTable
- :column="tableColumn"
- :table-data="tableData"
- :table-loading="tableLoading"
- :page="page"
- style="padding: 0 15px"
- :height="'calc(100vh - 290px)'"
- @pagination="pagination"
- >
- </limsTable>
- </template>
- </TableCard>
+ <limsTable
+ :column="tableColumn"
+ :table-data="tableData"
+ :table-loading="tableLoading"
+ :page="page"
+ style="padding: 0 15px"
+ :height="'calc(100vh - 290px)'"
+ @pagination="pagination"
+ >
+ </limsTable>
</div>
</div>
</div>
@@ -58,13 +54,11 @@
<script>
import { getYearAndMonthAndDays } from "@/utils/date";
-import TableCard from "@/components/TableCard/index.vue";
import limsTable from "@/components/Table/lims-table.vue";
import { selectAuxiliaryAllByMonth } from "@/api/performance/manHour";
export default {
components: {
- limsTable,
- TableCard,
+ limsTable
},
data() {
return {
--
Gitblit v1.9.3