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

Merge branch 'master' of https://git.meshkee.com/cssd/cssd-back

Browse Source
This commit is contained in:
Moradi
2025-04-12 18:09:45 +03:30
parent a5136a341f 47aab06e49
commit 056160bca5
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/show/views/Item/ShowItem.vue
-1
View File
@@ -113,7 +113,6 @@ export default {
const result = await axios.get(urls.showItem(id)); const result = await axios.get(urls.showItem(id));
if (result.status == 200) { if (result.status == 200) {
this.data = result.data.data; this.data = result.data.data;
console.log(result,'result',result.data,result.data.data)
if(this.data){ if(this.data){
this.generateBarcode(this.data.id); this.generateBarcode(this.data.id);
this.MedicalCenter = this.data.user.medical_center.name; this.MedicalCenter = this.data.user.medical_center.name;
resources/js/show/views/Label/ShowLabel.vue
+1 -2
View File
@@ -111,7 +111,7 @@
<v-expansion-panel class="WM-Panel" v-for="item in data.package.items" :key="item.key"> <v-expansion-panel class="WM-Panel" v-for="item in data.package.items" :key="item.key">
<v-expansion-panel-content> <v-expansion-panel-content>
<template v-slot:header> <template v-slot:header>
<div>{{ item.name }} ({{ item.pivot.count }})</div> <div>{{ item.name }} <span v-if="item.pivot">({{ item.pivot.count }})</span></div>
</template> </template>
<v-card> <v-card>
<v-card-text>note : {{ item.note }}</v-card-text> <v-card-text>note : {{ item.note }}</v-card-text>
@@ -227,7 +227,6 @@ export default {
} }
}, },
created() { created() {
console.log(this.$route.params.label,'this.$route.params');
if (this.$route.params.label) { if (this.$route.params.label) {
this.load(this.$route.params.label); this.load(this.$route.params.label);
} }
resources/js/show/views/Package/ShowPackage.vue
+11 -14
View File
@@ -2,7 +2,7 @@
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card color="black" title="Show Package"> <material-card color="black" title="Show Package">
<v-layout id="printMe" align-left justify-left wrap class="px-5 my-3"> <v-layout id="printMe" align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3 CSSD-font">Package - {{ MedicalCenter }}</h3> <h3 class="ml-3 CSSD-font"> {{ data.name }} - MC {{ MedicalCenter }}</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
@@ -10,17 +10,17 @@
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-info"></v-icon> <v-icon class="WMi-info"></v-icon>
<span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{ <span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">
data.name {{ data.name }}
}}</span> </span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<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 CSSD-font" style="letter-spacing:0 !important">{{ <span class="headline ml-2 CSSD-font" style="letter-spacing:0 !important">
data.created_at {{ data.created_at }}
}}</span> </span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
@@ -33,9 +33,9 @@
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-pencil"></v-icon> <v-icon class="WMi-pencil"></v-icon>
<span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{ <span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">
data.note {{ data.note }}
}}</span> </span>
</div> </div>
</v-flex> </v-flex>
</v-layout> </v-layout>
@@ -66,9 +66,7 @@
<v-layout row wrap class="ml-4"> <v-layout row wrap class="ml-4">
<template> <template>
<v-expansion-panel class="WM-Panel"> <v-expansion-panel class="WM-Panel">
<v-expansion-panel-content <v-expansion-panel-content v-for="(item, key) in data.items" :key="key">
v-for="(item, key) in data.items" :key="key"
>
<template v-slot:header> <template v-slot:header>
<div>{{ key + 1 + ": " + item.name }} ({{ item.pivot.count }})</div> <div>{{ key + 1 + ": " + item.name }} ({{ item.pivot.count }})</div>
</template> </template>
@@ -118,7 +116,6 @@ export default {
if (result.status == 200) { if (result.status == 200) {
this.data = result.data.data; this.data = result.data.data;
console.log(result,'result')
if (this.data) { if (this.data) {
this.generateBarcode(this.data.id); this.generateBarcode(this.data.id);
this.MedicalCenter = this.data.user.medical_center.name; this.MedicalCenter = this.data.user.medical_center.name;