待处理事项

This commit is contained in:
leave 2020-10-28 10:44:24 +08:00
parent 8ecb7da33e
commit 8c84a99625
3 changed files with 156 additions and 86 deletions

View File

@ -1,19 +1,28 @@
@borderColor: #ebebeb;
@fontBlue: #3ba1ff;
@headerHeight:60px;
.boderAndRadius{
@headerHeight: 60px;
.boderAndRadius {
border: 1px solid @borderColor;
border-radius:6px ;
border-radius: 6px;
background: #fff;
}
.commonFont {
font-size: 16px;
color: #52575b;
}
.comonPromptFont {
font-size: 14px;
color: #b1b1b1;
}
.common-main {
background-color: white;
padding: 40px 20px;
}
.noSelect {
-webkit-touch-callout: none;
-webkit-user-select: none;
@ -22,7 +31,8 @@
-ms-user-select: none;
user-select: none;
}
.center(){
.center() {
display: flex;
align-items: center;
justify-content: center;
@ -34,4 +44,4 @@
// }
// ::-webkit-scrollbar {
// width: 0 !important;height: 0;
// }
// }

View File

@ -140,7 +140,7 @@
</el-table>
<div
v-else
class="popup-empty"
class="popup-empty comonPromptFont"
>
<img
src=""
@ -292,7 +292,7 @@ export default {
apiInitiateAssessmentInfo(para).then(res => {
this.dialogSendVisible = false
console.log('发起考核成功', res)
this.$router.push({name: 'assessment-stepList', query: {id: res.data.id, name: 'assessment-homeList'}})
this.$router.push({ name: 'assessment-stepList', query: { id: res.data.id, name: 'assessment-homeList' } })
this.$message({
message: res.msg,
type: 'success'
@ -340,34 +340,34 @@ export default {
</script>
<style lang="less" scoped>
.initiate-assessment {
min-height: 600px;
.title {
margin-bottom: 25px;
min-height: 600px;
.title {
margin-bottom: 25px;
}
.choose-group {
margin-top: 200px;
}
.line-space {
margin-top: 20px;
}
.popup {
&-search {
margin-bottom: 20px;
}
.choose-group {
margin-top: 200px;
&-empty {
padding-top: 100px;
height: 500px;
width: 410px;
font-size: 14px;
text-align: center;
display: block;
align-content: center;
justify-content: center;
}
.line-space {
margin-top: 20px;
}
.popup {
&-search {
margin-bottom: 20px;
}
&-empty {
padding-top: 100px;
height: 500px;
width: 410px;
font-size: 14px;
text-align: center;
display: block;
align-content: center;
justify-content: center;
}
&-footer-left {
color: @fontBlue;
}
&-footer-left {
color: @fontBlue;
}
}
}
</style>

View File

@ -14,36 +14,46 @@
</el-menu>
</div>
<div class="todo-content-right">
<!-- <div v-if=""></div> -->
<el-table
:data="waitTableList"
:show-header="false"
style="border-top: 1px solid #ebebeb;"
max-height="500"
>
<el-table-column
prop="imgStr"
width="100"
></el-table-column>
<el-table-column prop="name"></el-table-column>
<el-table-column
width="200"
align="right"
<div v-if="selectedTableList.length > 0">
<el-table
:data="waitTableList"
@row-click="handleRowClick"
:show-header="false"
style="border-top: 1px solid #ebebeb;"
max-height="500"
>
<template slot-scope="scope">
{{scope.row.dateTime}}<i class="el-icon-arrow-right"></i>
</template>
</el-table-column>
</el-table>
<el-pagination
:hide-on-single-page="true"
:current-page.sync="rqParameter.currPage"
:page-size="rqParameter.pageSize"
:total="rqParameter.totalCount"
:page-count="rqParameter.totalPage"
<el-table-column
prop="imgStr"
width="100"
></el-table-column>
<el-table-column prop="name"></el-table-column>
<el-table-column
width="200"
align="right"
>
<template slot-scope="scope">
{{scope.row.dateTime}}<i class="el-icon-arrow-right"></i>
</template>
</el-table-column>
</el-table>
<el-pagination
:hide-on-single-page="false"
:current-page.sync="pageSelectedInfo.currPage"
:page-size="pageSelectedInfo.pageSize"
:total="pageSelectedInfo.totalCount"
:page-count="pageSelectedInfo.totalPage"
@current-change="handleCurrentChange"
layout="total, prev, pager, next, jumper"
></el-pagination> </div>
></el-pagination>
</div>
<div
v-else
class="todo-content-right-empty comonPromptFont"
>
<img src="ssss" />
<div>暂无代办</div>
</div>
</div>
</div>
</div>
</template>
@ -56,14 +66,32 @@ export default {
return {
activeIndex: '0',
waitCount: 0,
rqParameter: {
//
selectedTableList: [],
pageSelectedInfo: {
currPage: 1,
pageSize: 20,
status: 0,
totalCount: 1,
totalPage: 1
},
waitTableList: [{ imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }, { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }, { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }]
//
waitTableList: [
{ imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' },
{ imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' },
{ imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }
],
//
pageWaitInfo: {},
processedTableList: [],
pageProcessedInfo: {
currPage: 1,
pageSize: 20,
status: 0,
totalCount: 1,
totalPage: 1
}
}
},
components: {
@ -72,44 +100,55 @@ export default {
computed: {},
beforeMount () { },
mounted () {
this.activeIndex = '0'
this.rqParameter = {
currPage: 1,
pageSize: 20,
status: this.activeIndex,
totalCount: 1,
totalPage: 1
}
this.handleGetList()
},
methods: {
handleGetList () {
apiGetWaitList(this.rqParameter).then(res => {
this.rqParameter.currPage = res.data.currPage
this.rqParameter.totalCount = res.data.totalCount
this.rqParameter.totalPage = res.data.totalPage
apiGetWaitList(this.pageSelectedInfo).then(res => {
this.pageSelectedInfo.currPage = res.data.currPage
this.pageSelectedInfo.totalCount = res.data.totalCount
this.pageSelectedInfo.totalPage = res.data.totalPage
if (this.activeIndex === 0) {
//
this.waitCount = res.data.totalCount
}
this.waitTableList = res.data.list
this.selectedTableList = res.data.list
console.log('待处理', res)
})
},
handleMenuSeledt () {
this.rqParameter = {
currPage: 1,
pageSize: 20,
status: this.activeIndex,
totalCount: 1,
totalPage: 1
handleMenuSeledt (val) {
console.log('index ======', this.activeIndex)
console.log(val)
if (this.activeIndex !== val) {
console.log('menu 切换')
//
if (val === '0') {
console.log('menu 0')
this.processedTableList = this.selectedTableList
this.pageProcessedInfo = this.pageSelectedInfo
this.selectedTableList = this.waitTableList
this.pageSelectedInfo = this.pageWaitInfo
} else {
console.log('menu 1')
this.waitTableList = this.selectedTableList
this.pageWaitInfo = this.pageSelectedInfo
this.selectedTableList = this.processedTableList
this.pageSelectedInfo = this.pageProcessedInfo
}
//
console.log(this.pageSelectedInfo)
if (this.pageSelectedInfo.currPage === 1) {
this.handleGetList()
}
}
this.waitTableList = []
this.handleGetList()
this.activeIndex = val
},
handleCurrentChange (val) {
this.rqParameter.currPage = val
this.handleGetList()
//
this.pageSelectedInfo.currPage = val
},
handleRowClick (row) {
this.$router.push({ name: 'assessment-stepList', query: { id: row.id } })
}
},
watch: {}
@ -122,18 +161,39 @@ export default {
.todo {
&-content {
width: 1252px;
// min-height: 537px;
min-height: 278px;
padding: 28px;
display: flex;
&-left {
width: 200px;
float: left;
.el-menu-item.is-active {
background-color: #ecf4ff !important;
border-left: 3px solid #409eff;
color: #999;
span {
color: #999 !important;
}
}
}
&-right {
// border-left: 2px solid @borderColor;
// padding-left: 20px;
padding: 20px;
flex: 1;
.el-pagination {
text-align: right;
margin-top: 20px;
}
&-empty {
padding-top: 20px;
img {
width: 100px;
height: 100px;
}
height: 100%;
text-align: center;
}
}
}
}