From 81dc6d98e121951738831a27b0aedb6a888f0ea4 Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期六, 15 三月 2025 16:42:57 +0800 Subject: [PATCH] cnas样式统一 --- src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue | 2 src/views/CNAS/systemManagement/measuresDealRisks/index.vue | 6 src/views/CNAS/systemManagement/internalAuditManagement/components/implementationPlan.vue | 37 +- src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue | 84 ++---- src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue | 23 +- src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue | 37 +- src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue | 37 +- src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue | 58 ++--- src/views/CNAS/systemManagement/customerSatisfaction/index.vue | 73 ++---- src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue | 2 src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue | 55 +--- src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue | 35 +- src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue | 64 ++--- src/views/CNAS/systemManagement/internalAuditManagement/index.vue | 9 src/views/CNAS/systemManagement/correctiveAction/index.vue | 23 +- src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue | 37 +- src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue | 37 +- 17 files changed, 243 insertions(+), 376 deletions(-) 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/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..343b6e3 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="laboratoryName"> + <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/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; -- Gitblit v1.9.3