fix : items and style

This commit is contained in:
zeinab.ashrafi
2025-04-05 14:35:55 +03:30
parent 9625674f79
commit 983d1659db
16 changed files with 256 additions and 229 deletions
+10 -10
View File
@@ -139,8 +139,8 @@ export default {
role: 'Admin|Supervisor|User'
},
{
title: `<span>Add A </span><br/><span>Test Result</span>`,
svg: ` <svg width="40" height="40" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
title: `<span class="WM-Font-14 WM-LetterSpacing-5">Add A </span><br/><span class="WM-Font-14 WM-LetterSpacing-5">Test Result</span>`,
svg: ` <svg width="30" height="30" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_93_57)">
<path d="M17.5938 388.5H759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M388.5 17.5938V759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
@@ -181,8 +181,8 @@ export default {
role: 'Admin|Supervisor|User'
},
{
title: `<span>Add new </span><br/><span>item</span>`,
svg: ` <svg width="40" height="40" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
title: `<span class="WM-Font-14 WM-LetterSpacing-5">Add new </span><br/><span class="WM-Font-14 WM-LetterSpacing-5">item</span>`,
svg: ` <svg width="30" height="30" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_93_57)">
<path d="M17.5938 388.5H759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M388.5 17.5938V759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
@@ -223,8 +223,8 @@ export default {
role: 'Admin|Supervisor|User'
},
{
title: `<span>Add new </span><br/><span>Package</span>`,
svg: ` <svg width="40" height="40" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
title: `<span class="WM-Font-14 WM-LetterSpacing-5">Add new </span><br/><span class="WM-Font-14 WM-LetterSpacing-5">Package</span>`,
svg: ` <svg width="30" height="30" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_93_57)">
<path d="M17.5938 388.5H759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M388.5 17.5938V759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
@@ -255,8 +255,8 @@ export default {
role: 'Admin|Supervisor|User'
},
{
title: `<span>Add new </span><br/><span> label</span>`,
svg: ` <svg width="40" height="40" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
title: `<span class="WM-Font-14 WM-LetterSpacing-5">Add new </span><br/><span class="WM-Font-14 WM-LetterSpacing-5"> label</span>`,
svg: ` <svg width="30" height="30" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_93_57)">
<path d="M17.5938 388.5H759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M388.5 17.5938V759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
@@ -287,8 +287,8 @@ export default {
role: 'Admin|Supervisor|User'
},
{
title: `<span>Add new </span><br/><span>cycle</span>`,
svg: ` <svg width="40" height="40" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
title: `<span class="WM-Font-14 WM-LetterSpacing-5">Add new </span><br/><span class="WM-Font-14 WM-LetterSpacing-5">cycle</span>`,
svg: ` <svg width="30" height="30" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_93_57)">
<path d="M17.5938 388.5H759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M388.5 17.5938V759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+1 -1
View File
@@ -114,7 +114,7 @@ export default {
sortable: false,
text: "Action",
value: "action",
align: "right"
align: "right",
}
],
filter: {
+35 -73
View File
@@ -5,28 +5,29 @@
<v-layout align-center wrap class="my-3 px-5">
<v-flex xs12 sm4 md4 lg2 xl2 class="WM-FlexCenter">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3 pr-3" v-model="filter.item_id" label="Item ID" color="black"/>
<v-text-field class="py-3 pr-3" v-model="getFilters.item_id" @input="updateFilter('item_id', getFilters.item_id)" label="Item ID" color="black"/>
</v-flex>
<v-flex xs12 sm4 md4 lg2 xl2 class="WM-FlexCenter pl-3">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3 pr-3" v-model="filter.name" label="Name" color="black"/>
<v-text-field class="py-3 pr-3" v-model="getFilters.name" @input="updateFilter('name', getFilters.name)" label="Name" color="black"/>
</v-flex>
<v-flex xs12 sm4 md4 lg2 xl2 class="WM-FlexCenter pl-3" v-if="$hasRole('Admin')">
<v-icon class="fa fa-hospital-o mr-2 WM-Margin-B-8"/>
<v-autocomplete class="py-3 pr-3" v-model="filter.medical_center_id" item-text="name" item-value="id"
<v-autocomplete class="py-3 pr-3" v-model="getFilters.medical_center_id" item-text="name"
item-value="id" @input="updateFilter('medical_center_id', getFilters.medical_center_id)"
label="Hospital" color="black" :items="medicalCenters" :clearable="true"/>
</v-flex>
<v-flex xs12 sm4 md4 lg2 xl2 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3 pr-3" v-model="filter.size" label="Size" color="black"/>
<v-text-field class="py-3 pr-3" v-model="getFilters.size" @input="updateFilter('size', getFilters.size)" label="Size" color="black"/>
</v-flex>
<v-flex xs12 sm4 md4 lg2 xl2 class="WM-FlexCenter pl3">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3 pr-3" v-model="filter.udi" label="UDI" color="black"/>
<v-text-field class="py-3 pr-3" v-model="getFilters.udi" @input="updateFilter('udi', getFilters.udi)" label="UDI" color="black"/>
</v-flex>
<v-spacer/>
<v-flex class xs12 sm6 md6 lg2 xl1>
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 30px" @click="load()">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 30px" @click="onFilterClick()">
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
<span class="white--text">Filter</span>
</v-btn>
@@ -43,11 +44,12 @@
<v-layout class="px-4 my-3">
<v-divider/>
</v-layout>
<v-layout align-center wrap class="my-3 px-5">
<v-layout align-center wrap class="my-3 px-5" v-if="getMyItems">
<v-flex md12>
<v-data-table :headers="headers" :items="items" hide-actions>
<v-data-table :headers="headers" :items="getMyItems" hide-actions>
<template slot="headerCell" slot-scope="{ header }">
<span class="subheading font-weight-light text-white text--darken-3" v-text="header.text"/>
<span class="subheading font-weight-light text-white text--darken-3"
v-text="header.text"/>
</template>
<template slot="items" slot-scope="{ item }">
<td class="title font-weight-light">{{ item.id }}</td>
@@ -58,7 +60,8 @@
<td class="text-xs-right FlexBtn Height-MD-60 justify-self-end">
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" color="cyan" class="mr-2" @click="show(item.id)">
<v-btn v-bind="attrs" v-on="on" color="cyan" class="mr-2"
@click="showItem(item.id)">
<v-icon class="white--text mr-1 caption">fas fa-eye</v-icon>
<span>Show</span>
</v-btn>
@@ -88,7 +91,7 @@
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" color="red" class="WM-ActionButton mr-2"
@click="remove(item.id)" v-if="$hasRole('Admin|Supervisor')">
@click="removeItem(item.id)" v-if="$hasRole('Admin|Supervisor')">
<v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
<span>Remove</span>
</v-btn>
@@ -119,18 +122,18 @@
<script>
import {ApiService} from "@/services";
import {urls} from "@/config/urls";
import {mapMutations, mapGetters} from "vuex";
import {mapMutations, mapGetters, mapActions} from "vuex";
import toast from "@/services/global/toast.service";
export default {
data: () => ({
headers: [
// {sortable: true,text: "ID",value: "id"},
{sortable: false, text: "Item ID", value: "id"},
{sortable: false, text: "Item ID", value: "id" },
{sortable: false, text: "Name", value: "name"},
{sortable: false, text: "UDI", value: "udi"},
{sortable: false, text: "Size", value: "size"},
{sortable: false, text: "Action", value: "action", align: "left"}
{sortable: false, text: "Action", value: "action", align: "left",width:'20%'}
],
filter: {
name: '',
@@ -138,31 +141,28 @@ export default {
item_id: '',
medical_center_id: ''
},
items: [],
currentPage: 1,
lastPage: 1,
medicalCenters: []
}),
created() {
this.load();
async created() {
this.loadMyItem();
},
computed: {
...mapGetters('myItems', ["getFilters",'getMyItems','getCurrentPage','getLastPage']),
items(){ return this.getMyItems;},
currentPage(){ return this.getCurrentPage;},
lastPage(){ return this.getLastPage;},
},
methods: {
...mapMutations('myItems',["SET_FILTER"]),
...mapMutations("modal", ["changeCurrentModal"]),
async load(page = 1) {
let filter = '?';
for (const key in this.filter) {
if (this.filter.hasOwnProperty(key)) {
filter += `${key}=${this.filter[key]}&`;
}
}
filter += (page) ? `page=${page}` : `page=1`;
const result = await ApiService.get(urls.listMyItem(filter));
if (result && result.status == 200) {
this.items = result.data.data;
this.currentPage = result.data.data.current_page;
this.lastPage = result.data.data.last_page;
}
...mapActions('myItems', ['loadMyItem', 'removeItem', 'showItem', 'generateBarcode']),
onFilterClick() {
this.loadMyItem();
},
updateFilter(key, value) {
this.SET_FILTER({ key, value });
},
async generateBarcode(item, type = null) {
let code = item.udi;
@@ -178,45 +178,7 @@ export default {
toast.error('please first set UDI');
}
},
async show(testResultId) {
const result = await ApiService.get(urls.showItem(testResultId));
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-item-show",
properties: {result},
});
}
},
async changeStatus(id) {
const result = await ApiService.post(
urls.changeItemStatus(id)
);
if (result) {
for (const key in this.items) {
if (
this.items.hasOwnProperty(key) &&
this.items[key].id == id
) {
this.items[key].status = result.data.data.status;
}
}
}
},
async remove(testResultId) {
const result = await ApiService.delete(
urls.removeItem(testResultId)
);
if (result && result.status == 200) {
for (const key in this.items) {
if (
this.items.hasOwnProperty(key) &&
this.items[key].id == testResultId
) {
this.items.splice(key, 1);
}
}
}
},
async transfer(data) {
this.changeCurrentModal({
modal: "modal-user-list",
@@ -226,7 +188,7 @@ export default {
},
watch: {
currentPage(page) {
this.load(page);
this.loadMyItem(page);
},
}
};
+1 -1
View File
@@ -236,7 +236,7 @@ export default {
sortable: false,
text: "Action",
value: "action",
align: "left"
align: "left",
}
],
filter: {
+1 -1
View File
@@ -176,7 +176,7 @@ export default {
sortable: false,
text: "Action",
value: "action",
align: "right"
align: "right",
}
],
items: [],
+1 -1
View File
@@ -114,7 +114,7 @@ export default {
sortable: false,
text: "Action",
value: "action",
align: "left"
align: "left",
}
],
filter: {
+1 -1
View File
@@ -170,7 +170,7 @@ export default {
sortable: false,
text: "Action",
value: "action",
align: "right"
align: "right",
}
],
filter: {