Browse Source

Equipment - Add shipping_status & tracking_number

Vijayakrishnan 4 năm trước cách đây
mục cha
commit
699eed6bf9

+ 26 - 52
resources/views/app/patient/action-items-equipment-single.blade.php

@@ -34,10 +34,18 @@
                                 <span class="width-100px text-secondary text-sm">Purpose</span>
                                 <span class="font-weight-bold">@{{ item.purpose }}</span>
                             </div>
-                            <div class="d-flex align-items-start flex-nowrap">
+                            <div class="d-flex align-items-start flex-nowrap mb-2">
                                 <span class="width-100px text-secondary text-sm">Memo</span>
                                 <span class="font-weight-bold">@{{ item.memo ? item.memo : '-' }}</span>
                             </div>
+                            <div class="d-flex align-items-start flex-nowrap mb-2">
+                                <span class="width-100px text-secondary text-sm">Shipping Status</span>
+                                <span class="font-weight-bold">@{{ item.shipping_status ? item.shipping_status : '-' }}</span>
+                            </div>
+                            <div class="d-flex align-items-start flex-nowrap">
+                                <span class="width-100px text-secondary text-sm">Tracking #</span>
+                                <span class="font-weight-bold">@{{ item.tracking_number ? item.tracking_number : '-' }}</span>
+                            </div>
                         </div>
                     </div>
                     @include('app.patient.partials.ticket_action_links')
@@ -82,6 +90,14 @@
                         <label class="text-sm text-secondary mb-1">Memo</label>
                         <input type="text" v-model="popupItem.memo" class="form-control form-control-sm">
                     </div>
+                    <div class="mb-2">
+                        <label class="text-sm text-secondary mb-1">Shipping Status</label>
+                        <input type="text" v-model="popupItem.shipping_status" class="form-control form-control-sm">
+                    </div>
+                    <div class="mb-2">
+                        <label class="text-sm text-secondary mb-1">Tracking #</label>
+                        <input type="text" v-model="popupItem.tracking_number" class="form-control form-control-sm">
+                    </div>
                     <div class="d-flex align-items-center justify-content-center mt-3">
                         <button type="button" class="btn btn-sm btn-primary mr-2" v-on:click.prevent="savePopupItem()">Submit</button>
                         <button type="button" class="btn btn-sm btn-default border" onclick="return closeStagPopup()">Cancel</button>
@@ -118,46 +134,26 @@
                             item: {!! json_encode($item) !!},
                             popupItem: {
                                 uid: '',
-                                is_open: true,
-                                medication: '',
-                                strength: '',
-                                amount: '',
-                                route: '',
-                                frequency: '',
-                                dispense: '',
-                                refills: '',
+                                items: [''],
                                 purpose: '',
-                                pharmacyName: '',
-                                pharmacyCity: '',
-                                pharmacyState: '',
-                                pharmacyAddressMemo: '',
-                                pharmacyPhone: '',
-                                pharmacyFax: '',
+                                memo: '',
+                                shipping_status: '',
+                                tracking_number: '',
                             },
                             @include('app.patient.partials.ticket_vue_data')
                         },
                         methods: {
                             showPopup: function(_name, _item) {
                                 closeStagPopup();
+                                console.log(_item);
                                 this.popupMode = _item ? 'edit' : 'add';
                                 this.popupItem = _item ? JSON.parse(JSON.stringify(_item)) : {
                                     uid: '',
-                                    is_open: true,
-                                    medication: '',
-                                    strength: '',
-                                    amount: '',
-                                    route: '',
-                                    frequency: '',
-                                    dispense: '',
-                                    refills: '',
+                                    items: [''],
                                     purpose: '',
-                                    pharmacy: '',
-                                    pharmacyName: '',
-                                    pharmacyCity: '',
-                                    pharmacyState: '',
-                                    pharmacyAddressMemo: '',
-                                    pharmacyPhone: '',
-                                    pharmacyFax: '',
+                                    memo: '',
+                                    shipping_status: '',
+                                    tracking_number: '',
                                 };
                                 showStagPopup('equipment-popup');
                             },
@@ -211,28 +207,6 @@
                                     fastReload();
                                 });
                             },
-                            initICDAutoSuggest: function() {
-                                let self = this;
-                                $('#equipmentSingleApp input[type="text"][data-field="icd"]:not([ac-initialized])').each(function() {
-                                    var elem = this,
-                                        dynID = 'icd-' + Math.ceil(Math.random() * 1000000),
-                                        vueIndex = $(this).attr('data-index');
-                                    $(elem).attr('id', dynID);
-                                    new window.Def.Autocompleter.Search(dynID,
-                                        'https://clinicaltables.nlm.nih.gov/api/icd10cm/v3/search?sf=code,name&ef=name', {
-                                            tableFormat: true,
-                                            valueCols: [0],
-                                            colHeaders: ['Code', 'Name'],
-                                        }
-                                    );
-                                    window.Def.Autocompleter.Event.observeListSelections(dynID, function() {
-                                        let autocomp = elem.autocomp, acData = autocomp.getSelectedItemData();
-                                        self.popupItem.icds[vueIndex] = acData[0].code;
-                                        return false;
-                                    });
-                                    $(elem).attr('ac-initialized', 1);
-                                });
-                            },
                             @include('app.patient.partials.ticket_vue_methods',['ticketType'=>'equipment'])
                         },
                         mounted: function () {

+ 14 - 0
resources/views/app/patient/partials/equipment.blade.php

@@ -34,6 +34,20 @@
                             <span class="text-secondary">Purpose:</span>
                             <span v-html="item.purpose ? item.purpose : '-'"></span>
                         </div>
+                        <div v-if="item.shipping_status" class="d-inline-flex flex-wrap">
+                            <span class="mx-2 text-secondary">•</span>
+                            <div>
+                                <span class="text-secondary">Shipping status:</span>
+                                <span v-html="item.shipping_status ? item.shipping_status : '-'"></span>
+                            </div>
+                            <div v-if="item.tracking_number" class="d-inline-flex flex-wrap">
+                                <span class="mx-2 text-secondary">•</span>
+                                <div>
+                                    <span class="text-secondary">Tracking #:</span>
+                                    <span v-html="item.tracking_number ? item.tracking_number : '-'"></span>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <div>
                         <span class="text-secondary text-sm mt-1">Created:</span>