From 70fb166d8911a56aa1da46f285e997140efa013e Mon Sep 17 00:00:00 2001 From: Thanit Konmek Date: Fri, 23 Jun 2023 12:10:59 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableView.vue | 6 + .../views/01_compete/DetailEx.vue | 650 ++++++++---------- .../OrderReplace/MainOrderReplace.vue | 2 +- .../OrderReplace/detailOrderReplace.vue | 95 +++ .../components/OrderReplace/step/step01.vue | 492 +++++++++++++ .../components/OrderReplace/step/step02.vue | 227 ++++++ .../components/OrderReplace/step/step03.vue | 40 ++ .../components/OrderReplace/step/step04.vue | 40 ++ .../components/pass/TableView.vue | 155 ++++- src/modules/05_placement/router.ts | 16 +- 10 files changed, 1338 insertions(+), 385 deletions(-) create mode 100644 src/modules/05_placement/components/OrderReplace/detailOrderReplace.vue create mode 100644 src/modules/05_placement/components/OrderReplace/step/step01.vue create mode 100644 src/modules/05_placement/components/OrderReplace/step/step02.vue create mode 100644 src/modules/05_placement/components/OrderReplace/step/step03.vue create mode 100644 src/modules/05_placement/components/OrderReplace/step/step04.vue diff --git a/src/components/TableView.vue b/src/components/TableView.vue index 1c1c98c9a..d8d0b5a5e 100644 --- a/src/components/TableView.vue +++ b/src/components/TableView.vue @@ -160,6 +160,7 @@ style="min-width: 150px" class="gt-xs q-ml-sm" /> --> + +
@@ -384,6 +386,10 @@ const props = defineProps({ type: Boolean, defualt: false, }, + refreshData: { + type: Boolean, + defualt: false, + }, nextPageVisible: { type: Boolean, defualt: false, diff --git a/src/modules/03_recruiting/views/01_compete/DetailEx.vue b/src/modules/03_recruiting/views/01_compete/DetailEx.vue index 45db235f0..06fb879e3 100644 --- a/src/modules/03_recruiting/views/01_compete/DetailEx.vue +++ b/src/modules/03_recruiting/views/01_compete/DetailEx.vue @@ -1,304 +1,237 @@ diff --git a/src/modules/05_placement/components/OrderReplace/MainOrderReplace.vue b/src/modules/05_placement/components/OrderReplace/MainOrderReplace.vue index 59c72013b..6b78f89d5 100644 --- a/src/modules/05_placement/components/OrderReplace/MainOrderReplace.vue +++ b/src/modules/05_placement/components/OrderReplace/MainOrderReplace.vue @@ -408,7 +408,7 @@ onMounted(async () => { // ดูรายการสอบแข่งขัน หน้าต่อไป const redirectToPage = (id?: number) => { // router.push({ name: 'placementDetail'}); - router.push(`/orderPlacement/detail`); + router.push(`/placement/order/detail`); }; const clickDelete = (id: string) => { diff --git a/src/modules/05_placement/components/OrderReplace/detailOrderReplace.vue b/src/modules/05_placement/components/OrderReplace/detailOrderReplace.vue new file mode 100644 index 000000000..8f0329ea0 --- /dev/null +++ b/src/modules/05_placement/components/OrderReplace/detailOrderReplace.vue @@ -0,0 +1,95 @@ + + + diff --git a/src/modules/05_placement/components/OrderReplace/step/step01.vue b/src/modules/05_placement/components/OrderReplace/step/step01.vue new file mode 100644 index 000000000..26be5f055 --- /dev/null +++ b/src/modules/05_placement/components/OrderReplace/step/step01.vue @@ -0,0 +1,492 @@ + + + diff --git a/src/modules/05_placement/components/OrderReplace/step/step02.vue b/src/modules/05_placement/components/OrderReplace/step/step02.vue new file mode 100644 index 000000000..f73c32f3a --- /dev/null +++ b/src/modules/05_placement/components/OrderReplace/step/step02.vue @@ -0,0 +1,227 @@ + + diff --git a/src/modules/05_placement/components/OrderReplace/step/step03.vue b/src/modules/05_placement/components/OrderReplace/step/step03.vue new file mode 100644 index 000000000..db43bbf6f --- /dev/null +++ b/src/modules/05_placement/components/OrderReplace/step/step03.vue @@ -0,0 +1,40 @@ + + diff --git a/src/modules/05_placement/components/OrderReplace/step/step04.vue b/src/modules/05_placement/components/OrderReplace/step/step04.vue new file mode 100644 index 000000000..424d60e40 --- /dev/null +++ b/src/modules/05_placement/components/OrderReplace/step/step04.vue @@ -0,0 +1,40 @@ + + diff --git a/src/modules/05_placement/components/pass/TableView.vue b/src/modules/05_placement/components/pass/TableView.vue index 695d46c98..79e3c0d1a 100644 --- a/src/modules/05_placement/components/pass/TableView.vue +++ b/src/modules/05_placement/components/pass/TableView.vue @@ -1,61 +1,160 @@