From a1acb1fa79152d8fffe3814f3ebfa85a41cfedd9 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Wed, 21 Jun 2023 10:35:02 +0700
Subject: [PATCH] =?UTF-8?q?Ui=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?=
=?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B8=9A=E0=B8=A3?=
=?UTF-8?q?=E0=B8=A3=E0=B8=88=E0=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../OrderReplace/MainOrderReplace.vue | 543 ++++++++++++++++++
.../OrderReplace/addOrderReplace.vue | 181 ++++++
.../05_placement/interface/request/Main.ts | 27 +-
src/modules/05_placement/router.ts | 27 +-
src/modules/05_placement/store.ts | 86 ++-
5 files changed, 820 insertions(+), 44 deletions(-)
create mode 100644 src/modules/05_placement/components/OrderReplace/MainOrderReplace.vue
create mode 100644 src/modules/05_placement/components/OrderReplace/addOrderReplace.vue
diff --git a/src/modules/05_placement/components/OrderReplace/MainOrderReplace.vue b/src/modules/05_placement/components/OrderReplace/MainOrderReplace.vue
new file mode 100644
index 000000000..91a5d7fda
--- /dev/null
+++ b/src/modules/05_placement/components/OrderReplace/MainOrderReplace.vue
@@ -0,0 +1,543 @@
+
+ ออกคำสั่งบรรจุ
+
+
+
+
+
+
+
+
+ เพิ่มข้อมูล
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ rejectMessage }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/05_placement/interface/request/Main.ts b/src/modules/05_placement/interface/request/Main.ts
index 54d363323..0b84ae5f0 100644
--- a/src/modules/05_placement/interface/request/Main.ts
+++ b/src/modules/05_placement/interface/request/Main.ts
@@ -1,15 +1,24 @@
// ข้อมูลรายการสอบแข่งขัน/คัดเลือก
interface FormPlacementMainData {
- id: number;
- examRound: string;
- examOrder: number;
- fiscalYear: number;
- numberofCandidates: number;
- examType: number;
- accountExpirationDate: string;
- isExpired?: boolean;
+ id: number;
+ examRound: string;
+ examOrder: number;
+ fiscalYear: number;
+ numberofCandidates: number;
+ examType: number;
+ accountExpirationDate: string;
+ isExpired?: boolean;
}
-
+interface FormOrderPlacementMainData {
+ Order: number;
+ OrderNum: string;
+ fiscalYear: number;
+ OrderDate: string;
+ OrderBy: string;
+ Signer: string;
+ OrderStatus: boolean;
+}
export type { FormPlacementMainData };
+export type { FormOrderPlacementMainData };
diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts
index b59e6fbaf..406c6158d 100644
--- a/src/modules/05_placement/router.ts
+++ b/src/modules/05_placement/router.ts
@@ -2,12 +2,16 @@
* Router บรรจุ แต่งตั้ง ย้าย โอน (Placement)
*/
-const MainSorkorcho = () => import("@/modules/05_placement/components/exams_sorkorcho/Main.vue");
-const PlacementDetail = () => import("@/modules/05_placement/components/pass/Detail.vue");
-const MainOther = () => import("@/modules/05_placement/components/exams_other/Main.vue");
-const Placement2Detail = () => import("@/modules/05_placement/components/exams_other/Detail.vue");
-
-
+const MainSorkorcho = () =>
+ import("@/modules/05_placement/components/exams_sorkorcho/Main.vue");
+const PlacementDetail = () =>
+ import("@/modules/05_placement/components/pass/Detail.vue");
+const MainOther = () =>
+ import("@/modules/05_placement/components/exams_other/Main.vue");
+const Placement2Detail = () =>
+ import("@/modules/05_placement/components/exams_other/Detail.vue");
+const addOrderReplace = () =>
+ import("@/modules/05_placement/components/OrderReplace/addOrderReplace.vue");
export default [
{
path: "/placement",
@@ -49,5 +53,14 @@ export default [
Role: "placement",
},
},
+ {
+ path: "/placement/addOrderReplace",
+ name: "addOrderReplace",
+ component: addOrderReplace,
+ meta: {
+ Auth: true,
+ Key: [8],
+ Role: "placement",
+ },
+ },
];
-
diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index 122c3daec..bc7b251b8 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -1,6 +1,7 @@
import { defineStore } from "pinia";
import { ref } from "vue";
-import type { FormPlacementMainData } from "@/modules/05_placement/interface/request/Main"
+import type { FormPlacementMainData } from "@/modules/05_placement/interface/request/Main";
+import type { FormOrderPlacementMainData } from "@/modules/05_placement/interface/request/Main";
export const useProfileDataStore = defineStore("profile", () => {
interface profile {
@@ -89,65 +90,94 @@ export const usePlacementDataStore = defineStore("placement", () => {
const changePlacementColumns = (system: String, val: String[]) => {
if (system == "mappingPosition")
placementData.value.mappingPosition.columns = val;
- localStorage.setItem(
- "placement",
- JSON.stringify(placementData.value)
- );
+ localStorage.setItem("placement", JSON.stringify(placementData.value));
};
if (localStorage.getItem("placement") !== null) {
- placementData.value = JSON.parse(
- localStorage.getItem("placement") || "{}"
- );
+ placementData.value = JSON.parse(localStorage.getItem("placement") || "{}");
}
- let DataMainYear = ref([]) // ข้อมูลจำนวนปี
- let DataMainOrig = ref([]) // ข้อมูลหลักดั้งเดิม
- let DataMainUpdate = ref([]) // ข้อมูลเปลี่ยนแปลง
- const DataMainYearSet = (val: FormPlacementMainData[]) => (DataMainYear.value = val)
- const DataMain = (val: FormPlacementMainData[]) => (DataMainOrig.value = val)
- const DataUpdateMain = (filter_1: number | null, filter_2: number | null, filter_3: boolean) => {
+ let DataMainYear = ref([]); // ข้อมูลจำนวนปี
+ let DataMainOrig = ref([]); // ข้อมูลหลักดั้งเดิม
+ let DataMainUpdate = ref([]); // ข้อมูลเปลี่ยนแปลง
+ const DataMainYearSet = (val: FormPlacementMainData[]) =>
+ (DataMainYear.value = val);
+ const DataMain = (val: FormPlacementMainData[]) => (DataMainOrig.value = val);
+ const DataUpdateMain = (
+ filter_1: number | null,
+ filter_2: number | null,
+ filter_3: boolean
+ ) => {
DataMainUpdate.value = [];
if (filter_1 === null && filter_2 === 0 && filter_3 === false) {
// console.log('case 1');
// return DataMainUpdate.value = DataMainOrig.value; อันเก่า
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.isExpired === filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) => item.isExpired === filter_3
+ ));
} else if (filter_1 === null && filter_2 === null && filter_3 === false) {
// console.log('case 1.1');
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.isExpired === filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) => item.isExpired === filter_3
+ ));
} else if (filter_1 !== null && filter_2 === 0 && filter_3 === false) {
// console.log('case 2');
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder === filter_1 && item.isExpired === filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) => item.examOrder === filter_1 && item.isExpired === filter_3
+ ));
} else if (filter_1 !== null && filter_2 === null && filter_3 === false) {
// console.log('case 2.1');
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder === filter_1 && item.isExpired === filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) => item.examOrder === filter_1 && item.isExpired === filter_3
+ ));
} else if (filter_1 !== null && filter_2 !== 0 && filter_3 === false) {
// console.log('case 2.2');
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder === filter_1 && item.examType === filter_2 && item.isExpired === filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) =>
+ item.examOrder === filter_1 &&
+ item.examType === filter_2 &&
+ item.isExpired === filter_3
+ ));
} else if (filter_1 === null && filter_2 !== 0 && filter_3 === false) {
// console.log('case 3');
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examType === filter_2 && item.isExpired === filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) => item.examType === filter_2 && item.isExpired === filter_3
+ ));
} else if (filter_1 === null && filter_2 === 0 && filter_3 === true) {
// console.log('case 3.1');
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.isExpired === filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) => item.isExpired === filter_3
+ ));
} else if (filter_1 === null && filter_2 === null && filter_3 === true) {
// console.log('case 3.2');
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.isExpired === filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) => item.isExpired === filter_3
+ ));
} else if (filter_1 !== null && filter_2 === 0 && filter_3 === true) {
// console.log('case 3.3');
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder == filter_1 && item.isExpired == filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) => item.examOrder == filter_1 && item.isExpired == filter_3
+ ));
} else if (filter_1 !== null && filter_2 === null && filter_3 === true) {
// console.log('case 3.4');
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder == filter_1 && item.isExpired == filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) => item.examOrder == filter_1 && item.isExpired == filter_3
+ ));
} else if (filter_1 !== null && filter_2 !== 0 && filter_3 === true) {
// console.log('case 3.5');
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder == filter_1 && item.examType == filter_2 && item.isExpired == filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) =>
+ item.examOrder == filter_1 &&
+ item.examType == filter_2 &&
+ item.isExpired == filter_3
+ ));
} else if (filter_1 === null && filter_2 !== 0 && filter_3 === true) {
// console.log('case 3.6');
- return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examType == filter_2 && item.isExpired == filter_3);
+ return (DataMainUpdate.value = DataMainOrig.value.filter(
+ (item) => item.examType == filter_2 && item.isExpired == filter_3
+ ));
}
-
- }
+ };
return {
placementData,