diff --git a/src/stores/employee.ts b/src/stores/employee.ts index 510088a..9ca6167 100644 --- a/src/stores/employee.ts +++ b/src/stores/employee.ts @@ -67,9 +67,6 @@ export const useEmployee = defineStore({ headers: user.header })).data - console.log(this.clean.employee) - console.log(data) - Object.assign(this.clean.employee, data) Object.assign(this.employee, data) } @@ -87,20 +84,34 @@ export const useEmployee = defineStore({ async persist() { try { let result + let payload = Object.assign({}, this.employee) + + if (this.employee.password === this.clean.employee.password) { + payload.username = '' + payload.password = '' + } result = await axios.patch( 'employees/'+this.employee.id, - this.employee, + payload, { headers: user.header } ) + console.log(result) + + this.employee.password = '' + this.employee.passwordConfirm = '' + Object.assign(this.clean.employee, this.employee) notifications.add('success', result.statusText) } catch(error) { - if(error instanceof Error) notifications.add('danger', error.message, -1) + if(error instanceof Error) { + console.log(error) + notifications.add('danger', error.message, -1) + } else console.log(error) } } diff --git a/src/views/EmployeesDetails.vue b/src/views/EmployeesDetails.vue index 463f833..77a002d 100644 --- a/src/views/EmployeesDetails.vue +++ b/src/views/EmployeesDetails.vue @@ -2,12 +2,6 @@ -
Clean State
-{{ state.clean.employee }} -
-
Dirty State
-{{ state.employee }} -
@@ -168,7 +162,7 @@ const rules = computed(() => ({ requiredIf: requiredIf(() => createUser.value) }, password: { - requiredIf: requiredIf(() => state.employee.username !== '') + requiredIf: requiredIf(() => createUser.value) }, passwordConfirm: { sameAs: sameAs(state.employee.password)