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/nonconformingWork/nonconformingItem/index.vue | 70 +++++++++-------------------------
1 files changed, 19 insertions(+), 51 deletions(-)
diff --git a/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue b/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
index 416c5ed..1f6ffc5 100644
--- a/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
+++ b/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
@@ -1,28 +1,23 @@
<template>
- <div>
- <div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 120px">鍙戠敓閮ㄩ棬锛�</span>
- <el-input v-model="searchForm.occurrenceDepartment" 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>
- <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 class="capacity-scope">
+ <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.occurrenceDepartment"
+ @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 class="table">
+ <limsTable :column="tableColumn" :height="'calc(100vh - 19em)'" :table-data="tableData"
+ :table-loading="tableLoading" :page="page"
+ @pagination="pagination">
+ </limsTable>
</div>
<quality-info v-if="qualityInfo" ref="qualityInfo"></quality-info>
</div>
@@ -30,7 +25,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,
@@ -38,9 +32,9 @@
} from '@/api/cnas/process/nonconformingWork.js'
export default {
- name: 'a7-nonconforming-item',
+ name: 'NonconformingItem',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { QualityInfo, TableCard, limsTable },
+ components: { QualityInfo, limsTable },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
@@ -129,7 +123,6 @@
this.tableLoading = true
pageSuperviseDetailAccording({ ...entity, ...page }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
this.page.total = res.data.total
}).catch(err => {
@@ -168,29 +161,4 @@
</script>
<style scoped>
-.view-title {
- 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;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
-}
-
-.table {
- background-color: #ffffff;
-}
</style>
--
Gitblit v1.9.3