Commit dcb4f10d authored by Zhang Xiaojie's avatar Zhang Xiaojie

Merge remote-tracking branch 'origin/main' into zxj_dev

parents 0a24dd9f f004aef0
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
:content="date" :content="date"
@click="show = true" @click="show = true"
/> />
<van-calendar v-model="show" :round="false" @confirm="onConfirm" :show-confirm="false" :style="{ height:'100%'}" /> <van-calendar v-model="show" :round="false" color="#61C7FF" @confirm="onConfirm" :show-confirm="false" :style="{ height:'100%'}" />
<!-- 选择部门 --> <!-- 选择部门 -->
<group-cell <group-cell
dot dot
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</div> </div>
</div> </div>
<div <div
v-if="checked === t.id && t.children && t.children.length > 0" v-if="t.children && t.children.length > 0"
class="flex-shrink-0 flex items-center text-color-primary py-3" class="flex-shrink-0 flex items-center text-color-primary py-3"
@click="goNext(t)" @click="goNext(t)"
> >
...@@ -152,6 +152,7 @@ export default Vue.extend({ ...@@ -152,6 +152,7 @@ export default Vue.extend({
methods: { methods: {
// 下一级 // 下一级
goNext(team: Member) { goNext(team: Member) {
if (team.id !== this.checked) return
this.currentTeamId = team.id this.currentTeamId = team.id
this.setChecked() this.setChecked()
}, },
......
<template> <template>
<!-- 团队管理 --> <!-- 团队管理 -->
<main-page left-arrow> <main-page left-arrow>
<!-- 右侧二维码图标 -->
<template slot="right">
<div class="h-6.5 w-6.5 flex items-center justify-end">
<app-icon
icon-name="code"
class-name="w-4 h-4"
/>
</div>
</template>
<div class="px-4 pt-14"> <div class="px-4 pt-14">
<!-- 头部 --> <!-- 头部 -->
<div class="flex items-start pt-1 pb-5"> <div class="flex items-start pt-1 pb-5">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment