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

Merge branch 'master' of https://git.willaspace.com/external-projects/cssd-back

Browse Source
This commit is contained in:
mahdi purHosseini
2023-10-10 14:47:07 +03:30
parent 53fac19916 f3188c8b6d
commit 19d7439781
15 changed files with 65 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/vue/components/modal/barcode/Barcode.vue
+1 -1
View File
@@ -9,7 +9,7 @@
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg" class="WM-Width-350"><br />
<span v-if="Type != 'TestType'">{{ `${Type} ${item.udi ? 'UDI :' : 'ID :'} ${ID}` }}</span>
<span v-if="Type != 'TestType'">{{ `${Type} UDI : ${ID}` }}</span>
<span v-else>{{ Type + ':' + ID }}</span>
</v-flex>
</v-layout>
resources/js/vue/views/Item/List.vue
+13 -7
View File
@@ -145,6 +145,8 @@
import { ApiService } from "@/services";
import { urls } from "@/config/urls";
import { mapMutations, mapGetters } from "vuex";
import toast from "@/services/global/toast.service";
export default {
data: () => ({
headers: [
@@ -226,13 +228,17 @@ export default {
this.loadMedicalCenters();
},
async generateBarcode(item, type = null) {
let code = item.udi ? item.udi : item.id;
const result = await ApiService.post(urls.Barcode(code, type));
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-barcode-barcode",
properties: { result, item },
});
let code = item.udi;
if (code) {
const result = await ApiService.post(urls.Barcode(code, type));
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-barcode-barcode",
properties: { result, item },
});
}
} else {
toast.error('please first set UDI');
}
},
async show(testResultId) {
resources/js/vue/views/Label/AddEdit.vue
+11 -1
View File
@@ -23,7 +23,7 @@
<v-flex xs12 sm6 md3 class="WM-FlexCenter">
<v-icon class="fas fa-check mr-2 WM-Margin-B-8"></v-icon>
<v-autocomplete color="black" :items="items" item-text="name" v-model="formData.package_id"
item-value="id" label="Package ID" class="py-3 pr-3">
item-value="id" label="Package ID" class="py-3 pr-3" :filter="customFilter">
<template v-slot:chip="{ item }">
{{ item.name }} - {{ item.udi }}
</template>
@@ -120,6 +120,16 @@ export default {
}
},
methods: {
customFilter(item, queryText) {
const name = item.name.toLowerCase();
const udi = item.udi ? item.udi.toLowerCase() : null;
const searchText = queryText.toLowerCase();
if (udi) {
return name.indexOf(searchText) > -1 ||
udi.indexOf(searchText) > -1
}
return name.indexOf(searchText) > -1
},
async load(id) {
const result = await ApiService.get(urls.editLabel(id));
if (result.status == 200) {
resources/js/vue/views/Package/AddEdit.vue
+19 -1
View File
@@ -26,7 +26,15 @@
<div class="Inner">
<v-icon class="fas fa-check mr-2 WM-Margin-B-8"></v-icon>
<v-autocomplete class="py-3 pr-3" :items="items" item-text="name" v-model="item.id"
item-value="id" label="Select Items For Package" color="black"></v-autocomplete>
item-value="id" label="Select Items For Package" color="black" :filter="customFilter">
<template v-slot:selection="{ item }">
{{ item.name }} - {{ item.udi }}
</template>
<template v-slot:item="{ item }">
{{ item.name }} - {{ item.udi }}
</template>
</v-autocomplete>
<v-btn absolute small right bottom color="cyan" @click="duplicateForm(key)">
<v-icon class="white--text mr-2 caption">fas fa-plus</v-icon>ADD
@@ -113,6 +121,16 @@ export default {
this.loadItems();
},
methods: {
customFilter(item, queryText) {
const name = item.name.toLowerCase();
const udi = item.udi ? item.udi.toLowerCase() : null;
const searchText = queryText.toLowerCase();
if (udi) {
return name.indexOf(searchText) > -1 ||
udi.indexOf(searchText) > -1
}
return name.indexOf(searchText) > -1
},
async load(id) {
const result = await ApiService.get(urls.editPackage(id));
if (result.status == 200) {
resources/js/vue/views/Package/List.vue
+15 -8
View File
@@ -101,7 +101,7 @@
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn class="mr-2" v-bind="attrs" v-on="on" color="orange darken-1"
@click="generateBarcode(item.id, 'Package')">
@click="generateBarcode(item, 'Package')">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span>
</v-btn>
@@ -134,6 +134,8 @@
import { ApiService } from "@/services";
import { urls } from "@/config/urls";
import { mapMutations, mapGetters } from "vuex";
import toast from "@/services/global/toast.service";
export default {
data: () => ({
headers: [
@@ -238,13 +240,18 @@ export default {
}
}
},
async generateBarcode(code, type) {
const result = await ApiService.post(urls.Barcode(code, type));
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-barcode-barcode",
properties: { result }
});
async generateBarcode(item, type) {
const code = item.udi;
if (code) {
const result = await ApiService.post(urls.Barcode(code, type));
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-barcode-barcode",
properties: { result }
});
}
} else {
toast.error('please first set UDI');
}
},
async loadMedicalCenters() {