Merge branch 'develop' into nice
This commit is contained in:
commit
a5347a1bd8
1 changed files with 12 additions and 3 deletions
|
|
@ -439,16 +439,25 @@ watch(
|
|||
<div>
|
||||
<div
|
||||
:class="
|
||||
prop.node.isOfficer
|
||||
prop.node.isOfficer || prop.node.isInformation
|
||||
? 'text-weight-medium text-blue'
|
||||
: 'text-weight-medium'
|
||||
"
|
||||
>
|
||||
<div
|
||||
v-if="prop.node.isDeputy == true && prop.node.orgLevel == 0"
|
||||
v-if="
|
||||
(prop.node.isDeputy == true && prop.node.orgLevel == 0) ||
|
||||
(prop.node.isCommission == true &&
|
||||
prop.node.orgLevel == 0)
|
||||
"
|
||||
class="text-info"
|
||||
>
|
||||
{{ prop.node.orgTreeName }}
|
||||
{{ prop.node.orgTreeName
|
||||
}}{{
|
||||
prop.node.isCommission == true && prop.node.orgLevel == 0
|
||||
? ` (กก.)`
|
||||
: ""
|
||||
}}
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ prop.node.orgTreeName }}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue