From cb2a01ee7dea28a2661720060b03c41dc372acb5 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 01 八月 2025 11:53:16 +0800
Subject: [PATCH] 完善串口处理数据，数据选择
---
src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue | 73 +++++++++++++++---------------------
1 files changed, 30 insertions(+), 43 deletions(-)
diff --git a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
index e7341e3..955f69f 100644
--- a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
+++ b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
@@ -1,26 +1,28 @@
<template>
<div class="capacity-scope">
- <div class="search">
- <div>
- <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
- <el-form-item label="鏍囧噯鍙�" prop="standardNo" v-if="tabIndex === '0'">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.standardNo"></el-input>
- </el-form-item>
- <el-form-item label="瀛樻。鍚嶇О" prop="archivedName" v-if="tabIndex === '1'">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.archivedName"></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;" v-if="tabIndex === '0'">
+ <span style="width: 68px;font-size: 14px;font-weight: 700;color: #606266;">鏍囧噯鍙�</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.standardNo"
+ @keyup.enter.native="searchList"></el-input>
+ </div>
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;" v-if="tabIndex === '1'">
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">瀛樻。鍚嶇О</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.archivedName"
+ @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="openApprovalDialog1">寤� 妗�</el-button>
<el-upload ref='upload' :action="action" :before-upload="beforeUpload" :headers="uploadHeader" :on-error="onError"
- :on-success="handleSuccessUp" :show-file-list="false"
- accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
- style="display: inline-block; margin-left: 10px;">
+ :on-success="handleSuccessUp" :show-file-list="false"
+ accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
+ style="display: inline-block; margin-left: 10px;">
<el-button :loading="upLoading" size="small" type="primary">瀵煎叆</el-button>
</el-upload>
<el-button size="small" style="margin-left: 10px;" type="primary" @click="openFormDia">鏂� 澧�</el-button>
@@ -35,22 +37,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 +71,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 +82,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
},
--
Gitblit v1.9.3