cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-13 16:21:16 +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-09 10:49:42 +03:30
parent ac19e51d28 9832fbe81a
commit 6c8054edac
5 changed files with 96 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/show/config/urls.js
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ const urls = {
}, },
showItem: function(id) { showItem: function(id) {
// return `/ShowItem/${id}`; // return `/ShowItem/${id}`;
return `/show-item/${id}`; return `/api/show-item/${id}`;
}, },
showPackage: function(id) { showPackage: function(id) {
resources/js/show/router/paths.js
Vendored
+10 -5
View File
@@ -16,26 +16,31 @@ export default [
{ {
path: '/Show/Item/:item', path: '/Show/Item/:item',
name: 'ShowItem', name: 'ShowItem',
view: 'Item/ShowItem' view: 'Item/ShowItem',
meta: {public: true}
}, },
{ {
path: '/Show/Package/:package', path: '/Show/Package/:package',
name: 'ShowPackage', name: 'ShowPackage',
view: 'Package/ShowPackage' view: 'Package/ShowPackage',
meta: { public: true }
}, },
{ {
path: '/Show/Label/:label', path: '/Show/Label/:label',
name: 'ShowLabel', name: 'ShowLabel',
view: 'Label/ShowLabel' view: 'Label/ShowLabel',
meta: { public: true }
}, },
{ {
path: '/Show/Cycle/:cycle', path: '/Show/Cycle/:cycle',
name: 'ShowCycle', name: 'ShowCycle',
view: 'Cycle/ShowCycle' view: 'Cycle/ShowCycle',
meta: { public: true }
}, },
{ {
path: '/Show/TestResult/:id', path: '/Show/TestResult/:id',
name: 'ShowTestResult', name: 'ShowTestResult',
view: 'TestResult/ShowTestResult' view: 'TestResult/ShowTestResult',
meta: { public: true }
}, },
] ]
resources/js/show/views/Item/ShowItem.vue
+3
View File
@@ -113,9 +113,12 @@ 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){
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;
} }
}
} catch (error) { } catch (error) {
console.error("Error loading data:", error); console.error("Error loading data:", error);
} }
resources/js/show/views/Label/ShowLabel.vue
+1 -1
View File
@@ -227,8 +227,8 @@ export default {
} }
}, },
created() { created() {
console.log(this.$route.params.label,'this.$route.params');
if (this.$route.params.label) { if (this.$route.params.label) {
console.log(this.$route.params);
this.load(this.$route.params.label); this.load(this.$route.params.label);
} }
}, },
resources/js/show/views/Package/ShowPackage.vue
+27 -17
View File
@@ -10,25 +10,32 @@
<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">{{ data.name }}</span> <span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{
data.name
}}</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">{{ data.created_at }}</span> <span class="headline ml-2 CSSD-font" style="letter-spacing:0 !important">{{
data.created_at
}}</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-user"></v-icon> <v-icon class="WMi-user"></v-icon>
<span class="headline ml-2 CSSD-font" style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span> <span class="headline ml-2 CSSD-font"
style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</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-pencil"></v-icon> <v-icon class="WMi-pencil"></v-icon>
<span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{ data.note }}</span> <span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{
data.note
}}</span>
</div> </div>
</v-flex> </v-flex>
</v-layout> </v-layout>
@@ -39,8 +46,8 @@
</v-flex> </v-flex>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="barcodeimg"> <v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg" class="WM-Width-350"><br /> <img :src="barcodeimg" class="WM-Width-350"><br/>
<span class="CSSD-font">Package ID : {{data.id}}</span> <span class="CSSD-font">Package ID : {{ data.id }}</span>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="ml-4">
@@ -63,7 +70,7 @@
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>
<v-card> <v-card>
<v-card-text>note : {{ item.note }}</v-card-text> <v-card-text>note : {{ item.note }}</v-card-text>
@@ -75,7 +82,7 @@
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout row wrap align-center justify-center style="text-align:center"> <v-layout row wrap align-center justify-center style="text-align:center">
<v-flex class xs12 md12 sm12 > <v-flex class xs12 md12 sm12>
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="addPackage()"> <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> <v-icon class="black--text">keyboard_arrow_left</v-icon>
<span class="black--text">Back</span> <span class="black--text">Back</span>
@@ -96,13 +103,14 @@
<script> <script>
import axios from "axios"; import axios from "axios";
import { urls } from "@show/config/urls"; import {urls} from "@show/config/urls";
export default { export default {
data: () => ({ data: () => ({
data : {}, data: {},
barcodeimg : '', barcodeimg: '',
QRCodeimg : '', QRCodeimg: '',
MedicalCenter : '' MedicalCenter: ''
}), }),
methods: { methods: {
async load(id) { async load(id) {
@@ -110,9 +118,12 @@ 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) {
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;
} }
}
}, },
async generateBarcode(packageId) { async generateBarcode(packageId) {
@@ -122,10 +133,10 @@ export default {
this.barcodeimg = result.data.data.Barcode ? result.data.data.Barcode : null; this.barcodeimg = result.data.data.Barcode ? result.data.data.Barcode : null;
} }
}, },
editPackage(packageId){ editPackage(packageId) {
window.location.href = '/packages/'+packageId+'/edit'; window.location.href = '/packages/' + packageId + '/edit';
}, },
addPackage(){ addPackage() {
window.location.href = '/add-package'; window.location.href = '/add-package';
}, },
print() { print() {
@@ -163,7 +174,6 @@ export default {
} }
}, },
created() { created() {
console.log('------------------',this.$route.params,'------------------')
if (this.$route.params.package) { if (this.$route.params.package) {
this.load(this.$route.params.package); this.load(this.$route.params.package);
} }