diff --git a/src/views/otherPage/index.vue b/src/views/otherPage/index.vue index c1a4c14..d18e0d7 100644 --- a/src/views/otherPage/index.vue +++ b/src/views/otherPage/index.vue @@ -40,7 +40,7 @@ v-if="statusCode === 'endTime' && statusIndex === lists.$index" v-model="lists.row.endTime" type="datetime" - placeholder="选择开始时间" + placeholder="选择结束时间" @change="changeTime(lists.row,'endTime',$event)" > @@ -179,7 +179,7 @@ } if(type === 'startTime') { params.startTime = this.$moment(e).valueOf() - } else if (type === 'emdTime') { + } else if (type === 'endTime') { params.endTime = this.$moment(e).valueOf() } else if (type === 'description') { params.description = e.target.value diff --git a/src/views/privilegeManagement/role/permissions.vue b/src/views/privilegeManagement/role/permissions.vue index 8532315..154cdd5 100644 --- a/src/views/privilegeManagement/role/permissions.vue +++ b/src/views/privilegeManagement/role/permissions.vue @@ -131,11 +131,16 @@ if(list && list.length) { for(let i = 0; i < list.length; i++) { if(list[i].own === 1) { - keyList.push(list[i].permissionId) - } - if(list[i].children && list[i].children.length) { - const itemList = this.getKeys(list[i].children) - keyList.push([...itemList]) + if(!list[i].children.length) { + keyList.push(list[i].permissionId) + } else { + const itemList = this.getDefaultKeys(list[i].children) + if(itemList.length) { + for(let m=0;m