Vijayakrishnan 3 жил өмнө
parent
commit
1d84a57943

+ 12 - 10
resources/views/app/patient/prescriptions/list.blade.php

@@ -23,7 +23,7 @@
         @endif
     </div>
     <div class="d-flex align-items-start bg-white">
-        <div :class="currentPrescription ? '' : 'flex-grow-1'">
+        <div :class="currentPrescription ? 'max-width-300px' : 'flex-grow-1'">
             <table class="table table-striped table-sm table-bordered mb-0">
                 <thead class="bg-light">
                 <tr>
@@ -34,7 +34,7 @@
                 <tbody>
                 <tr v-for="(prescription, index) in prescriptions" :class="currentPrescription && currentPrescription.id === prescription.id ? 'bg-aliceblue' : ''">
                     <td class="width-150px">
-                        <a href="#" v-on:click.prevent="currentPrescription=prescription"
+                        <a href="#" v-on:click.prevent="currentPrescription=prescription; setAddMode('')"
                            class="text-nowrap"
                            :class="currentPrescription && currentPrescription.id === prescription.id ? 'font-weight-bold' : ''">
                             @{{prescription.created_at_friendly_short}}
@@ -197,6 +197,7 @@
             </div>
 
             @if(@$note)
+            <div v-if="currentPrescription && currentPrescription.erx_category === 'DRUG'">
             <div v-if="addDrugToErxMode === 'existing'" class="border border-info p-2 bg-aliceblue mb-2 rounded">
                 <div class="d-flex align-items-baseline mb-2">
                     <label for="" class="text-secondary font-weight-bold m-0">Add From Existing Medications</label>
@@ -204,15 +205,15 @@
                 </div>
                 <table class="m-0 table table-sm border bg-white table-hover table-bordered">
                     <tr>
-                        <th>Medication</th>
-                        <th>Instructions</th>
-                        <th>Dispense</th>
-                        <th>Refills</th>
-                        <th>&nbsp;</th>
+                        <th class="align-bottom">Medication</th>
+                        <th class="align-bottom">Instructions<br>To Pharmacist</th>
+                        <th class="align-bottom">Dispense</th>
+                        <th class="align-bottom">Refills</th>
+                        <th class="align-bottom">&nbsp;</th>
                     </tr>
                     <tr v-for="drug in existingDrugs" v-if="notAlreadyAdded(drug.data.name)">
-                        <td class="">@{{ drug.data.name }}</td>
-                        <td class="width-150px bg-white py-0 px-0">
+                        <td class="width-200px">@{{ drug.data.name }}</td>
+                        <td class="bg-white py-0 px-0">
                             <input type="text" class="form-control form-control-sm min-width-unset rounded-0 border-0 shadow-none" v-model="drug.instructions">
                         </td>
                         <td class="width-70px bg-white py-0 px-0">
@@ -221,7 +222,7 @@
                         <td class="width-70px bg-white py-0 pl-0">
                             <input type="text" class="form-control form-control-sm min-width-unset rounded-0 border-0 shadow-none" v-model="drug.data.refills">
                         </td>
-                        <td class="text-right">
+                        <td class="width-70px text-right">
                             <a href="#" v-on:click.prevent="addExistingDrugToERx(drug.uid)" class="text-nowrap">Add to eRx</a>
                         </td>
                     </tr>
@@ -271,6 +272,7 @@
                     </div>
                 </form>
             </div>
+            </div>
             @endif
 
             <hr class="my-3">