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/process/nonconformingWork/nonconformingDistribution/index.vue | 87 ++++++++++++-------------------------------
1 files changed, 24 insertions(+), 63 deletions(-)
diff --git a/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue b/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
index 4a54eb8..626fe9d 100644
--- a/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
+++ b/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
@@ -1,37 +1,26 @@
<template>
- <div>
- <div>
- <!-- <div class="view-title">
- <span>涓嶇鍚堥」鐨勫垎甯�</span>
- <span>
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
- </div> -->
- <div class="search-background">
- <span class="search-group">
- <span style="width: 120px">骞翠唤锛�</span>
- <el-input v-model="searchForm.distributionYear" clearable size="small"></el-input>
- </span>
- <span class="search-group">
- <el-button size="small" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <div class="btn">
- <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </div>
+ <div class="capacity-scope">
+ <div class="search">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="骞翠唤" prop="laboratoryName">
+ <el-input v-model="searchForm.distributionYear" clearable size="small"></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>
- <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>
+ <div>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</div>
+ </div>
+ <div class="table">
+ <limsTable :column="tableColumn" :height="'calc(100vh - 19em)'" :table-data="tableData"
+ :table-loading="tableLoading" :page="page"
+ @pagination="pagination">
+ </limsTable>
</div>
<form-dia v-if="formDia" ref="formDia" @closeDia="closeDia"></form-dia>
</div>
@@ -39,7 +28,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,
@@ -48,9 +36,9 @@
} from '@/api/cnas/process/nonconformingWork.js'
export default {
- name: 'a7-distribution-of-nonconforming',
+ name: 'NonconformingDistribution',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { FormDia, TableCard, limsTable },
+ components: { FormDia, limsTable },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
@@ -200,36 +188,9 @@
</script>
<style scoped>
-.view-title {
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
- align-items: center;
- height: 60px;
- padding-left: 20px;
-}
-
-.search-background {
- width: 100%;
- height: 80px;
- line-height: 80px;
- background-color: #ffffff;
- display: flex;
- position: relative;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
-}
-
-.table {
- background-color: #ffffff;
-}
-
-.btn {
- position: absolute;
- right: 20px;
- top: 16px;
}
</style>
--
Gitblit v1.9.3