diff --git a/src/modules/03_leave/views/AddLeave.vue b/src/modules/03_leave/views/AddLeave.vue index 6cb43ce..c82abb6 100644 --- a/src/modules/03_leave/views/AddLeave.vue +++ b/src/modules/03_leave/views/AddLeave.vue @@ -176,7 +176,7 @@ const fectDataresign = async (id: string) => { .then((res: any) => { let data = res.data.result // console.log(data); - ;(tranferOrg.value = data.location), (dateCommand.value = data.sendDate), (dateLeave.value = data.activeDate), (noteReason.value = data.reason), (files.value = data.file) + ;(tranferOrg.value = data.location), (dateCommand.value = data.sendDate), (dateLeave.value = data.activeDate), (noteReason.value = data.reason), (files.value = data.docs) }) .catch((e: any) => { console.log(e) @@ -189,6 +189,7 @@ const fectDataresign = async (id: string) => { const fileUploadDoc = async (file: any) => { fileDocDataUpload.value.push(file) + nameFile.value = file[0].name files.value = file } diff --git a/src/modules/03_leave/views/result.vue b/src/modules/03_leave/views/result.vue index 7b58eb9..df76563 100644 --- a/src/modules/03_leave/views/result.vue +++ b/src/modules/03_leave/views/result.vue @@ -107,22 +107,22 @@ const adjust_option = ref([ const saveForm = () => { let hasError = false if ( - reasonWork.value === 0 || - reasonWorkOther.value.length < 0 || - timeThink.value === 0 || - exitFactor.value === 0 || - exitFactorOther.value.length < 0 || - adjust.value === 0 || - adjustOther.value.length < 0 || - realReason.value.length < 1 || - notExitFactor.value.length < 1 || - haveJob.value === null || - haveJobReason.value.length < 0 || - suggestFriends.value === null || - suggestFriendsReason.value.length < 0 || - futureWork.value === null || - futureWorkReason.value.length < 0 || - suggestion.value.length < 1 + reasonWork.value === 0 + // reasonWorkOther.value.length < 0 || + // timeThink.value === 0 || + // exitFactor.value === 0 || + // exitFactorOther.value.length < 0 || + // adjust.value === 0 || + // adjustOther.value.length < 0 || + // realReason.value.length < 1 || + // notExitFactor.value.length < 1 || + // haveJob.value === null || + // haveJobReason.value.length < 0 || + // suggestFriends.value === null || + // suggestFriendsReason.value.length < 0 || + // futureWork.value === null || + // futureWorkReason.value.length < 0 || + // suggestion.value.length < 1 ) { hasError = true } else {