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

fix : display data in details and style

Browse Source
This commit is contained in:
zeinab.ashrafi
2025-04-23 11:53:24 +03:30
parent 8482e6bc53
commit b5abe4d2c8
4 changed files with 82 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/Item/List.vue
+18 -1
View File
@@ -113,6 +113,17 @@
</template>
<span>Generate Barcode</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn class="mr-2" v-bind="attrs" v-on="on" color="light-gray"
v-if="$hasRole('Admin|Supervisor') || item.user_id == $store.state.user.id"
@click="transfer(item)">
<v-icon class="black--text mr-2 caption">fas fa-arrows-alt</v-icon>
<span class="CSSD-font">Transfer</span>
</v-btn>
</template>
<span>Transfer</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<router-link class="LinkBtn"
@@ -291,7 +302,13 @@ export default {
const target = this.items.find(i => i.id === item.id)
if (target) target.status = newStatus
}
}
},
async transfer(data) {
this.changeCurrentModal({
modal: "modal-user-list",
properties: {data},
});
},
},
watch: {
currentPage(page) {
src/views/TestResult/List.vue
+27 -61
View File
@@ -32,7 +32,8 @@
</v-flex>
<v-flex xs12 sm4 md4 lg3 xl2 class="WM-FlexCenter">
<v-icon class="far fa-calendar-alt mr-2"/>
<v-menu class="pr-3" lazy :close-on-content-click="true" transition="v-scale-transition" offset-y
<v-menu class="pr-3" lazy :close-on-content-click="true" transition="v-scale-transition"
offset-y
v-model="fromMenu" style="width: 100%">
<v-text-field class="pt-3 pr-3" required slot="activator" label="FromDate"
v-model="filter.fromPicker" color="black"/>
@@ -42,7 +43,8 @@
</v-flex>
<v-flex xs12 sm4 md4 lg3 xl2 class="WM-FlexCenter" style="display: flex;align-items: center;">
<v-icon class="far fa-calendar-alt mr-2"/>
<v-menu class="pr-3" lazy :close-on-content-click="true" transition="v-scale-transition" offset-y
<v-menu class="pr-3" lazy :close-on-content-click="true" transition="v-scale-transition"
offset-y
v-model="upToMenu" style="width: 100%">
<v-text-field class="pt-3 pr-3" required slot="activator" label="UpToDate" color="black"
v-model="filter.upToPicker"/>
@@ -54,7 +56,9 @@
<v-flex xs12 sm6 md6 lg12 xl3 class="WM-Align-R">
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" color="WM-Tooltip-Btn WM-Outline-Btn WM-Border WM-Margin-BT-0 WM-Border-Black mr-2" @click="load(null, null)">
<v-btn v-bind="attrs" v-on="on"
color="WM-Tooltip-Btn WM-Outline-Btn WM-Border WM-Margin-BT-0 WM-Border-Black mr-2"
@click="load(null, null)">
<v-icon class="black--text caption">fas fa-search</v-icon>
</v-btn>
</template>
@@ -108,9 +112,9 @@
<td class="text-xs-right FlexBtn justify-self-end">
<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-btn color="light-gray" class="mr-2" @click="show(item.id)" v-bind="attrs"
v-on="on">
<v-icon class="white--text mr-1 caption">fas fa-eye</v-icon>
<v-icon class="black--text mr-1 caption">fas fa-eye</v-icon>
<span>Show</span>
</v-btn>
</template>
@@ -118,10 +122,10 @@
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn color="orange" class="mr-2"
<v-btn color="light-gray" class="mr-2"
@click="generateBarcode(item.id, 'TestResult')" v-bind="attrs"
v-on="on">
<v-icon class="white--text mr-1 caption">fa fa-bars</v-icon>
<v-icon class="black--text mr-1 caption">fa fa-bars</v-icon>
<span>generate Barcode</span>
</v-btn>
</template>
@@ -133,7 +137,7 @@
<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-btn color="orange" class="mr-2" v-bind="attrs" v-on="on">
<v-btn color="black" 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>
</v-btn>
@@ -144,7 +148,7 @@
<v-tooltip bottom open-on-hover>
<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="removeModal(item.id)"
<v-btn color="red" class="WM-ActionButton" @click="removeModal(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-trash</v-icon>
@@ -223,54 +227,19 @@ export default {
lastPage: 1,
testTypes: [],
medicalCenters: [],
deviceLabels: [{
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"
},
deviceLabels: [
{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"},
]
}),
created() {
@@ -363,10 +332,7 @@ export default {
},
getModalResult(testResult) {
for (const key in this.items) {
if (
this.items.hasOwnProperty(key) &&
this.items[key].id == testResult.id
) {
if (this.items.hasOwnProperty(key) && this.items[key].id == testResult.id) {
this.items[key].verified = testResult.verified;
}
}