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

fix : pagination of my-items -list packages display item.udi -items details

Browse Source
This commit is contained in:
zeinab.ashrafi
2025-04-30 12:47:32 +03:30
parent 35d8327a77
commit 70b6ce503d
5 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/modal/barcode/Barcode.vue
+3 -2
View File
@@ -13,8 +13,9 @@
<span v-else>{{ Type + ':' + ID }}</span> <span v-else>{{ Type + ':' + ID }}</span>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-R"> <v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-R">
<a v-if="Type != 'TestType'" :href="'https://www.cssd-doc.com/'+ShowLink" target="_blank"><img :src="QRCodeimg" <a v-if="Type != 'TestType'" :href="'https://www.cssd-doc.com/'+ShowLink" target="_blank">
class="WM-Width-150"></a> <img :src="QRCodeimg" class="WM-Width-150">
</a>
<img v-else :src="QRCodeimg" class="WM-Width-150"> <img v-else :src="QRCodeimg" class="WM-Width-150">
</v-flex> </v-flex>
</v-layout> </v-layout>
src/components/modal/item/show.vue
+1 -1
View File
@@ -90,7 +90,7 @@
<v-layout row wrap class="align-center mt-3"> <v-layout row wrap class="align-center mt-3">
<v-flex xs12 md6 sm6 v-if="barcodeimg"> <v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg" class="WM-Width-350"><br/> <img :src="barcodeimg" class="WM-Width-350"><br/>
<span class="CSSD-font">Item ID : {{ data.id }}</span> <span class="CSSD-font">Item UDI : {{ data.udi }}</span>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-R"> <v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-R">
<a :href="'https://www.cssd-doc.com/Show/Item/' + data.id + ''" target="_blank"> <a :href="'https://www.cssd-doc.com/Show/Item/' + data.id + ''" target="_blank">
src/views/MyItem/List.vue
+23 -13
View File
@@ -31,17 +31,19 @@
<v-flex xs12 sm6 md6 lg2 xl3 class="WM-Align-R"> <v-flex xs12 sm6 md6 lg2 xl3 class="WM-Align-R">
<v-tooltip bottom open-on-hover> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }"> <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()"> <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()">
<v-icon class="black--text caption">fas fa-search</v-icon> <v-icon class="black--text caption">fas fa-search</v-icon>
</v-btn> </v-btn>
</template> </template>
<span>Filter</span> <span>Filter</span>
</v-tooltip> </v-tooltip>
<!-- <v-btn class="WM-Outline-Btn WM-Border mr-2 WM-Margin-BT-0 WM-Border-Black" style="padding: 10px 30px;"> <!-- <v-btn class="WM-Outline-Btn WM-Border mr-2 WM-Margin-BT-0 WM-Border-Black" style="padding: 10px 30px;">
<v-icon class="black&#45;&#45;text mr-2 caption">fas fa-share-square</v-icon> <v-icon class="black&#45;&#45;text mr-2 caption">fas fa-share-square</v-icon>
<span class="black&#45;&#45;text">EXPORT</span> <span class="black&#45;&#45;text">EXPORT</span>
</v-btn>--> </v-btn>-->
<router-link :to="{ name: 'AddItem' }"> <router-link :to="{ name: 'AddItem' }">
<v-btn class="WM-CyanBlueGradient-BG WM-Margin-BT-0" style="padding:10px 30px"> <v-btn class="WM-CyanBlueGradient-BG WM-Margin-BT-0" style="padding:10px 30px">
@@ -207,16 +209,22 @@ export default {
items() { items() {
return this.getMyItems; return this.getMyItems;
}, },
currentPage() { currentPage: {
return this.getCurrentPage; get() {
return this.getCurrentPage;
},
set(val) {
this.$store.commit('myItems/SET_MY_ITEMS_CURRENT_PAGE', val);
this.$store.dispatch('myItems/loadMyItem', val);
}
}, },
lastPage() { lastPage() {
return this.getLastPage; return this.getLastPage;
}, }
}, },
methods: { methods: {
...mapMutations('myItems', ["SET_FILTER"]), ...mapMutations('myItems', ["SET_FILTER"]),
...mapMutations("modal", ["changeCurrentModal",'closeModal']), ...mapMutations("modal", ["changeCurrentModal", 'closeModal']),
...mapActions('myItems', ['loadMyItem', 'removeItem', 'showItem', 'generateBarcode']), ...mapActions('myItems', ['loadMyItem', 'removeItem', 'showItem', 'generateBarcode']),
onFilterClick() { onFilterClick() {
this.loadMyItem(); this.loadMyItem();
@@ -281,8 +289,8 @@ export default {
getStatus(item) { getStatus(item) {
if (item.status === 'pending') { if (item.status === 'pending') {
return [ return [
{status: 'approved', label: 'approve', color: 'cyan', font_color : 'white', icon: 'fa-check'}, {status: 'approved', label: 'approve', color: 'cyan', font_color: 'white', icon: 'fa-check'},
{status: 'rejected', label: 'reject', color: 'light-gray',font_color : 'black', icon: 'fa-close'}, {status: 'rejected', label: 'reject', color: 'light-gray', font_color: 'black', icon: 'fa-close'},
] ]
} else { } else {
const nextStatus = item.status === 'rejected' ? 'approved' : 'rejected' const nextStatus = item.status === 'rejected' ? 'approved' : 'rejected'
@@ -307,10 +315,12 @@ export default {
} }
} }
}, },
watch: { watch: {
currentPage(page) { currentPage(page) {
this.loadMyItem(page); this.$store.dispatch('myItems/loadMyItem', page);
}, }
} }
}; };
</script> </script>
src/views/MyPackage/List.vue
+2 -2
View File
@@ -62,7 +62,7 @@
<td class="title font-weight-light">{{ item.description }}</td> <td class="title font-weight-light">{{ item.description }}</td>
<td class="title font-weight-light"> <td class="title font-weight-light">
<span v-for="(i , index) in item.items" :key="index"> <span v-for="(i , index) in item.items" :key="index">
{{ i.id }} <span v-if="index !== item.items.length-1">,</span> {{ i.udi }} <span v-if="index !== item.items.length-1">,</span>
</span> </span>
</td> </td>
<td class="title font-weight-light">{{ item.status }}</td> <td class="title font-weight-light">{{ item.status }}</td>
@@ -186,7 +186,7 @@ export default {
{sortable: false, text: "Name", value: "name"}, {sortable: false, text: "Name", value: "name"},
{sortable: false, text: "Hospital", value: "Hospital"}, {sortable: false, text: "Hospital", value: "Hospital"},
{sortable: false, text: "Description", value: "description"}, {sortable: false, text: "Description", value: "description"},
{sortable: false, text: "Items", value: "item"}, {sortable: false, text: "Items UDI", value: "item"},
{sortable: false, text: "Status", value: "status"}, {sortable: false, text: "Status", value: "status"},
{sortable: false, text: "Action", value: "action", align: "center", width: '20%'} {sortable: false, text: "Action", value: "action", align: "center", width: '20%'}
], ],
src/views/Package/List.vue
+2 -2
View File
@@ -65,7 +65,7 @@
<td class="title font-weight-light">{{ item.description }}</td> <td class="title font-weight-light">{{ item.description }}</td>
<td class="title font-weight-light"> <td class="title font-weight-light">
<span v-for="(i , index) in item.items" :key="index"> <span v-for="(i , index) in item.items" :key="index">
{{ i.id }} <span v-if="index !== item.items.length-1">,</span> {{ i.udi }} <span v-if="index !== item.items.length-1">,</span>
</span> </span>
</td> </td>
<td class="title font-weight-light">{{ item.status }}</td> <td class="title font-weight-light">{{ item.status }}</td>
@@ -190,7 +190,7 @@ export default {
{sortable: false, text: "Hospital", value: "Hospital"}, {sortable: false, text: "Hospital", value: "Hospital"},
{sortable: false, text: "Owner", value: "User"}, {sortable: false, text: "Owner", value: "User"},
{sortable: false, text: "Description", value: "description"}, {sortable: false, text: "Description", value: "description"},
{sortable: false, text: "Items", value: "items"}, {sortable: false, text: "Items UDI", value: "items"},
{sortable: false, text: "Status", value: "status"}, {sortable: false, text: "Status", value: "status"},
{sortable: false, text: "Action", value: "action", align: "center", width: '20%'} {sortable: false, text: "Action", value: "action", align: "center", width: '20%'}
], ],