weborsha/deal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix add employee pc

Browse Source
This commit is contained in:
Vladimir 2026-07-05 13:06:40 +03:00
parent e1d0faa1a4
commit 5b1cd832d6
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/components/deal/DealModal.vue
View File

@ -934,10 +934,13 @@ onMounted(async () => {
watch(selectedRequisitionSideOneId, async (newId, oldId) => { watch(selectedRequisitionSideOneId, async (newId, oldId) => {
if (newId != null) { if (newId != null) {
// Убираем who_work старой заявки стороны 1 из requisitionEmployees // Убираем who_work старой заявки стороны 1 из requisitionEmployees
if (oldId) { if (oldId && selectedRequisitionSideOne.value) {
const oldRequisition = originalRequisitionsList.value.find(r => r.id === oldId); const oldWhoWork = selectedRequisitionSideOne.value.who_work;
if (oldRequisition?.who_work) { if (oldWhoWork) {
requisitionEmployees.value = requisitionEmployees.value.filter(e => e.id !== oldRequisition.who_work); const otherSideWhoWork = selectedRequisitionSideTwo.value?.who_work;
if (oldWhoWork !== otherSideWhoWork) {
requisitionEmployees.value = requisitionEmployees.value.filter(e => e.id !== oldWhoWork);
}
} }
} }
@ -985,9 +988,15 @@ watch(selectedRequisitionSideTwoId, async (newId, oldId) => {
deal.value.side_two_object_id = null; deal.value.side_two_object_id = null;
// Убираем who_work старой заявки стороны 2 из requisitionEmployees // Убираем who_work старой заявки стороны 2 из requisitionEmployees
const oldRequisition = originalRequisitionsList.value.find(r => r.id === oldId); if (oldId && selectedRequisitionSideTwo.value) {
if (oldRequisition?.who_work) { const oldWhoWork = selectedRequisitionSideTwo.value.who_work;
requisitionEmployees.value = requisitionEmployees.value.filter(e => e.id !== oldRequisition.who_work); if (oldWhoWork) {
// Не удаляем если этот сотрудник — who_work другой стороны
const otherSideWhoWork = selectedRequisitionSideOne.value?.who_work;
if (oldWhoWork !== otherSideWhoWork) {
requisitionEmployees.value = requisitionEmployees.value.filter(e => e.id !== oldWhoWork);
}
}
} }
} }
@ -1094,7 +1103,10 @@ const requisitionEmployees = ref([]);
const manualEmployees = ref([]); const manualEmployees = ref([]);
const selectedEmployees = computed(() => { const selectedEmployees = computed(() => {
return [...requisitionEmployees.value, ...manualEmployees.value]; const sideOneWhoWork = selectedRequisitionSideOne.value?.who_work;
const sideOneEmp = sideOneWhoWork ? requisitionEmployees.value.filter(e => e.id === sideOneWhoWork) : [];
const otherRequisitionEmps = requisitionEmployees.value.filter(e => !sideOneWhoWork || e.id !== sideOneWhoWork);
return [...sideOneEmp, ...otherRequisitionEmps, ...manualEmployees.value];
}); });
const isWhoWork = (employeeId) => { const isWhoWork = (employeeId) => {