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 | 214 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 127 insertions(+), 87 deletions(-) diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue index a34af7c..3860a33 100644 --- a/src/views/inspectionManagement/commissionInspection/index.vue +++ b/src/views/inspectionManagement/commissionInspection/index.vue @@ -1,6 +1,6 @@ <template> <div> - <div v-if="!showDetail"> + <div> <div class="content-main"> <div class="top-bar"> <el-form ref="form" :inline="true" :model="searchData"> @@ -35,11 +35,19 @@ <el-button type="primary" plain @click="reset">閲嶇疆</el-button> </el-form-item> </el-form> - <el-form> - <el-button class="rightBtn" type="primary" @click="goToaddCommision">鏂板濮旀墭</el-button> + <el-form class="rightForm"> + <!-- 鏄剧ず鏂板濮旀墭鐨勭綉鍧�閾炬帴 --> + <div v-show="showlinkDiv === true"> + <span style="font-size: 12px;">{{ textToCopy }}</span> + <el-button type="text" @click="copyText" style="margin-left: 30px;">{{ copied ===false?'澶嶅埗':'宸插鍒�' }}</el-button> + </div> + <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"> @@ -48,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" @@ -140,27 +149,27 @@ <!-- 鍒嗛〉鍣� --> <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 v-else> - <router-view /> - </div> - </div> + </el-card> + + </div> + </div> </template> <script> -import { getCommisionList, getlink } from '@/api/inspection/commisioninspection' +import { getCommisionList } from '@/api/inspection/commisioninspection' export default { data() { return { @@ -205,19 +214,33 @@ currentPage: 1, pageSize: 5, total: 100, - showDetail: false + showlinkDiv: false, + copied: false, + textToCopy: 'http://localhost:8080/#/addCommision' } }, created() { this.getCommisionList() }, - updated() { - if (this.$router.currentRoute.name === 'AddCommision') { - // console.log(this.$router.currentRoute.name) - this.showDetail = true - } - }, + // updated() { + // if (this.$router.currentRoute.name === 'AddCommision') { + // // console.log(this.$router.currentRoute.name) + // this.showDetail = true + // } + // }, methods: { + copyText() { + this.$copyText(this.textToCopy) + .then(() => { + this.copied = true; + // setTimeout(() => { + // this.copied = false; + // }, 2000); + }) + .catch(error => { + console.log('澶嶅埗澶辫触',error); + }); + }, async getCommisionList(){ const res = await getCommisionList({pageNo:this.currentPage, pageSize:this.pageSize}) this.commisionTable = res.data.row @@ -228,32 +251,33 @@ // 灏哸llDepartmentNames杞崲涓簅ptions闇�瑕佺殑鏍煎紡 this.options = allDepartmentNames.map(name => ({ value: name, label: name })) - }, - // 鏌ヨ鏂规硶 - async search() { - // 灏嗘悳绱㈡潯浠朵綔涓哄弬鏁颁紶閫掔粰getCommisionList鏂规硶 - if(this.radioValue === 0){ - const res = await getCommisionList({ - pageNo: this.currentPage, - pageSize: this.pageSize, - entrustCoding: this.searchData.code, - sampleName: this.searchData.name, - entrusted: this.searchData.department, - }) - }else{ - const res = await getCommisionList({ - pageNo: this.currentPage, - pageSize: this.pageSize, - entrustCoding: this.searchData.code, - sampleName: this.searchData.name, - entrusted: this.searchData.department, - inspectionStatus: this.radioValue - }) - } - // console.log(res) - this.commisionTable = res.data.row - this.total = res.data.total - }, + }, + // 鏌ヨ鏂规硶 + async search() { + // 灏嗘悳绱㈡潯浠朵綔涓哄弬鏁颁紶閫掔粰getCommisionList鏂规硶 + let res + if (this.radioValue === 0) { + res = await getCommisionList({ + pageNo: this.currentPage, + pageSize: this.pageSize, + entrustCoding: this.searchData.code, + sampleName: this.searchData.name, + entrusted: this.searchData.department, + }) + } else { + res = await getCommisionList({ + pageNo: this.currentPage, + pageSize: this.pageSize, + entrustCoding: this.searchData.code, + sampleName: this.searchData.name, + entrusted: this.searchData.department, + inspectionStatus: this.radioValue + }) + } + // console.log(res) + this.commisionTable = res.data.row + this.total = res.data.total + }, // 閲嶇疆鏂规硶 reset() { @@ -261,13 +285,13 @@ this.searchData.code = '' this.searchData.name = '' this.searchData.department = '' - this.radioValue = '0' + this.radioValue = 0 // 閲嶆柊鑾峰彇鏁版嵁 this.getCommisionList() }, async radioclick(){ // 澶勭悊鐐瑰嚮radio鐨勬椂闂� - // console.log('radioValue',this.radioValue) + console.log('radioValue',this.radioValue) if(this.radioValue === 0){ this.getCommisionList() }else{ @@ -303,15 +327,20 @@ this.total = res.data.total } }, - goToaddCommision() { - this.$router.push('/inspectionManagement/commissionInspection/addCommision') - this.showDetail = true + showLink() { + this.showlinkDiv = true } } } </script> -<style scoped> +<style lang="scss" scoped> + .top-bar { + margin: -25px -15px; + background: #fff; + display: flex; + justify-content: space-between; + padding: 5px 24px 0px 24px; .top-bar{ margin: -25px -15px; @@ -322,42 +351,53 @@ .sermargin{ margin-right: 60px; } - } -.rightBtn{ - background-color: rgb(1, 102, 226); -} -.library-table{ - background-color: #fff; - flex: 1; - margin: 0px -15px; - margin-top: 40px; + .rightForm{ display: flex; - flex-direction: column; - .table-header{ - padding: 20px; - display: flex; - justify-content: space-between; - .el-form-item{ - margin-bottom: 30px !important; - } + justify-content: space-between; + /* background-color: #bfa; */ + height: 40px; + line-height: 40px; + >div{ + padding: 0px 10px; + padding-bottom: 10px; + border:1px solid rgb(8, 156, 230); + margin-right: 10px; + /* height: 40px; + line-height: 40px; */ } - .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; - } + .rightBtn{ + background-color: rgb(1, 102, 226); } } + } -</style> + + .rightBtn { + background-color: rgb(1, 102, 226); + } + + + + } + .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