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 : package transfer

Browse Source
This commit is contained in:
zeinab.ashrafi
2025-05-15 12:04:49 +03:30
parent ba6cc0ef83
commit be15f1352c
6 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/modal/user/List.vue
+11 -1
View File
@@ -114,13 +114,23 @@ export default {
},
async transfer() {
try {
const result = await this.transferItem({
let result = {}
if (this.getModalProperties.type && this.getModalProperties.type === 'item') {
result = await this.transferItem({
itemId: this.getModalProperties.data.id,
userId: this.selected.id,
isUser: this.$hasRole('User')
});
} else if (this.getModalProperties.type && this.getModalProperties.type === 'package') {
result = await ApiService.post(urls.transferPackage(this.getModalProperties.data.id), {
user_id: this.selected.id,
});
}
if (result && result.status === 200) {
this.setResultModal(result);
this.closeModal();
return result;
}
} catch (e) {
console.error("Transfer failed:", e);
}
src/config/urls.js
+3
View File
@@ -183,6 +183,9 @@ const urls = {
transferItem: function (id) {
return `/transfer-items/${id}`;
},
transferPackage: function (id) {
return `/transfer-packages/${id}`;
},
removeItem: function (id) {
return `Items/${id}`;
},
src/views/Item/List.vue
+5 -4
View File
@@ -44,7 +44,8 @@
<span>Filter</span>
</v-tooltip>
<v-btn class="WM-Outline-Btn WM-Border mr-2 WM-Margin-BT-0 WM-Border-Black" @click="download()" style="padding: 10px 30px;">
<v-btn class="WM-Outline-Btn WM-Border mr-2 WM-Margin-BT-0 WM-Border-Black" @click="download()"
style="padding: 10px 30px;">
<v-icon class="black--text mr-2 caption">fas fa-share-square</v-icon>
<span class="black--text">EXPORT</span>
</v-btn>
@@ -288,8 +289,8 @@ export default {
getStatus(item) {
if (item.status === 'pending') {
return [
{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: 'approved', label: 'approve', color: 'cyan', font_color: 'white', icon: 'fa-check'},
{status: 'rejected', label: 'reject', color: 'light-gray', font_color: 'black', icon: 'fa-close'},
]
} else {
const nextStatus = item.status === 'rejected' ? 'approved' : 'rejected'
@@ -316,7 +317,7 @@ export default {
async transfer(data) {
this.changeCurrentModal({
modal: "modal-user-list",
properties: {data},
properties: {data, type: 'item'},
});
},
},
src/views/MyItem/List.vue
+1 -1
View File
@@ -235,7 +235,7 @@ export default {
async transfer(data) {
this.changeCurrentModal({
modal: "modal-user-list",
properties: {data},
properties: {data, type: 'item'},
});
},
async generateBarcode(item, type = null) {
src/views/MyPackage/List.vue
+15 -6
View File
@@ -22,14 +22,16 @@
<v-flex xs12 sm6 md6 lg4 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()">
<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-btn>
</template>
<span>Filter</span>
</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>
<span class="black&#45;&#45;text">EXPORT</span>
</v-btn>-->
@@ -261,8 +263,8 @@ export default {
getStatus(item) {
if (item.status === 'pending') {
return [
{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: 'approved', label: 'approve', color: 'cyan', font_color: 'white', icon: 'fa-check'},
{status: 'rejected', label: 'reject', color: 'light-gray', font_color: 'black', icon: 'fa-close'},
]
} else {
const nextStatus = item.status === 'rejected' ? 'approved' : 'rejected'
@@ -293,11 +295,18 @@ export default {
}
},
async transfer(data) {
this.changeCurrentModal({
const result = this.changeCurrentModal({
modal: "modal-user-list",
properties: {data},
properties: {data, type:'package'},
});
if (result && result.status === 200) {
for (const key in this.items) {
if (this.items.hasOwnProperty(key) && this.items[key].id === data.id) {
this.items.splice(key, 1);
}
}
}
},
},
computed: {
...mapGetters("modal", ["getModalResult"])
src/views/Package/List.vue
+9 -2
View File
@@ -292,10 +292,17 @@ export default {
}
},
async transfer(data) {
this.changeCurrentModal({
const result = this.changeCurrentModal({
modal: "modal-user-list",
properties: {data},
properties: {data, type:'package'},
});
if (result && result.status === 200) {
for (const key in this.items) {
if (this.items.hasOwnProperty(key) && this.items[key].id === data.id) {
this.items.splice(key, 1);
}
}
}
},
async changeStatus(item, status) {
const result = await ApiService.post(urls.changePackageStatus(item.id), {status})