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

fix : items & package & barcode modal & show-modal

Browse Source
This commit is contained in:
zeinab.ashrafi
2025-04-09 12:58:52 +03:30
parent 983d1659db
commit 1d77e7b000
18 changed files with 627 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/TestResult/List.vue
+104 -146
View File
@@ -3,57 +3,57 @@
<v-container fluid>
<material-card class color="black" title="All Test Result" text>
<v-layout align-center wrap class="px-5 my-3">
<v-flex xs12 sm6 md6 lg2 class="WM-FlexCenter pl-3">
<v-flex xs12 sm4 md4 lg3 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.device_id" label="ID"
color="black"/>
color="black"/>
</v-flex>
<v-flex xs12 sm6 md6 lg3 class="WM-FlexCenter pl-3">
<v-flex xs12 sm4 md4 lg3 xl2 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-autocomplete :items="deviceLabels" item-text="name" item-value="id"
v-model="filter.device_label" label="ID Label" color="black" class="py-3 pr-3"
:clearable="true"/>
v-model="filter.device_label" label="ID Label" color="black" class="py-3 pr-3"
:clearable="true"/>
</v-flex>
<v-flex xs12 sm6 md6 lg3 class="WM-FlexCenter pl-3">
<v-flex xs12 sm4 md4 lg3 xl2 class="WM-FlexCenter pl-3">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/>
<v-autocomplete class="py-3 pr-3" v-model="filter.testType_id" label="TestType Name"
color="black" :items="testTypes" item-text="name" item-value="id"/>
color="black" :items="testTypes" item-text="name" item-value="id"/>
</v-flex>
<v-flex xs12 sm6 md6 lg3 class="WM-FlexCenter pl-3">
<v-flex xs12 sm4 md4 lg3 xl2 class="WM-FlexCenter pl-3">
<v-icon class="fa fa-hospital-o mr-2 WM-Margin-B-8"/>
<v-autocomplete class="py-3 pr-3" v-model="filter.medicalCenter_id" label="Hospital"
color="black" :items="medicalCenters" item-text="name" item-value="id"
:clearable="true"/>
color="black" :items="medicalCenters" item-text="name" item-value="id"
:clearable="true"/>
</v-flex>
<v-flex xs12 sm6 md6 lg3 class="WM-FlexCenter pl-3">
<v-flex xs12 sm4 md4 lg3 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.user_name" label="User Name"
color="black"/>
color="black"/>
</v-flex>
<v-flex xs12 sm6 md6 lg3 class="WM-FlexCenter pl-3">
<v-flex xs12 sm4 md4 lg3 xl2 class="WM-FlexCenter pl-3">
<v-icon class="far fa-calendar-alt mr-2"/>
<v-menu lazy :close-on-content-click="true" transition="v-scale-transition" offset-y
v-model="fromMenu" style="width: 100%">
v-model="fromMenu" style="width: 100%">
<v-text-field class="py-3 pr-3" required slot="activator" label="FromDate"
v-model="filter.fromPicker" color="black"/>
v-model="filter.fromPicker" color="black"/>
<v-date-picker color="pink" no-title v-model="filter.fromPicker"
:date-format="date => new Date(date).toDateString()"/>
:date-format="date => new Date(date).toDateString()"/>
</v-menu>
</v-flex>
<v-flex xs12 sm6 md6 lg3 style="display: flex;align-items: center;">
<v-flex xs12 sm4 md4 lg3 xl2 style="display: flex;align-items: center;">
<v-icon class="far fa-calendar-alt mr-2"/>
<v-menu lazy :close-on-content-click="true" transition="v-scale-transition" offset-y
v-model="upToMenu" style="width: 100%">
v-model="upToMenu" style="width: 100%">
<v-text-field class="py-3 pr-3" required slot="activator" label="UpToDate" color="black"
v-model="filter.upToPicker"/>
v-model="filter.upToPicker"/>
<v-date-picker color="pink" no-title v-model="filter.upToPicker"
:date-format="date => new Date(date).toDateString()"/>
:date-format="date => new Date(date).toDateString()"/>
</v-menu>
</v-flex>
<v-spacer/>
<v-spacer/>
<v-flex class xs12 sm6 md6 lg2 xl1>
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 30px" @click="load(null, null)">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 30px" @click="load(null, null)">
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
<span class="white--text">Filter</span>
</v-btn>
@@ -67,23 +67,6 @@
</router-link>
</v-flex>
</v-layout>
<!--<v-layout wrap class="px-5 mb-3 my-3">
<v-flex class xs12 md3 sm3 class="WM-XL-Align-L text-lg-left">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 30px" @click="load(null, null)">
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
<span class="white--text">Filter</span>
</v-btn>
</v-flex>
<v-spacer></v-spacer>
<v-flex wrap xs12 md2 sm2 class="WM-Align-R">
<router-link :to="{name: 'SubmitTestResult'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-plus</v-icon>
<span class="black--text">Add</span>
</v-btn>
</router-link>
</v-flex>
</v-layout>-->
<v-layout class="px-4 my-3">
<v-divider/>
</v-layout>
@@ -92,19 +75,25 @@
<v-data-table :headers="headers" :items="items" hide-actions>
<template slot="headerCell" slot-scope="{ header }">
<span class="subheading font-weight-light text-white text--darken-3"
v-text="header.text" />
v-text="header.text"/>
</template>
<template slot="items" slot-scope="{ item }">
<td class="headline font-weight-light">{{ item.id }}</td>
<td class="title font-weight-light">{{ item.test_type ? item.test_type.name : 'Archived Test' }}</td>
<td class="title font-weight-light">{{ item.id }}</td>
<td class="title font-weight-light">
{{ item.test_type ? item.test_type.name : 'Archived Test' }}
</td>
<td class="title font-weight-light">{{ item.user.medical_center.name }}</td>
<td class="title font-weight-light">{{ item.user.name }}</td>
<td class="title font-weight-light">
<span v-if="item.result == 'Reject'" class="ResultMsg Reject">{{ item.result }}</span>
<span v-else-if="item.result == 'Accept'" class="ResultMsg Accept">{{ item.result }}</span>
<span v-if="item.result == 'Reject'" class="ResultMsg Reject">
{{item.result}}
</span>
<span v-else-if="item.result == 'Accept'" class="ResultMsg Accept">
{{item.result}}
</span>
</td>
<td class="title font-weight-light">{{ $d(new Date(item.created_at), 'long') }}</td>
<td class="title font-weight-light">
<td class="title font-weight-light text-center">
<span v-if="item.verified == 'NotVerified'" class="NotVerified">
<v-icon class="caption fa fa-times NotVerified"/>
</span>
@@ -117,7 +106,7 @@
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn color="cyan" class="mr-2" @click="show(item.id)" v-bind="attrs"
v-on="on">
v-on="on">
<v-icon class="white--text mr-1 caption">fas fa-eye</v-icon>
<span>Show</span>
</v-btn>
@@ -127,8 +116,8 @@
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn color="orange" class="mr-2"
@click="generateBarcode(item.id, 'TestResult')" v-bind="attrs"
v-on="on">
@click="generateBarcode(item.id, 'TestResult')" v-bind="attrs"
v-on="on">
<v-icon class="white--text mr-1 caption">fa fa-bars</v-icon>
<span>generate Barcode</span>
</v-btn>
@@ -139,8 +128,8 @@
<template v-slot:activator="{ on, attrs }">
<!-- v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" -->
<router-link class="LinkBtn"
v-if="$hasRole('Admin') || (item.user_id == $store.state.user.id && item.verified == 'None')"
:to="{ name: 'EditTestResult', params: { testResult: item.id } }">
v-if="$hasRole('Admin') || (item.user_id == $store.state.user.id && item.verified == 'None')"
:to="{ name: 'EditTestResult', params: { testResult: item.id } }">
<v-btn color="orange" class="mr-2" v-bind="attrs" v-on="on">
<v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
<span>Edit</span>
@@ -153,9 +142,9 @@
<template v-slot:activator="{ on, attrs }">
<!-- v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" -->
<v-btn color="pink" class="WM-ActionButton" @click="remove(item.id)"
v-if="$hasRole('Admin') || (item.user_id == $store.state.user.id && item.verified == 'None')"
v-bind="attrs" v-on="on">
<v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
v-if="$hasRole('Admin') || (item.user_id == $store.state.user.id && item.verified == 'None')"
v-bind="attrs" v-on="on">
<v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
<span>Remove</span>
</v-btn>
</template>
@@ -169,7 +158,7 @@
<v-divider/>
<div class="text-xs-center mt-2" v-if="lastPage > 1">
<v-pagination color="black" v-model="currentPage" :length="lastPage"
:total-visible="6"></v-pagination>
:total-visible="6"/>
</div>
<v-layout row wrap align-center justify-center class="mt-3">
<router-link to="/dashboard">
@@ -195,49 +184,18 @@ import {
mapMutations,
mapGetters
} from "vuex";
export default {
data: () => ({
headers: [{
sortable: false,
text: "ID",
value: "name"
},
{
sortable: false,
text: "Test Type",
value: "TestType"
},
{
sortable: false,
text: "Hospital",
value: "Hospital"
},
{
sortable: false,
text: "User",
value: "Users"
},
{
sortable: false,
text: "Result",
value: "result"
},
{
sortable: false,
text: "Date",
value: "date"
},
{
sortable: false,
text: "Verify",
value: "verify"
},
{
sortable: false,
text: "Action",
value: "action",
align: "left",
}
headers: [
{sortable: false, text: "ID", value: "name"},
{sortable: false, text: "Test Type", value: "TestType"},
{sortable: false, text: "Hospital", value: "Hospital"},
{sortable: false, text: "User", value: "Users"},
{sortable: false, text: "Result", value: "result",width:'5%'},
{sortable: false, text: "Date", value: "date"},
{sortable: false, text: "Verify", value: "verify",width:'5%'},
{sortable: false, text: "Action", value: "action", align: "left",}
],
filter: {
device_id: '',
@@ -259,50 +217,50 @@ export default {
name: "Washer ID",
id: "Washer ID"
},
{
name: "Autoclave ID",
id: "Autoclave ID"
},
{
name: "Sterilizer ID",
id: "Sterilizer ID"
},
{
name: "Seal Machine ID",
id: "Seal Machine ID"
},
{
name: "Patiant ID",
id: "Patiant ID"
},
{
name: "Set/Pack ID",
id: "Set/Pack ID"
},
{
name: "Medical Device ID",
id: "Medical Device ID"
},
{
name: "OR ID",
id: "OR ID"
},
{
name: "Personal ID",
id: "Personal ID"
},
{
name: "Instrument ID",
id: "Instrument ID"
},
{
name: "Basket ID",
id: "Basket ID"
},
{
name: "Implant ID",
id: "Implant ID"
},
{
name: "Autoclave ID",
id: "Autoclave ID"
},
{
name: "Sterilizer ID",
id: "Sterilizer ID"
},
{
name: "Seal Machine ID",
id: "Seal Machine ID"
},
{
name: "Patiant ID",
id: "Patiant ID"
},
{
name: "Set/Pack ID",
id: "Set/Pack ID"
},
{
name: "Medical Device ID",
id: "Medical Device ID"
},
{
name: "OR ID",
id: "OR ID"
},
{
name: "Personal ID",
id: "Personal ID"
},
{
name: "Instrument ID",
id: "Instrument ID"
},
{
name: "Basket ID",
id: "Basket ID"
},
{
name: "Implant ID",
id: "Implant ID"
},
]
}),
created() {
@@ -327,10 +285,10 @@ export default {
}
filter += (page) ? `page=${page}` : `page=1`;
const result = await ApiService.get(
urls.listTestResult(filter)
urls.listTestResult(filter)
);
if (result && result.status == 200) {
const { data, meta } = result.data;
const {data, meta} = result.data;
this.items = data;
this.currentPage = meta.current_page;
this.lastPage = meta.last_page;
@@ -338,7 +296,7 @@ export default {
},
async show(testResultId) {
const result = await ApiService.get(
urls.showTestResult(testResultId)
urls.showTestResult(testResultId)
);
if (result && result.status == 200) {
this.changeCurrentModal({
@@ -351,13 +309,13 @@ export default {
},
async remove(testResultId) {
const result = await ApiService.delete(
urls.removeTestResult(testResultId)
urls.removeTestResult(testResultId)
);
if (result && result.status == 200) {
for (const key in this.items) {
if (
this.items.hasOwnProperty(key) &&
this.items[key].id == testResultId
this.items.hasOwnProperty(key) &&
this.items[key].id == testResultId
) {
this.items.splice(key, 1);
}
@@ -398,8 +356,8 @@ export default {
getModalResult(testResult) {
for (const key in this.items) {
if (
this.items.hasOwnProperty(key) &&
this.items[key].id == testResult.id
this.items.hasOwnProperty(key) &&
this.items[key].id == testResult.id
) {
this.items[key].verified = testResult.verified;
}