mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-13 12:02:51 +00:00
no message
This commit is contained in:
parent
1c3ce47dcc
commit
ee12cc21c1
@ -83,7 +83,7 @@ export default {
|
|||||||
{icon: '', name: 'joinMeeting', label: '加入会议'},
|
{icon: '', name: 'joinMeeting', label: '加入会议'},
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
{icon: '', name: 'workReport', label: '工作报告'},
|
{icon: '', name: 'workReport', label: '工作报告'},
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|||||||
@ -60,7 +60,7 @@
|
|||||||
<Button type="primary" icon="md-add" @click="onShowDepartment(null)">{{$L('新建部门')}}</Button>
|
<Button type="primary" icon="md-add" @click="onShowDepartment(null)">{{$L('新建部门')}}</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="management-user">
|
<div class="management-user" :style="userStyle">
|
||||||
<div class="search-container lr">
|
<div class="search-container lr">
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
@ -313,6 +313,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
loadIng: 0,
|
loadIng: 0,
|
||||||
minBox: false,
|
minBox: false,
|
||||||
|
minWidth: 0,
|
||||||
|
|
||||||
keys: {},
|
keys: {},
|
||||||
keyIs: false,
|
keyIs: false,
|
||||||
@ -773,12 +774,29 @@ export default {
|
|||||||
this.minBox = v
|
this.minBox = v
|
||||||
},
|
},
|
||||||
immediate: true
|
immediate: true
|
||||||
|
},
|
||||||
|
minBox: {
|
||||||
|
handler() {
|
||||||
|
this.$nextTick(_=> {
|
||||||
|
if (this.$el && this.$el.clientWidth > 0) {
|
||||||
|
this.minWidth = this.$el.clientWidth
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
immediate: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
departmentParentDisabled() {
|
departmentParentDisabled() {
|
||||||
return !!(this.departmentData.id > 0 && this.departmentList.find(({parent_id}) => parent_id == this.departmentData.id));
|
return !!(this.departmentData.id > 0 && this.departmentList.find(({parent_id}) => parent_id == this.departmentData.id));
|
||||||
},
|
},
|
||||||
|
userStyle({minWidth}) {
|
||||||
|
const style = {}
|
||||||
|
if (minWidth > 0) {
|
||||||
|
style.minWidth = (minWidth - 40) + 'px'
|
||||||
|
}
|
||||||
|
return style
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
onSearch() {
|
onSearch() {
|
||||||
@ -1064,6 +1082,10 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
onSelectDepartment(id) {
|
onSelectDepartment(id) {
|
||||||
|
if (this.windowSmall) {
|
||||||
|
this.minBox = true
|
||||||
|
}
|
||||||
|
//
|
||||||
if (this.departmentSelect === id) {
|
if (this.departmentSelect === id) {
|
||||||
this.departmentSelect = -1
|
this.departmentSelect = -1
|
||||||
return
|
return
|
||||||
|
|||||||
5
resources/assets/sass/components/mobile.scss
vendored
5
resources/assets/sass/components/mobile.scss
vendored
@ -149,8 +149,9 @@
|
|||||||
|
|
||||||
.tabbar-badge {
|
.tabbar-badge {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: -4px;
|
top: -6px;
|
||||||
right: 12px;
|
right: 50%;
|
||||||
|
transform: translateX(36px);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -48,7 +48,6 @@
|
|||||||
.management-box {
|
.management-box {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
min-width: 500px;
|
|
||||||
height: 0;
|
height: 0;
|
||||||
&.min-box {
|
&.min-box {
|
||||||
.management-department {
|
.management-department {
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user