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/systemManagement/correctiveAction/index.vue | 47 +++++++++++++++++++----------------------------
1 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/src/views/CNAS/systemManagement/correctiveAction/index.vue b/src/views/CNAS/systemManagement/correctiveAction/index.vue
index 85c46e0..f5f6de6 100644
--- a/src/views/CNAS/systemManagement/correctiveAction/index.vue
+++ b/src/views/CNAS/systemManagement/correctiveAction/index.vue
@@ -1,25 +1,21 @@
<template>
- <div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 150px">涓嶅悎鏍兼弿杩帮細</span>
- <el-input v-model="searchForm.raiseResult" 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="capacity-scope">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="涓嶅悎鏍兼弿杩�" prop="raiseResult">
+ <el-input v-model="searchForm.raiseResult" 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 - 17em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination">
- </limsTable>
- </template>
- </TableCard>
- </div>
+ <limsTable :column="tableColumn" :height="'calc(100vh - 17em)'" :table-data="tableData"
+ :table-loading="tableLoading" @pagination="pagination"
+ :page="page">
+ </limsTable>
</div>
<corrective-info v-if="correctiveInfo" ref="correctiveInfo"></corrective-info>
<ViewTestRecord v-if="viewTestRecordDialog" ref="viewTestRecordDialog"></ViewTestRecord>
@@ -27,10 +23,8 @@
</template>
<script>
-import TableCard from '@/components/TableCard/index.vue';
import limsTable from "@/components/Table/lims-table.vue";
import CorrectiveInfo from './components/correctiveInfo.vue';
-// import QualityInfo from '../do/a7-nonconforming-item/qualityInfo.vue';
import ViewTestRecord from './components/ViewTestRecord.vue';
import {
pageSuperviseDetailCorrect,
@@ -38,13 +32,12 @@
} from '@/api/cnas/systemManagement/correctiveAction.js'
export default {
- name: 'a8-corrective-action',
+ name: 'CorrectiveAction',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
- // QualityInfo,
+ // QualityInfo,
CorrectiveInfo,
limsTable,
- TableCard,
ViewTestRecord
},
data() {
@@ -108,8 +101,8 @@
page: {
size: 20,
current: 1,
+ total: 0,
},
- total: 0,
correctiveInfo: false,
viewTestRecordDialog: false,
};
@@ -128,9 +121,8 @@
this.tableLoading = true
pageSuperviseDetailCorrect({ ...entity, ...page }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
- this.total = res.data.total
+ this.page.total = res.data.total
}).catch(err => {
console.log('err---', err);
this.tableLoading = false
@@ -140,7 +132,6 @@
handleDown(row) {
exportSuperviseDetaillCorrect({ superviseDetailsCorrectId: row.superviseDetailsCorrectId }).then(res => {
this.outLoading = false
- this.$message.success('瀵煎嚭鎴愬姛')
const blob = new Blob([res], { type: 'application/msword' });
this.$download.saveAs(blob, '鐩戠潱绾犳鎺柦' + '.docx');
})
--
Gitblit v1.9.3