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

update

Browse Source
This commit is contained in:
Fayyazi
2019-12-01 14:23:29 +03:30
parent 94d1bda083
commit 9526ec80fd
38 changed files with 658 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/vue/components/core/Drawer.vue
-1
View File
@@ -128,7 +128,6 @@ export default {
to: {name: 'AllPackage'},
icon: 'fas fa-archive',
text: 'Packages',
role: 'Admin'
},
{
to: {name: 'AllLabels'},
resources/js/vue/components/modal/barcode/Barcode.vue
+6 -4
View File
@@ -13,7 +13,7 @@
</v-layout>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
<a :href="ShowLink" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</v-layout>
</v-layout>
@@ -33,14 +33,16 @@ import { mapGetters } from "vuex";
export default {
data: () => ({
barcodeimg : null,
QRCodeimg : null
QRCodeimg : null,
ShowLink : ''
}),
created() {
this.barcodeimg = this.getModalProperties.result.data.data.Barcode ? this.getModalProperties.result.data.data.Barcode : null;
this.QRCodeimg = this.getModalProperties.result.data.data.QRCode ? this.getModalProperties.result.data.data.QRCode : null;
this.ShowLink = this.getModalProperties.result.data.data.ShowLink ? this.getModalProperties.result.data.data.ShowLink : '#';
},
computed: {
...mapGetters("modal", ["getModalProperties"])
...mapGetters("modal", ["getModalProperties", "getModalLink"])
},
methods: {
print() {
@@ -78,4 +80,4 @@ export default {
}
}
};
</script>
</script>
resources/js/vue/components/modal/cycle/Show.vue
+11 -6
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs>
<material-card id="printMe" color="black" title="Show Cycle">
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Info</h3>
<h3 class="ml-3">Cycle - {{ data.user.medical_center.name }}</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
@@ -28,11 +28,10 @@
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class="WM-d-flex">
<v-icon class="WMi-pencil"></v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
<span class="title">Cycle Number :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
@@ -41,6 +40,12 @@
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.date }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class="WM-d-flex">
<v-icon class="WMi-pencil"></v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
</div>
</v-flex>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Barcode And QRCode Image</h3>
@@ -55,7 +60,7 @@
</v-layout>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
<a :href="'/Show/Cycle/'+data.id+''" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</v-layout>
</v-layout>
@@ -118,7 +123,7 @@
</v-btn>
</v-flex>
</v-layout>
</material-card>
</v-container>
</template>
resources/js/vue/components/modal/item/show.vue
+33 -2
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs>
<material-card color="black" title="Show Item">
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3"> Info</h3>
<h3 class="ml-3"> Item - {{ data.user.medical_center.name }}</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
@@ -44,7 +44,26 @@
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
</div>
</v-flex>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Barcode And QRCode Image</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg"><br />
<span>{{data.unique_id}}</span>
</v-flex>
</v-layout>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<a :href="'/Show/Item/'+data.id+''" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</v-layout>
</v-layout>
</v-layout>
</material-card>
</v-container>
@@ -62,16 +81,28 @@ import { ApiService } from "@/services";
import { urls } from "@/config/urls";
export default {
data: () => ({
data : {}
data : {},
QRCodeimg : '',
barcodeimg : ''
}),
methods: {
...mapMutations("modal", ["closeModal", "setResultModal"]),
async generateBarcode(itemId) {
const result = await ApiService.post(urls.Barcode(itemId));
if (result && result.status == 200) {
this.QRCodeimg = result.data.data.QRCode ? result.data.data.QRCode : null;
this.barcodeimg = result.data.data.Barcode ? result.data.data.Barcode : null;
}
},
},
created() {
this.data = this.getModalProperties.result.data.data;
},
computed: {
...mapGetters("modal", ["getModalProperties"])
},
mounted() {
this.generateBarcode(this.data.id);
}
};
</script>
resources/js/vue/components/modal/label/Show.vue
+2 -2
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs>
<material-card color="black" title="Show Label">
<v-layout align-left justify-left wrap class="px-2 my-3">
<h3 class="ml-3">Info</h3>
<h3 class="ml-3">Label</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
@@ -67,7 +67,7 @@
<v-flex xs6 md5 sm5>
<div class="mt-5">
<v-flex xs6 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
<a :href="'/Show/Package/'+data.package.id+''" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</div>
</v-flex>
resources/js/vue/components/modal/package/Show.vue
+2 -9
View File
@@ -3,18 +3,11 @@
<v-container grid-list-xs>
<material-card color="black" title="Show Package">
<v-layout id="printMe" align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Info</h3>
<h3 class="ml-3">Package - {{ data.user.medical_center.name }}</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<!-- <v-flex xs12 md6 sm6>
<div class>
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
</v-flex>
</div>
</v-flex> -->
<v-flex xs12 md6 sm6>
<div class="WM-d-flex">
<v-icon class="WMi-info"></v-icon>
@@ -53,7 +46,7 @@
</v-layout>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
<a :href="'/Show/Package/'+data.id+''" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</v-layout>
</v-layout>
resources/js/vue/components/modal/testresult/Show.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs>
<material-card color="black" title="Show Test Result" id="printMe">
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Common Info</h3>
<h3 class="ml-3">Test Type : {{ data.test_type.name }}</h3>
<v-flex xs12>
<hr class="v-divider theme--light" />
</v-flex>