cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-10 19:51:07 +03:30
Code Issues Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
f.shokouhi
2020-01-09 10:42:13 +03:30
parent b81ec9326f
commit bb43c4f824
4 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/vue/components/core/Modal.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<modal-base :show="getCurrentModal" width="70%" @close="closeModal"> <modal-base :show="getCurrentModal" :width="getModalProperties.width ? getModalProperties.width + '%': '70%'" @close="closeModal">
<component :is="getCurrentModal" v-bind="getModalProperties"></component> <component :is="getCurrentModal" v-bind="getModalProperties"></component>
</modal-base> </modal-base>
</div> </div>
resources/js/vue/components/modal/label/Show.vue
+28 -24
View File
@@ -2,81 +2,85 @@
<template> <template>
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card color="black" title="Show Label"> <material-card color="black" title="Show Label">
<v-layout align-left justify-left wrap class="px-5 my-3"> <v-layout align-left justify-left wrap class="px-2 my-3">
<h3 class="ml-3">Info</h3> <h3 class="ml-3">Info</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
<v-layout id="printMe" row wrap class="ml-4"> <v-layout id="printMe">
<v-flex xs10 md12 sm12>
<v-layout row wrap class="ml-4">
<v-flex xs12 md12 sm12> <v-flex xs12 md12 sm12>
<div class="WM-d-flex"> <div class="WM-d-flex">
<span class="title">Lot Number :</span> <span class="title">Lot Number :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.lot_number }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.lot_number }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs6 md7 sm7>
<div class=""> <div class="">
<!-- <v-icon class="WMi-location"></v-icon> --> <!-- <v-icon class="WMi-location"></v-icon> -->
<span class="headline ml-1" style="letter-spacing:0 !important">{{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }}</span> <span class="headline ml-1" style="letter-spacing:0 !important">{{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs6 md5 sm5>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-Industry"></v-icon> <v-icon class="WMi-Industry"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.sterile_date }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.sterile_date }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs6 md7 sm7>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-user"></v-icon> <v-icon class="WMi-user"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs6 md5 sm5>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-hourglass"></v-icon> <v-icon class="WMi-hourglass"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.expire_date }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.expire_date }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md12 sm12> <v-flex xs6 md7 sm7>
<div class> <div class>
<span class="title">Sterilizer ID :</span> <span class="title">Sterilizer ID :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.sterilizer_id}}</span> <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.sterilizer_id}}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs6 md5 sm5>
<div class> <div class>
<span class="title">Cycle No :</span> <span class="title">Cycle No :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <!-- text-align:center;margin-top:50px ml-4 -->
<div class> <v-flex xs6 md7 sm7>
<v-flex xs12 md6 sm6 v-if="QRCodeimg"> <div class="mt-5">
<img :src="QRCodeimg"> <v-layout row wrap class="" style="">
</v-flex> <v-flex xs6 md12 sm12 v-if="barcodeimg">
</div>
</v-flex>
<v-flex xs12 md12 sm12>
<div class>
<v-layout row wrap align-center justify-center class="ml-4" style="text-align:center;margin-top:50px">
<v-flex xs12 md12 sm12 v-if="barcodeimg">
<img :src="barcodeimg"><br /> <img :src="barcodeimg"><br />
<span>{{data.id}}</span> <span>{{data.id}}</span>
</v-flex> </v-flex>
</v-layout> </v-layout>
</div> </div>
</v-flex> </v-flex>
<v-flex xs6 md5 sm5>
<div class="mt-5">
<v-flex xs6 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
</v-flex>
</div>
</v-flex>
</v-layout>
</v-flex>
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3"> <v-layout align-left justify-left wrap class="px-2 my-3">
<h3 class="ml-3">Package</h3> <h3 class="ml-3">Package</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="mx-3">
<template> <template>
<v-expansion-panel class="WM-Panel"> <v-expansion-panel class="WM-Panel">
<v-expansion-panel-content> <v-expansion-panel-content>
@@ -107,7 +111,7 @@
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout row wrap align-center justify-center> <v-layout row wrap align-center justify-center style="margin-left: -15%;">
<v-flex class xs12 md2 sm2 @click="print" > <v-flex class xs12 md2 sm2 @click="print" >
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px"> <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon> <v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
resources/js/vue/views/Label/List.vue
+1 -1
View File
@@ -202,7 +202,7 @@ export default {
if (result && result.status == 200) { if (result && result.status == 200) {
this.changeCurrentModal({ this.changeCurrentModal({
modal: "modal-label-show", modal: "modal-label-show",
properties: { result } properties: { result, width: 40 }
}); });
} }
}, },
resources/views/welcome.blade.php
+1 -1
View File
@@ -7,7 +7,7 @@
<title>CSSD-DOC</title> <title>CSSD-DOC</title>
<!-- Fonts --> <!-- Fonts -->
<link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet"> {{-- <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet"> --}}
<!-- Styles --> <!-- Styles -->
<style> <style>