|
|
@@ -310,7 +310,15 @@ $this->setPageTitle('Distributions') ; |
|
|
|
<span class="label label-success" v-if="!order.date_update && !order.date_delete"><span class="glyphicon glyphicon-check"></span></span> |
|
|
|
</td> |
|
|
|
<td class="column-user"> |
|
|
|
<span v-if="order.user">{{ order.user.lastname+' '+order.user.name }}</span> |
|
|
|
<span v-if="order.user"> |
|
|
|
<template v-if="order.user.name_legal_person && order.user.name_legal_person.length"> |
|
|
|
{{ order.user.name_legal_person }} |
|
|
|
</template> |
|
|
|
<template v-else> |
|
|
|
{{ order.user.lastname+' '+order.user.name }} |
|
|
|
</template> |
|
|
|
|
|
|
|
</span> |
|
|
|
<span v-else>{{ order.username }}</span> |
|
|
|
<span v-if="order.comment && order.comment.length > 0" class="glyphicon glyphicon-comment"></span> |
|
|
|
</td> |
|
|
@@ -535,7 +543,14 @@ $this->setPageTitle('Distributions') ; |
|
|
|
</label> |
|
|
|
<select class="form-control" v-model="order.id_user"> |
|
|
|
<option value="0">--</option> |
|
|
|
<option v-for="user in users" :value="user.id_user" @click="userChange">{{ user.lastname +' '+ user.name }}</option> |
|
|
|
<option v-for="user in users" :value="user.id_user" @click="userChange"> |
|
|
|
<template v-if="user.name_legal_person && user.name_legal_person.length"> |
|
|
|
{{ user.name_legal_person }} |
|
|
|
</template> |
|
|
|
<template v-else> |
|
|
|
{{ user.lastname +' '+ user.name }} |
|
|
|
</template> |
|
|
|
</option> |
|
|
|
</select> |
|
|
|
<input v-model="order.username" type="text" class="form-control" placeholder="Ou saisissez ici le nom de l'utilisateur" /> |
|
|
|
</div> |