This commit is contained in:
熊成强 2020-11-03 17:17:39 +08:00
parent 7a41945f41
commit 87e0828e9a
4 changed files with 13 additions and 7 deletions

View File

@ -23,12 +23,12 @@
</span> </span>
</div> </div>
<div class="popup-item-content"> <div class="popup-item-content">
<div class="popup-item-content-item"> <div v-if="!isSignle" class="popup-item-content-item">
<div class="content" v-show="!isSignle"> <div class="content" v-show="!isSignle">
<el-checkbox :value ='isAll' @change="handleChangChoose($event)">全选</el-checkbox> <el-checkbox :value ='isAll' @change="handleChangChoose($event)">全选</el-checkbox>
</div> </div>
</div> </div>
<div v-for="(i) in showData" :key="i.departmentId" class="popup-item-content-item borderItem"> <div v-for="(i) in showData" :key="i.departmentId" class="popup-item-content-item">
<div class="content"><el-checkbox :value ='handleCheck(i)' @change='handleChangChoose($event,i)' >{{i.departmentName}}</el-checkbox></div> <div class="content"><el-checkbox :value ='handleCheck(i)' @change='handleChangChoose($event,i)' >{{i.departmentName}}</el-checkbox></div>
<div class="popup-item-content-item-next" :class="{isHasActive:handleCheck(i)|| !i.list}" @click='handleNext(i)'>下级</div> <div class="popup-item-content-item-next" :class="{isHasActive:handleCheck(i)|| !i.list}" @click='handleNext(i)'>下级</div>
</div> </div>
@ -109,7 +109,7 @@ export default {
beforeMount () {}, beforeMount () {},
mounted () { mounted () {
this.data = this.deplist this.data = this.deplist
this.tags = this.showDataList.list.concat([]) || [] this.tags = this.showDataList ? this.showDataList.list.concat([]) : []
this.showData = this.data.length > -1 ? this.data : [] this.showData = this.data.length > -1 ? this.data : []
}, },
methods: { methods: {
@ -232,7 +232,7 @@ export default {
&-title{ &-title{
color:#9b9b9b; color:#9b9b9b;
padding-bottom: 4px; padding-bottom: 4px;
border-bottom: 1px solid @borderColor; // border-bottom: 1px solid @borderColor;
padding: 10px; padding: 10px;
} }
&-content{ &-content{
@ -241,6 +241,9 @@ export default {
.borderItem{ .borderItem{
border-top: 1px solid @borderColor; border-top: 1px solid @borderColor;
} }
&-item:first-child{
// border-top:none;
}
&-item:nth-last-child(1){ &-item:nth-last-child(1){
border-bottom: 1px solid @borderColor; border-bottom: 1px solid @borderColor;
} }
@ -250,6 +253,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
align-items: center; align-items: center;
border-top: 1px solid @borderColor;
.isHasActive{ .isHasActive{
color: rgba(196, 196, 196, 0.933) !important; color: rgba(196, 196, 196, 0.933) !important;
border-left: 1px solid rgba(196, 196, 196, 0.933) !important; border-left: 1px solid rgba(196, 196, 196, 0.933) !important;

View File

@ -176,7 +176,7 @@ export default {
this.handleGetData(Object.assign({}, this.form, this.params)) this.handleGetData(Object.assign({}, this.form, this.params))
}, },
handlePush (id) { handlePush (id) {
this.$router.push({name: 'assessment-stepList', query: {id: 10}}) this.$router.push({name: 'assessment-stepList', query: {id}})
}, },
async handleGetData (parmas = this.params) { async handleGetData (parmas = this.params) {
try { try {

View File

@ -282,7 +282,7 @@ export default {
// this.handleKaoping() // this.handleKaoping()
this.$router.push({ this.$router.push({
name: 'assessment-performance', name: 'assessment-performance',
query: { id: 267 } query: { id }
}) })
console.log('id: ', id) console.log('id: ', id)
}, },

View File

@ -50,7 +50,9 @@ export default {
showDialogDepart: false, showDialogDepart: false,
// //
showData: {}, showData: {
list: []
},
// //
len: 1, len: 1,
// //