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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
STW_TTTY\stwtt 2024-09-27 18:05:58 +07:00
commit dfa9f3405b
105 changed files with 1241 additions and 1266 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/18_command/components/DialogCreateCommand.vue
View file

@ -235,7 +235,7 @@ async function getListCommandDraf() {
await http
.get(
config.API.commandList +
`?page=${pagination.value.page}&pageSize=${pagination.value.rowsPerPage}&year=${commandYear.value}&keyword=${filter.value}&status=DRAFT`
`?page=${pagination.value.page}&pageSize=${pagination.value.rowsPerPage}&year=${commandYear.value}&keyword=${filter.value}&status=DRAFT&commandTypeId=${commandType.value}`
)
.then(async (res) => {
totalList.value = Math.ceil(
@ -280,6 +280,15 @@ watch(modal, () => {
fetchCommandType();
}
});
watch(
() => selectCreate.value,
async () => {
if (selectCreate.value == "DRAF") {
getListCommandDraf();
}
}
);
</script>
<template>

3
src/modules/18_command/components/Step/View0_Live.vue
View file

@ -45,7 +45,7 @@ const fileUploadTailer = ref<any>(null); //ไฟล์เอกสารแน
const fileOrder = ref<any>(null); //ไฟล์คำสั่ง
const fileTailer = ref<any>(null); //ไฟล์เอกสารแนบท้าย
const isLoad = ref<boolean>(false); //แสดงโหลด
const isLoad = ref<boolean>(true); //แสดงโหลด
const modalPerView = ref<boolean>(false);
/**
@ -259,7 +259,6 @@ function onConfirmOrder() {
onMounted(async () => {
isCheckDraft.value = isDraft.value;
isCheckAuthority.value = isAuthority.value;
if (step.value !== 1) {
isLoad.value = false;
let promises = [fetchDoc("order")];