รวมไฟล์แก้งานงวด2
This commit is contained in:
Kittapath
parent
79889c9464
commit
2249097b07
89 changed files with 11287 additions and 7048 deletions
|
|
@ -3,14 +3,14 @@
|
|||
<q-space />
|
||||
<q-btn
|
||||
v-if="!editvisible"
|
||||
outline
|
||||
flat
|
||||
round
|
||||
:disabled="editvisible"
|
||||
:color="editvisible ? 'grey-7' : 'primary'"
|
||||
@click="edit"
|
||||
label="แก้ไขข้อมูล"
|
||||
|
||||
><!-- icon="mdi-pencil-outline"
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip> -->
|
||||
icon="mdi-pencil-outline"
|
||||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
<div v-else>
|
||||
<!-- <q-btn
|
||||
|
|
@ -26,14 +26,14 @@
|
|||
<q-tooltip>ยกเลิก</q-tooltip>
|
||||
</q-btn> -->
|
||||
<q-btn
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
flat
|
||||
round
|
||||
:disabled="!editvisible"
|
||||
:color="!editvisible ? 'grey-7' : 'public'"
|
||||
@click="checkSave"
|
||||
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
</q-card-actions>
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@
|
|||
<ddNoResultMsg />
|
||||
</template>
|
||||
</q-select>
|
||||
<div class="col-xs-12 col-sm-12 col-md-12">
|
||||
<div class="col-xs-12 col-sm-12 col-md-12 q-pt-sm">
|
||||
<q-input
|
||||
:class="getClass(true)"
|
||||
hide-bottom-space
|
||||
|
|
@ -145,10 +145,33 @@
|
|||
type="textarea"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-12 col-md-12">
|
||||
<div class="col-xs-12 col-sm-12 col-md-12 q-pt-sm">
|
||||
<q-toggle v-model="item.isActive" dense size="34px" color="positive">
|
||||
ปกติ
|
||||
</q-toggle>
|
||||
<q-toggle
|
||||
v-model="item.isCondition"
|
||||
dense
|
||||
size="34px"
|
||||
color="positive"
|
||||
class="q-pl-md"
|
||||
>
|
||||
ติดเงื่อนไข
|
||||
</q-toggle>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-12 col-md-12 q-pt-sm">
|
||||
<q-input
|
||||
:class="getClass(true)"
|
||||
hide-bottom-space
|
||||
:outlined="true"
|
||||
dense
|
||||
lazy-rules
|
||||
:readonly="false"
|
||||
:borderless="false"
|
||||
v-model="item.conditionNote"
|
||||
:label="`${'รายละเอียดเงื่อนไข'}`"
|
||||
type="textarea"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -294,7 +317,7 @@
|
|||
label="จำนวน"
|
||||
:rules="[(val:any) => val > 0 || `${'ต้องมากกว่า 0'}`]"
|
||||
/>
|
||||
<div class="col-xs-12 col-sm-12 col-md-12">
|
||||
<div class="col-xs-12 col-sm-12 col-md-12 q-pt-sm">
|
||||
<q-input
|
||||
:class="getClass(true)"
|
||||
hide-bottom-space
|
||||
|
|
@ -308,7 +331,7 @@
|
|||
type="textarea"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-12 col-md-12">
|
||||
<div class="col-xs-12 col-sm-12 col-md-12 q-pt-sm">
|
||||
<q-toggle
|
||||
v-model="item.isActive"
|
||||
dense
|
||||
|
|
@ -317,6 +340,29 @@
|
|||
>
|
||||
ปกติ
|
||||
</q-toggle>
|
||||
<q-toggle
|
||||
v-model="item.isCondition"
|
||||
dense
|
||||
size="34px"
|
||||
color="positive"
|
||||
class="q-pl-md"
|
||||
>
|
||||
ติดเงื่อนไข
|
||||
</q-toggle>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-12 col-md-12 q-pt-sm">
|
||||
<q-input
|
||||
:class="getClass(true)"
|
||||
hide-bottom-space
|
||||
:outlined="true"
|
||||
dense
|
||||
lazy-rules
|
||||
:readonly="false"
|
||||
:borderless="false"
|
||||
v-model="item.conditionNote"
|
||||
:label="`${'รายละเอียดเงื่อนไข'}`"
|
||||
type="textarea"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
|
|
@ -362,6 +408,8 @@ watch(myForm, (form: QForm | null, prevForm: QForm | null) => {
|
|||
positions.value[0].positionMasterId = props.editObj?.positionMasterId;
|
||||
positions.value[0].positionUserNote = props.editObj?.positionUserNote;
|
||||
positions.value[0].isActive = props.editObj?.isActive;
|
||||
positions.value[0].isCondition = props.editObj?.isCondition;
|
||||
positions.value[0].conditionNote = props.editObj?.conditionNote;
|
||||
}
|
||||
}
|
||||
emit("update:formprops", form);
|
||||
|
|
@ -373,6 +421,8 @@ const positionSet = ref<object>({
|
|||
positionMasterId: "", // ชื่อตำแหน่ง จากระบบข้อมูลหลัก Table PositionMaster เช่น นักจัดการงานทั่วไป,พยาบาลชำนาญการ
|
||||
positionUserNote: "",
|
||||
isActive: true,
|
||||
isCondition: false,
|
||||
conditionNote: "",
|
||||
}); //เก็บข้อมูลที่จะเลือกใน Drop Down แต่ละตัวจะต้องมี key ของมัน เพื่อส่งไปให้ API
|
||||
emit("update:positions", positions.value);
|
||||
|
||||
|
|
@ -395,6 +445,8 @@ const fetchPositionMaster = async () => {
|
|||
positionFilter.value.push({
|
||||
id: e.id,
|
||||
isActive: e.isActive,
|
||||
isCondition: e.isCondition,
|
||||
conditionNote: e.conditionNote,
|
||||
positionType: e.positionType,
|
||||
positionLine: e.positionLine,
|
||||
positionPath: e.positionPath,
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ interface ResponseObject {
|
|||
interface ResponseTree {
|
||||
no: number;
|
||||
profilePositionId: string | null;
|
||||
organizationPositionId: string | null;
|
||||
name: string | null;
|
||||
edu: string | null;
|
||||
posiNumOld: string | null;
|
||||
|
|
@ -33,7 +34,7 @@ interface ResponseTree {
|
|||
levelOld: any;
|
||||
levelNew: any;
|
||||
change: string | null;
|
||||
statusPosition: Boolean;
|
||||
statusPosition: string | null;
|
||||
report2Id: string | null;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,128 +1,116 @@
|
|||
<template>
|
||||
<div class="toptitle text-dark col-12 row items-center">รายงานบัญชี</div>
|
||||
<q-card flat bordered class="col-12">
|
||||
<div class="row col-12">
|
||||
<q-tabs
|
||||
v-model="tab"
|
||||
no-caps
|
||||
inline-label
|
||||
align="left"
|
||||
class="text-primary"
|
||||
>
|
||||
<q-tab name="audit1" label="บัญชี 1" />
|
||||
<q-tab name="audit2" label="บัญชี 2" />
|
||||
<q-tab name="audit3" label="บัญชี 3" />
|
||||
</q-tabs>
|
||||
</div>
|
||||
<q-separator />
|
||||
<q-tab-panels
|
||||
v-model="tab"
|
||||
transition-prev="jump-up"
|
||||
transition-next="jump-up"
|
||||
animated
|
||||
swipeable
|
||||
class="row col-12 text-dark"
|
||||
>
|
||||
<q-tab-panel name="audit1">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<q-select
|
||||
class="col-xs-12 col-sm-6"
|
||||
v-model="goverment"
|
||||
label="ระบุรหัสส่วนราชการ"
|
||||
dense
|
||||
emit-value
|
||||
map-options
|
||||
option-label="name"
|
||||
:options="govermentOP"
|
||||
option-value="id"
|
||||
lazy-rules
|
||||
hide-bottom-space
|
||||
:readonly="false"
|
||||
:borderless="false"
|
||||
:outlined="true"
|
||||
:hide-dropdown-icon="false"
|
||||
/>
|
||||
<q-btn
|
||||
size="md"
|
||||
icon="mdi-download"
|
||||
round
|
||||
flat
|
||||
color="primary"
|
||||
@click="clickAccount1"
|
||||
>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="audit2">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<q-select
|
||||
class="col-xs-12 col-sm-6"
|
||||
v-model="goverment"
|
||||
label="ระบุรหัสส่วนราชการ"
|
||||
dense
|
||||
emit-value
|
||||
map-options
|
||||
option-label="name"
|
||||
:options="govermentOP"
|
||||
option-value="id"
|
||||
lazy-rules
|
||||
hide-bottom-space
|
||||
:readonly="false"
|
||||
:borderless="false"
|
||||
:outlined="true"
|
||||
:hide-dropdown-icon="false"
|
||||
/>
|
||||
<div class="toptitle text-dark col-12 row items-center">รายงานบัญชี</div>
|
||||
<q-card flat bordered class="col-12">
|
||||
<div class="row col-12">
|
||||
<q-tabs
|
||||
v-model="tab"
|
||||
no-caps
|
||||
inline-label
|
||||
align="left"
|
||||
class="text-primary"
|
||||
>
|
||||
<q-tab name="audit1" label="บัญชี 1" />
|
||||
<q-tab name="audit2" label="บัญชี 2" />
|
||||
<q-tab name="audit3" label="บัญชี 3" />
|
||||
</q-tabs>
|
||||
</div>
|
||||
<q-separator />
|
||||
<q-tab-panels
|
||||
v-model="tab"
|
||||
transition-prev="jump-up"
|
||||
transition-next="jump-up"
|
||||
animated
|
||||
swipeable
|
||||
class="row col-12 text-dark"
|
||||
>
|
||||
<q-tab-panel name="audit1">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<q-select
|
||||
class="col-xs-12 col-sm-6"
|
||||
v-model="goverment"
|
||||
label="ระบุหน่วยงานที่ต้องการออกรายงาน"
|
||||
dense
|
||||
:options="govermentOP"
|
||||
lazy-rules
|
||||
hide-bottom-space
|
||||
:readonly="false"
|
||||
:borderless="false"
|
||||
:outlined="true"
|
||||
:hide-dropdown-icon="false"
|
||||
/>
|
||||
<q-btn
|
||||
size="md"
|
||||
icon="mdi-download"
|
||||
round
|
||||
flat
|
||||
color="primary"
|
||||
@click="clickAccount1"
|
||||
>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="audit2">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<q-select
|
||||
class="col-xs-12 col-sm-6"
|
||||
v-model="goverment"
|
||||
label="ระบุรหัสส่วนราชการ"
|
||||
dense
|
||||
:options="govermentOP"
|
||||
lazy-rules
|
||||
hide-bottom-space
|
||||
:readonly="false"
|
||||
:borderless="false"
|
||||
:outlined="true"
|
||||
:hide-dropdown-icon="false"
|
||||
/>
|
||||
|
||||
<q-btn
|
||||
size="md"
|
||||
icon="mdi-download"
|
||||
flat
|
||||
round
|
||||
color="primary"
|
||||
@click="clickAccount2"
|
||||
>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="audit3">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<q-select
|
||||
class="col-xs-12 col-sm-6"
|
||||
v-model="goverment"
|
||||
label="ระบุรหัสส่วนราชการ"
|
||||
dense
|
||||
emit-value
|
||||
map-options
|
||||
option-label="name"
|
||||
:options="govermentOP"
|
||||
option-value="id"
|
||||
lazy-rules
|
||||
hide-bottom-space
|
||||
:readonly="false"
|
||||
:borderless="false"
|
||||
:outlined="true"
|
||||
:hide-dropdown-icon="false"
|
||||
/>
|
||||
<q-btn
|
||||
size="md"
|
||||
icon="mdi-download"
|
||||
flat
|
||||
round
|
||||
color="primary"
|
||||
@click="clickAccount3"
|
||||
>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
<!-- <viewpdf
|
||||
<q-btn
|
||||
size="md"
|
||||
icon="mdi-download"
|
||||
flat
|
||||
round
|
||||
color="primary"
|
||||
@click="clickAccount2"
|
||||
>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="audit3">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<q-select
|
||||
class="col-xs-12 col-sm-6"
|
||||
v-model="goverment"
|
||||
label="ระบุรหัสส่วนราชการ"
|
||||
dense
|
||||
:options="govermentOP"
|
||||
lazy-rules
|
||||
hide-bottom-space
|
||||
:readonly="false"
|
||||
:borderless="false"
|
||||
:outlined="true"
|
||||
:hide-dropdown-icon="false"
|
||||
/>
|
||||
<q-btn
|
||||
size="md"
|
||||
icon="mdi-download"
|
||||
flat
|
||||
round
|
||||
color="primary"
|
||||
@click="clickAccount3"
|
||||
>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
<!-- <viewpdf
|
||||
:src="pdfSrc"
|
||||
:currentpage="pdfCurrentPage"
|
||||
:totalpage="pdfTotalPage" /> -->
|
||||
</q-btn>
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
</q-tab-panels>
|
||||
</q-card>
|
||||
</q-btn>
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
</q-tab-panels>
|
||||
</q-card>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { onMounted, computed, ref, watch } from "vue";
|
||||
|
|
@ -144,54 +132,123 @@ const dataStore = useDataStore();
|
|||
const { loaderPage } = dataStore;
|
||||
const $q = useQuasar(); // show dialog
|
||||
const mixin = useCounterMixin();
|
||||
const { messageError, modalError, modalWarning } = mixin;
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
const { date2Thai, success, dateToISO } = mixin;
|
||||
|
||||
const govermentOP = ref<DataOption[]>([]);
|
||||
const govermentOPfilter = ref<DataOption[]>([]);
|
||||
const goverment = ref<string>("");
|
||||
const govermentOP = ref<any[]>([]);
|
||||
const govermentOPfilter = ref<any[]>([]);
|
||||
const goverment = ref<any>();
|
||||
const tab = ref<string>("audit1");
|
||||
|
||||
const clickAccount1 = async () => {
|
||||
window.open(config.API.getReportAccount1(goverment.value));
|
||||
if (goverment.value === null || goverment.value === undefined) {
|
||||
modalWarning($q, "คำเตือน", "กรุณาเลือกหน่วยงานที่ต้องการออกรายงาน!");
|
||||
return;
|
||||
}
|
||||
loaderPage(true);
|
||||
await http
|
||||
.get(config.API.getReportAccount1(goverment.value?.value as string), {
|
||||
responseType: "blob",
|
||||
})
|
||||
.then((res) => {
|
||||
var a = document.createElement("a");
|
||||
a.href = URL.createObjectURL(res.data);
|
||||
a.download = `รายงานบัญชี1_${goverment.value?.label}.pdf`;
|
||||
// start download
|
||||
a.click();
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
loaderPage(false);
|
||||
});
|
||||
|
||||
// window.open(config.API.getReportAccount1(goverment.value));
|
||||
};
|
||||
|
||||
const clickAccount2 = async () => {
|
||||
window.open(config.API.getReportAccount2(goverment.value));
|
||||
if (goverment.value === null || goverment.value === undefined) {
|
||||
modalWarning($q, "คำเตือน", "กรุณาเลือกหน่วยงานที่ต้องการออกรายงาน!");
|
||||
return;
|
||||
}
|
||||
loaderPage(true);
|
||||
await http
|
||||
.get(config.API.getReportAccount2(goverment.value?.value as string), {
|
||||
responseType: "blob",
|
||||
})
|
||||
.then((res) => {
|
||||
var a = document.createElement("a");
|
||||
a.href = URL.createObjectURL(res.data);
|
||||
a.download = `รายงานบัญชี2_${goverment.value?.label}.pdf`;
|
||||
// start download
|
||||
a.click();
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
loaderPage(false);
|
||||
});
|
||||
//window.open(config.API.getReportAccount2(goverment.value));
|
||||
};
|
||||
|
||||
const clickAccount3 = async () => {
|
||||
window.open(config.API.getReportAccount3(goverment.value));
|
||||
if (goverment.value === null || goverment.value === undefined) {
|
||||
modalWarning($q, "คำเตือน", "กรุณาเลือกหน่วยงานที่ต้องการออกรายงาน!");
|
||||
return;
|
||||
}
|
||||
loaderPage(true);
|
||||
await http
|
||||
.get(config.API.getReportAccount3(goverment.value?.value as string), {
|
||||
responseType: "blob",
|
||||
})
|
||||
.then((res) => {
|
||||
var a = document.createElement("a");
|
||||
a.href = URL.createObjectURL(res.data);
|
||||
a.download = `รายงานบัญชี3_${goverment.value?.label}.pdf`;
|
||||
// start download
|
||||
a.click();
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
loaderPage(false);
|
||||
});
|
||||
// window.open(config.API.getReportAccount3(goverment.value));
|
||||
};
|
||||
|
||||
const fetchOrganizationAgency = async () => {
|
||||
loaderPage(true);
|
||||
await http
|
||||
// .get(config.API.organizationAgency)
|
||||
.get(config.API.getOCType)
|
||||
.then((res) => {
|
||||
const data = res.data.result;
|
||||
let option: DataOption[] = [];
|
||||
data.map((r: any) => {
|
||||
option.push({
|
||||
id: r.organizationId.toString(),
|
||||
name: r.organizationName.toString(),
|
||||
});
|
||||
});
|
||||
govermentOP.value = option;
|
||||
govermentOPfilter.value = option;
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
})
|
||||
.finally(() => {
|
||||
loaderPage(false);
|
||||
});
|
||||
loaderPage(true);
|
||||
await http
|
||||
// .get(config.API.organizationAgency)
|
||||
.get(config.API.getOCType)
|
||||
.then((res) => {
|
||||
const data = res.data.result;
|
||||
let option: any[] = [];
|
||||
data.map((r: any) => {
|
||||
option.push({
|
||||
value: r.organizationId.toString(),
|
||||
label: r.organizationName.toString(),
|
||||
});
|
||||
});
|
||||
govermentOP.value = option;
|
||||
govermentOPfilter.value = option;
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
})
|
||||
.finally(() => {
|
||||
loaderPage(false);
|
||||
});
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
loaderPage(false);
|
||||
await fetchOrganizationAgency();
|
||||
loaderPage(false);
|
||||
await fetchOrganizationAgency();
|
||||
console.log(govermentOP.value);
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -74,9 +74,6 @@
|
|||
<div v-if="col.name == 'no'">
|
||||
{{ props.rowIndex + 1 }}
|
||||
</div>
|
||||
<div v-else-if="col.name == 'statusPosition'">
|
||||
{{ col.value ? "ถือครอง" : "ว่าง" }}
|
||||
</div>
|
||||
<div
|
||||
v-else-if="col.name == 'levelOld' || col.name == 'levelNew'"
|
||||
>
|
||||
|
|
@ -351,6 +348,7 @@ const doSearch = async () => {
|
|||
no: index + 1,
|
||||
report2Id: e.report2Id,
|
||||
profilePositionId: e.profilePositionId,
|
||||
organizationPositionId: e.organizationPositionId,
|
||||
name: e.name ?? "-",
|
||||
edu: e.edu ?? "-",
|
||||
posiNumOld: e.posiNumOld ?? "-",
|
||||
|
|
@ -363,7 +361,8 @@ const doSearch = async () => {
|
|||
e.report2Id == "00000000-0000-0000-0000-000000000000"
|
||||
? "ไม่เปลี่ยนแปลง"
|
||||
: "เปลี่ยนแปลง",
|
||||
statusPosition: e.statusPosition,
|
||||
statusPosition:
|
||||
e.statusPosition?.toString() === "true" ? "ครอง" : "ไม่ครอง",
|
||||
});
|
||||
});
|
||||
rows.value = array;
|
||||
|
|
@ -402,11 +401,11 @@ const onConfirm = async () => {
|
|||
};
|
||||
|
||||
const clickTransfer = async (rows: ResponseTree) => {
|
||||
if (rows.statusPosition) {
|
||||
router.push(
|
||||
`/organizational/manage/report/${rows.profilePositionId ?? "1"}`
|
||||
);
|
||||
}
|
||||
// if (rows.statusPosition) {
|
||||
router.push(
|
||||
`/organizational/manage/report/${rows.organizationPositionId ?? "1"}`
|
||||
);
|
||||
// }
|
||||
};
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
@click="clickBack"
|
||||
/>
|
||||
<label
|
||||
>บัญชีจัดข้าราชการกรุงเทพมหานครสามัญเข้าประเภทตำแหน่ง สายงาน
|
||||
>บัญชีจัดข้าราชการกรุงเทพมหานครสามัญเข้าตำแหน่งประเภท สายงาน
|
||||
และระดับตำแหน่ง</label
|
||||
>
|
||||
</div>
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
<q-select
|
||||
class="col-xs-12 col-sm-6"
|
||||
v-model="myData.category"
|
||||
label="ประเภทตำแหน่ง"
|
||||
label="ตำแหน่งประเภท"
|
||||
dense
|
||||
emit-value
|
||||
map-options
|
||||
|
|
@ -384,7 +384,7 @@
|
|||
dense
|
||||
:options="categoryOP"
|
||||
v-model="myData.category2"
|
||||
label="ประเภทตำแหน่ง"
|
||||
label="ตำแหน่งประเภท"
|
||||
emit-value
|
||||
map-options
|
||||
option-label="name"
|
||||
|
|
@ -557,12 +557,13 @@
|
|||
<q-card-actions class="q-py-sm">
|
||||
<q-space />
|
||||
<q-btn
|
||||
unelevated
|
||||
flat
|
||||
round
|
||||
color="public"
|
||||
label="บันทึก"
|
||||
icon="mdi-content-save-outline"
|
||||
@click="checkSave"
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
@ -710,15 +711,42 @@ const fetchData = async () => {
|
|||
myData.value.category = data.category ?? "";
|
||||
myData.value.level = data.level ?? "";
|
||||
await updateGoverment(data.goverment2);
|
||||
myData.value.goverment2 = data.goverment2 ?? "";
|
||||
myData.value.agency2 = data.agency2 ?? "";
|
||||
myData.value.posiNum2 = data.posiNum2 ?? "";
|
||||
myData.value.posiManage2 = data.posiManage2 ?? "";
|
||||
myData.value.sideManage2 = data.sideManage2 ?? "";
|
||||
myData.value.posiWork2 = data.posiWork2 ?? "";
|
||||
myData.value.sideWork2 = data.sideWork2 ?? "";
|
||||
myData.value.category2 = data.category2 ?? "";
|
||||
myData.value.level2 = data.level2 ?? "";
|
||||
myData.value.goverment2 =
|
||||
data.goverment2 == "00000000-0000-0000-0000-000000000000"
|
||||
? ""
|
||||
: data.goverment2;
|
||||
myData.value.agency2 =
|
||||
data.agency2 == "00000000-0000-0000-0000-000000000000"
|
||||
? ""
|
||||
: data.agency2;
|
||||
myData.value.posiNum2 =
|
||||
data.posiNum2 == "00000000-0000-0000-0000-000000000000"
|
||||
? ""
|
||||
: data.posiNum2;
|
||||
myData.value.posiManage2 =
|
||||
data.posiManage2 == "00000000-0000-0000-0000-000000000000"
|
||||
? ""
|
||||
: data.posiManage2;
|
||||
myData.value.sideManage2 =
|
||||
data.sideManage2 == "00000000-0000-0000-0000-000000000000"
|
||||
? ""
|
||||
: data.sideManage2;
|
||||
myData.value.posiWork2 =
|
||||
data.posiWork2 == "00000000-0000-0000-0000-000000000000"
|
||||
? ""
|
||||
: data.posiWork2;
|
||||
myData.value.sideWork2 =
|
||||
data.sideWork2 == "00000000-0000-0000-0000-000000000000"
|
||||
? ""
|
||||
: data.sideWork2;
|
||||
myData.value.category2 =
|
||||
data.category2 == "00000000-0000-0000-0000-000000000000"
|
||||
? ""
|
||||
: data.category2;
|
||||
myData.value.level2 =
|
||||
data.level2 == "00000000-0000-0000-0000-000000000000"
|
||||
? ""
|
||||
: data.level2;
|
||||
})
|
||||
.catch((e) => {})
|
||||
.finally(() => {
|
||||
|
|
@ -913,7 +941,7 @@ const fetchPositionNum = async () => {
|
|||
});
|
||||
};
|
||||
|
||||
//ประเภทตำแหน่ง
|
||||
//ตำแหน่งประเภท
|
||||
const fetchCategory = async () => {
|
||||
// loaderPage(true);
|
||||
await http
|
||||
|
|
@ -1058,7 +1086,7 @@ const filterSelector = (val: any, update: Function, filtername: string) => {
|
|||
});
|
||||
break;
|
||||
case "4":
|
||||
//ประเภทตำแหน่ง
|
||||
//ตำแหน่งประเภท
|
||||
update(() => {
|
||||
categoryOP.value = categoryOPfilter.value.filter(
|
||||
(v: DataOption) => v.name.indexOf(val) > -1
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
@click="clickBack"
|
||||
/>
|
||||
<label
|
||||
>ประวัติบัญชีจัดข้าราชการกรุงเทพมหานครสามัญเข้าประเภทตำแหน่ง สายงาน
|
||||
>ประวัติบัญชีจัดข้าราชการกรุงเทพมหานครสามัญเข้าตำแหน่งประเภท สายงาน
|
||||
และระดับตำแหน่ง</label
|
||||
>
|
||||
<q-card flat bordered class="col-12 q-my-sm q-pt-sm">
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
/>
|
||||
<q-input
|
||||
v-model="items.oldPositionType"
|
||||
label="ประเภทตำแหน่ง"
|
||||
label="ตำแหน่งประเภท"
|
||||
class="col-xs-12 col-sm-6"
|
||||
hide-bottom-space
|
||||
:outlined="false"
|
||||
|
|
@ -259,7 +259,7 @@
|
|||
/>
|
||||
<q-input
|
||||
v-model="items.newPositionType"
|
||||
label="ประเภทตำแหน่ง"
|
||||
label="ตำแหน่งประเภท"
|
||||
class="col-xs-12 col-sm-6"
|
||||
hide-bottom-space
|
||||
:outlined="false"
|
||||
|
|
|
|||
|
|
@ -1,91 +1,109 @@
|
|||
<template>
|
||||
<div class="toptitle text-dark col-12 row items-center">รายงานบัญชี</div>
|
||||
<div class="col-12 row"></div>
|
||||
<q-card flat bordered class="col-12">
|
||||
<div class="row col-12">
|
||||
<q-tabs
|
||||
v-model="tab"
|
||||
no-caps
|
||||
inline-label
|
||||
align="left"
|
||||
active-class="text-primary"
|
||||
class="text-grey-7"
|
||||
>
|
||||
<q-tab name="audit1" label="บัญชี 1" />
|
||||
<q-tab name="audit2" label="บัญชี 2" />
|
||||
<q-tab name="audit3" label="บัญชี 3" />
|
||||
</q-tabs>
|
||||
</div>
|
||||
<q-separator />
|
||||
<q-tab-panels
|
||||
v-model="tab"
|
||||
transition-prev="jump-up"
|
||||
transition-next="jump-up"
|
||||
animated
|
||||
swipeable
|
||||
class="row col-12 text-dark"
|
||||
>
|
||||
<q-tab-panel name="audit1">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<span class="text-subtitle1 text-weight-medium"
|
||||
>รายงานบัญชีฉบับที่ 1</span
|
||||
>
|
||||
<q-select
|
||||
class="col-xs-12 col-sm-6"
|
||||
v-model="goverment"
|
||||
label="รหัสส่วนราชการ"
|
||||
dense
|
||||
emit-value
|
||||
map-options
|
||||
option-label="name"
|
||||
:options="govermentOP"
|
||||
option-value="id"
|
||||
lazy-rules
|
||||
hide-bottom-space
|
||||
:readonly="true"
|
||||
:borderless="true"
|
||||
:outlined="false"
|
||||
:hide-dropdown-icon="true"
|
||||
/>
|
||||
<q-btn size="md" icon="mdi-download" round flat color="primary">
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
<!-- <viewpdf
|
||||
<div class="toptitle text-dark col-12 row items-center">รายงานบัญชี</div>
|
||||
<div class="col-12 row"></div>
|
||||
<q-card flat bordered class="col-12">
|
||||
<div class="row col-12">
|
||||
<q-tabs
|
||||
v-model="tab"
|
||||
no-caps
|
||||
inline-label
|
||||
align="left"
|
||||
active-class="text-primary"
|
||||
class="text-grey-7"
|
||||
>
|
||||
<q-tab name="audit1" label="บัญชี 1" />
|
||||
<q-tab name="audit2" label="บัญชี 2" />
|
||||
<q-tab name="audit3" label="บัญชี 3" />
|
||||
</q-tabs>
|
||||
</div>
|
||||
<q-separator />
|
||||
<q-tab-panels
|
||||
v-model="tab"
|
||||
transition-prev="jump-up"
|
||||
transition-next="jump-up"
|
||||
animated
|
||||
swipeable
|
||||
class="row col-12 text-dark"
|
||||
>
|
||||
<q-tab-panel name="audit1">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<span class="text-subtitle1 text-weight-medium"
|
||||
>รายงานบัญชีฉบับที่ 1</span
|
||||
>
|
||||
<q-select
|
||||
class="col-xs-12 col-sm-6"
|
||||
v-model="goverment"
|
||||
label="รหัสส่วนราชการ"
|
||||
dense
|
||||
emit-value
|
||||
map-options
|
||||
option-label="name"
|
||||
:options="govermentOP"
|
||||
option-value="id"
|
||||
lazy-rules
|
||||
hide-bottom-space
|
||||
:readonly="true"
|
||||
:borderless="true"
|
||||
:outlined="false"
|
||||
:hide-dropdown-icon="true"
|
||||
/>
|
||||
<q-btn
|
||||
size="md"
|
||||
icon="mdi-download"
|
||||
round
|
||||
flat
|
||||
color="primary"
|
||||
>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
<!-- <viewpdf
|
||||
:src="pdfSrc"
|
||||
:currentpage="pdfCurrentPage"
|
||||
:totalpage="pdfTotalPage" /> -->
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="audit2">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<span class="text-subtitle1 text-weight-medium"
|
||||
>รายงานบัญชีฉบับที่ 2</span
|
||||
>
|
||||
<q-btn size="md" icon="mdi-download" flat round color="primary">
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
<!-- <viewpdf
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="audit2">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<span class="text-subtitle1 text-weight-medium"
|
||||
>รายงานบัญชีฉบับที่ 2</span
|
||||
>
|
||||
<q-btn
|
||||
size="md"
|
||||
icon="mdi-download"
|
||||
flat
|
||||
round
|
||||
color="primary"
|
||||
>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
<!-- <viewpdf
|
||||
:src="pdfSrc"
|
||||
:currentpage="pdfCurrentPage"
|
||||
:totalpage="pdfTotalPage" /> -->
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="audit3">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<span class="text-subtitle1 text-weight-medium"
|
||||
>รายงานบัญชีฉบับที่ 3</span
|
||||
>
|
||||
<q-btn size="md" icon="mdi-download" flat round color="primary">
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
<!-- <viewpdf
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="audit3">
|
||||
<div class="row col-12 items-center q-gutter-md">
|
||||
<span class="text-subtitle1 text-weight-medium"
|
||||
>รายงานบัญชีฉบับที่ 3</span
|
||||
>
|
||||
<q-btn
|
||||
size="md"
|
||||
icon="mdi-download"
|
||||
flat
|
||||
round
|
||||
color="primary"
|
||||
>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
<!-- <viewpdf
|
||||
:src="pdfSrc"
|
||||
:currentpage="pdfCurrentPage"
|
||||
:totalpage="pdfTotalPage" /> -->
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
</q-tab-panels>
|
||||
</q-card>
|
||||
</div>
|
||||
</q-tab-panel>
|
||||
</q-tab-panels>
|
||||
</q-card>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { onMounted, computed, ref, watch } from "vue";
|
||||
|
|
@ -117,32 +135,32 @@ const goverment = ref<string>("");
|
|||
const tab = ref<string>("audit1");
|
||||
|
||||
const fetchOrganizationAgency = async () => {
|
||||
loaderPage(true);
|
||||
await http
|
||||
// .get(config.API.organizationAgency)
|
||||
.get(config.API.listOrganizationAgency("หน่วยงาน"))
|
||||
.then((res) => {
|
||||
const data = res.data.result;
|
||||
let option: DataOption[] = [];
|
||||
data.map((r: any) => {
|
||||
option.push({
|
||||
id: r.organizationId.toString(),
|
||||
name: r.organizationName.toString(),
|
||||
});
|
||||
});
|
||||
govermentOP.value = option;
|
||||
govermentOPfilter.value = option;
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
})
|
||||
.finally(() => {
|
||||
loaderPage(false);
|
||||
});
|
||||
loaderPage(true);
|
||||
await http
|
||||
// .get(config.API.organizationAgency)
|
||||
.get(config.API.listOrganizationAgency("หน่วยงาน"))
|
||||
.then((res) => {
|
||||
const data = res.data.result;
|
||||
let option: DataOption[] = [];
|
||||
data.map((r: any) => {
|
||||
option.push({
|
||||
id: r.organizationId.toString(),
|
||||
name: r.organizationName.toString(),
|
||||
});
|
||||
});
|
||||
govermentOP.value = option;
|
||||
govermentOPfilter.value = option;
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
})
|
||||
.finally(() => {
|
||||
loaderPage(false);
|
||||
});
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
loaderPage(false);
|
||||
await fetchOrganizationAgency();
|
||||
loaderPage(false);
|
||||
await fetchOrganizationAgency();
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue