modify position temp
This commit is contained in:
parent
a8fdca1138
commit
0a5da6ea61
2 changed files with 23 additions and 20 deletions
|
|
@ -11,7 +11,7 @@ import config from "@/app.config";
|
|||
*/
|
||||
import type { QTableProps } from "quasar";
|
||||
import type {
|
||||
FormDataPosition,
|
||||
FormDataPositionTemp,
|
||||
DataOption,
|
||||
RowDetailPositions,
|
||||
ListMenu,
|
||||
|
|
@ -86,11 +86,11 @@ const listMenu = ref<ListMenu[]>([
|
|||
const rows = ref<RowDetailPositions[]>([]); //รายกานข้อมูลอัตรากำลัง
|
||||
const rowsPositionSelect = ref<RowDetailPositions[]>([]); //รายการตำแหน่ง
|
||||
|
||||
const formData = reactive<FormDataPosition>({
|
||||
shortName: props.shortName,
|
||||
prefixNo: "",
|
||||
positionNo: "",
|
||||
suffixNo: "",
|
||||
const formData = reactive<FormDataPositionTemp>({
|
||||
// shortName: props.shortName,
|
||||
// prefixNo: "",
|
||||
// positionNo: "",
|
||||
// suffixNo: "",
|
||||
reason: "",
|
||||
});
|
||||
|
||||
|
|
@ -146,9 +146,9 @@ async function fetchPosition(id: string) {
|
|||
.then((res) => {
|
||||
const data = res.data.result;
|
||||
|
||||
formData.prefixNo = data.posMasterNoPrefix;
|
||||
formData.positionNo = data.posMasterNo;
|
||||
formData.suffixNo = data.posMasterNoSuffix;
|
||||
// formData.prefixNo = data.posMasterNoPrefix;
|
||||
// formData.positionNo = data.posMasterNo;
|
||||
// formData.suffixNo = data.posMasterNoSuffix;
|
||||
formData.reason = data.reason;
|
||||
rows.value = data.positions.map((e: any) => ({
|
||||
...e,
|
||||
|
|
@ -178,9 +178,9 @@ function onSubmit() {
|
|||
posLevelId: e.posLevelId, //*ระดับตำแหน่ง
|
||||
}));
|
||||
const body = {
|
||||
posMasterNoPrefix: formData.prefixNo, //*Prefix นำหน้าตำแหน่งเลขที่ เป็น Optional (ไม่ใช่อักษรย่อของหน่วยงาน/ส่วนราชการ)
|
||||
posMasterNo: Number(formData.positionNo), //*ตำแหน่งเลขที่ เป็นตัวเลข
|
||||
posMasterNoSuffix: formData.suffixNo, //Suffix หลังตำแหน่งเลขที่ เช่น ช.
|
||||
// posMasterNoPrefix: formData.prefixNo, //*Prefix นำหน้าตำแหน่งเลขที่ เป็น Optional (ไม่ใช่อักษรย่อของหน่วยงาน/ส่วนราชการ)
|
||||
// posMasterNo: Number(formData.positionNo), //*ตำแหน่งเลขที่ เป็นตัวเลข
|
||||
// posMasterNoSuffix: formData.suffixNo, //Suffix หลังตำแหน่งเลขที่ เช่น ช.
|
||||
reason: formData.reason, //Suffix หลังตำแหน่งเลขที่ เช่น ช.
|
||||
orgRootId: props.orgLevel === 0 ? props.treeId : null, //Id สำนัก
|
||||
orgChild1Id: props.orgLevel === 1 ? props.treeId : null,
|
||||
|
|
@ -326,9 +326,9 @@ watch(
|
|||
rowsPositionSelect.value = [];
|
||||
search.value = "";
|
||||
rows.value = [];
|
||||
formData.prefixNo = "";
|
||||
formData.positionNo = "";
|
||||
formData.suffixNo = "";
|
||||
// formData.prefixNo = "";
|
||||
// formData.positionNo = "";
|
||||
// formData.suffixNo = "";
|
||||
} else {
|
||||
props.rowId && fetchPosition(props.rowId);
|
||||
}
|
||||
|
|
@ -368,7 +368,7 @@ watch(
|
|||
</div>
|
||||
<div class="col-12"><q-separator /></div>
|
||||
<div class="row q-col-gutter-sm col-12 q-pa-sm">
|
||||
<div class="row col-8 q-col-gutter-sm">
|
||||
<!-- <div class="row col-8 q-col-gutter-sm">
|
||||
<div class="col-12">
|
||||
<q-input
|
||||
v-model="formData.shortName"
|
||||
|
|
@ -417,8 +417,8 @@ watch(
|
|||
label="Suffix ตำแหน่งเลขที่"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
</div> -->
|
||||
<div class="col-12">
|
||||
<q-input
|
||||
v-model="formData.reason"
|
||||
:class="inputEdit(isReadonly)"
|
||||
|
|
@ -426,8 +426,6 @@ watch(
|
|||
outlined
|
||||
for="#reason"
|
||||
label="หมายเหตุ"
|
||||
type="textarea"
|
||||
rows="4"
|
||||
/>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,10 @@ interface FormDataPosition {
|
|||
reason: string;
|
||||
}
|
||||
|
||||
interface FormDataPositionTemp {
|
||||
reason: string;
|
||||
}
|
||||
|
||||
interface FormDataNewStructure {
|
||||
orgRevisionId: string;
|
||||
orgRevisionName: string;
|
||||
|
|
@ -150,4 +154,5 @@ export type {
|
|||
FormPositionSelectRef,
|
||||
NewPagination,
|
||||
DataDocumentList,
|
||||
FormDataPositionTemp,
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue