hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้ไข อัพโหลดเอกสารรับโอน

Browse source
This commit is contained in:
AnandaTon 2023-09-01 15:59:21 +07:00
parent e312462f80
commit fadd6a4df7
4 changed files with 378 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

409
src/modules/05_placement/components/Receive/receiveMain.vue
View file

@ -18,6 +18,7 @@ import type {
ResponseRow,
} from "@/modules/05_placement/interface/response/Receive";
const id = ref<string>("");
const $q = useQuasar();
const router = useRouter();
const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
@ -39,7 +40,10 @@ const modal = ref<boolean>(false);
const popup = () => {
const row = filters.value.filter(
(r: ResponseRow) =>
(r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE") && r.positionNumber != null
(r.status == "WAITTING" ||
r.status == "PENDING" ||
r.status == "APPROVE") &&
r.positionNumber != null
);
rows2.value = row;
modal.value = true;
@ -73,6 +77,8 @@ const filterKeyword = ref<string>("");
const filterKeyword2 = ref<string>("");
const filterRef = ref<any>(null);
const files = ref<any>();
const nameFile = ref<string>("");
const fileUpload = ref<any>([]);
const fileDocDataUpload = ref<File[]>([]);
const listRecevice = ref<any[]>([]);
const filters = ref<ResponseRow[]>([]);
@ -267,6 +273,11 @@ onMounted(() => {
fecthlistRecevice();
});
const SaveData = async () => {
await addUpload();
await clickCloseUpload();
};
const fecthlistRecevice = async () => {
showLoader();
await http
@ -312,30 +323,32 @@ const fecthlistRecevice = async () => {
});
};
const fileUploadDoc = async (files: any) => {
files.forEach((file: any) => {
fileDocDataUpload.value.push(file);
});
const fileUploadDoc = async (val: any) => {
nameFile.value = val[0].name;
fileUpload.value = val;
};
const addUpload = async () => {
// showLoader();
// await http
// .post(config.API.listRoundInsignia())
// .then(() => {
// success($q, "บันทึกข้อมูลสำเร็จ");
// })
// .catch((e) => {
// messageError($q, e);
// })
// .finally(async () => {
// hideLoader();
// });
};
const SaveData = async () => {
await addUpload();
await clickCloseUpload();
if (fileUpload.value.length > 0) {
const blob = fileUpload.value.slice(0, fileUpload.value[0].size);
const newFile = new File(blob, nameFile.value, {
type: fileUpload.value[0].type,
});
const formData = new FormData();
formData.append("", newFile);
showLoader();
await http
.put(config.API.receiveFile(personalId.value), formData)
.then(() => {
success($q, "บันทึกข้อมูลสำเร็จ");
})
.catch((e) => {
messageError($q, e);
})
.finally(async () => {
hideLoader();
});
}
};
const resetFilter = () => {
@ -372,6 +385,7 @@ const openModalTree = (id: string) => {
const openUpload = (id: string) => {
personalId.value = id;
modalupload.value = true;
console.log(personalId.value);
};
const openDelete = (id: string) => {
@ -440,27 +454,64 @@ const saveOrder = async () => {
<q-tooltip>เพิ่มข้อมูล</q-tooltip>
</q-btn>
<q-btn @click="popup()" size="14px" flat round color="add" icon="mdi-account-arrow-right">
<q-btn
@click="popup()"
size="14px"
flat
round
color="add"
icon="mdi-account-arrow-right"
>
<q-tooltip>ส่งไปออกคำสั่งรับโอน</q-tooltip>
</q-btn>
<q-space />
<q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword" ref="filterRef" outlined
debounce="300" placeholder="ค้นหา">
<q-input
class="col-xs-12 col-sm-3 col-md-2"
standout
dense
v-model="filterKeyword"
ref="filterRef"
outlined
debounce="300"
placeholder="ค้นหา"
>
<template v-slot:append>
<q-icon v-if="filterKeyword == ''" name="search" />
<q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
<q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</q-input>
<q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm" />
<q-select
v-model="visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns"
option-value="name"
options-cover
style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
/>
</div>
<div class="col-12 q-pt-sm">
<d-table :columns="columns" :rows="rows" :filter="filterKeyword" row-key="fullname"
:visible-columns="visibleColumns">
<d-table
:columns="columns"
:rows="rows"
:filter="filterKeyword"
row-key="fullname"
:visible-columns="visibleColumns"
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th v-for="col in props.cols" :key="col.name" :props="props">
@ -474,16 +525,31 @@ const saveOrder = async () => {
<q-td key="no" :props="props" @click="nextPage(props.row)">
{{ props.rowIndex + 1 }}
</q-td>
<q-td key="citizenId" :props="props" @click="nextPage(props.row)">
<q-td
key="citizenId"
:props="props"
@click="nextPage(props.row)"
>
{{ props.row.citizenId }}
</q-td>
<q-td key="fullname" :props="props" @click="nextPage(props.row)">
<q-td
key="fullname"
:props="props"
@click="nextPage(props.row)"
>
{{ props.row.fullname }}
</q-td>
<q-td key="organizationName" :props="props" @click="nextPage(props.row)">
<div v-if="props.row.orgName !== null ||
props.row.positionPath !== null
">
<q-td
key="organizationName"
:props="props"
@click="nextPage(props.row)"
>
<div
v-if="
props.row.orgName !== null ||
props.row.positionPath !== null
"
>
<div class="col-4">
<div class="text-weight-medium">
{{
@ -491,20 +557,20 @@ const saveOrder = async () => {
}}
{{
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})`
: ""
? `(${props.row.organizationShortName})`
: ""
}}
</div>
<div class="text-weight-light">
{{
props.row.positionPath !== null
? props.row.positionPath
: "-"
? props.row.positionPath
: "-"
}}
{{
props.row.positionNumber !== null
? `(${props.row.positionNumber})`
: ""
? `(${props.row.positionNumber})`
: ""
}}
</div>
</div>
@ -515,53 +581,122 @@ const saveOrder = async () => {
</div>
</div>
</q-td>
<q-td key="birthday" :props="props" @click="nextPage(props.row)">
<q-td
key="birthday"
:props="props"
@click="nextPage(props.row)"
>
{{ props.row.birthday }}
</q-td>
<q-td key="dateText" :props="props" @click="nextPage(props.row)">
<q-td
key="dateText"
:props="props"
@click="nextPage(props.row)"
>
{{ props.row.dateText }}
</q-td>
<q-td key="statusText" :props="props" @click="nextPage(props.row)">
<q-td
key="statusText"
:props="props"
@click="nextPage(props.row)"
>
{{ props.row.statusText }}
</q-td>
<q-td auto-width>
<q-btn icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
<q-menu transition-show="jump-down" transition-hide="jump-up">
<q-btn
icon="mdi-dots-vertical"
size="12px"
color="grey-7"
flat
round
dense
>
<q-menu
transition-show="jump-down"
transition-hide="jump-up"
>
<q-list dense style="min-width: 100px">
<q-item clickable v-close-popup @click="openModalTree(props.row.personalId)" :disable="props.row.status == 'REPORT' ||
props.row.status == 'DONE'
">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon :color="props.row.status == 'REPORT' ||
<q-item
clickable
v-close-popup
@click="openModalTree(props.row.personalId)"
:disable="
props.row.status == 'REPORT' ||
props.row.status == 'DONE'
"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
:color="
props.row.status == 'REPORT' ||
props.row.status == 'DONE'
? 'grey'
: 'primary'
" size="xs" name="mdi-bookmark-outline" />
? 'grey'
: 'primary'
"
size="xs"
name="mdi-bookmark-outline"
/>
</q-item-section>
<q-item-section>เลือกหน่วยงานที่รับโอน</q-item-section>
<q-item-section
>เลือกหน่วยงานที่รับโอน</q-item-section
>
</q-item>
<q-item clickable v-close-popup @click="openUpload(props.row.personalId)" :disable="props.row.status == 'REPORT' ||
props.row.status == 'DONE'
">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon :color="props.row.status == 'REPORT' ||
<q-item
clickable
v-close-popup
@click="openUpload(props.row.personalId)"
:disable="
props.row.status == 'REPORT' ||
props.row.status == 'DONE'
"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
:color="
props.row.status == 'REPORT' ||
props.row.status == 'DONE'
? 'grey'
: 'blue'
" size="xs" name="attach_file" />
? 'grey'
: 'blue'
"
size="xs"
name="attach_file"
/>
</q-item-section>
<q-item-section>อัพโหลดเอกสาร</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="openDelete(props.row.personalId)" :disable="props.row.status == 'REPORT' ||
props.row.status == 'DONE'
">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-item
clickable
v-close-popup
@click="openDelete(props.row.personalId)"
:disable="
props.row.status == 'REPORT' ||
props.row.status == 'DONE'
"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-tooltip>ลบข้อมูล</q-tooltip>
<q-icon :color="props.row.status == 'REPORT' ||
<q-icon
:color="
props.row.status == 'REPORT' ||
props.row.status == 'DONE'
? 'grey'
: 'red'
" size="xs" name="mdi-delete" />
? 'grey'
: 'red'
"
size="xs"
name="mdi-delete"
/>
</q-item-section>
<q-item-section>ลบ</q-item-section>
</q-item>
@ -585,24 +720,61 @@ const saveOrder = async () => {
<div class="row justify-end">
<div class="col-5">
<q-toolbar style="padding: 0">
<q-input borderless outlined dense debounce="300" v-model="filterKeyword2" placeholder="ค้นหา"
style="width: 850px; max-width: auto">
<q-input
borderless
outlined
dense
debounce="300"
v-model="filterKeyword2"
placeholder="ค้นหา"
style="width: 850px; max-width: auto"
>
<template v-slot:append>
<q-icon v-if="filterKeyword2 == ''" name="search" />
<q-icon v-if="filterKeyword2 !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
<q-icon
v-if="filterKeyword2 !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</q-input>
<q-select v-model="visibleColumns2" multiple outlined dense options-dense
:display-value="$q.lang.table.columns" emit-value map-options :options="columns2" option-value="name"
options-cover style="min-width: 150px" class="gt-xs q-ml-sm" />
<q-select
v-model="visibleColumns2"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns2"
option-value="name"
options-cover
style="min-width: 150px"
class="gt-xs q-ml-sm"
/>
</q-toolbar>
</div>
</div>
<d-table :columns="columns2" :rows="rows2" :filter="filterKeyword2" row-key="personalId" flat
:visible-columns="visibleColumns2" selection="multiple" v-model:selected="selected">
<d-table
:columns="columns2"
:rows="rows2"
:filter="filterKeyword2"
row-key="personalId"
flat
:visible-columns="visibleColumns2"
selection="multiple"
v-model:selected="selected"
>
<template v-slot:header-selection="scope">
<q-checkbox keep-color color="primary" dense v-model="scope.selected" />
<q-checkbox
keep-color
color="primary"
dense
v-model="scope.selected"
/>
</template>
<!-- <template v-slot:body-selection="scope">
<q-checkbox
@ -615,7 +787,12 @@ const saveOrder = async () => {
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td>
<q-checkbox keep-color color="primary" dense v-model="props.selected" />
<q-checkbox
keep-color
color="primary"
dense
v-model="props.selected"
/>
</q-td>
<q-td key="no" :props="props">
{{ props.rowIndex + 1 }}
@ -626,29 +803,36 @@ const saveOrder = async () => {
<q-td key="fullname" :props="props" @click="nextPage(props.row)">
{{ props.row.fullname }}
</q-td>
<q-td key="organizationName" :props="props" @click="nextPage(props.row)">
<div v-if="props.row.orgName !== null ||
props.row.positionPath !== null
">
<q-td
key="organizationName"
:props="props"
@click="nextPage(props.row)"
>
<div
v-if="
props.row.orgName !== null ||
props.row.positionPath !== null
"
>
<div class="col-4">
<div class="text-weight-medium">
{{ props.row.orgName !== null ? props.row.orgName : "-" }}
{{
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})`
: ""
? `(${props.row.organizationShortName})`
: ""
}}
</div>
<div class="text-weight-light">
{{
props.row.positionPath !== null
? props.row.positionPath
: "-"
? props.row.positionPath
: "-"
}}
{{
props.row.positionNumber !== null
? `(${props.row.positionNumber})`
: ""
? `(${props.row.positionNumber})`
: ""
}}
</div>
</div>
@ -665,7 +849,11 @@ const saveOrder = async () => {
<q-td key="dateText" :props="props" @click="nextPage(props.row)">
{{ props.row.dateText }}
</q-td>
<q-td key="statusText" :props="props" @click="nextPage(props.row)">
<q-td
key="statusText"
:props="props"
@click="nextPage(props.row)"
>
{{ props.row.statusText }}
</q-td>
</q-tr>
@ -674,7 +862,12 @@ const saveOrder = async () => {
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-btn label="ส่งไปออกคำสั่ง" @click="saveOrder" :disable="checkSelected" color="public" />
<q-btn
label="ส่งไปออกคำสั่ง"
@click="saveOrder"
:disable="checkSelected"
color="public"
/>
</q-card-actions>
</q-card>
</q-dialog>
@ -682,12 +875,17 @@ const saveOrder = async () => {
<q-dialog v-model="modalupload">
<q-card style="width: 600px">
<DialogHeader title="อัพโหลดเอกสาร" :close="clickCloseUpload" />
<q-separator />
<q-separator />
<q-card-section class="q-pt-none">
<div class="col-12 row items-center q-col-gutter-sm">
<div class="col-12">
<q-file outlined dense v-model="files" @added="fileUploadDoc" label="อัพโหลดเอกสาร" lazy-rules>
<q-file
outlined
dense
v-model="files"
@added="fileUploadDoc"
label="อัพโหลดเอกสาร"
lazy-rules
>
<!-- :rules="[
(val) => val || 'กรุณาเลือกไฟล์หนังสือถึงหน่วยงานที่รับโอน',
]" -->
@ -700,14 +898,25 @@ const saveOrder = async () => {
</q-card-section>
<q-card-actions class="text-primary q-py-sm">
<q-space />
<q-btn flat round color="public" @click="SaveData" icon="mdi-content-save-outline">
<q-btn
flat
round
color="public"
@click="SaveData()"
icon="mdi-content-save-outline"
>
<q-tooltip>บันทึก</q-tooltip>
</q-btn>
</q-card-actions>
</q-card>
</q-dialog>
<DialogOrgTree v-model:modal="modalTree" :close="closeModalTree" :personal="personal" :personalId="personalId" />
<DialogOrgTree
v-model:modal="modalTree"
:close="closeModalTree"
:personal="personal"
:personalId="personalId"
/>
<!-- :personalId="personalId" -->
</template>
<style scoped lang="scss"></style>

102
src/modules/08_registryEmployee/views/Information/Tempinformation.vue
View file

@ -3,7 +3,7 @@
<HeaderTop
v-model:edit="edit"
header="ข้อมูลลูกจ้างชั่วคราว"
icon="mdi-map-marker"
icon="mdi-account"
:save="saveData"
:history="!statusAdd()"
:changeBtn="changeBtn"
@ -13,8 +13,7 @@
:addEmployee="statusAdd()"
/>
<q-form ref="myform">
<div class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs">
<div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-sm">
<div class="col-xs-6 col-sm-3 col-md-3">
<selector
:class="getClass(edit)"
@ -95,7 +94,7 @@
:label="`${'สังกัด'}`"
/>
</div>
<div class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs">
<div class="col-xs-6 col-sm-3 col-md-3">
<q-input
:class="getClass(edit)"
@ -120,7 +119,6 @@
:label="`${'ค่าจ้าง'}`"
/>
</div>
<div class="col-12 q-pt-lg"><q-separator /></div>
<div class="col-xs-6 col-sm-3 col-md-3">
<CurrencyInput
v-model="employeeMoneyIncrease"
@ -162,7 +160,6 @@
/>
</div>
</div>
</div>
</q-form>
</q-card>
<HistoryTable
@ -244,7 +241,7 @@
const positionEmployeeLineOptions = ref<DataOption[]>([]);
const positionEmployeePositionId = ref<string>("");
const positionEmployeePositionOptions = ref<DataOption[]>([]);
const employeeWage = ref<string>("");
const employeeWage = ref<number>(0);
const employeeTypeIndividual = ref<string>("");
const employeeMoneyIncrease = ref<number>(0);
const employeeMoneyAllowance = ref<number>(0);
@ -404,7 +401,7 @@
]);
onMounted(async () => {
// await fetchData();
await fetchData();
await fetchDataSelector();
});
@ -420,6 +417,7 @@
showLoader();
await fetchEmployeeGroup();
await fetchpositionEmployeeLine();
await fetchPositionEmployeePosition();
hideLoader();
};
@ -469,41 +467,41 @@
// await fetchData();
};
// const fetchData = async () => {
// if (route.params.id) {
// showLoader();
// await http
// .get(config.API.profileEmployeeTempId(route.params.id.toString()))
// .then((res) => {
// const data: any = res.data.result;
// rows.value = [];
// data.map((e: any) => {
// rows.value.push({
// id: e.id,
// employeeMoneyIncrease: e.employeeMoneyIncrease,
// employeeMoneyAllowance: e.employeeMoneyAllowance,
// employeeMoneyEmployee: e.employeeMoneyEmployee,
// employeeMoneyEmployer: e.employeeMoneyEmployer,
// positionEmployeeGroupId: e.positionEmployeeGroupId,
// positionEmployeePositionId: e.positionEmployeePositionId,
// positionEmployeeLineId: e.positionEmployeeLineId,
// employeeTypeIndividual: e.employeeTypeIndividual,
// employeeOc: e.employeeOc,
// employeeWage: e.employeeWage,
// createdFullName: e.createdFullName,
// createdAt: new Date(e.createdAt),
// });
// });
const fetchData = async () => {
if (route.params.id) {
showLoader();
await http
.get(config.API.profileEmployeeTempId(route.params.id.toString()))
.then((res) => {
const data: any = res.data.result;
rows.value = [];
data.map((e: any) => {
rows.value.push({
id: e.id,
employeeMoneyIncrease: e.employeeMoneyIncrease,
employeeMoneyAllowance: e.employeeMoneyAllowance,
employeeMoneyEmployee: e.employeeMoneyEmployee,
employeeMoneyEmployer: e.employeeMoneyEmployer,
positionEmployeeGroupId: e.positionEmployeeGroupId,
positionEmployeePositionId: e.positionEmployeePositionId,
positionEmployeeLineId: e.positionEmployeeLineId,
employeeTypeIndividual: e.employeeTypeIndividual,
employeeOc: e.employeeOc,
employeeWage: e.employeeWage,
createdFullName: e.createdFullName,
createdAt: new Date(e.createdAt),
});
});
// })
// .catch((e) => {
// messageError($q, e);
// })
// .finally(() => {
// hideLoader();
// });
// }
// };
})
.catch((e) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
}
};
// กลุ่มงาน
const fetchEmployeeGroup = async () => {
@ -539,6 +537,26 @@ const fetchpositionEmployeeLine = async () => {
messageError($q, e);
});
};
//ชื่อตำแหน่ง
const fetchPositionEmployeePosition = async () => {
await http
.get(config.API.positionEmployeePosition)
.then((res) => {
const data = res.data.result;
let option: DataOption[] = [];
data.map((r: DataOption) => {
option.push({ id: r.id.toString(), name: r.name.toString() });
});
positionEmployeePositionOptions.value = option;
})
.catch((e) => {
messageError($q, e);
});
};
// const editData = async () => {
// const body: any = {