From 95fda13c28cb664a57336dd2e01d5b41ec4f717f Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 25 八月 2023 12:57:19 +0800
Subject: [PATCH] 查看详情页
---
src/views/inspectionManagement/commissionInspection/index.vue | 195 ++++++++----------------------------------------
1 files changed, 35 insertions(+), 160 deletions(-)
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index 8f14387..3860a33 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -44,7 +44,10 @@
<el-button class="rightBtn" type="primary" @click="showLink">鏂板濮旀墭</el-button>
</el-form>
</div>
- <div class="library-table">
+ </div>
+
+ <el-card style="margin: 20px 8px;">
+ <div >
<div class="table-header">
<div class="search-bar">
<el-radio-group v-model="radioValue" @change="radioclick">
@@ -53,11 +56,12 @@
</el-radio-button>
</el-radio-group>
</div>
+
<div class="generateInsp">
<el-button type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">鐢熸垚鎶ユ鍗�</el-button>
</div>
</div>
- <div class="table-box">
+
<el-table
ref="commisionTable"
:max-height="800"
@@ -145,20 +149,23 @@
<!-- 鍒嗛〉鍣� -->
<div>
<el-pagination
+ class="pagination"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
- :page-sizes="[5, 10, 20]"
+ :page-sizes="[10,20,30]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
- </div>
+
+
</div>
- </div>
- </div>
- </div>
+ </el-card>
+
+ </div>
+ </div>
</template>
<script>
@@ -272,7 +279,6 @@
this.total = res.data.total
},
-<<<<<<< HEAD
// 閲嶇疆鏂规硶
reset() {
// 閲嶇疆鎼滅储鏉′欢
@@ -326,82 +332,9 @@
}
}
}
-=======
- // 閲嶇疆鏂规硶
- reset() {
- // 閲嶇疆鎼滅储鏉′欢
- this.searchData.code = ''
- this.searchData.name = ''
- this.searchData.department = ''
- this.radioValue = 0
- // 閲嶆柊鑾峰彇鏁版嵁
- this.getCommisionList()
- },
- async radioclick() {
- // 澶勭悊鐐瑰嚮radio鐨勬椂闂�
- console.log('radioValue', this.radioValue)
- if (this.radioValue === 0) {
- this.getCommisionList()
- } else {
- const res = await getCommisionList({
- pageNo: this.currentPage,
- pageSize: this.pageSize,
- inspectionStatus: this.radioValue
- })
- // console.log(res)
- this.commisionTable = res.data.row
- this.total = res.data.total
- }
-
- },
- // 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
- async handleSizeChange(val) {
- // console.log(`姣忛〉 ${val} 鏉)
- this.currentPage = 1
- this.pageSize = val
- if (this.radioValue === 0) {
- this.getCommisionList()
- } else {
- const res = await getCommisionList({
- pageNo: this.currentPage,
- pageSize: this.pageSize,
- inspectionStatus: this.radioValue
- })
- this.commisionTable = res.data.row
- this.total = res.data.total
- }
- },
- // 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
- async handleCurrentChange(val) {
- // console.log(`褰撳墠椤�: ${val}`)
- this.currentPage = val
- if (this.radioValue === 0) {
- this.getCommisionList()
- } else {
- const res = await getCommisionList({
- pageNo: this.currentPage,
- pageSize: this.pageSize,
- inspectionStatus: this.radioValue
- })
- this.commisionTable = res.data.row
- this.total = res.data.total
- }
- },
- goToaddCommision() {
- // this.$router.push('/inspectionManagement/commissionInspection/addCommision')
- // this.showDetail = true
- selectViewUUID({
- day: this.day
- }).then(res => {
- this.viewId = res.data
- })
- }
- }
- }
->>>>>>> d94af68ec3f6317124df81296b08c7c110641fca
</script>
-<style scoped>
+<style lang="scss" scoped>
.top-bar {
margin: -25px -15px;
background: #fff;
@@ -409,7 +342,6 @@
justify-content: space-between;
padding: 5px 24px 0px 24px;
-<<<<<<< HEAD
.top-bar{
margin: -25px -15px;
background: #fff;
@@ -439,90 +371,33 @@
}
}
-.library-table{
- background-color: #fff;
- flex: 1;
- margin: 0px -15px;
- margin-top: 40px;
- display: flex;
- flex-direction: column;
- .table-header{
- padding: 20px;
- display: flex;
- justify-content: space-between;
- .el-form-item{
- margin-bottom: 30px !important;
- }
- }
- .table-box{
- padding: 0px 20px;
- margin-top: 0px;
- flex: 1;
- background: #fff;
- /* padding: 20px 20px 10px 20px; */
- display: flex;
- flex-direction: column;
- .el-table {
- flex: 1;
- }
- >div:nth-child(2){
- display: flex;
- justify-content: end;
- margin: 10px 0;
- }
- }
- }
-=======
- .sermargin {
- margin-right: 60px;
- }
- }
->>>>>>> d94af68ec3f6317124df81296b08c7c110641fca
.rightBtn {
background-color: rgb(1, 102, 226);
}
- .library-table {
- background-color: #fff;
- flex: 1;
- margin: 0px -15px;
- margin-top: 40px;
- display: flex;
- flex-direction: column;
-
- .table-header {
- padding: 20px;
- display: flex;
- justify-content: space-between;
-
- .el-form-item {
- margin-bottom: 30px !important;
- }
- }
-
- .table-box {
- padding: 0px 20px;
- margin-top: 0px;
- flex: 1;
- background: #fff;
- /* padding: 20px 20px 10px 20px; */
- display: flex;
- flex-direction: column;
-
- .el-table {
- flex: 1;
- }
-
- >div:nth-child(2) {
- display: flex;
- justify-content: end;
- margin: 10px 0;
- }
- }
- }
+
+ }
+ .table-header{
+ display:flex;
+ margin-bottom: 10px;
+ .search-bar{
+ width: 50%;
+ }
+ .generateInsp{
+ width: 50%;
+ display: flex;
+ justify-content: end;
+ }
+ }
+ .pagination{
+ display: flex;
+ margin-top: 20px;
+ justify-content: end;
+}
.vue_qr_div{
text-align: center;
}
+
</style>
\ No newline at end of file
--
Gitblit v1.9.3