From 13a60da2424da8cd50e52e35e0126e23e34ea6f3 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 15:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/systemManagement/documentControl/index.vue | 12
src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue | 37
src/views/CNAS/process/method/methodVerification/index.vue | 11
src/views/CNAS/systemManagement/measuresDealRisks/index.vue | 6
src/views/business/inspectionReview/index.vue | 3
src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue | 37
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue | 3
src/views/CNAS/systemManagement/documentControl/components/FileList.vue | 81 --
src/views/CNAS/systemManagement/internalAuditManagement/components/implementationPlan.vue | 37
src/views/business/productOrder/index.vue | 43
src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue | 56 -
src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue | 56 -
src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue | 61 -
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/illuminance-recording.vue | 2
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue | 23
src/views/business/inspectionTask/index.vue | 178 +++---
src/views/CNAS/systemManagement/customerSatisfaction/index.vue | 73 -
src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue | 53 -
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions.vue | 2
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue | 4
src/views/business/materialOrder/copperOrder.vue | 8
src/views/business/materialOrder/customsInspection.vue | 8
src/views/CNAS/process/uncertainty/index.vue | 55 -
src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue | 55 -
src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue | 35
src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue | 70 -
src/views/CNAS/systemManagement/internalAuditManagement/index.vue | 9
src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue | 37
src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue | 37
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue | 2
src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue | 59 -
src/views/CNAS/process/sampleDisposal/index.vue | 71 --
src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue | 2
src/views/CNAS/process/reportResults/index.vue | 65 -
src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue | 84 +-
src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue | 37
src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue | 37
src/views/business/materialOrder/index.vue | 3
src/views/CNAS/process/complaint/index.vue | 53 -
src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue | 37
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue | 2
src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue | 58 -
src/views/CNAS/systemManagement/managementReview/index.vue | 9
src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue | 2
src/views/CNAS/process/demand/index.vue | 6
src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue | 64 -
src/views/CNAS/systemManagement/correctiveAction/index.vue | 23
47 files changed, 642 insertions(+), 1,064 deletions(-)
diff --git a/src/views/CNAS/process/complaint/index.vue b/src/views/CNAS/process/complaint/index.vue
index c654149..ca806a0 100644
--- a/src/views/CNAS/process/complaint/index.vue
+++ b/src/views/CNAS/process/complaint/index.vue
@@ -1,23 +1,23 @@
<template>
- <div class="Complaint">
+ <div class="capacity-scope">
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏍峰搧缂栧彿锛�</div>
- <div class="search_input"><el-input v-model="queryParams.sampleCode" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鏍峰搧缂栧彿" prop="sampleCode">
+ <el-input v-model="queryParams.sampleCode" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item label="鎶曡瘔鍚嶇О" prop="complainName">
+ <el-input v-model="queryParams.complainName" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing">
- <div class="search_label">鎶曡瘔鍚嶇О锛�</div>
- <div class="search_input">
- <el-input v-model="queryParams.complainName" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()"></el-input>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btn">
+ <div>
<el-button :loading="outLoading" size="small" type="primary" @click="handleDown">瀵煎嚭</el-button>
<el-button size="small" type="primary" @click="openAdd">鏂板</el-button>
</div>
@@ -286,6 +286,7 @@
},
data() {
return {
+ tableLoading: false,
addPower: false,
outLoading: false,
addDialogVisible: false,
@@ -492,19 +493,11 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 80px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
-
.search_thing {
width: 350px;
display: flex;
@@ -519,12 +512,6 @@
.search_input {
width: calc(100% - 110px);
-}
-
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px - 10px - 40px);
- padding: 20px;
}
.dialog-body {
diff --git a/src/views/CNAS/process/demand/index.vue b/src/views/CNAS/process/demand/index.vue
index f2d5dd4..ef70abd 100644
--- a/src/views/CNAS/process/demand/index.vue
+++ b/src/views/CNAS/process/demand/index.vue
@@ -23,9 +23,9 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
</el-form-item>
</el-form>
- </div>
- <div style="text-align: right; margin-bottom: 20px">
- <el-button size="small" type="primary" @click="goAdd">鏂板</el-button>
+ <div style="text-align: right; margin-bottom: 20px">
+ <el-button size="small" type="primary" @click="goAdd">鏂板</el-button>
+ </div>
</div>
<div class="table">
<el-table v-loading="tableListLoading" :data="tableList"
diff --git a/src/views/CNAS/process/method/methodVerification/index.vue b/src/views/CNAS/process/method/methodVerification/index.vue
index 59fda20..8be4cf8 100644
--- a/src/views/CNAS/process/method/methodVerification/index.vue
+++ b/src/views/CNAS/process/method/methodVerification/index.vue
@@ -17,12 +17,10 @@
</div>
</div>
<div class="table">
- <div>
- <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>
- </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>
@@ -100,6 +98,7 @@
page: {
size: 20,
current: 1,
+ total: 0
},
total: 0,
formDIa: false,
diff --git a/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue b/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
index ac7825b..626fe9d 100644
--- a/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
+++ b/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
@@ -1,25 +1,26 @@
<template>
- <div>
- <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">
- <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>
+ <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>
@@ -187,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>
diff --git a/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue b/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
index cd98d2a..89c7d20 100644
--- a/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
+++ b/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
@@ -1,22 +1,21 @@
<template>
- <div>
+ <div class="capacity-scope">
<div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 120px">鍙戠敓閮ㄩ棬锛�</span>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="鍙戠敓閮ㄩ棬" prop="occurrenceDepartment">
<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">
- <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>
- </div>
+ </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">
+ <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>
@@ -160,29 +159,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>
diff --git a/src/views/CNAS/process/reportResults/index.vue b/src/views/CNAS/process/reportResults/index.vue
index 9cf49ca..a3415d1 100644
--- a/src/views/CNAS/process/reportResults/index.vue
+++ b/src/views/CNAS/process/reportResults/index.vue
@@ -1,16 +1,19 @@
<template>
- <div class="report-results">
+ <div class="capacity-scope">
<div class="search">
- <div class="search_thing">
- <div class="search_label">妫�楠屾姤鍛婄紪鍙凤細</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.insReportCode"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="妫�楠屾姤鍛婄紪鍙�" prop="insReportCode">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.insReportCode"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btn">
+ <div>
<el-button size="small" type="primary" @click="handleDown" :loading="outLoading" v-if="outPower">瀵煎嚭</el-button>
<el-button size="small" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
</div>
@@ -311,11 +314,9 @@
<style scoped>
.search {
- background-color: #fff;
- height: 80px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
.search_thing {
@@ -332,41 +333,5 @@
.search_input {
width: calc(100% - 110px);
-}
-
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px - 10px - 40px);
- padding: 20px;
-}
-
-.tables {
- table-layout: fixed;
- width: 100%;
-}
-
-.tables td {
- height: 40px;
- width: 100px;
- text-align: center;
- font-size: 14px;
- word-wrap: break-word;
- white-space: normal;
-}
-
-.en {
- font-size: 12px;
- word-break: break-word;
- /* 鑷姩鏂 */
- overflow-wrap: break-word;
- /* 闃叉婧㈠嚭 */
- white-space: normal;
- /* 榛樿鎹㈣ */
-}
-
-.btn {
- position: absolute;
- top: 16px;
- right: 20px;
}
</style>
diff --git a/src/views/CNAS/process/sampleDisposal/index.vue b/src/views/CNAS/process/sampleDisposal/index.vue
index b3df7ab..6ad90f6 100644
--- a/src/views/CNAS/process/sampleDisposal/index.vue
+++ b/src/views/CNAS/process/sampleDisposal/index.vue
@@ -2,28 +2,24 @@
<div class="capacity-scope">
<el-tabs type="border-card" v-model="activeName" style="height: 100%;" @tab-click="queryParams.totaldealId = ''">
<el-tab-pane label="濉啓" name="濉啓" style="height: 100%;" :key="1">
- <el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;">鏂板</el-button>
+ <el-button size="small" type="primary" @click="handleAdd0" style="margin-bottom: 10px">鏂板</el-button>
<div class="table" style="height: calc(100% - 200px)" v-if="activeName == '濉啓'">
<lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading"
- key="tableData"
- :height="'calc(100vh - 290px)'" :page="page" @pagination="pagination"></lims-table>
+ key="tableData" :height="'calc(100vh - 290px)'" :page="page" @pagination="pagination"></lims-table>
</div>
</el-tab-pane>
<el-tab-pane label="鍘嗗彶璁板綍" name="鍘嗗彶璁板綍" style="height: 100%;" :key="2">
- <div class="search">
- <div class="search_thing">
- <div class="search_label">骞存湀锛�</div>
- <div class="search_input">
- <el-date-picker v-model="queryParams0.month" type="month" placeholder="閫夋嫨鏈�" format="yyyy-MM"
- value-format="yyyy-MM" size="small" @change="refreshTable()">
- </el-date-picker>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- </div>
+ <el-form :model="queryParams0" ref="queryParams0" size="small" :inline="true">
+ <el-form-item label="骞存湀" prop="month">
+ <el-date-picker v-model="queryParams0.month" type="month" placeholder="閫夋嫨鏈�" format="yyyy-MM"
+ value-format="yyyy-MM" size="small" @change="refreshTable()">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
<div class="table">
<lims-table :tableData="tableData0" :column="column0" :tableLoading="tableLoading"
key="tableData0"
@@ -486,19 +482,6 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
-.search {
- background-color: #fff;
- height: 40px;
- display: flex;
- align-items: center;
- position: relative;
-}
-
.search_thing {
width: 350px;
display: flex;
@@ -515,19 +498,8 @@
width: calc(100% - 110px);
}
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 140px);
- padding: 20px;
-}
-
.downPdf {
opacity: 0 !important;
-}
-
-.tables {
- table-layout: fixed;
- width: 100%;
}
.tables td {
@@ -537,23 +509,6 @@
font-size: 14px;
word-wrap: break-word;
white-space: normal;
-}
-
-.en {
- font-size: 12px;
- word-break: break-word;
- /* 鑷姩鏂 */
- overflow-wrap: break-word;
- /* 闃叉婧㈠嚭 */
- white-space: normal;
- /* 榛樿鎹㈣ */
-}
-
-.user-info {
- display: flex;
- align-items: center;
- justify-content: space-evenly;
- margin-top: 20px;
}
.user-info .el-button {
diff --git a/src/views/CNAS/process/uncertainty/index.vue b/src/views/CNAS/process/uncertainty/index.vue
index 4cb8d52..1583364 100644
--- a/src/views/CNAS/process/uncertainty/index.vue
+++ b/src/views/CNAS/process/uncertainty/index.vue
@@ -1,21 +1,23 @@
<template>
- <div class="uncertainty-evaluation">
+ <div class="capacity-scope">
<div class="search">
- <div class="search_thing">
- <div class="search_label">鎶ュ憡鍚嶇О锛�</div>
- <div class="search_input"><el-input v-model="queryParams.reportName" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鎶ュ憡鍚嶇О" prop="reportName">
+ <el-input v-model="queryParams.reportName" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btn">
- <el-button :loading="outLoading" size="small" style="margin-right: 16px;margin-top: 3px;" type="primary"
- @click="handleDown0">瀵煎嚭</el-button>
+ <div style="display: flex;align-items: center;">
+ <el-button :loading="outLoading" size="small" type="primary" style="margin-right: 10px" @click="handleDown0">瀵煎嚭</el-button>
<el-upload ref='upload' :action="action" :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError"
- :on-success="handleSuccessUp" :show-file-list="false"
- accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'>
+ :on-success="handleSuccessUp" :show-file-list="false"
+ accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'>
<el-button :loading="upLoading" size="small" type="primary">瀵煎叆</el-button></el-upload>
</div>
</div>
@@ -252,17 +254,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 80px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
.search_thing {
@@ -279,19 +274,5 @@
.search_input {
width: calc(100% - 80px);
-}
-
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px - 10px - 40px);
- padding: 20px;
-}
-
-.btn {
- position: absolute;
- top: 16px;
- right: 20px;
- display: flex;
- align-items: center;
}
</style>
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
index faf3b3b..a2b3430 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
@@ -1,5 +1,5 @@
<template>
- <div class="capacity-scope">
+ <div>
<div class="search">
<div>
<el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions.vue
index 38db4fc..f6603f9 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions.vue
@@ -1,7 +1,7 @@
<template>
<el-row>
<el-col :span="2">
- <el-menu style="height: 100vh;" @select="clickSelect" :default-active="activeName">
+ <el-menu @select="clickSelect" :default-active="activeName">
<el-menu-item index="鐢垫簮绋冲畾鎬�">
<span slot="title">鐢垫簮绋冲畾鎬�</span>
</el-menu-item>
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/illuminance-recording.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/illuminance-recording.vue
index 43f5c11..ce87d88 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/illuminance-recording.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/illuminance-recording.vue
@@ -31,7 +31,7 @@
</el-table-column>
</el-table>
<el-pagination :current-page="1" :page-size="search.size" :page-sizes="[10, 20, 30, 50, 100]" :total="search.total"
- layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+ layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" background
@current-change="handleCurrentChange">
</el-pagination>
<el-dialog :visible.sync="dialogVisible" title="鏂板" width="50%" @open="openDialog">
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
index 0940cf3..aecefa0 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
@@ -10,6 +10,7 @@
<el-table
:data="tableData"
height="calc(100vh - 18em)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
style="width: 100%">
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
@@ -46,7 +47,7 @@
</el-table>
<el-pagination :current-page="1" :page-size="search.size" :page-sizes="[10, 20, 30, 50, 100]"
:total="search.total" layout="->,total, sizes, prev, pager, next, jumper"
- @size-change="handleSizeChange"
+ @size-change="handleSizeChange" background
@current-change="handleCurrentChange">
</el-pagination>
<el-dialog
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
index 84aab15..2fc53ba 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
@@ -34,7 +34,7 @@
</template>
</el-table-column>
</el-table>
- <el-pagination :current-page="1" :page-size="search.size" :page-sizes="[10, 20, 30, 50, 100]"
+ <el-pagination :current-page="1" :page-size="search.size" :page-sizes="[10, 20, 30, 50, 100]" background
:total="search.total" layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
@current-change="handleCurrentChange">
</el-pagination>
@@ -76,7 +76,7 @@
</template>
</el-table-column>
</el-table>
- <el-pagination :current-page="1" :page-size="search1.size" :page-sizes="[10, 20, 30, 50, 100]"
+ <el-pagination :current-page="1" :page-size="search1.size" :page-sizes="[10, 20, 30, 50, 100]" background
:total="search1.total" layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange1"
@current-change="handleCurrentChange1">
</el-pagination>
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
index 095a61f..f2123c6 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
@@ -1,5 +1,5 @@
<template>
- <div class="capacity-scope">
+ <div>
<div class="search">
<div>
<el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
diff --git a/src/views/CNAS/systemManagement/correctiveAction/index.vue b/src/views/CNAS/systemManagement/correctiveAction/index.vue
index 7a0e3d5..f5f6de6 100644
--- a/src/views/CNAS/systemManagement/correctiveAction/index.vue
+++ b/src/views/CNAS/systemManagement/correctiveAction/index.vue
@@ -1,18 +1,19 @@
<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">
<limsTable :column="tableColumn" :height="'calc(100vh - 17em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination"
+ :table-loading="tableLoading" @pagination="pagination"
:page="page">
</limsTable>
</div>
diff --git a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
index 3368ce3..dcfdb49 100644
--- a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
+++ b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
@@ -1,24 +1,26 @@
<template>
- <div>
+ <div class="capacity-scope">
<div>
- <div class="search-background">
- <span v-if="tabIndex === '0'" class="search-group">
- <span style="width: 150px">鍗曚綅鍚嶇О锛�</span>
- <el-input v-model="searchForm.unitName" clearable size="small"></el-input>
- </span>
- <span v-if="tabIndex === '1'" class="search-group">
- <span style="width: 150px">鏂囦欢鍚嶇О锛�</span>
- <el-input v-model="searchForm1.fileName" 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">
+ <div class="search">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="unitName" v-if="tabIndex === '0'">
+ <el-input v-model="searchForm.unitName" clearable size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鏂囦欢鍚嶇О" prop="fileName" v-if="tabIndex === '1'">
+ <el-input v-model="searchForm1.fileName" 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>
<el-button v-if="tabIndex === '0'" size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
<el-upload v-if="tabIndex === '1'" 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'>
+ :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'>
<el-button :loading="upLoading" size="small" type="primary">瀵煎叆</el-button>
</el-upload>
</div>
@@ -32,13 +34,13 @@
</div>
<div v-if="tabIndex === '0'">
<limsTable :column="tableColumn" :height="'calc(100vh - 22em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination"
+ :table-loading="tableLoading" @pagination="pagination"
:page="page">
</limsTable>
</div>
<div v-if="tabIndex === '1'">
<limsTable :column="tableColumn1" :height="'calc(100vh - 22em)'" :table-data="tableData1"
- :table-loading="tableLoading1" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination0">
+ :table-loading="tableLoading1" @pagination="pagination0">
</limsTable>
</div>
</div>
@@ -343,40 +345,13 @@
</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;
}
.table-tab {
- margin: 0 20px 20px 20px;
-}
-
-.btn {
- position: absolute;
- top: 16px;
- right: 20px;
+ margin: 0 0 20px 0;
}
</style>
diff --git a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue b/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
index f642c37..4487da6 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
@@ -1,24 +1,22 @@
<template>
<!-- 鏂囦欢鍙楁帶鐢宠 -->
- <div class="controlled-file-application" style="height: 100%;">
+ <div>
<div class="search">
- <div class="search_thing">
- <div class="search_label">鐢宠鏂囦欢缂栧彿锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鐢宠鏂囦欢缂栧彿" prop="laboratoryName">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <!-- <div class="search_thing">
- <div class="search_label">鐢宠浜猴細</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="queryParams.createUserName" @keyup.enter.native="refreshTable()"></el-input></div>
- </div> -->
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btns" style="padding-left: 30px;">
- <el-button size="small" type="primary"
- @click="addDialogVisible = true, addInfo = {}, file = null">鏂囦欢鍙楁帶鐢宠</el-button>
+ <div>
+ <el-button size="small" type="primary" icon="el-icon-plus"
+ @click="addDialogVisible = true, addInfo = {}, file = null">鏂囦欢鍙楁帶鐢宠</el-button>
</div>
</div>
<div class="table">
@@ -502,17 +500,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 40px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
.search_thing {
@@ -530,19 +521,6 @@
.search_input {
width: calc(100% - 110px);
}
-
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px);
- padding: 20px;
-}
-
-.btns {
- position: absolute;
- right: 20px;
- top: 5px;
-}
-
.stamp {
cursor: pointer;
border: #fff 1px solid;
diff --git a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
index 647782b..522e74a 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
@@ -1,24 +1,26 @@
<template>
<!-- 鍙戞斁鍥炴敹璁板綍 -->
- <div class="distribution-collection-record" style="height: 100%;">
+ <div>
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏂囦欢缂栧彿锛�</div>
- <div class="search_input"><el-input v-model="queryParams.documentCode" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鏂囦欢缂栧彿" prop="documentCode">
+ <el-input v-model="queryParams.documentCode" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item label="鏂囦欢鍚嶇О" prop="laboratoryNumber">
+ <el-input v-model="queryParams.name" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing">
- <div class="search_label">鏂囦欢鍚嶇О锛�</div>
- <div class="search_input"><el-input v-model="queryParams.name" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btns" style="padding-left: 30px;">
- <el-button v-if="addPower" size="small" type="primary"
- @click="addDialogVisible = true, addInfo = {}, radio = '鍙戞斁', file = null">娣诲姞鍙戞斁璁板綍</el-button>
+ <div>
+ <el-button v-if="addPower" size="small" type="primary" icon="el-icon-plus"
+ @click="addDialogVisible = true, addInfo = {}, radio = '鍙戞斁', file = null">娣诲姞鍙戞斁璁板綍</el-button>
<el-button v-if="outPower" :loading="outLoading" size="small" type="primary" @click="handleOut">瀵煎嚭</el-button>
</div>
</div>
@@ -521,17 +523,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 40px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
.search_thing {
@@ -548,17 +543,5 @@
.search_input {
width: calc(100% - 110px);
-}
-
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px);
- padding: 20px;
-}
-
-.btns {
- position: absolute;
- right: 20px;
- top: 5px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
index 3817ac1..b03f44c 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
@@ -1,19 +1,22 @@
<template>
<!-- 鏂囦欢鍙樻洿鐢宠 -->
- <div class="file-change-request">
+ <div>
<div class="search">
- <div class="search_thing">
- <div class="search_label">鐢宠鏂囦欢缂栧彿锛�</div>
- <div class="search_input"><el-input v-model="queryParams.code" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鐢宠鏂囦欢缂栧彿" prop="code">
+ <el-input v-model="queryParams.code" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btns">
- <el-button size="small" type="primary"
- @click="addDialogVisible = true, addInfo = {}, currentFile = {}, title = '鏂囦欢鍙樻洿鐢宠', file = null">鏂囦欢鍙樻洿鐢宠</el-button>
+ <div>
+ <el-button size="small" type="primary" icon="el-icon-plus"
+ @click="addDialogVisible = true, addInfo = {}, currentFile = {}, title = '鏂囦欢鍙樻洿鐢宠', file = null">鏂囦欢鍙樻洿鐢宠</el-button>
<el-button :loading="outLoading" size="small" type="primary" @click="handleOut">瀵煎嚭</el-button>
</div>
</div>
@@ -592,21 +595,9 @@
</script>
<style scoped>
->>> .el-dialog__body {
- max-height: 75vh;
- overflow-y: auto;
-}
.title {
height: 60px;
line-height: 60px;
-}
-
-.search {
- background-color: #fff;
- height: 40px;
- display: flex;
- align-items: center;
- position: relative;
}
.search_thing {
@@ -625,16 +616,10 @@
width: calc(100% - 110px);
}
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px);
- padding: 20px;
-}
-
-.btns {
- position: absolute;
- right: 20px;
- top: 5px;
+.search {
+ height: 46px;
+ display: flex;
+ justify-content: space-between;
}
h4.title {
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileList.vue b/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
index 3720194..7e1fe05 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
@@ -1,29 +1,29 @@
<template>
<!-- 鏂囦欢娓呭崟 -->
- <div class="file-list" style="height: 100%;">
+ <div>
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏂囦欢鍚嶇О锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.name"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鏂囦欢鍚嶇О" prop="name">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.name"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item label="鏂囦欢鐘舵��" prop="state">
+ <el-select v-model="queryParams.state" size="small" @change="refreshTable()">
+ <el-option :label="item.label" :value="item.value" v-for="(item, index) in fileState"
+ :key="index"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing">
- <div class="search_label">鏂囦欢鐘舵�侊細</div>
- <div class="search_input">
- <el-select v-model="queryParams.state" size="small" @change="refreshTable()">
- <el-option :label="item.label" :value="item.value" v-for="(item, index) in fileState"
- :key="index"></el-option>
- </el-select>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btns" style="padding-left: 30px;">
+ <div>
<el-upload :action="action" :multiple="false" accept='.xls,.xlsx' :headers="uploadHeader"
- :on-change="beforeUpload" :on-error="onError" ref='upload' :on-success="handleSuccessUp"
- :show-file-list="false">
+ :on-change="beforeUpload" :on-error="onError" ref='upload' :on-success="handleSuccessUp"
+ :show-file-list="false">
<el-button size="small" type="primary" :loading="upLoading">瀵煎叆</el-button></el-upload>
</div>
</div>
@@ -385,44 +385,9 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 40px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
-}
-
-.search_thing {
- width: 350px;
- display: flex;
- align-items: center;
-}
-
-.search_label {
- width: 110px;
- font-size: 14px;
- text-align: right;
-}
-
-.search_input {
- width: calc(100% - 110px);
-}
-
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px);
- padding: 20px;
-}
-
-.btns {
- position: absolute;
- right: 20px;
- top: 5px;
+ justify-content: space-between;
}
</style>
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
index 4ffb93a..9d93027 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
@@ -1,19 +1,22 @@
<template>
<!-- 鏂囦欢浣滃簾鐢宠 -->
- <div class="file-obsoletion-request" style="height: 100%;">
+ <div>
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏂囦欢缂栧彿锛�</div>
- <div class="search_input"><el-input v-model="queryParams.documentCode" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鏂囦欢缂栧彿" prop="documentCode">
+ <el-input v-model="queryParams.documentCode" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btns" style="padding-left: 30px;">
- <el-button size="small" type="primary"
- @click="addDialogVisible = true, addInfo = {}, file = null">鏂囦欢浣滃簾鐢宠</el-button>
+ <div>
+ <el-button size="small" type="primary" icon="el-icon-plus"
+ @click="addDialogVisible = true, addInfo = {}, file = null">鏂囦欢浣滃簾鐢宠</el-button>
<el-button :loading="outLoading" size="small" type="primary" @click="handleOut">瀵煎嚭</el-button>
</div>
</div>
@@ -72,17 +75,6 @@
</div>
</div>
</el-col>
- <!-- <el-col :span="12" style="margin-bottom: 16px;">
- <div class="search_thing">
- <div class="search_label">浣滃簾鏂瑰紡锛�</div>
- <div class="search_input">
- <el-select v-model="addInfo.method" size="small" style="width: 100%;">
- <el-option label="浣滃簾" value="浣滃簾"></el-option>
- <el-option label="鏃犳晥" value="鏃犳晥"></el-option>
- </el-select>
- </div>
- </div>
- </el-col> -->
<el-col :span="12" style="margin-bottom: 16px;">
<div class="search_thing">
<div class="search_label">鏈熸湜浣滃簾鏃堕棿锛�</div>
@@ -417,17 +409,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 40px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
.search_thing {
@@ -444,17 +429,5 @@
.search_input {
width: calc(100% - 110px);
-}
-
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px);
- padding: 20px;
-}
-
-.btns {
- position: absolute;
- right: 20px;
- top: 5px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/documentControl/index.vue b/src/views/CNAS/systemManagement/documentControl/index.vue
index 749cfa5..8a926b4 100644
--- a/src/views/CNAS/systemManagement/documentControl/index.vue
+++ b/src/views/CNAS/systemManagement/documentControl/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="file-handling">
+ <div class="capacity-scope">
<el-tabs type="border-card" v-model="activeName" style="height: 100%;">
<el-tab-pane :label="item.name" :name="item.component" v-for="(item, index) in tabList" :key="index"
style="height: 100%;">
@@ -55,14 +55,4 @@
</script>
<style scoped>
-.file-handling {
- margin-top: 10px;
- height: calc(100% - 20px);
-}
-
->>>.el-tabs__content {
- height: 100%;
- padding: 0;
- padding-top: 10px;
-}
</style>
diff --git a/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue b/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
index e332606..ac88098 100644
--- a/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
@@ -1,31 +1,31 @@
<template>
<!-- 浣滃簾鏂囦欢閿�姣佽褰� -->
- <div class="ObsoleteDocumentDestructionRecords">
+ <div class="capacity-scope">
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏂囦欢鍚嶇О锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentName"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鏂囦欢鍚嶇О" prop="documentName">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentName"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item label="鏂囦欢缂栧彿" prop="documentCode">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing">
- <div class="search_label">鏂囦欢缂栧彿锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
- @keyup.enter.native="refreshTable()"></el-input>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btn">
+ <div>
<el-button size="small" type="primary" @click="openAdd">鏂板</el-button>
<el-upload :action="action" :multiple="false" :show-file-list="false" accept='.doc,.docx'
- :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload'
- :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
+ :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload'
+ :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
<el-button type="primary" size="small">瀵煎叆</el-button></el-upload>
<el-button size="small" type="primary" @click="handleDown" :loading="outLoading"
- style="display:inline-block;margin-left: 20px;">瀵煎嚭</el-button>
+ style="display:inline-block;margin-left: 20px;">瀵煎嚭</el-button>
</div>
</div>
<div class="table">
@@ -387,16 +387,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 80px;
+ height: 46px;
display: flex;
- align-items: center;
+ justify-content: space-between;
}
.search_thing {
@@ -413,19 +407,5 @@
.search_input {
width: calc(100% - 110px);
-}
-
-.table {
- margin-top: 10px;
- background-color: #fff;
- height: calc(100% - 60px - 80px - 10px - 40px);
- padding: 20px;
- padding-top: 0;
-}
-
-.btn {
- position: absolute;
- right: 20px;
- top: 16px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
index f03e924..617c274 100644
--- a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
@@ -1,31 +1,31 @@
<template>
<!-- 鎵�鏈夋枃浠讹紙鍐呫�佸閮ㄦ枃浠讹級鐨勫彂鏀句笌鍥炴敹璁板綍 -->
- <div class="DistributionRetrievalRecordsAllDocuments">
+ <div class="capacity-scope">
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏂囦欢鍚嶇О锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentName"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鏂囦欢鍚嶇О" prop="documentName">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentName"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item label="鏂囦欢缂栧彿" prop="documentCode">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing">
- <div class="search_label">鏂囦欢缂栧彿锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
- @keyup.enter.native="refreshTable()"></el-input>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btn">
+ <div>
<el-button size="small" type="primary" @click="openAdd">鏂板</el-button>
<el-upload :action="action" :multiple="false" :show-file-list="false" accept='.doc,.docx'
- :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload'
- :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
+ :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload'
+ :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
<el-button type="primary" size="small">瀵煎叆</el-button></el-upload>
<el-button size="small" type="primary" @click="handleDown" :loading="outLoading"
- style="display:inline-block;margin-left: 20px;">瀵煎嚭</el-button>
+ style="display:inline-block;margin-left: 20px;">瀵煎嚭</el-button>
</div>
</div>
<div class="table">
@@ -436,16 +436,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 80px;
+ height: 46px;
display: flex;
- align-items: center;
+ justify-content: space-between;
}
.search_thing {
@@ -462,13 +456,5 @@
.search_input {
width: calc(100% - 110px);
-}
-
-.table {
- margin-top: 10px;
- background-color: #fff;
- height: calc(100% - 60px - 80px - 10px - 40px);
- padding: 20px;
- padding-top: 0;
}
</style>
diff --git a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
index 1485e6c..4fbcee7 100644
--- a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
@@ -3,7 +3,7 @@
<div class="capacity-scope">
<el-tabs type="border-card" v-model="activeName" style="height: 100%;" @change="getTableData">
<el-tab-pane label="濉啓" name="濉啓" style="height: 100%;">
- <div style="display: flex;align-items: center;justify-content: flex-end;margin-right: 20px;">
+ <div style="display: flex;align-items: center;justify-content: flex-end;margin-bottom: 10px">
<el-button size="small" type="primary" @click="openAdd('鏂板')" style="margin-left: 20px;">鏂板</el-button>
<el-upload :action="action" :multiple="false" :show-file-list="false" accept='.doc,.docx'
:headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload'
@@ -14,19 +14,18 @@
:height="'calc(100vh - 290px)'" @pagination="pagination0"></lims-table>
</el-tab-pane>
<el-tab-pane label="鍘嗗彶璁板綍" name="鍘嗗彶璁板綍" style="height: 100%;">
- <div class="search">
- <div class="search_thing">
- <div class="search_label">骞达細</div>
- <div class="search_input">
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="骞�" prop="year">
<el-date-picker v-model="queryParams.year" type="year" placeholder="閫夋嫨骞�" format="yyyy" value-format="yyyy"
- size="small" @change="refreshTable()">
+ size="small" @change="refreshTable()">
</el-date-picker>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
<lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
:height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
diff --git a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
index 2257543..4e56e7a 100644
--- a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
@@ -1,30 +1,30 @@
<template>
<!-- 鏂囦欢瀹氭湡瀹℃煡璁板綍 -->
- <div class="PeriodicDocumentReviewRecords">
+ <div class="capacity-scope">
<el-tabs type="border-card" v-model="activeName" style="height: 100%;">
<el-tab-pane label="濉啓" name="濉啓" style="height: 100%;">
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏂囦欢鍚嶇О锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="queryParams.documentName" @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鏂囦欢鍚嶇О" prop="documentName">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="queryParams.documentName" @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item label="鏂囦欢缂栧彿" prop="documentCode">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing">
- <div class="search_label">鏂囦欢缂栧彿锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
- @keyup.enter.native="refreshTable()"></el-input>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btns">
+ <div>
<el-button size="small" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
<el-upload :action="action" :multiple="false" :show-file-list="false" accept='.doc,.docx'
- :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload' v-if="upPower"
- :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
+ :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload' v-if="upPower"
+ :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
<el-button type="primary" size="small">瀵煎叆</el-button></el-upload>
</div>
</div>
@@ -34,19 +34,18 @@
</div>
</el-tab-pane>
<el-tab-pane label="鍘嗗彶璁板綍" name="鍘嗗彶璁板綍" style="height: 100%;">
- <div class="search">
- <div class="search_thing">
- <div class="search_label">骞达細</div>
- <div class="search_input">
+ <div>
+ <el-form :model="queryParams0" ref="queryParams0" size="small" :inline="true">
+ <el-form-item label="骞�" prop="year">
<el-date-picker v-model="queryParams0.year" type="year" placeholder="閫夋嫨骞�" format="yyyy"
- value-format="yyyy" size="small" @change="refreshTable(1)">
+ value-format="yyyy" size="small" @change="refreshTable(1)">
</el-date-picker>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh(1)">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable(1)">鏌� 璇�</el-button>
- </div>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable(1)">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh(1)">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
<div class="table">
<lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading"
@@ -530,17 +529,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 40px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
.search_thing {
@@ -559,21 +551,7 @@
width: calc(100% - 110px);
}
-.table {
- margin-top: 10px;
- background-color: #fff;
- height: calc(100% - 60px - 140px);
- padding: 20px;
- padding-top: 0;
-}
-
>>>.el-tabs__content {
height: 100%;
-}
-
-.btns {
- position: absolute;
- right: 20px;
- top: 5px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue b/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
index 234e7f1..d902ac1 100644
--- a/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
@@ -1,22 +1,23 @@
<template>
<!-- 鏂囦欢淇鐢宠瀹℃壒璁板綍 -->
- <div class="DocumentRevisionRequestApprovalRecords">
+ <div class="capacity-scope">
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏂囦欢缂栧彿锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
- @keyup.enter.native="refreshTable()"></el-input>
- </div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鏂囦欢缂栧彿" prop="documentCode">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btn">
+ <div>
<el-button size="small" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
<el-button size="small" type="primary" @click="handleDown" :loading="outLoading" v-if="outPower"
- style="display:inline-block;margin-left: 20px;">瀵煎嚭</el-button>
+ style="display:inline-block;margin-left: 20px;">瀵煎嚭</el-button>
</div>
</div>
<div class="table">
@@ -702,17 +703,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 80px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
.search_thing {
@@ -729,14 +723,6 @@
.search_input {
width: calc(100% - 110px);
-}
-
-.table {
- margin-top: 10px;
- background-color: #fff;
- height: calc(100% - 60px - 80px - 10px - 40px);
- padding: 20px;
- padding-top: 0;
}
.tables {
@@ -796,13 +782,4 @@
left: 0;
}
->>>.el-dialog__body {
- height: auto;
-}
-
-.btn {
- position: absolute;
- right: 20px;
- top: 16px;
-}
</style>
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue
index 5638155..2c393bb 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue
@@ -1,19 +1,24 @@
<template>
<div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 160px">鍙楀閮ㄩ棬锛�</span>
- <el-input v-model="searchForm.department" clearable size="small"></el-input>
- <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <span class="search-group">
+ <div class="search">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="鍙楀閮ㄩ棬" prop="department">
+ <el-input v-model="searchForm.department" 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>
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
+ </div>
</div>
<div class="table">
<limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 10px;margin-bottom: 16px" :page="page" @pagination="pagination">
+ :table-loading="tableLoading" :page="page" @pagination="pagination">
</limsTable>
</div>
<audit-inspection-dia v-if="auditInspectionDia" ref="auditInspectionDia"
@@ -235,17 +240,9 @@
</script>
<style scoped>
-.search-background {
- width: 100%;
- height: 60px;
- line-height: 60px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue
index b0caa51..a1c84ad 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue
@@ -1,19 +1,24 @@
<template>
<div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 160px">鏃堕棿锛�</span>
- <el-input v-model="searchForm.meetingDate" clearable size="small"></el-input>
- <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <span class="search-group">
+ <div class="search">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="鏃堕棿" prop="meetingDate">
+ <el-input v-model="searchForm.meetingDate" 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>
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
+ </div>
</div>
<div class="table">
<limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 10px;margin-bottom: 16px" :page="page" @pagination="pagination">
+ :table-loading="tableLoading" :page="page" @pagination="pagination">
</limsTable>
</div>
<audit-meeting-sign-dia v-if="auditMeetingSignDia" ref="auditMeetingSignDia"
@@ -183,17 +188,9 @@
</script>
<style scoped>
-.search-background {
- width: 100%;
- height: 60px;
- line-height: 60px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue
index 38bdaeb..2142a31 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue
@@ -1,15 +1,20 @@
<template>
<div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 160px">瀹℃牳鐩殑锛�</span>
- <el-input v-model="searchForm.purposes" clearable size="small"></el-input>
- <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <span class="search-group">
+ <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.purposes" 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>
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
+ </div>
</div>
<div class="table">
<limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
@@ -293,17 +298,9 @@
</script>
<style scoped>
-.search-background {
- width: 100%;
- height: 60px;
- line-height: 60px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue
index c0c2d4c..6b72bee 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue
@@ -1,19 +1,24 @@
<template>
<div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 200px">涓嶅悎鏍兼弿杩帮細</span>
- <el-input v-model="searchForm.raiseResult" clearable size="small"></el-input>
- <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <span class="search-group">
+ <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.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>
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
+ </div>
</div>
<div class="table">
<limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 10px;margin-bottom: 16px" :page="page" @pagination="pagination">
+ :table-loading="tableLoading" :page="page" @pagination="pagination">
</limsTable>
</div>
<corrective-action-d-ia v-if="correctiveActionDIa" ref="correctiveActionDIa"
@@ -163,17 +168,9 @@
</script>
<style scoped>
-.search-background {
- width: 100%;
- height: 60px;
- line-height: 60px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/implementationPlan.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/implementationPlan.vue
index 98ddec0..f6698a2 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/implementationPlan.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/implementationPlan.vue
@@ -1,19 +1,24 @@
<template>
<div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 160px">瀹℃牳鐩殑锛�</span>
- <el-input v-model="searchForm.purposes" clearable size="small"></el-input>
- <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <span class="search-group">
+ <div class="search">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="瀹℃牳鐩殑" prop="purposes">
+ <el-input v-model="searchForm.purpose" 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>
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
+ </div>
</div>
<div class="table">
<limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 10px;margin-bottom: 16px" @pagination="pagination" :page="page">
+ :table-loading="tableLoading" @pagination="pagination" :page="page">
</limsTable>
</div>
<implement-plan-dia v-if="implementPlanDia" ref="implementPlanDia"
@@ -273,17 +278,9 @@
</script>
<style scoped>
-.search-background {
- width: 100%;
- height: 60px;
- line-height: 60px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue
index 2c37944..cf2dab2 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue
@@ -1,19 +1,24 @@
<template>
<div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 160px">鍐呭鐩殑锛�</span>
- <el-input v-model="searchForm.purpose" clearable size="small"></el-input>
- <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <span class="search-group">
+ <div class="search">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="鍐呭鐩殑" prop="purpose">
+ <el-input v-model="searchForm.purpose" 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>
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
+ </div>
</div>
<div class="table">
<limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 10px;margin-bottom: 16px" @pagination="pagination" :page="page">
+ :table-loading="tableLoading" @pagination="pagination" :page="page">
</limsTable>
</div>
<year-plan-dia v-if="yearPlanDia" ref="yearPlanDia" @closeYearDia="closeYearDia"></year-plan-dia>
@@ -295,17 +300,9 @@
</script>
<style scoped>
-.search-background {
- width: 100%;
- height: 60px;
- line-height: 60px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/index.vue b/src/views/CNAS/systemManagement/internalAuditManagement/index.vue
index 4b61b39..d64e780 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/index.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="main">
+ <div class="capacity-scope">
<el-tabs v-model="activeName" class="tab-panel" type="border-card">
<el-tab-pane label="骞村害璁″垝" name="yearPlan">
<year-plan></year-plan>
@@ -47,11 +47,4 @@
</script>
<style scoped>
-.main {
- padding: 15px 0;
-}
-
-.tab-panel {
- background: #fff;
-}
</style>
diff --git a/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue b/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue
index 056045b..ddc4721 100644
--- a/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue
+++ b/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue
@@ -1,19 +1,24 @@
<template>
<div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 160px">璇勫鍦扮偣锛�</span>
- <el-input v-model="searchForm.judgingLocation" clearable size="small"></el-input>
- <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <span class="search-group">
+ <div class="search">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="璇勫鍦扮偣" prop="judgingLocation">
+ <el-input v-model="searchForm.judgingLocation" 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>
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
+ </div>
</div>
<div class="table">
<limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 10px;margin-bottom: 16px" :page="page" @pagination="pagination">
+ :table-loading="tableLoading" :page="page" @pagination="pagination">
</limsTable>
</div>
<management-form-d-ia v-if="managementFormDIa" ref="managementFormDIa"
@@ -287,17 +292,9 @@
</script>
<style scoped>
-.search-background {
- width: 100%;
- height: 60px;
- line-height: 60px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue b/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue
index dc89b07..820a8fd 100644
--- a/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue
+++ b/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue
@@ -1,19 +1,24 @@
<template>
<div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 160px">浼氳鍦扮偣锛�</span>
- <el-input v-model="searchForm.place" clearable size="small"></el-input>
- <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <span class="search-group">
+ <div class="search">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="浼氳鍦扮偣" prop="place">
+ <el-input v-model="searchForm.place" 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>
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
+ </div>
</div>
<div class="table">
<limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 10px;margin-bottom: 16px" :page="page" @pagination="pagination">
+ :table-loading="tableLoading" :page="page" @pagination="pagination">
</limsTable>
</div>
<meeting-records-dia v-if="meetingRecordsDia" ref="meetingRecordsDia"
@@ -174,17 +179,9 @@
</script>
<style scoped>
-.search-background {
- width: 100%;
- height: 60px;
- line-height: 60px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue b/src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue
index 45b2994..8adf05e 100644
--- a/src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue
+++ b/src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue
@@ -1,19 +1,24 @@
<template>
<div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 160px">鍦扮偣锛�</span>
- <el-input v-model="searchForm.place" clearable size="small"></el-input>
- <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <span class="search-group">
+ <div class="search">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="鍦扮偣" prop="place">
+ <el-input v-model="searchForm.place" 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>
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
+ </div>
</div>
<div class="table">
<limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 10px;margin-bottom: 16px" :page="page" @pagination="pagination">
+ :table-loading="tableLoading" :page="page" @pagination="pagination">
</limsTable>
</div>
<review-report-dia v-if="reviewReportDia" ref="reviewReportDia" @closeYearDia="closeYearDia"></review-report-dia>
@@ -243,17 +248,9 @@
</script>
<style scoped>
-.search-background {
- width: 100%;
- height: 60px;
- line-height: 60px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
}
</style>
diff --git a/src/views/CNAS/systemManagement/managementReview/index.vue b/src/views/CNAS/systemManagement/managementReview/index.vue
index 9111484..d18aa48 100644
--- a/src/views/CNAS/systemManagement/managementReview/index.vue
+++ b/src/views/CNAS/systemManagement/managementReview/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="main">
+ <div class="capacity-scope">
<el-tabs v-model="activeName" class="tab-panel" type="border-card">
<el-tab-pane label="绠＄悊璇勫璁″垝" name="yearPlan">
<management-review-plan></management-review-plan>
@@ -38,11 +38,4 @@
</script>
<style scoped>
-.main {
- padding: 15px 0;
-}
-
-.tab-panel {
- background: #fff;
-}
</style>
diff --git a/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue b/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue
index 5f69ca3..1a2f691 100644
--- a/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue
+++ b/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue
@@ -58,7 +58,7 @@
</el-table-column>
</el-table>
<el-pagination :current-page="1" :page-size="page.size" :page-sizes="[10, 20, 30, 50, 100]" :total="page.total"
- layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+ layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" background
@current-change="handleCurrentChange">
</el-pagination>
<el-dialog title="鎻愮ず" :visible.sync="dialogVisible" width="50%">
diff --git a/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue b/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
index 33f189f..2cbdc4a 100644
--- a/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
+++ b/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
@@ -50,7 +50,7 @@
</el-table-column>
</el-table>
<el-pagination :current-page="1" :page-size="search.size" :page-sizes="[10, 20, 30, 50, 100]" :total="search.total"
- layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+ layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" background
@current-change="handleCurrentChange">
</el-pagination>
<el-dialog title="鎻愮ず" :visible.sync="dialogVisible" width="50%">
diff --git a/src/views/CNAS/systemManagement/measuresDealRisks/index.vue b/src/views/CNAS/systemManagement/measuresDealRisks/index.vue
index 5506e5b..0bc2362 100644
--- a/src/views/CNAS/systemManagement/measuresDealRisks/index.vue
+++ b/src/views/CNAS/systemManagement/measuresDealRisks/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="main">
+ <div class="capacity-scope">
<el-tabs v-model="activeName" type="border-card" :lazy="true">
<el-tab-pane label="鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�" name="鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�">
<HazardIdentificationRiskAssessment v-if="activeName === '鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�'" />
@@ -29,10 +29,6 @@
</script>
<style scoped>
-.main {
- width: 100%;
-}
-
/deep/ .el-tabs--border-card>.el-tabs__content {
height: calc(100vh - 9em);
padding: 0;
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index 2f7df2a..4af1036 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/src/views/business/inspectionReview/index.vue
@@ -251,6 +251,9 @@
mounted() {
this.refreshTable()
},
+ activated() {
+ this.refreshTable()
+ },
methods: {
refreshTable() {
this.tableLoading = true;
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 206760d..c1b6a22 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -1,92 +1,3 @@
-<style scoped>
-.search {
- background-color: #fff;
- height: 40px;
- display: flex;
- align-items: center;
- margin-top: 20px;
-}
-
-.search_thing {
- display: flex;
- align-items: center;
- height: 50px;
-}
-
-.search_label {
- width: 100px;
- font-size: 14px;
- text-align: right;
-}
-
-.search_input {
- width: calc(100% - 120px);
-}
-
-.ins-order-plan-main .search {
- width: 100%;
- height: 40px;
- background-color: #fff;
- border-radius: 3px;
-}
-
-.ins-order-plan-main .center {
- background-color: #fff;
- border-radius: 3px;
- padding: 20px;
- padding-top: 0px;
-}
-
-.tab {
- list-style-type: none;
- display: flex;
- padding-left: 6px;
-}
-
-.tab li {
- line-height: 24px;
- padding: 4px 10px;
- font-size: 14px;
- color: #333333;
- border: 1px solid #eeeeee;
- cursor: pointer;
-}
-
-.tab li:nth-child(1) {
- border-radius: 8px 0 0 8px;
-}
-
-.tab li:nth-last-child(1) {
- border-radius: 0 8px 8px 0;
-}
-
-.tab li.active {
- border-color: #3a7bfa;
- color: #3a7bfa;
-}
-
-.center .center-options .center-title {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: right;
-}
-
-.center .center-options .center-title span:last-child {
- color: #3a7bfa;
- font-size: 23px;
- font-weight: 400;
-}
-
-.view-self-checkbox {
- margin-left: 50px;
-}
-</style>
-<style>
-.ins-order-plan-main .el-form-item__label {
- color: #000;
-}
-</style>
<template>
<div class="ins-order-plan-main">
<div style="height: 100%">
@@ -1007,3 +918,92 @@
},
};
</script>
+<style scoped>
+.search {
+ background-color: #fff;
+ height: 40px;
+ display: flex;
+ align-items: center;
+ margin-top: 20px;
+}
+
+.search_thing {
+ display: flex;
+ align-items: center;
+ height: 50px;
+}
+
+.search_label {
+ width: 100px;
+ font-size: 14px;
+ text-align: right;
+}
+
+.search_input {
+ width: calc(100% - 120px);
+}
+
+.ins-order-plan-main .search {
+ width: 100%;
+ height: 40px;
+ background-color: #fff;
+ border-radius: 3px;
+}
+
+.ins-order-plan-main .center {
+ background-color: #fff;
+ border-radius: 3px;
+ padding: 20px;
+ padding-top: 0px;
+}
+
+.tab {
+ list-style-type: none;
+ display: flex;
+ padding-left: 6px;
+}
+
+.tab li {
+ line-height: 24px;
+ padding: 4px 10px;
+ font-size: 14px;
+ color: #333333;
+ border: 1px solid #eeeeee;
+ cursor: pointer;
+}
+
+.tab li:nth-child(1) {
+ border-radius: 8px 0 0 8px;
+}
+
+.tab li:nth-last-child(1) {
+ border-radius: 0 8px 8px 0;
+}
+
+.tab li.active {
+ border-color: #3a7bfa;
+ color: #3a7bfa;
+}
+
+.center .center-options .center-title {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: right;
+}
+
+.center .center-options .center-title span:last-child {
+ color: #3a7bfa;
+ font-size: 23px;
+ font-weight: 400;
+}
+
+.view-self-checkbox {
+ margin-left: 50px;
+}
+</style>
+<style>
+.ins-order-plan-main .el-form-item__label {
+ color: #000;
+}
+</style>
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 8001abe..1f76b7c 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -106,10 +106,10 @@
</el-row>
</el-form>
</div>
- <div style="display: flex;justify-content: space-between;">
+ <div style="display: flex;justify-content: space-between;background-color: #F5F7FB;margin-bottom: 6px">
<div v-if="active==1">
<el-form :inline="true" :model="addObj1" label-width="90px">
- <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px">
+ <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px;margin-top: 6px">
<el-select v-model="model" :placeholder="active>1 ? '' : '璇疯緭鍏�'"
allow-create clearable default-first-option filterable
size="small"
@@ -118,7 +118,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="妫�楠屾爣鍑�:">
+ <el-form-item label="妫�楠屾爣鍑�:" style="margin-bottom: 6px;margin-top: 6px">
<el-select v-model="standardMethodListId" :loading="methodLoad"
:placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"
@change="changeStandardMethodListId" @focus="methodFocus">
@@ -128,7 +128,7 @@
</el-form-item>
</el-form>
</div>
- <div style="margin-top: 3px">
+ <div style="margin-bottom: 6px;margin-top: 6px">
<el-button v-show="active==1" :disabled="sampleList.length === 2" size="small" type="primary" @click="handleSplitCountNum">鎷嗗垎</el-button>
</div>
</div>
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 1bba060..3aa17dc 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -142,10 +142,10 @@
</el-form>
</div>
<div>
- <div style="display: flex;justify-content: space-between;">
+ <div style="display: flex;justify-content: space-between;background-color: #F5F7FB;margin-bottom: 6px">
<div v-if="active==1">
<el-form :inline="true" :model="addObj1" label-width="90px">
- <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px">
+ <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px;margin-top: 6px">
<el-select v-model="model" :placeholder="active>1 ? '' : '璇疯緭鍏�'"
allow-create clearable default-first-option filterable
size="small"
@@ -154,7 +154,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="妫�楠屾爣鍑�:">
+ <el-form-item label="妫�楠屾爣鍑�:" style="margin-bottom: 6px;margin-top: 6px">
<el-select v-model="standardMethodListId" :loading="methodLoad"
:placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"
@change="changeStandardMethodListId" @focus="methodFocus">
@@ -164,7 +164,7 @@
</el-form-item>
</el-form>
</div>
- <div style="margin-top: 3px">
+ <div style="margin-bottom: 6px;margin-top: 6px">
<el-button v-show="active==1" :disabled="sampleList.length === 2" size="small" type="primary" @click="handleSplitCountNum">鎷嗗垎</el-button>
</div>
</div>
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index b6232e1..b7c2f45 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -829,6 +829,9 @@
mounted() {
this.refreshTable()
},
+ activated () {
+ this.refreshTable()
+ },
// 鏂规硶闆嗗悎
methods: {
// 鐐瑰嚮鏌ヨ鍥炶皟
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index 5ca78c6..18745a7 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -15,11 +15,6 @@
<el-input v-model="entity.sampleModel" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="refreshTable()"></el-input>
</el-form-item>
-<!-- <el-form-item label="鏍峰搧缂栧彿" prop="sampleCode" v-if="more">-->
-<!-- <el-input v-model="entity.sampleCode" clearable placeholder="璇疯緭鍏�" size="small"-->
-<!-- @keyup.enter.native="refreshTable">-->
-<!-- </el-input>-->
-<!-- </el-form-item>-->
<el-form-item label="涓嬪崟鏃堕棿" prop="createTime" v-if="more">
<el-date-picker v-model="entity.createTime" clearable format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" size="small"
style="width:100%" type="date" value-format="yyyy-MM-dd HH:mm:ss">
@@ -338,9 +333,21 @@
tableData: [],
tableLoading: false,
column: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
+ {
+ label: "濮旀墭缂栧彿",
+ prop: "entrustCode",
+ width: "160px",
+ dataType: "link",
+ linkMethod: "changeEntrustCode",
+ },
{ label: '濮旀墭鍗曚綅', prop: 'company' },
- { label: '鏍峰搧鍚嶇О', prop: 'sampleName' },
+ {
+ label: "鏍峰搧鍚嶇О",
+ prop: "sampleName",
+ width: "160px",
+ dataType: "link",
+ linkMethod: "selectAllByOne",
+ },
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '鏍峰搧鏁伴噺', prop: 'sampleNum' },
{ label: '妫�楠屼汉', prop: 'testingName' },
@@ -748,6 +755,9 @@
this.refreshTable()
this.getAuthorizedPerson()
},
+ activated() {
+ this.refreshTable()
+ },
methods: {
// 鏌ヨ鍒楄〃鏁版嵁
refreshTable() {
@@ -783,6 +793,9 @@
},
// 鎵撳紑淇敼濮旀墭缂栧彿寮规
changeEntrustCode(row) {
+ if (this.tabIndex !== 1) {
+ return
+ }
this.entrustCodeVisible = true
this.entrustCodeInfo = { ...row }
},
@@ -929,15 +942,13 @@
},
// 璇︽儏
selectAllByOne(row) {
- this.active = 2;
- // console.log(row);
- // //鎵撳紑寮规
- // this.dialogVisible = true;
- // //row = 鐐瑰嚮瀵瑰簲琛屽��
- // //澶嶅埗缁檉ormData
- // this.formData = this.HaveJson(row);
- this.currentId = row.id
- this.examine = 1
+ this.$router.push({
+ path: "/productOrder/add", query: {
+ examine: 1,
+ active: 2,
+ currentId: row.id
+ }
+ });
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
--
Gitblit v1.9.3