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

fix : label

Browse Source
This commit is contained in:
zeinab.ashrafi
2025-03-12 11:10:35 +03:30
parent 9359af0852
commit 850f302365
5 changed files with 159 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/core/View.vue
+1 -5
View File
@@ -11,11 +11,7 @@
<script>
export default {
metaInfo () {
return {
title: 'CSSD Dashboard'
}
}
}
</script>
src/router/index.js
+3 -1
View File
@@ -59,7 +59,9 @@ router.beforeEach((to, from, next) => {
const onlyWhenLoggedOut = to.matched.some(record => record.meta.onlyWhenLoggedOut);
const loggedIn = !!TokenService.getToken();
const roles = (to.meta && to.meta.roles) ? to.meta.roles : null;
if (to.meta.title) {
document.title = to.meta.title;
}
if (!isPublic && !loggedIn) {
return next({
path:'/login',
src/router/paths.js
+110 -26
View File
@@ -8,31 +8,42 @@ export default [
path: '/dashboard',
name: 'Dashboard',
view: 'Dashboard',
meta: {
title:'CSSD Dashboard'
}
},
{
path: '/my-info',
name: 'MyInfo',
view: 'User/MyInfo'
view: 'User/MyInfo',
meta: {
title:'My Inf | CSSD Dashboard'
}
},
{
path: '/manage-users',
name: 'ManageUsers',
view: 'User/List',
meta: {
roles: 'Admin|Supervisor'
roles: 'Admin|Supervisor',
title:'Manage User | CSSD Dashboard'
}
},
{
path: '/test-type/create',
name: 'AddTestType',
view: 'TestType/AddEdit'
view: 'TestType/AddEdit',
meta: {
title:'Add Test Typ | CSSD Dashboard'
}
},
{
path: '/test-type/:testType/edit',
name: 'EditTestType',
view: 'TestType/AddEdit',
meta: {
roles: 'Admin'
roles: 'Admin',
title:'Edit Test Typ | CSSD Dashboard'
}
},
{
@@ -40,7 +51,8 @@ export default [
name: 'ListTestType',
view: 'TestType/List',
meta: {
roles: 'Admin'
roles: 'Admin',
title:'List Test Typ | CSSD Dashboard'
}
},
{
@@ -48,6 +60,7 @@ export default [
name: 'ManageMedicalCenter',
view: 'MedicalCenter/List',
meta: {
title:'Manage Medical Center | CSSD Dashboard',
roles: 'Admin'
}
},
@@ -56,6 +69,7 @@ export default [
name: 'AddMedicalCenter',
view: 'MedicalCenter/AddEdit',
meta: {
title:'Add Medical Center | CSSD Dashboard',
roles: 'Admin'
}
},
@@ -64,6 +78,7 @@ export default [
name: 'EditMedicalCenter',
view: 'MedicalCenter/AddEdit',
meta: {
title:'Edit Medical Center | CSSD Dashboard',
roles: 'Admin'
}
},
@@ -72,6 +87,7 @@ export default [
name: 'AddOperator',
view: 'Auth/Register',
meta: {
title:'Add Operator | CSSD Dashboard',
roles: 'Admin'
}
},
@@ -80,6 +96,7 @@ export default [
name: 'OperatorList',
view: 'MedicalCenter/OperatorList',
meta: {
title:'Operator List | CSSD Dashboard',
roles: 'Admin'
}
},
@@ -88,6 +105,7 @@ export default [
name: 'Login',
view: 'Auth/Login',
meta: {
title:'Login | CSSD Dashboard',
public: true, // Allow access to even if not logged in
onlyWhenLoggedOut: true
}
@@ -97,6 +115,7 @@ export default [
name: 'Register',
view: 'Auth/Register',
meta: {
title:'Register | CSSD Dashboard',
public: true, // Allow access to even if not logged in
onlyWhenLoggedOut: true,
roles: 'Admin'
@@ -107,6 +126,7 @@ export default [
name: 'ForgotPassword',
view: 'Auth/ForgotPassword',
meta: {
title:'Forgot Password | CSSD Dashboard',
public: true, // Allow access to even if not logged in
onlyWhenLoggedOut: true
},
@@ -116,112 +136,176 @@ export default [
name: 'ShowTestResult',
view: 'TestResult/Show',
meta: {
title:'Show Test Result | CSSD Dashboard',
public: true,
},
},
{
path: '/resualt-test',
name: 'AllResultTest',
view: 'TestResult/List'
view: 'TestResult/List',
meta:{
title:'All Result Test | CSSD Dashboard',
}
},
{
path: '/add-test-result',
name: 'SubmitTestResult',
view: 'TestResult/AddEdit'
view: 'TestResult/AddEdit',
meta:{
title:'Submit Test Result | CSSD Dashboard',
}
},
{
path: '/test-result/:testResult/edit',
name: 'EditTestResult',
view: 'TestResult/AddEdit'
view: 'TestResult/AddEdit',
meta:{
title:'Edit Test Result | CSSD Dashboard',
}
},
{
path: '/test-result/NotVerified',
name: 'NotVerifyTestResult',
view: 'TestResult/List'
view: 'TestResult/List',
meta:{
title:'Not Verify Test Resul | CSSD Dashboard'
}
},
{
path: '/statistics',
name: 'Statistics',
view: 'Statistics/Chart'
view: 'Statistics/Chart',
meta:{
title:'Statistics | CSSD Dashboard',
}
},
{
path: '/add-package',
name: 'AddPackage',
view: 'Package/AddEdit'
view: 'Package/AddEdit',
meta:{
title:'Add Package | CSSD Dashboard',
}
},
{
path: '/packages',
name: 'AllPackage',
view: 'Package/List'
view: 'Package/List',
meta:{
title:'All Package | CSSD Dashboard',
}
},
{
path: '/packages/:package/edit',
name: 'EditPackage',
view: 'Package/AddEdit'
view: 'Package/AddEdit',
meta:{
title:'Edit Package | CSSD Dashboard',
}
},
{
path: '/add-label',
name: 'AddLabel',
view: 'Label/AddEdit'
view: 'Label/AddEdit',
meta:{
title:'Add Label | CSSD Dashboard',
}
},
{
path: '/labels',
name: 'AllLabels',
view: 'Label/List'
view: 'Label/List',
meta:{
title:'All Labels | CSSD Dashboard',
}
},
{
path: '/label/:label/edit',
name: 'EditLabel',
view: 'Label/AddEdit'
view: 'Label/AddEdit',
meta:{
title:'Edit Label | CSSD Dashboard',
}
},
{
path: '/add-cycle',
name: 'AddCycle',
view: 'Cycle/AddEdit'
view: 'Cycle/AddEdit',
meta:{
title:'Add Cycle | CSSD Dashboard',
}
},
{
path: '/cycles',
name: 'AllCycle',
view: 'Cycle/List'
view: 'Cycle/List',
meta:{
title:'All Cycle | CSSD Dashboard',
}
},
{
path: '/cycle/:cycle/edit',
name: 'EditCycle',
view: 'Cycle/AddEdit'
view: 'Cycle/AddEdit',
meta:{
title:'Edit Cycle | CSSD Dashboard',
}
},
{
path: '/add-Item',
name: 'AddItem',
view: 'Item/AddEdit'
view: 'Item/AddEdit',
meta:{
title:'Add Item | CSSD Dashboard',
}
},
{
path: '/Items',
name: 'AllItem',
view: 'Item/List'
view: 'Item/List',
meta:{
title:'All Item | CSSD Dashboard',
}
},
{
path: '/Item/:Item/edit',
name: 'EditItem',
view: 'Item/AddEdit'
view: 'Item/AddEdit',
meta:{
title:'Edit Item | CSSD Dashboard',
}
},
{
path: '/my-Items',
name: 'MyItem',
view: 'MyItem/List'
view: 'MyItem/List',
meta:{
title:'My Item | CSSD Dashboard',
}
},
{
path: '/tickets',
name: 'Tickets',
view: 'Tickets/List'
view: 'Tickets/List',
meta:{
title:'Tickets | CSSD Dashboard',
}
},
{
path: '/ShowPackage/:package',
name: 'ShowPackage',
view: 'Package/ShowPackage'
view: 'Package/ShowPackage',
meta:{
title:'Show Package | CSSD Dashboard',
}
},
{
path: '/Intro',
name: 'Intro',
view: 'Intro/Intro'
view: 'Intro/Intro',
meta:{
title:'Intro | CSSD Dashboard',
}
},
]
src/views/Item/List.vue
+9 -11
View File
@@ -3,40 +3,38 @@
<v-container fluid>
<material-card class color="black" title="All Items" text>
<v-layout align-center wrap class="my-3 px-5">
<v-flex xs12 md3 sm3 class="WM-FlexCenter">
<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-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<v-flex xs12 sm4 md4 lg3 xl2 class="WM-FlexCenter">
<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-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3" v-if="$hasRole('Admin')">
<v-flex xs12 sm4 md4 lg3 xl2 class="WM-FlexCenter" 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" label="Hospital" color="black" :items="medicalCenters"
:clearable="true"/>
</v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<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.size" label="Size" color="black"/>
</v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl3">
<v-flex xs12 sm4 md3 lg2 xl2 class="WM-FlexCenter">
<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-flex>
</v-layout>
<v-layout class="px-5 my-3">
<v-flex class xs12 md2 sm3>
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load()">
<!--btn-->
<v-flex xs12 sm4 md4 lg3 xl1 class="WM-FlexCenter">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:9px 30px" @click="load()">
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
<span class="white--text CSSD-font">Filter</span>
</v-btn>
</v-flex>
<v-spacer/>
<v-flex xs12 md2 sm2 class="text-xs-right">
<v-flex xs12 sm12 md4 lg3 xl1 class="text-xs-right">
<router-link :to="{ name: 'AddItem' }">
<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>
src/views/Label/AddEdit.vue
+36 -37
View File
@@ -4,24 +4,24 @@
<material-card color="black" title="Add Label on Set ">
<v-layout wrap class="px-5 my-3">
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-flex xs12 sm6 md4 lg3 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field name="sterilizerId" label="Sterilizer ID" color="black"
v-model="formData.sterilizer_id" class="py-3 pr-3"></v-text-field>
v-model="formData.sterilizer_id" class="py-3 pr-3"/>
</v-flex>
<v-flex xs12 sm6 md3 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-text-field name="cycle_number" label="Cycle Number" color="black" v-model="formData.cycle_number"
class="py-3 pr-3"></v-text-field>
<v-flex xs12 sm6 md4 lg3 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field name="cycle_number" label="Preferred Cycle Number" color="black" v-model="formData.cycle_number"
class="py-3 pr-3"/>
</v-flex>
<v-flex xs12 sm6 md3 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-flex xs12 sm6 md4 lg3 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field name="lot_number" label="Lot Number" color="black" readonly v-model="lotNumber"
class="py-3 pr-3"></v-text-field>
class="py-3 pr-3"/>
</v-flex>
<v-spacer></v-spacer>
<v-flex xs12 sm6 md3 class="WM-FlexCenter">
<v-icon class="fas fa-check mr-2 WM-Margin-B-8"></v-icon>
<v-spacer/>
<v-flex xs12 sm6 md4 lg3 class="WM-FlexCenter">
<v-icon class="fas fa-check mr-2 WM-Margin-B-8"/>
<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" :filter="customFilter">
<template v-slot:chip="{ item }">
@@ -33,46 +33,44 @@
</template>
</v-autocomplete>
</v-flex>
<v-flex xs12 sm6 md2 class="WM-FlexCenter pl-3">
<v-icon class="far fa-calendar-alt mr-2"></v-icon>
<v-flex xs12 sm6 md4 lg3 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="fromMenuSterile">
v-model="fromMenuSterile" style="width: 100%">
<v-text-field required slot="activator" label="Sterile Date" color="black" class="pr-3"
v-model="formData.sterile_date">
</v-text-field>
<v-date-picker color="pink" no-title v-model="formData.sterile_date"
:date-format="date => new Date(date).toDateString()"></v-date-picker>
v-model="formData.sterile_date"/>
<v-date-picker color="pink" :min="today" no-title v-model="formData.sterile_date"
:date-format="date => new Date(date).toDateString()"/>
</v-menu>
</v-flex>
<v-flex xs12 sm6 md2 class="WM-FlexCenter pl-3">
<v-icon class="far fa-calendar-alt mr-2"></v-icon>
<v-flex xs12 sm6 md4 lg3 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="fromMenuExpire">
v-model="fromMenuExpire" style="width: 100%">
<v-text-field required slot="activator" label="Expire Date" color="black" class="pr-3"
v-model="formData.expire_date">
</v-text-field>
<v-date-picker :show-current="showCurrent" min="2020-01-01" color="pink" no-title
v-model="formData.expire_date"/>
<v-date-picker :show-current="showCurrent" :min="formData.sterile_date" color="pink" no-title
v-model="formData.expire_date"
:date-format="date => new Date(date).toDateString()"></v-date-picker>
:date-format="date => new Date(date).toDateString()"/>
</v-menu>
</v-flex>
</v-layout>
<v-layout row wrap justify-center align-center>
<v-flex xs12 md2 sm2 class="text-md-center text-xs-center">
<v-flex xs12 sm6 md4 lg3 class="text-md-center text-sm-center text-xs-center">
<router-link :to="{ name: 'AllLabels' }">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text">keyboard_arrow_left</v-icon>
<span class="black--text">Back</span>
</v-btn>
</router-link>
</v-flex>
<v-flex xs12 sm6 md4 lg3 class="text-md-center text-xs-center">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="submitForm()">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">SAVE</span>
</v-btn>
</v-flex>
<v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center">
<router-link :to="{ name: 'AllLabels' }">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text">keyboard_arrow_left</v-icon>
<span class="black--text">Back</span>
</v-btn>
</router-link>
</v-flex>
</v-layout>
</material-card>
</v-container>
@@ -89,10 +87,11 @@ export default {
showCurrent: false,
fromMenuSterile: false,
fromMenuExpire: false,
today: new Date().toISOString().split("T")[0],
formData: {
result: "",
package_id: "",
expire_date: "2020-01-01",
expire_date: null,
sterilizer_id: '',
cycle_number: '',
sterile_date: new Date().toISOString().substr(0, 10)