|
|
@@ -89,9 +89,9 @@
|
|
|
<td class="px-2 py-2 c-pointer" v-on:click.prevent="showErxPopup(item)">
|
|
|
<div class="d-flex align-items-center">
|
|
|
<div class="pro-initials text-uppercase"
|
|
|
- :title="allProsFlat['pro_' + item.ordering_pro_id].displayedName"
|
|
|
- :style="'background-color: ' + allProsFlat['pro_' + item.ordering_pro_id].colors.bc + '; color: ' + allProsFlat['pro_' + item.ordering_pro_id].colors.fc + ';'">
|
|
|
- @{{allProsFlat['pro_' + item.ordering_pro_id].displayedInitials}}
|
|
|
+ :title="allProsFlat['pro_' + item.assigned_pro_id].displayedName"
|
|
|
+ :style="'background-color: ' + allProsFlat['pro_' + item.assigned_pro_id].colors.bc + '; color: ' + allProsFlat['pro_' + item.assigned_pro_id].colors.fc + ';'">
|
|
|
+ @{{allProsFlat['pro_' + item.assigned_pro_id].displayedInitials}}
|
|
|
</div>
|
|
|
<div class="flex-grow-1 d-inline-flex ml-2 flex-wrap">
|
|
|
<span class="font-weight-bold text-dark font-size-13">@{{item.data.medication}}</span>
|
|
|
@@ -542,6 +542,14 @@
|
|
|
reloadPopupItem: function(_type) {
|
|
|
$.get('/get-ticket/' + this[_type + 'PopupItem'].uid, (_data) => {
|
|
|
this[_type + 'PopupItem'] = _data;
|
|
|
+
|
|
|
+ // also update in main list
|
|
|
+ for (let i=0; i < this.ticketsByType[_type].length; i++) {
|
|
|
+ if (this.ticketsByType[_type][i].uid === this[_type + 'PopupItem'].uid) {
|
|
|
+ this.ticketsByType[_type].splice(i, 1, _data);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
}, 'json');
|
|
|
},
|
|
|
closeItem: function(_item) {
|
