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

fix

Browse Source
This commit is contained in:
sajjad
2023-09-25 02:23:32 -07:00
parent eb9a033de9
commit b5d82b6543
6 changed files with 63 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/vue/views/Item/AddEdit.vue
+1 -1
View File
@@ -32,7 +32,7 @@
<v-layout class="px-5 mb-3"> <v-layout class="px-5 mb-3">
<v-flex xs12 md4 sm4 class="WM-FlexCenter"> <v-flex xs12 md4 sm4 class="WM-FlexCenter">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon> <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
<v-text-field name="UID" label="UID" color="black" v-model="formData.uid" :rules="[rules.required]" <v-text-field name="UDI" label="UDI" color="black" v-model="formData.udi" :rules="[rules.required]"
class="py-3 pr-3"></v-text-field> class="py-3 pr-3"></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md8 sm8 class="WM-FlexCenter" v-if="galleryDataLoaded"> <v-flex xs12 md8 sm8 class="WM-FlexCenter" v-if="galleryDataLoaded">
resources/js/vue/views/Item/List.vue
+10 -4
View File
@@ -51,9 +51,10 @@
<td class="title font-weight-light">{{ item.id }}</td> <td class="title font-weight-light">{{ item.id }}</td>
<!-- <td class="title font-weight-light">{{ item.unique_id }}</td> --> <!-- <td class="title font-weight-light">{{ item.unique_id }}</td> -->
<td class="title font-weight-light">{{ item.name }}</td> <td class="title font-weight-light">{{ item.name }}</td>
<td class="title font-weight-light">{{ item.user ? item.user.name : '' }}</td>
<td class="title font-weight-light">{{ (item.user && item.user.medical_center) ? <td class="title font-weight-light">{{ (item.user && item.user.medical_center) ?
item.user.medical_center.name : '' }}</td> item.user.medical_center.name : '' }}</td>
<td class="title font-weight-light">{{ item.uid }}</td> <td class="title font-weight-light">{{ item.udi }}</td>
<td class="title font-weight-light">{{ item.size }}</td> <td class="title font-weight-light">{{ item.size }}</td>
<td class="text-xs-right FlexBtn Height-MD-60"> <td class="text-xs-right FlexBtn Height-MD-60">
<v-tooltip bottom open-on-hover v-if="$hasRole('Supervisor|Admin')"> <v-tooltip bottom open-on-hover v-if="$hasRole('Supervisor|Admin')">
@@ -155,6 +156,11 @@ export default {
text: "Name", text: "Name",
value: "name" value: "name"
}, },
{
sortable: true,
text: "User",
value: "User"
},
{ {
sortable: true, sortable: true,
text: "Hospital", text: "Hospital",
@@ -162,8 +168,8 @@ export default {
}, },
{ {
sortable: false, sortable: false,
text: "UID", text: "UDI",
value: "uid" value: "udi"
}, },
{ {
sortable: false, sortable: false,
@@ -213,7 +219,7 @@ export default {
this.loadMedicalCenters(); this.loadMedicalCenters();
}, },
async generateBarcode(item, type = null) { async generateBarcode(item, type = null) {
let code = item.uid ? item.uid : item.id; let code = item.udi ? item.udi : item.id;
const result = await ApiService.post(urls.Barcode(code, type)); const result = await ApiService.post(urls.Barcode(code, type));
if (result && result.status == 200) { if (result && result.status == 200) {
this.changeCurrentModal({ this.changeCurrentModal({
resources/js/vue/views/Label/AddEdit.vue
+43 -84
View File
@@ -2,102 +2,58 @@
<v-form ref="form"> <v-form ref="form">
<v-container grid-list-xs fluid> <v-container grid-list-xs fluid>
<material-card color="black" title="Add Label on Set "> <material-card color="black" title="Add Label on Set ">
<v-layout wrap class="px-5 my-3"> <v-layout wrap class="px-5 my-3">
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-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-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-text-field <v-text-field name="sterilizerId" label="Sterilizer ID" color="black"
name="sterilizerId" v-model="formData.sterilizer_id" class="py-3 pr-3"></v-text-field>
label="Sterilizer ID"
color="black"
v-model="formData.sterilizer_id"
class="py-3 pr-3"
></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3 class="WM-FlexCenter pl-3"> <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-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-text-field <v-text-field name="cycle_number" label="Cycle Number" color="black" v-model="formData.cycle_number"
name="cycle_number" class="py-3 pr-3"></v-text-field>
label="Cycle Number"
color="black"
v-model="formData.cycle_number"
class="py-3 pr-3"
></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3 class="WM-FlexCenter pl-3"> <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-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-text-field <v-text-field name="lot_number" label="Lot Number" color="black" readonly v-model="lotNumber"
name="lot_number" class="py-3 pr-3"></v-text-field>
label="Lot Number"
color="black"
readonly
v-model="lotNumber"
class="py-3 pr-3"
></v-text-field>
</v-flex> </v-flex>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-flex xs12 sm6 md3 class="WM-FlexCenter"> <v-flex xs12 sm6 md3 class="WM-FlexCenter">
<v-icon class="fas fa-check mr-2 WM-Margin-B-8"></v-icon> <v-icon class="fas fa-check mr-2 WM-Margin-B-8"></v-icon>
<v-autocomplete <v-autocomplete color="black" :items="items" item-text="name" v-model="formData.package_id"
color="black" item-value="id" label="Select Package For Label" class="py-3 pr-3">
:items="items" <template v-slot:chip="{ item }">
item-text="name" {{ item.name }} - {{ item.udi }}
v-model="formData.package_id" </template>
item-value="id"
label="Select Package For Label" <template v-slot:item="{ item }">
class="py-3 pr-3" {{ item.name }} - {{ item.udi }}
></v-autocomplete> </template>
</v-autocomplete>
</v-flex> </v-flex>
<v-flex xs12 sm6 md2 class="WM-FlexCenter pl-3"> <v-flex xs12 sm6 md2 class="WM-FlexCenter pl-3">
<v-icon class="far fa-calendar-alt mr-2"></v-icon> <v-icon class="far fa-calendar-alt mr-2"></v-icon>
<v-menu <v-menu lazy :close-on-content-click="true" transition="v-scale-transition" offset-y
lazy v-model="fromMenuSterile">
:close-on-content-click="true" <v-text-field required slot="activator" label="Sterile Date" color="black" class="pr-3"
transition="v-scale-transition"
offset-y
v-model="fromMenuSterile"
>
<v-text-field
required
slot="activator"
label="Sterile Date"
color="black"
class="pr-3"
v-model="formData.sterile_date"> v-model="formData.sterile_date">
</v-text-field> </v-text-field>
<v-date-picker <v-date-picker color="pink" no-title v-model="formData.sterile_date"
color="pink" :date-format="date => new Date(date).toDateString()"></v-date-picker>
no-title
v-model="formData.sterile_date"
:date-format="date => new Date(date).toDateString()"
></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-flex xs12 sm6 md2 class="WM-FlexCenter pl-3"> <v-flex xs12 sm6 md2 class="WM-FlexCenter pl-3">
<v-icon class="far fa-calendar-alt mr-2"></v-icon> <v-icon class="far fa-calendar-alt mr-2"></v-icon>
<v-menu <v-menu lazy :close-on-content-click="true" transition="v-scale-transition" offset-y
lazy v-model="fromMenuExpire">
:close-on-content-click="true" <v-text-field required slot="activator" label="Expire Date" color="black" class="pr-3"
transition="v-scale-transition"
offset-y
v-model="fromMenuExpire"
>
<v-text-field
required
slot="activator"
label="Expire Date"
color="black"
class="pr-3"
v-model="formData.expire_date"> v-model="formData.expire_date">
</v-text-field> </v-text-field>
<v-date-picker <v-date-picker :show-current="showCurrent" min="2020-01-01" color="pink" no-title
:show-current="showCurrent"
min="2020-01-01"
color="pink"
no-title
v-model="formData.expire_date" v-model="formData.expire_date"
:date-format="date => new Date(date).toDateString()" :date-format="date => new Date(date).toDateString()"></v-date-picker>
></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
</v-layout> </v-layout>
@@ -110,7 +66,7 @@
</v-btn> </v-btn>
</v-flex> </v-flex>
<v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center"> <v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center">
<router-link :to="{name: 'AllLabels'}"> <router-link :to="{ name: 'AllLabels' }">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text">keyboard_arrow_left</v-icon> <v-icon class="black--text">keyboard_arrow_left</v-icon>
<span class="black--text">Back</span> <span class="black--text">Back</span>
@@ -130,16 +86,16 @@ import { mapMutations } from "vuex";
export default { export default {
data() { data() {
return { return {
showCurrent : false, showCurrent: false,
fromMenuSterile: false , fromMenuSterile: false,
fromMenuExpire: false, fromMenuExpire: false,
formData: { formData: {
result: "", result: "",
package_id: "", package_id: "",
expire_date : "2020-01-01", expire_date: "2020-01-01",
sterilizer_id : '', sterilizer_id: '',
cycle_number : '', cycle_number: '',
sterile_date : new Date().toISOString().substr(0, 10) sterile_date: new Date().toISOString().substr(0, 10)
}, },
items: [], items: [],
rules: { rules: {
@@ -158,8 +114,8 @@ export default {
} }
this.loadItems(); this.loadItems();
}, },
computed:{ computed: {
lotNumber(){ lotNumber() {
return this.formData.sterilizer_id + ' - ' + this.formData.cycle_number; return this.formData.sterilizer_id + ' - ' + this.formData.cycle_number;
} }
}, },
@@ -200,12 +156,15 @@ export default {
</script> </script>
<style> <style>
.v-btn--floating { .v-btn--floating {
padding: 0!important; padding: 0 !important;
} }
.theme--light.v-btn.v-btn--flat { .theme--light.v-btn.v-btn--flat {
color: rgba(0,0,0,.87)!important; color: rgba(0, 0, 0, .87) !important;
} }
.v-btn--floating, .v-btn--icon:before {
border-radius: 50%!important; .v-btn--floating,
.v-btn--icon:before {
border-radius: 50% !important;
} }
</style> </style>
resources/js/vue/views/Package/AddEdit.vue
+5 -5
View File
@@ -8,11 +8,6 @@
<v-text-field name="name" label="Name" color="black" v-model="formData.name" <v-text-field name="name" label="Name" color="black" v-model="formData.name"
:rules="[rules.required, rules.counter]" class="py-3 pr-3"></v-text-field> :rules="[rules.required, rules.counter]" class="py-3 pr-3"></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
<v-text-field name="UID" label="UID" color="black" v-model="formData.uid" :rules="[rules.required]"
class="py-3 pr-3"></v-text-field>
</v-flex>
<!-- <v-flex xs12 md3 sm3 class="WM-FlexCenter"> <!-- <v-flex xs12 md3 sm3 class="WM-FlexCenter">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon> <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
<v-text-field <v-text-field
@@ -41,6 +36,11 @@
</v-btn> </v-btn>
</div> </div>
</v-flex> </v-flex>
<v-flex xs3 class="WM-FlexCenter">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
<v-text-field name="UDI" label="UDI" color="black" v-model="formData.udi" :rules="[rules.required]"
class="py-3"></v-text-field>
</v-flex>
<!-- </v-row> --> <!-- </v-row> -->
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-flex xs12> <v-flex xs12>
resources/js/vue/views/Package/List.vue
+3 -3
View File
@@ -61,7 +61,7 @@
<td class="title font-weight-light">{{ (item.user && item.user.medical_center) ? <td class="title font-weight-light">{{ (item.user && item.user.medical_center) ?
item.user.medical_center.name : '' }}</td> item.user.medical_center.name : '' }}</td>
<td class="title font-weight-light">{{ item.user ? item.user.name : '' }}</td> <td class="title font-weight-light">{{ item.user ? item.user.name : '' }}</td>
<td class="title font-weight-light">{{ item.uid }}</td> <td class="title font-weight-light">{{ item.udi }}</td>
<td class="title font-weight-light">{{ item.description }}</td> <td class="title font-weight-light">{{ item.description }}</td>
<td class="text-xs-right FlexBtn Height-MD-60"> <td class="text-xs-right FlexBtn Height-MD-60">
<v-tooltip bottom open-on-hover> <v-tooltip bottom open-on-hover>
@@ -163,8 +163,8 @@ export default {
value: "User" value: "User"
}, },
{ {
text: "UID", text: "UDI",
value: "uid" value: "udi"
}, },
{ {
sortable: true, sortable: true,
resources/js/vue/views/TestResult/List.vue
+1 -1
View File
@@ -13,7 +13,7 @@
</v-flex> </v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3"> <v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon> <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
<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"></v-autocomplete> <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" :clearable="true"></v-autocomplete>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3"> <v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<v-icon class="fa fa-hospital-o mr-2 WM-Margin-B-8"></v-icon> <v-icon class="fa fa-hospital-o mr-2 WM-Margin-B-8"></v-icon>