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

Merge branch 'develop' into dev

Browse source 
* develop:
  roll back leave fix commander
  fix
  fix
  ระบบลา: ไม่บังคับเลือกผู้บังคับบัญชา
  fix:education
  fix: api
  fix: probation api
  fix(probation):status
  fix
  fix(probation): statusProbationMain
  fix(leave-report) diable  btn search
This commit is contained in:
Warunee Tamkoo 2025-12-02 17:22:16 +07:00
commit f737fe26b1
22 changed files with 92 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/05_placement/components/probation/DialogOrder.vue
View file

@ -203,7 +203,7 @@ async function getList() {
.get(
config.API.probationPersonalList() +
`?status=${
commandType.value ? (commandType.value == "C-PM-11" ? 3 : 2) : ""
commandType.value ? (commandType.value == "C-PM-11" ? 2 : 3) : ""
}&page=${pagination.value.page}&pageSize=${
pagination.value.rowsPerPage
}&keyword=${filter.value.trim()}`
@ -254,6 +254,7 @@ watch(
listCommand.value = data.filter(
(v: any) => v.code === "C-PM-11" || v.code === "C-PM-12"
);
console.log(listCommand.value);
}
}
}

1
src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
View file

@ -132,6 +132,7 @@ onMounted(async () => {
:checkPermission="probationStore?.dataPermissions?.tab2?.isEdit as boolean"
:is-max="probationStore.tabs.length === 3"
/>
<q-tab-panels
v-model="tab"
animated

5
src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
View file

@ -89,7 +89,7 @@ async function FileDownload(type: string) {
if (dataRole.value == "mentor") {
showLoader();
await http
.get(config.API.reportEvaluateRecord1(type, numTab.id))
.get(config.API.reportEvaluateRecord2(type, numTab.id))
.then(async (res) => {
const data = res.data.result;
await genReport(
@ -108,7 +108,7 @@ async function FileDownload(type: string) {
//ผุ้บังคับ
showLoader();
await http
.get(config.API.reportEvaluateRecord1(type, numTab.id))
.get(config.API.reportEvaluateRecord2(type, numTab.id))
.then(async (res) => {
const data = res.data.result;
await genReport(
@ -148,6 +148,7 @@ onMounted(async () => {
:checkPermission="probationStore?.dataPermissions?.tab3?.isEdit as boolean"
:is-max="probationStore.tabs.length === 3"
/>
<q-tab-panels
v-model="tab"
animated