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

fix : style , errors

Browse Source
This commit is contained in:
Ashrafi
2025-04-13 13:10:15 +03:30
parent 90b0e0dc65
commit 2e98810cf0
6 changed files with 77 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/modal/barcode/Barcode.vue
+1 -1
View File
@@ -13,7 +13,7 @@
<span v-else>{{ Type + ':' + ID }}</span>
</v-flex>
<v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-R">
<a v-if="Type != 'TestType'" :href="ShowLink" target="_blank"><img :src="QRCodeimg"
<a v-if="Type != 'TestType'" :href="'https://www.cssd-doc.com/'+ShowLink" target="_blank"><img :src="QRCodeimg"
class="WM-Width-150"></a>
<img v-else :src="QRCodeimg" class="WM-Width-150">
</v-flex>
src/components/modal/package/Show.vue
+53 -22
View File
@@ -3,40 +3,43 @@
<material-card color="black" title="Show Package">
<v-layout id="printMe" align-left justify-left wrap class="px-3 mb-3">
<h3 class="CSSD-font mt-0">
{{ data.name }} - MC {{(data.user != null && data.user.medical_center != null) ? data.user.medical_center.name : ''}}
{{ data.name }} - MC
{{ (data.user != null && data.user.medical_center != null) ? data.user.medical_center.name : '' }}
</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="">
<v-flex xs12 md3 sm3>
<v-flex xs12 sm4 md4>
<div class="WM-d-flex">
<v-icon class="WMi-info"></v-icon>
<span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{
data.name
}}</span>
<v-icon class="WMi-info"/>
<span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">
{{ data.name }}
</span>
</div>
</v-flex>
<v-flex xs12 md3 sm3>
<v-flex xs12 sm4 md4>
<div class="WM-d-flex">
<v-icon class="WMi-Industry"></v-icon>
<span class="headline ml-2 CSSD-font"
style="letter-spacing:0 !important">{{ $d(new Date(data.created_at), 'long') }}</span>
<v-icon class="WMi-Industry"/>
<span class="headline ml-2 CSSD-font" style="letter-spacing:0 !important">
{{ $d(new Date(data.created_at), 'long') }}
</span>
</div>
</v-flex>
<v-flex xs12 md3 sm3>
<v-flex xs12 sm4 md4>
<div class="WM-d-flex">
<v-icon class="WMi-user"></v-icon>
<span class="headline ml-2 CSSD-font"
style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span>
<v-icon class="WMi-user"/>
<span class="headline ml-2 CSSD-font" style="letter-spacing:0 !important">
{{ data.user ? data.user.name : '' }}
</span>
</div>
</v-flex>
<v-flex xs12 md3 sm3>
<v-flex xs12 sm12 md12>
<div class="WM-d-flex">
<v-icon class="WMi-pencil"></v-icon>
<span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{
data.note
}}</span>
<v-icon class="WMi-pencil"/>
<span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">
{{ data.note }}
</span>
</div>
</v-flex>
</v-layout>
@@ -63,13 +66,25 @@
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<v-layout row wrap class="ml-4 WM-Relative">
<template v-if="data.items.length">
<v-expansion-panel class="WM-Panel">
<v-expansion-panel-content v-for="(item, key) in data.items" :key="key">
<template v-slot:header>
<div class="CSSD-font">{{ key + 1 + ": " + item.name }} <span
v-if="item.pivot">({{ item.pivot.count }})</span></div>
<v-layout row class="CSSD-font">
<span class="item-counter">{{ key + 1 }}</span>
<v-layout row class="pl-2">
<v-flex xs12 sm6 md4>
<span class="sub-text">Item ID:</span> {{ item.id }}
</v-flex>
<v-flex xs12 sm6 md4>
<span class="sub-text">Item Name:</span>{{ item.name }}
</v-flex>
<v-flex xs12 sm6 md4>
<span v-if="item.pivot">({{ item.pivot.count }})</span>
</v-flex>
</v-layout>
</v-layout>
</template>
<v-card>
<v-card-text>note : {{ item.note }}</v-card-text>
@@ -168,3 +183,19 @@ export default {
}
};
</script>
<style scoped>
.item-counter {
font-size: 44px;
opacity: .3;
font-family: 'Montserrat-Bold';
line-height: 44px;
position: absolute;
left: 0;
top: 0;
color: #b7b7b7;
}
.sub-text {
font-size: 12px;
}
</style>
src/components/modal/user/List.vue
+1 -1
View File
@@ -46,7 +46,7 @@
<v-flex xs12 sm6 md4 lg3 class="text-md-center text-xs-center">
<v-btn type="submit" class="WM-CyanBlueGradient-BG ml-5 px-5">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">Submit</span>
<span class="white--text">Transfer</span>
</v-btn>
</v-flex>
</v-layout>
src/views/Cycle/List.vue
+7 -1
View File
@@ -67,6 +67,11 @@
{{ (item.user && item.user.medical_center) ? item.user.medical_center.name : '' }}
</td>
<td class="title font-weight-light">{{ item.sterilizer_id }}</td>
<td class="title font-weight-light">
<span v-for="(label , index) in item.labels" :key="index">
{{ label.id }} <span v-if="index !== item.labels.length-1">,</span>
</span>
</td>
<td class="title font-weight-light">{{ item.cycle_number }}</td>
<td class="title font-weight-light">{{ item.date }}</td>
<td class="text-xs-right FlexBtn Height-MD-60 justify-self-end">
@@ -155,9 +160,10 @@ export default {
{sortable: false, text: "ID", value: "Cycle ID"},
{sortable: false, text: "Hospital", value: "Hospital"},
{sortable: false, text: "Sterilizer ID", value: "Sterilizer ID"},
{sortable: false, text: "Label IDs", value: "Label IDs"},
{sortable: false, text: "Cycle Number", value: "Cycle Number"},
{sortable: false, text: "Date", value: "date"},
{sortable: false, text: "Action", value: "action", align: "center"}
{sortable: false, text: "Action", value: "action", align: "center",width:'10%'}
],
filter: {},
Menu: false,
src/views/Label/List.vue
+4 -2
View File
@@ -67,6 +67,7 @@
<td class="title font-weight-light">{{ item.user ? item.user.name : '' }}</td>
<td class="title font-weight-light">{{ item.cycle_number }}</td>
<td class="title font-weight-light">{{ item.sterilizer_id }}</td>
<td class="title font-weight-light">{{ item.package_id }}</td>
<td class="text-xs-right FlexBtn Height-MD-60 justify-self-end">
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
@@ -158,8 +159,9 @@ export default {
{sortable: false, text: "Hospital", value: "Hospital"},
{sortable: false, text: "Owner", value: "User"},
{sortable: false, text: "Cycle Number", value: "Cycle Number"},
{sortable: false, text: "SterilizerID", value: "SterilizerID"},
{sortable: false, text: "Action", value: "action", align: "center"}
{sortable: false, text: "Sterilizer ID", value: "Sterilizer ID"},
{sortable: false, text: "Package ID", value: "Package ID"},
{sortable: false, text: "Action", value: "action", align: "center",width:'10%'}
],
filter: {},
items: [],
src/views/Package/AddEdit.vue
+11 -2
View File
@@ -149,10 +149,11 @@ export default {
};
},
created() {
this.loadItems();
if (this.$route.params.package) {
this.load(this.$route.params.package);
}
this.loadItems();
},
methods: {
customFilter(item, queryText) {
@@ -168,6 +169,14 @@ export default {
const result = await ApiService.get(urls.editPackage(id));
if (result.status == 200) {
this.formData = result.data.data;
const usedItems = this.formData.items.filter(i => i.id && i.name);
const existingIds = this.items.map(i => i.id);
usedItems.forEach(ui => {
if (!existingIds.includes(ui.id)) {
this.items.push(ui);
}
});
}
},
async loadItems() {
@@ -177,6 +186,7 @@ export default {
}
},
async submitForm() {
this.formData.items = this.formData.items.filter(item => item.id);
let result;
if (this.$route.params.package) {
result = await ApiService.put(urls.updatePackage(this.$route.params.package), this.formData);
@@ -191,7 +201,6 @@ export default {
duplicateForm(infoIndex) {
this.formData.items.push({name: "",});
console.log(this.$refs[`selectItem-1`], infoIndex);
this.$refs[`selectItem-${infoIndex}`][0].focus();
},
removeForm(infoIndex) {