From 64573c492f0496a9a9e75de7d9edf64cbde18ce0 Mon Sep 17 00:00:00 2001 From: oat Date: Tue, 30 Jan 2024 10:22:14 +0700 Subject: [PATCH 1/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=20note=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B9=84=E0=B8=A1?= =?UTF-8?q?=E0=B9=88=E0=B9=84=E0=B8=9B,=E0=B9=81=E0=B8=AA=E0=B8=94?= =?UTF-8?q?=E0=B8=87=E0=B8=9C=E0=B8=A5=E0=B8=84=E0=B8=AD=E0=B8=A5=E0=B8=B1?= =?UTF-8?q?=E0=B8=A1=E0=B8=99=E0=B9=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../01_metadataNew/components/insignia/InsigniaList.vue | 9 ++------- .../interface/response/insignia/Insignia.ts | 1 + src/modules/01_metadataNew/stores/InsigniaStore.ts | 6 ++++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/modules/01_metadataNew/components/insignia/InsigniaList.vue b/src/modules/01_metadataNew/components/insignia/InsigniaList.vue index a77a1fe19..227ac7657 100644 --- a/src/modules/01_metadataNew/components/insignia/InsigniaList.vue +++ b/src/modules/01_metadataNew/components/insignia/InsigniaList.vue @@ -181,7 +181,6 @@ async function fetchData(id: string) { } onMounted(async () => { fetchData(id.value); - console.log(id.value); }); async function onSubmit() { @@ -207,7 +206,7 @@ async function addData() { name: name.value, isActive: isActive.value, shortName: shortName.value, - note: note.value == "" ? "-" : "", + note: note.value == "" ? "-" : note.value, insigniaTypeId: id.value, }); fetchData(id.value); @@ -218,7 +217,7 @@ async function editData(idData: string) { name: name.value, isActive: isActive.value, shortName: shortName.value, - note: note.value == "" ? "-" : "", + note: note.value == "" ? "-" : note.value, insigniaTypeId: id.value, }); fetchData(id.value); @@ -232,10 +231,6 @@ async function deleteData(idData: string) { import { defineEmits } from "vue"; const emit = defineEmits(["nameType"]); - -const nameType = () => { - emit("nameType", insigniaTypeId.value); -}; diff --git a/src/modules/11_discipline/components/1_Complaint/EditPage.vue b/src/modules/11_discipline/components/1_Complaint/EditPage.vue index 67691ce19..d6de14f06 100644 --- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue +++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue @@ -406,7 +406,7 @@ onMounted(() => { -
+ { diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue index a0a9636ce..2c5e84200 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue @@ -405,7 +405,7 @@ watch( - + { diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue index 6ddd4ec56..251fe61fd 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue @@ -459,7 +459,7 @@ onMounted(async () => { - + { - -
- +
+ +
-
- รายชื่อกรรมการเพื่อพิจารณาความผิดทางวินัย +
+ วันที่สอบสวน + +
+ +
- เพิ่มกรรมการ + ปฏิทิน
-
-
- - -
-
- -
-
-
-
- -
- -
- -
- - -
-
- -
-
- -
-
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- ผลการพิจารณาความผิดทางวินัย -
- -
- -
-
- - -
-
- - -
- +
+
+
- +
+
+ + + +
+ +
+ + + + + +
+ +
+ + + + + +
+
+
+ + +
+ + + + {{ e.name }} ({{ e.daysExtend }} วัน) +

+ {{ date2Thai(e.dateStart) }} - + {{ date2Thai(e.dateEnd) }} +

+ + +
- +
+ +
+ +
+ +
+ รายชื่อกรรมการเพื่อพิจารณาความผิดทางวินัย + + เพิ่มกรรมการ + +
+
+
+ + +
+
+ +
+
+
+ +
+ +
+ +
+ +
+ + +
+
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ ผลการพิจารณาความผิดทางวินัย +
+ +
+ +
+
+ + +
+
+ + +
+ +
+ +
+
+ +
- -
- - บับทึกข้อมูล -
- +
+
- -
- -
- - + +
+ + - - + + - + - -
+ +
+
+
+ + บับทึกข้อมูล +
+ +
-
+
{ /> -->
- + - + { + diff --git a/src/modules/11_discipline/components/UploadFile.vue b/src/modules/11_discipline/components/UploadFile.vue index 2f9206894..70a5b0755 100644 --- a/src/modules/11_discipline/components/UploadFile.vue +++ b/src/modules/11_discipline/components/UploadFile.vue @@ -127,16 +127,16 @@ function downloadFile(link: string) { + - -
- อัปโหลดไฟล์ -
@@ -212,9 +211,9 @@ function downloadFile(link: string) { -
- ไม่มีรายการเอกสาร +
+ ไม่มีรายการเอกสาร
- +
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index ce5834086..8357baf27 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -164,19 +164,17 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
Date: Tue, 30 Jan 2024 12:06:06 +0700 Subject: [PATCH 4/5] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20ui=20sort=20=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B9=81?= =?UTF-8?q?=E0=B8=9A=E0=B8=9A=20drag=20&=20drop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env.d.ts | 1 + package.json | 1 + src/main.ts | 6 +- .../components/insignia/InsigniaDetail.vue | 1 + .../components/insignia/InsigniaList.vue | 12 ++ .../components/insignia/TableDraggable.vue | 152 ++++++++++++++++++ .../01_metadataNew/stores/InsigniaStore.ts | 2 +- tsconfig.json | 2 + 8 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 src/modules/01_metadataNew/components/insignia/TableDraggable.vue diff --git a/env.d.ts b/env.d.ts index 11f02fe2a..33cd2182c 100644 --- a/env.d.ts +++ b/env.d.ts @@ -1 +1,2 @@ /// +declare module 'quasar-ui-q-draggable-table'; \ No newline at end of file diff --git a/package.json b/package.json index 403f6f025..cc3443f41 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "node-sass": "^9.0.0", "npm-run-all": "^4.1.5", "prettier": "^2.7.1", + "quasar-ui-q-draggable-table": "^1.0.1", "sass": "^1.69.4", "start-server-and-test": "^1.15.2", "typescript": "~4.7.4", diff --git a/src/main.ts b/src/main.ts index 2926f9112..79578a04c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -2,7 +2,10 @@ import { createApp, defineAsyncComponent } from "vue"; import App from "./App.vue"; import router from "./router"; import { Dialog, Notify, Quasar, Loading } from "quasar"; -import quasarUserOptions from "./quasar-user-options"; +import "./quasar-user-options"; + +import qDraggableTable from 'quasar-ui-q-draggable-table'; +import 'quasar-ui-q-draggable-table/dist/index.css'; import "quasar/src/css/index.sass"; import th from "quasar/lang/th"; @@ -29,6 +32,7 @@ app.config.globalProperties.$filters = filters; app.use(router); app.use(pinia); +app.use(qDraggableTable); app.use( Quasar, diff --git a/src/modules/01_metadataNew/components/insignia/InsigniaDetail.vue b/src/modules/01_metadataNew/components/insignia/InsigniaDetail.vue index db71f6c5e..7a82b6fab 100644 --- a/src/modules/01_metadataNew/components/insignia/InsigniaDetail.vue +++ b/src/modules/01_metadataNew/components/insignia/InsigniaDetail.vue @@ -43,6 +43,7 @@ onMounted(async () => { fetchData(id.value); }); +