From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableOverview.vue | 67 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 26 deletions(-)
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;
--
Gitblit v1.9.3