new update

This commit is contained in:
Fayyazi
2019-12-17 11:42:56 +03:30
parent 9526ec80fd
commit 8cfb213b81
29 changed files with 373 additions and 205 deletions
+65 -49
View File
@@ -1,15 +1,15 @@
<template>
<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">Cycle - {{ data.user.medical_center.name }}</h3>
<material-card color="black" title="Show Cycle">
<v-layout id="printMe" align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Cycle - {{ MedicalCenter }}</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="WM-d-flex">
<v-icon class="WMi-sort-numeric-up"></v-icon>
<span class="title">Cycle ID :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
</div>
</v-flex>
@@ -53,7 +53,7 @@
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg"><br />
<span>{{data.unique_id}}</span>
<span>Cycle ID : {{data.id}}</span>
</v-flex>
</v-layout>
<v-layout row wrap class="ml-4">
@@ -69,56 +69,64 @@
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap style="margin-left: 20px !important;">
</v-layout>
<v-layout row wrap style="margin-left: 20px !important;">
<template>
<v-expansion-panel class="WM-Panel" v-for="(label, key) in data.labels" :key="key">
<template>
<v-expansion-panel class="WM-Panel" v-for="(label, key) in data.labels" :key="key">
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ label.id }} ({{ label.pivot.count }})</div>
</template>
<v-card>
<v-card-text> Package :
<v-expansion-panel class="WM-Panel">
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ label.package.name }} </div>
</template>
<v-card>
<v-card-text>note : {{ label.package.note }}</v-card-text>
<v-card-text>
Items :
<v-expansion-panel class="WM-Panel" v-for="item in label.package.items" :key="item.key">
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ item.name }} ({{ item.pivot.count }})</div>
</template>
<v-card>
<v-card-text>note : {{ item.note }}</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
<template v-slot:header>
<div>{{ label.id }} ({{ label.pivot.count }})</div>
</template>
<v-card>
<v-card-text> Package :
<v-expansion-panel class="WM-Panel">
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ label.package.name }} </div>
</template>
<v-card>
<v-card-text>note : {{ label.package.note }}</v-card-text>
<v-card-text>
Items :
<v-expansion-panel class="WM-Panel" v-for="item in label.package.items" :key="item.key">
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ item.name }} ({{ item.pivot.count }})</div>
</template>
<v-card>
<v-card-text>note : {{ item.note }}</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</template>
</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</template>
</v-layout>
</v-layout>
<v-layout row wrap align-center justify-center>
<v-flex class xs12 md2 sm2 @click="print" >
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-layout row wrap align-center justify-center style="text-align:center">
<v-flex class xs12 md12 sm12 >
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="addCycle()">
<v-icon class="black--text">keyboard_arrow_left</v-icon>
<span class="black--text">Back</span>
</v-btn>
<v-btn class="WM-CyanBlueGradient-BG" @click="print" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
<span class="white--text">Print</span>
</v-btn>
<v-btn color="orange" class="mr-2" style="padding:10px 60px" @click="editCycle(data.id)">
<v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
<span>Edit</span>
</v-btn>
</v-flex>
</v-layout>
@@ -133,24 +141,32 @@ export default {
data: () => ({
data : {},
barcodeimg : '',
QRCodeimg : ''
QRCodeimg : '',
MedicalCenter : ''
}),
methods: {
async load(id) {
const result = await axios.get(urls.showCycle(id));
if (result.status == 200) {
this.data = result.data.data;
this.generateBarcode(this.data.unique_id);
this.generateBarcode(this.data.id);
this.MedicalCenter = this.data.user.medical_center.name;
}
},
async generateBarcode(packageId) {
const result = await axios.post(urls.Barcode(packageId));
async generateBarcode(cycleId) {
const result = await axios.post(urls.Barcode(cycleId, 'Cycle'));
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;
}
},
editCycle(cycleId){
window.location.href = '/cycle/'+cycleId+'/edit';
},
addCycle(cycleId){
window.location.href = '/add-cycle';
},
print() {
const prtHtml = document.getElementById("printMe").innerHTML;
+65 -9
View File
@@ -1,16 +1,15 @@
<template>
<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"> Item - {{ data.user.medical_center.name }}</h3>
<v-layout align-left id="printMe" justify-left wrap class="px-5 my-3">
<h3 class="ml-3"> Item - {{ MedicalCenter }}</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>
<span class="title">ID :</span>
<span class="title">Item ID :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
</div>
</v-flex>
@@ -54,7 +53,7 @@
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg"><br />
<span>{{data.unique_id}}</span>
<span>Item ID : {{data.id}}</span>
</v-flex>
</v-layout>
<v-layout row wrap class="ml-4">
@@ -63,11 +62,27 @@
</v-flex>
</v-layout>
</v-layout>
</v-layout>
<v-layout row wrap align-center justify-center style="text-align:center">
<v-flex class xs12 md12 sm12 >
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="addItem()">
<v-icon class="black--text">keyboard_arrow_left</v-icon>
<span class="black--text">Back</span>
</v-btn>
<v-btn class="WM-CyanBlueGradient-BG" @click="print" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
<span class="white--text">Print</span>
</v-btn>
<v-btn color="orange" class="mr-2" style="padding:10px 60px" @click="editItem(data.id)">
<v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
<span>Edit</span>
</v-btn>
</v-flex>
</v-layout>
</material-card>
</v-container>
</template>
<script>
export default {
data: () => ({
@@ -83,25 +98,66 @@ export default {
data: () => ({
data : {},
QRCodeimg : '',
barcodeimg : ''
barcodeimg : '',
MedicalCenter : ''
}),
methods: {
async load(id) {
const result = await axios.get(urls.showItem(id));
console.log(result,'re');
if (result.status == 200) {
this.data = result.data.data;
this.generateBarcode(this.data.id);
this.MedicalCenter = this.data.user.medical_center.name;
}
},
async generateBarcode(itemId) {
const result = await axios.post(urls.Barcode(itemId));
const result = await axios.post(urls.Barcode(itemId, 'Item'));
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;
}
},
editItem(itemId){
window.location.href = '/item/'+itemId+'/edit';
},
addItem(){
window.location.href = '/add-item';
},
print() {
const prtHtml = document.getElementById("printMe").innerHTML;
// Get all stylesheets HTML
let stylesHtml = "";
for (const node of [
...document.querySelectorAll('link[rel="stylesheet"], style')
]) {
stylesHtml += node.outerHTML;
}
// Open the print window
const WinPrint = window.open(
"",
"",
"left=0,top=0,width=800,height=900,toolbar=0,scrollbars=0,status=0"
);
WinPrint.document.write(`<!DOCTYPE html>
<html>
<head>
${stylesHtml}
</head>
<body>
${prtHtml}
</body>
</html>`);
WinPrint.document.close();
WinPrint.focus();
WinPrint.print();
WinPrint.close();
}
},
created() {
if (this.$route.params.item) {
+53 -32
View File
@@ -1,4 +1,3 @@
<template>
<v-container grid-list-xs>
<material-card color="black" title="Show Label">
@@ -8,19 +7,24 @@
<hr class="v-divider theme--light">
</v-flex>
<v-layout id="printMe">
<v-flex xs10 md12 sm12>
<v-layout row wrap class="ml-4">
<v-flex xs12 md12 sm12>
<div class="WM-d-flex">
<span class="title">Lot Number :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.lot_number }}</span>
<p class="headline ml-5" style="letter-spacing:0 !important">{{ MedicalCenter }}</p>
</div>
</v-flex>
<v-flex xs6 md7 sm7>
<div class="">
<!-- <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>
<v-flex xs6 md6 sm6 class="mt-4">
<div class="WM-d-flex">
<v-icon class="WMi-location"></v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important" v-if="dataLoaded">{{data.package.name}}</span>
</div>
</v-flex>
<v-flex xs6 md5 sm5>
<div>
<v-flex xs6 md6 sm6 v-if="QRCodeimg">
<a :href="'/Show/Package/'+data.package.id+''" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</div>
</v-flex>
<v-flex xs6 md5 sm5>
@@ -30,10 +34,10 @@
</div>
</v-flex>
<v-flex xs6 md7 sm7>
<div class="WM-d-flex">
<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>
</div>
<!-- <div class="WM-d-flex">
<span class="title">Lot No :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.lot_number }}</span>
</div> -->
</v-flex>
<v-flex xs6 md5 sm5>
<div class="WM-d-flex">
@@ -48,34 +52,34 @@
</div>
</v-flex>
<v-flex xs6 md5 sm5>
<div class="WM-d-flex">
<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>
</div>
</v-flex>
<v-flex xs6 md7 sm7>
<div class>
<span class="title">Cycle No :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
</div>
</v-flex>
<!-- text-align:center;margin-top:50px ml-4 -->
<v-flex xs6 md7 sm7>
<div class="mt-5">
<v-layout row wrap class="" style="">
<v-flex xs9 md9 sm9>
<div class="mt-4" style="text-align:center">
<v-layout row wrap class="" >
<v-flex xs6 md12 sm12 v-if="barcodeimg">
<img :src="barcodeimg"><br />
<img :src="barcodeimg" style="width:200px"><br />
<span>{{data.id}}</span>
</v-flex>
</v-layout>
</div>
</v-flex>
<v-flex xs6 md5 sm5>
<div class="mt-5">
<v-flex xs6 md6 sm6 v-if="QRCodeimg">
<a :href="'/Show/Package/'+data.package.id+''" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</div>
</v-flex>
</v-layout>
</v-flex>
</v-layout>
</v-layout>
<v-layout align-left justify-left wrap class="px-2 my-3">
<v-layout align-left justify-left wrap class="px-2 my-3" v-if="dataLoaded">
<h3 class="ml-3">Package</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
@@ -111,12 +115,20 @@
</v-layout>
</v-layout>
<v-layout row wrap align-center justify-center style="margin-left: -15%;">
<v-flex class xs12 md2 sm2 @click="print" >
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-layout row wrap align-center justify-center style="text-align:center">
<v-flex class xs12 md12 sm12 >
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="addLabel()">
<v-icon class="black--text">keyboard_arrow_left</v-icon>
<span class="black--text">Back</span>
</v-btn>
<v-btn class="WM-CyanBlueGradient-BG" @click="print" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
<span class="white--text">Print</span>
</v-btn>
<v-btn color="orange" class="mr-2" style="padding:10px 60px" @click="editLabel(data.id)">
<v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
<span>Edit</span>
</v-btn>
</v-flex>
</v-layout>
@@ -135,17 +147,20 @@ export default {
data: () => ({
data : {},
QRCodeimg : '',
barcodeimg : ''
barcodeimg : '',
MedicalCenter : '',
dataLoaded : false
}),
methods: {
async load(id) {
const result = await axios.get(urls.showLabel(id));
console.log(result.data);
if (result.status == 200) {
this.data = result.data.data;
this.generateBarcode(this.data.id);
this.generateQRcodePackage(this.data.package.id)
this.generateQRcodePackage(this.data.package.id);
this.MedicalCenter = this.data.user.medical_center.name;
this.dataLoaded = true;
}
},
async generateQRcodePackage(packageId) {
@@ -155,11 +170,17 @@ export default {
}
},
async generateBarcode(labelId) {
const result = await axios.post(urls.Barcode(labelId));
const result = await axios.post(urls.Barcode(labelId, 'Label'));
if (result && result.status == 200) {
this.barcodeimg = result.data.data.Barcode ? result.data.data.Barcode : null;
}
},
editLabel(LabelId){
window.location.href = '/label/'+LabelId+'/edit';
},
addLabel(LabelId){
window.location.href = '/add-label';
},
print() {
const prtHtml = document.getElementById("printMe").innerHTML;
+35 -27
View File
@@ -1,42 +1,34 @@
<template>
<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">Package - {{ data.user.medical_center.name }}</h3>
<h3 class="ml-3">Package - {{ MedicalCenter }}</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>
<span class="title">Name :</span>
<div class="WM-d-flex">
<v-icon class="WMi-info"></v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.name }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Description :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
<div class="WM-d-flex">
<v-icon class="WMi-Industry"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Register User :</span>
<div class="WM-d-flex">
<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>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Date :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
<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>
@@ -48,7 +40,7 @@
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg"><br />
<span>{{data.unique_id}}</span>
<span>Package ID : {{data.id}}</span>
</v-flex>
</v-layout>
<v-layout row wrap class="ml-4">
@@ -83,12 +75,20 @@
</v-layout>
</v-layout>
<v-layout row wrap align-center justify-center>
<v-flex class xs12 md2 sm2 @click="print" >
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-layout row wrap align-center justify-center style="text-align:center">
<v-flex class xs12 md12 sm12 >
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="addPackage()">
<v-icon class="black--text">keyboard_arrow_left</v-icon>
<span class="black--text">Back</span>
</v-btn>
<v-btn class="WM-CyanBlueGradient-BG" @click="print" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
<span class="white--text">Print</span>
</v-btn>
<v-btn color="orange" class="mr-2" style="padding:10px 60px" @click="editPackage(data.id)">
<v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
<span>Edit</span>
</v-btn>
</v-flex>
</v-layout>
@@ -103,25 +103,33 @@ export default {
data: () => ({
data : {},
barcodeimg : '',
QRCodeimg : ''
QRCodeimg : '',
MedicalCenter : ''
}),
methods: {
async load(id) {
const result = await axios.get(urls.showPackage(id));
console.log(result.data);
if (result.status == 200) {
this.data = result.data.data;
this.generateBarcode(this.data.unique_id);
this.generateBarcode(this.data.id);
this.MedicalCenter = this.data.user.medical_center.name;
}
},
async generateBarcode(packageId) {
const result = await axios.post(urls.Barcode(packageId));
const result = await axios.post(urls.Barcode(packageId, 'Package'));
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;
}
},
editPackage(packageId){
window.location.href = '/packages/'+packageId+'/edit';
},
addPackage(){
window.location.href = '/add-package';
},
print() {
const prtHtml = document.getElementById("printMe").innerHTML;