From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/process/method/methodVerification/index.vue | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/src/views/CNAS/process/method/methodVerification/index.vue b/src/views/CNAS/process/method/methodVerification/index.vue
index 950abcd..82491db 100644
--- a/src/views/CNAS/process/method/methodVerification/index.vue
+++ b/src/views/CNAS/process/method/methodVerification/index.vue
@@ -1,32 +1,26 @@
<template>
<div class="capacity-scope">
- <div class="search">
- <div>
- <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
- <el-form-item label="鏍囧噯鏂规硶" prop="methodName">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.methodName"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="searchList">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetSearchForm">閲� 缃�</el-button>
- </el-form-item>
- </el-form>
+ <div style="display: flex;justify-content: space-between">
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">鏍囧噯鏂规硶</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.methodName"
+ @keyup.enter.native="searchList"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" size="mini" @click="searchList">鏌ヨ</el-button>
+ <el-button size="mini" @click="resetSearchForm">閲嶇疆</el-button>
+ </div>
</div>
- <div>
+ <div style="line-height: 30px;">
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</div>
</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>
- </div>
+ <limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
+ :table-loading="tableLoading" :page="page"
+ @pagination="pagination">
+ </limsTable>
</div>
<formDIa v-if="formDIa" ref="formDIa" :operationType="operationType" @closeDia="closeDia"></formDIa>
</div>
@@ -34,14 +28,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: 'a7-method-verification',
+ name: 'MethodVerification',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { TableCard, limsTable, formDIa },
+ components: { limsTable, formDIa },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
@@ -105,6 +98,7 @@
page: {
size: 20,
current: 1,
+ total: 0
},
total: 0,
formDIa: false,
--
Gitblit v1.9.3