diff --git a/src/modules/02_transfer/views/AddTransfer.vue b/src/modules/02_transfer/views/AddTransfer.vue index 4d4d994..dd15282 100644 --- a/src/modules/02_transfer/views/AddTransfer.vue +++ b/src/modules/02_transfer/views/AddTransfer.vue @@ -21,9 +21,7 @@ accept=".jpg,.png,.pdf,.csv,.doc" url="http://localhost:4444/upload" label="เอกสารเพิ่มเติม" - :color="routeName != 'addTransfer' ? 'grey-8': 'blue'" - multiple - :disable="routeName != 'addTransfer'" + type="file" @added="fileUploadDoc" /> @@ -336,6 +334,8 @@ const createTransfer = async () => { formData.append("Organization", tranferOrg.value) formData.append("Reason", noteReason.value) formData.append("file", files.value) + console.log(files.value) + console.log(formData) await http .post(config.API.listtransfer(), formData) @@ -369,7 +369,8 @@ const fecthDataTransfer = async (id: string) => { }) } -const fileUploadDoc = async (files: any) => { - fileDocDataUpload.value.push(files) +const fileUploadDoc = async (file: any) => { + fileDocDataUpload.value.push(file) + files.value = file } diff --git a/src/modules/03_leave/router.ts b/src/modules/03_leave/router.ts index 7540b1f..5fc2b1a 100644 --- a/src/modules/03_leave/router.ts +++ b/src/modules/03_leave/router.ts @@ -2,36 +2,48 @@ * Router ขอโอน */ -const LeaveMain = () => import("@/modules/03_leave/views/Main.vue"); +const LeaveMain = () => import("@/modules/03_leave/views/Main.vue") -const AddLeave = () => import("@/modules/03_leave/views/AddLeave.vue"); +const AddLeave = () => import("@/modules/03_leave/views/AddLeave.vue") + +const ResultQuestionair = () => import("@/modules/03_leave/views/result.vue") export default [ - { - path: "/leave", - name: "leave", - component: LeaveMain, - meta: { - Auth: true, - Key: [7], - }, - }, - { - path: "/leave/add", - name: "AddLeave", - component: AddLeave, - meta: { - Auth: true, - Key: [7], - }, - }, - { - path: "/leave/:id", - name: "detailLeave", - component: AddLeave, - meta: { - Auth: true, - Key: [7], - }, - }, -]; + { + path: "/leave", + name: "leave", + component: LeaveMain, + meta: { + Auth: true, + Key: [7], + }, + }, + { + path: "/leave/add", + name: "AddLeave", + component: AddLeave, + meta: { + Auth: true, + Key: [7], + }, + }, + { + path: "/leave/:id", + name: "detailLeave", + component: AddLeave, + meta: { + Auth: true, + Key: [7], + }, + }, + + { + path: "/leave/result", + name: "resultLeave", + component: ResultQuestionair, + meta: { + Auth: true, + Key: [7], + }, + }, +] diff --git a/src/modules/03_leave/views/AddLeave.vue b/src/modules/03_leave/views/AddLeave.vue index 02b297c..7b7df8d 100644 --- a/src/modules/03_leave/views/AddLeave.vue +++ b/src/modules/03_leave/views/AddLeave.vue @@ -1,44 +1,18 @@ @@ -93,140 +57,131 @@ - + +
+ +
- - + + -
- - -
- - - - +
+ + +
+ + + + diff --git a/src/modules/03_leave/views/result.vue b/src/modules/03_leave/views/result.vue new file mode 100644 index 0000000..dcd7877 --- /dev/null +++ b/src/modules/03_leave/views/result.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index 7823bb4..bddd5fb 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -73,7 +73,7 @@ const doLogout = () => {
- +