@@ -531,7 +531,7 @@ const pagination = ref({
dense
v-model="type"
:options="optionsType"
- label="คำสั่งแต่งตั่ง - เลื่อน"
+ label="ประเภทคำสั่ง"
style="width: 400px; max-width: auto"
emit-value
map-options
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index cb95fe3bd..04910a2a1 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -149,13 +149,10 @@ const visibleColumns = ref
([
const action = ref("");
const fileUpload = ref(null);
-const fileInputRef = ref(null);
onMounted(() => {
retireld.value = retireld_params.toString();
- console.log(retireld_params);
fecthlistprofile(retireld.value);
- fecthCheck(retireld.value);
});
const round = ref();
const typeReport = ref("");
@@ -188,6 +185,9 @@ const fecthlistprofile = async (id: string) => {
remove: e.remove,
}));
console.log(statusReport.value);
+ if (statusReport.value == false) {
+ fecthCheck(retireld.value);
+ } else statusUpload.value = true;
})
.catch((e) => {
messageError($q, e);
@@ -200,7 +200,6 @@ const fecthCheck = async (id: string) => {
await http
.get(config.API.checkfileupload(id))
.then((res) => {
- console.log(res);
statusUpload.value = res.data.result;
})
.catch((err) => {
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index dbb9e41e6..95b5bbd0e 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -380,6 +380,7 @@ const fetchRetirement = async (type: string, year: any) => {
round: items.round,
typeReport: typeReportChangeName(items.typeReport),
json: items.json,
+ document: items.document,
}));
actionOption.value = rows.value;
rows.value.sort((a, b) => a.round - b.round);
@@ -569,13 +570,17 @@ const clickSelect = async (action: string) => {
.onDismiss(() => {});
};
-const clickClose = async () => {
- modal.value = false;
-};
+// const clickClose = async () => {
+// modal.value = false;
+// };
const checkjson = ref();
const checkststus = (data: any) => {
- let jsonfasle = rows.value.find((e: any) => e.json == false);
+
+
+ let jsonfasle = data.find((e: any) => e.document == false);
+ // console.log(jsonfasle)
+
if (jsonfasle) {
checkjson.value = true;
} else checkjson.value = false;
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 4d190c950..55f687b51 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -173,9 +173,6 @@ const columns2 = ref([
const rows2 = ref([]);
-const Note = ref("");
-const titleModal = ref("");
-const actionModal = ref("");
const person = ref([]);
const props = defineProps({
tab: {
diff --git a/src/modules/07_insignia/components/3_result/DialogForm.vue b/src/modules/07_insignia/components/3_result/DialogForm.vue
index e88727359..6a18795e0 100644
--- a/src/modules/07_insignia/components/3_result/DialogForm.vue
+++ b/src/modules/07_insignia/components/3_result/DialogForm.vue
@@ -1,4 +1,4 @@
-div
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ col.label }}
+
+
+
+
+
+
+
+ {{ props.rowIndex + 1 }}
+
+
+ {{ props.row.fileName }}
+
+
+ {{ props.row.annotation }}
+
+
+
+ ดาว์โหลด PDF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue
index 74a90045a..f994d8b32 100644
--- a/src/modules/07_insignia/views/ResultPage.vue
+++ b/src/modules/07_insignia/views/ResultPage.vue
@@ -2,8 +2,12 @@
import { ref, onMounted } from "vue";
// import { useRouter } from "vue-router";
import { useCounterMixin } from "@/stores/mixin";
+import http from "@/plugins/http";
+import config from "@/app.config";
import DialogForm from "@/modules/07_insignia/components/3_result/DialogForm.vue";
+import fileUploadview from "../components/3_result/fileUpload.vue";
+
import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
import type { QTableProps, QInput } from "quasar";
import { useQuasar } from "quasar";
@@ -14,23 +18,31 @@ const { date2Thai, dialogConfirm } = mixin;
const $q = useQuasar();
const tab = ref("hight");
-const fileUpload = ref("");
-const reason = ref("");
-const documentTitle = ref("");
-
const selectType = ref("1");
-const selectTypeOption = ref([{id: "1", name: "เบญจมาภรณ์มงกุฎไทย"}]);
-
-const selectRound = ref("1");
-const selectRoundOption = ref([
- { id: "1", name: "รอบการเสนอขอพระราชทานเครื่องราชฯ ปี 2566" },
+const selectTypeOption = ref([
+ { id: "1", name: "เบญจมาภรณ์มงกุฎไทย" },
]);
-const filterKeyword = ref("");
-const filterDoc = ref(null);
-const resetFilterRef = () => {
- filterKeyword.value = "";
- filterDoc.value.focus();
+
+const selectRound = ref();
+const selectRoundOption = ref([]);
+onMounted(async () => {
+ await fecthRound();
+});
+const fecthRound = async () => {
+ await http
+ .get(config.API.noteround())
+ .then((res) => {
+ let data = res.data.result;
+ selectRoundOption.value = data;
+ selectRound.value = data[0].id;
+ })
+ .catch((err) => {
+ console.log(err);
+ });
};
+
+const filterKeyword = ref("");
+
const pagination = ref({
sortBy: "filename",
descending: true,
@@ -48,14 +60,9 @@ const visibleColumns = ref([
"datepay",
"typepay",
"address",
- "action"
-]);
-const visibleColumnsReference = ref([
- "no",
- "fileName",
- "annotation",
- "file",
+ "action",
]);
+
const filterRef = ref();
const filter = ref("");
const columns = ref([
@@ -156,53 +163,7 @@ const columns = ref([
field: "",
},
]);
-const colums2 = ref([
- {
- name: "no",
- align: "left",
- label: "ลำดับ",
- field: "no",
- sortable: true,
- },
- {
- name: "fileName",
- align: "left",
- label: "ชื่อเอกสาร",
- field: "fileName",
- sortable: true,
-
- },
- {
- name: "annotation",
- align: "left",
- label: "หมายเหตุ",
- field: "annotation",
- sortable: true,
-
- },
- {
- name: "file",
- align: "left",
- label: "ไฟล์เอกสาร",
- field: "file",
- sortable: true,
- },
-]);
-const rows2 = ref([
- {
- no:"1",
- fileName:"test1",
- annotation:"ทดสอบ",
- file:""
- },
- {
- no:"2",
- fileName:"test2",
- annotation:"ทดสอบ",
- file:""
- }
-])
const rows = ref([
{
no: "1",
@@ -234,21 +195,21 @@ const modal = ref(false);
const close = () => {
modal.value = false;
-}
+};
const addData = () => {
modal.value = true;
- console.log("addData")
+ console.log("addData");
};
const editData = (id: string) => {
modal.value = true;
- console.log("editData", id)
+ console.log("editData", id);
};
const save = () => {
- console.log("save function")
-}
+ console.log("save function");
+};
const resetFilter = () => {
// reset ค่าที่ค้นหาเมื่อกดปุ่ม X ในกล่องค้นหา
@@ -272,7 +233,6 @@ const filterSelector = (val: any, update: Function, filtername: string) => {
// );
// });
// break;
-
// default:
// break;
// }
@@ -287,26 +247,34 @@ const filterSelector = (val: any, update: Function, filtername: string) => {
รอบ
-
+ input-class="text-bold text-grey"
+ >
-
+
@@ -314,378 +282,414 @@ const filterSelector = (val: any, update: Function, filtername: string) => {
-
-
+
-
filterSelector(inputValue, doneFn, 'selectTypeOption')" />
-
-
- เพิ่ม
-
-
-
-
-
-
-
-
-
- บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์
-
-
-
- บันทึกผลการจ่ายใบกำกับ
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ props.rowIndex + 1 }}
-
-
-
-
- แก้ไขข้อมูล
-
-
-
-
- {{ props.value }}
-
-
-
-
-
-
-
-
-
filterSelector(inputValue, doneFn, 'selectTypeOption'
- )" />
-
-
- เพิ่ม
-
-
-
-
-
-
-
-
-
- บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์
-
-
-
- บันทึกผลการจ่ายใบกำกับ
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ props.rowIndex + 1 }}
-
-
-
-
- แก้ไขข้อมูล
-
-
-
-
- {{ props.value }}
-
-
-
-
-
-
-
-
-
filterSelector(inputValue, doneFn, 'selectTypeOption'
- )" />
-
-
- เพิ่ม
-
-
-
-
-
-
-
-
-
- บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์
-
-
-
- บันทึกผลการจ่ายใบกำกับ
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ props.rowIndex + 1 }}
-
-
-
-
- แก้ไขข้อมูล
-
-
-
-
- {{ props.value }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
filterSelector(inputValue, doneFn, 'selectTypeOption')"
/>
+
+
+ เพิ่ม
+
+
+
+
+
+
+
+
+
+ บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์
+
+
+
+ บันทึกผลการจ่ายใบกำกับ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
- {{ props.rowIndex + 1 }}
-
-
- {{ props.row.fileName }}
-
-
- {{ props.row.annotation }}
-
-
-
+
+
+
+ {{ props.rowIndex + 1 }}
+
+
+
+
- ดาว์โหลด PDF
+ แก้ไขข้อมูล
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {{ props.value }}
+
+
+
+
+
+
+
filterSelector(inputValue, doneFn, 'selectTypeOption'
+ )"
+ />
+
+
+ เพิ่ม
+
+
+
+
+
+
+
+
+
+ บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์
+
+
+
+ บันทึกผลการจ่ายใบกำกับ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ props.rowIndex + 1 }}
+
+
+
+
+ แก้ไขข้อมูล
+
+
+
+
+ {{ props.value }}
+
+
+
+
+
+
+
+
+
filterSelector(inputValue, doneFn, 'selectTypeOption'
+ )"
+ />
+
+
+ เพิ่ม
+
+
+
+
+
+
+
+
+
+ บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์
+
+
+
+ บันทึกผลการจ่ายใบกำกับ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ props.rowIndex + 1 }}
+
+
+
+
+ แก้ไขข้อมูล
+
+
+
+
+ {{ props.value }}
+
+
+
+
+
+
+
+
+
-
+