From 772ee9cd0e9e37e811e6693e5f66b0a84e4b22c1 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Thu, 29 Jun 2023 14:04:50 +0700
Subject: [PATCH 1/6] add delete button

---
 .../components/OrderPlacement/step/step03.vue | 123 +++++++++++-------
 1 file changed, 74 insertions(+), 49 deletions(-)

diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
index 802561d14..dd876b604 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
@@ -69,46 +69,70 @@
         :pagination-label="paginationLabel"
         v-model:pagination="pagination"
       >
-        <template v-slot:body-cell="props">
-          <q-td :props="props">
-            <div v-if="props.col.name == 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-            <div v-else-if="props.col.name == 'notification'">
-              <q-select
-                :class="getClass(true)"
-                hide-bottom-space
-                multiple
-                :outlined="true"
+        <template v-slot:header="props">
+          <q-tr :props="props">
+            <q-th v-for="col in props.cols" :key="col.name" :props="props">
+              <span class="text-weight-medium">{{ col.label }}</span>
+            </q-th>
+            <q-th auto-width />
+          </q-tr>
+        </template>
+        <template v-slot:body="props">
+          <q-tr :props="props" class="cursor-pointer">
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <div v-if="col.name == 'no'">
+                {{ props.rowIndex + 1 }}
+              </div>
+              <div v-else-if="col.name == 'notification'">
+                <q-select
+                  :class="getClass(true)"
+                  hide-bottom-space
+                  multiple
+                  :outlined="true"
+                  dense
+                  use-chips
+                  lazy-rules
+                  :readonly="!true"
+                  :borderless="!true"
+                  v-model="col.value"
+                  :rules="[(val:any) => !!val || `${'กรุณาเลือกช่องทาง'}`,(val:any) => val.length > 0 || `${'กรุณาเลือกช่องทาง'}`]"
+                  :label="`${'เลือกช่องทาง'}`"
+                  emit-value
+                  map-options
+                  option-label="name"
+                  :options="notificationOption"
+                  option-value="id"
+                  input-debounce="0"
+                  color="primary"
+                >
+                  <template v-slot:no-option>
+                    <q-item>
+                      <q-item-section class="text-black">
+                        ไม่พบข้อมูลที่ค้นหา
+                      </q-item-section>
+                    </q-item>
+                  </template>
+                </q-select>
+              </div>
+
+              <div v-else @click="click(props)">
+                {{ col.value }}
+              </div>
+            </q-td>
+            <q-td>
+              <q-btn
                 dense
-                use-chips
-                lazy-rules
-                :readonly="!true"
-                :borderless="!true"
-                v-model="props.value"
-                :rules="[(val:any) => !!val || `${'กรุณาเลือกช่องทาง'}`,(val:any) => val.length > 0 || `${'กรุณาเลือกช่องทาง'}`]"
-                :label="`${'เลือกช่องทาง'}`"
-                emit-value
-                map-options
-                option-label="name"
-                :options="notificationOption"
-                option-value="id"
-                input-debounce="0"
-                color="primary"
+                size="12px"
+                flat
+                round
+                color="red"
+                @click="clickDelete(props.row.id)"
+                icon="mdi-delete"
               >
-                <template v-slot:no-option>
-                  <q-item>
-                    <q-item-section class="text-black">
-                      ไม่พบข้อมูลที่ค้นหา
-                    </q-item-section>
-                  </q-item>
-                </template>
-              </q-select>
-            </div>
-            <div v-else @click="click(props)">
-              {{ props.value }}
-            </div>
-          </q-td>
+                <q-tooltip>ลบข้อมูล</q-tooltip>
+              </q-btn>
+            </q-td>
+          </q-tr>
         </template>
         <template v-slot:pagination="scope">
           <q-pagination
@@ -126,14 +150,15 @@
     </div>
     <q-separator />
     <div class="flex justify-end q-pa-sm q-gutter-sm">
-      <q-btn 
-        dense 
-        outline 
-        color="primary" 
-        icon="chevron_left" 
-        @click="previous" 
+      <q-btn
+        dense
+        outline
+        color="primary"
+        icon="chevron_left"
+        @click="previous"
         class="q-pr-md"
-        label="เลือกรายชื่อ">
+        label="เลือกรายชื่อ"
+      >
       </q-btn>
       <q-btn
         dense
@@ -142,12 +167,12 @@
         color="public"
         @click="next"
         class="q-px-md"
-      ><!-- icon="mdi-content-save-outline"
-        <q-tooltip>บันทึก</q-tooltip> -->
+        ><!-- icon="mdi-content-save-outline"
+          <q-tooltip>บันทึก</q-tooltip> -->
       </q-btn>
       <!-- <q-btn flat round color="primary" icon="chevron_right" @click="next">
-        <q-tooltip>ต่อไป</q-tooltip>
-      </q-btn> -->
+          <q-tooltip>ต่อไป</q-tooltip>
+        </q-btn> -->
     </div>
   </div>
 </template>

From 0f867b94db3617390048014935536db3732111de Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Fri, 30 Jun 2023 10:07:14 +0700
Subject: [PATCH 2/6] Revert "add delete button"

This reverts commit 772ee9cd0e9e37e811e6693e5f66b0a84e4b22c1.
---
 .../components/OrderPlacement/step/step03.vue | 123 +++++++-----------
 1 file changed, 49 insertions(+), 74 deletions(-)

diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
index dd876b604..802561d14 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
@@ -69,70 +69,46 @@
         :pagination-label="paginationLabel"
         v-model:pagination="pagination"
       >
-        <template v-slot:header="props">
-          <q-tr :props="props">
-            <q-th v-for="col in props.cols" :key="col.name" :props="props">
-              <span class="text-weight-medium">{{ col.label }}</span>
-            </q-th>
-            <q-th auto-width />
-          </q-tr>
-        </template>
-        <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
-            <q-td v-for="col in props.cols" :key="col.name" :props="props">
-              <div v-if="col.name == 'no'">
-                {{ props.rowIndex + 1 }}
-              </div>
-              <div v-else-if="col.name == 'notification'">
-                <q-select
-                  :class="getClass(true)"
-                  hide-bottom-space
-                  multiple
-                  :outlined="true"
-                  dense
-                  use-chips
-                  lazy-rules
-                  :readonly="!true"
-                  :borderless="!true"
-                  v-model="col.value"
-                  :rules="[(val:any) => !!val || `${'กรุณาเลือกช่องทาง'}`,(val:any) => val.length > 0 || `${'กรุณาเลือกช่องทาง'}`]"
-                  :label="`${'เลือกช่องทาง'}`"
-                  emit-value
-                  map-options
-                  option-label="name"
-                  :options="notificationOption"
-                  option-value="id"
-                  input-debounce="0"
-                  color="primary"
-                >
-                  <template v-slot:no-option>
-                    <q-item>
-                      <q-item-section class="text-black">
-                        ไม่พบข้อมูลที่ค้นหา
-                      </q-item-section>
-                    </q-item>
-                  </template>
-                </q-select>
-              </div>
-
-              <div v-else @click="click(props)">
-                {{ col.value }}
-              </div>
-            </q-td>
-            <q-td>
-              <q-btn
+        <template v-slot:body-cell="props">
+          <q-td :props="props">
+            <div v-if="props.col.name == 'no'">
+              {{ props.rowIndex + 1 }}
+            </div>
+            <div v-else-if="props.col.name == 'notification'">
+              <q-select
+                :class="getClass(true)"
+                hide-bottom-space
+                multiple
+                :outlined="true"
                 dense
-                size="12px"
-                flat
-                round
-                color="red"
-                @click="clickDelete(props.row.id)"
-                icon="mdi-delete"
+                use-chips
+                lazy-rules
+                :readonly="!true"
+                :borderless="!true"
+                v-model="props.value"
+                :rules="[(val:any) => !!val || `${'กรุณาเลือกช่องทาง'}`,(val:any) => val.length > 0 || `${'กรุณาเลือกช่องทาง'}`]"
+                :label="`${'เลือกช่องทาง'}`"
+                emit-value
+                map-options
+                option-label="name"
+                :options="notificationOption"
+                option-value="id"
+                input-debounce="0"
+                color="primary"
               >
-                <q-tooltip>ลบข้อมูล</q-tooltip>
-              </q-btn>
-            </q-td>
-          </q-tr>
+                <template v-slot:no-option>
+                  <q-item>
+                    <q-item-section class="text-black">
+                      ไม่พบข้อมูลที่ค้นหา
+                    </q-item-section>
+                  </q-item>
+                </template>
+              </q-select>
+            </div>
+            <div v-else @click="click(props)">
+              {{ props.value }}
+            </div>
+          </q-td>
         </template>
         <template v-slot:pagination="scope">
           <q-pagination
@@ -150,15 +126,14 @@
     </div>
     <q-separator />
     <div class="flex justify-end q-pa-sm q-gutter-sm">
-      <q-btn
-        dense
-        outline
-        color="primary"
-        icon="chevron_left"
-        @click="previous"
+      <q-btn 
+        dense 
+        outline 
+        color="primary" 
+        icon="chevron_left" 
+        @click="previous" 
         class="q-pr-md"
-        label="เลือกรายชื่อ"
-      >
+        label="เลือกรายชื่อ">
       </q-btn>
       <q-btn
         dense
@@ -167,12 +142,12 @@
         color="public"
         @click="next"
         class="q-px-md"
-        ><!-- icon="mdi-content-save-outline"
-          <q-tooltip>บันทึก</q-tooltip> -->
+      ><!-- icon="mdi-content-save-outline"
+        <q-tooltip>บันทึก</q-tooltip> -->
       </q-btn>
       <!-- <q-btn flat round color="primary" icon="chevron_right" @click="next">
-          <q-tooltip>ต่อไป</q-tooltip>
-        </q-btn> -->
+        <q-tooltip>ต่อไป</q-tooltip>
+      </q-btn> -->
     </div>
   </div>
 </template>

From b3aebde52dd1accc8aecf28a98785d25d6718e01 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 30 Jun 2023 14:14:44 +0700
Subject: [PATCH 3/6] =?UTF-8?q?table=20popup=20=E0=B9=84=E0=B8=A1=E0=B9=88?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=A1=E0=B8=9A=E0=B8=B9=E0=B8=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_placement/components/pass/Table.vue    | 176 ++++++------------
 .../components/pass/TableDetail.vue           |  93 ++++++---
 2 files changed, 119 insertions(+), 150 deletions(-)

diff --git a/src/modules/05_placement/components/pass/Table.vue b/src/modules/05_placement/components/pass/Table.vue
index a95d7b0b9..cc7a50eb6 100644
--- a/src/modules/05_placement/components/pass/Table.vue
+++ b/src/modules/05_placement/components/pass/Table.vue
@@ -9,6 +9,7 @@ import DialogCard from "@/modules/05_placement/components/pass/TableDetail.vue";
 import DialogFooter from "@/modules/05_placement/components/pass/DialogFooter.vue";
 import DialogHeader from "@/modules/05_placement/components/pass/DialogHeader.vue";
 import type { TableName } from "@/modules/05_placement/interface/request/placement";
+import type  Deferment  from "@/modules/05_placement/components/pass/Deferment.vue";
 import type {
   treeTab,
   DataOption,
@@ -1582,79 +1583,6 @@ const listKeyId = (data: any) => {
                         hide-bottom-space
                       />
                     </div>
-                    <!-- <div class="col-xs-12 col-sm-12 col-md-12">
-                      <q-input
-                        :class="getClass(edit)"
-                        :outlined="edit"
-                        dense
-                        lazy-rules
-                        :readonly="!edit"
-                        :borderless="!edit"
-                        v-model="salaryClass"
-                        :rules="[
-                            (val: string) =>
-                              !!val || `${'กรุณากรอกตำแหน่ง (รายละเอียด)'}`,
-                          ]"
-                        :label="`${'ตำแหน่ง (รายละเอียด)'}`"
-                        @update:modelValue="clickEditRow"
-                        hide-bottom-space
-                        autogrow
-                      >
-                        <template v-slot:append>
-                          <q-btn
-                            color="info"
-                            flat
-                            dense
-                            round
-                            size="14px"
-                            icon="mdi-plus"
-                            @click="templateDetail"
-                            :disable="!edit"
-                          />
-                        </template>
-                      </q-input>
-                    </div>
-
-                    <div class="row col-xs-12 col-sm-12 col-md-12">
-                      <selector
-                        :class="getClass(edit)"
-                        :outlined="edit"
-                        dense
-                        lazy-rules
-                        :readonly="!edit"
-                        :borderless="!edit"
-                        v-model="refSelected"
-                        :label="`${'ต้นแบบเอกสารอ้างอิง'}`"
-                        @update:modelValue="clickEditRowRef"
-                        option-label="name"
-                        :options="refOptions"
-                        option-value="id"
-                        hide-bottom-space
-                        use-input
-                        input-debounce="0"
-                        @filter="(inputValue: any,
-                            doneFn: Function) => filterSelector(inputValue, doneFn, '8'
-                            )"
-                      />
-                    </div>
-                    <div class="col-xs-12 col-sm-12 col-md-12">
-                      <q-input
-                        :class="getClass(edit)"
-                        :outlined="edit"
-                        dense
-                        lazy-rules
-                        :readonly="!edit"
-                        :borderless="!edit"
-                        v-model="salaryRef"
-                        :rules="[
-                            (val: string) => !!val || `${'กรุณากรอกเอกสารอ้างอิง'}`,
-                          ]"
-                        :label="`${'เอกสารอ้างอิง'}`"
-                        @update:modelValue="clickEditRow"
-                        type="textarea"
-                        hide-bottom-space
-                      />
-                    </div> -->
                   </div>
                 </q-scroll-area>
               </q-card>
@@ -1681,56 +1609,58 @@ const listKeyId = (data: any) => {
     />
   </q-form>
   <q-dialog v-model="modal_right" persistent>
-    <q-card style="width: 800px">
-      <q-form ref="myForm">
-        <DialogHeader
-          :title="`${modalEdit ? 'ขอผ่อนผัน' : 'สละสิทธิ์'} ชื่อ${Name}`"
-          :close="clickClose"
-        />
-        <q-separator />
-        <q-card-section class="q-p-sm">
-          <div class="col-xs-12 col-sm-12 col-md-12">
-            <q-input
-              :class="getClass(edit)"
-              hide-bottom-space
-              :outlined="edit"
-              dense
-              lazy-rules
-              :rules="[(val) => !!val || `${'กรุณากรอกเหตุผล'}`]"
-              :readonly="!edit"
-              :borderless="!edit"
-              v-model="positionMasterUserNote"
-              :label="`${'กรอกเหตุผล'}`"
-              @update:modelValue="clickEditRow"
-              type="textarea"
-            />
-            <q-file
-              v-if="getNumFile === 1"
-              v-model="files"
-              dense
-              :label="`${'เลือกไฟล์เอกสารหลักฐาน'}`"
-              outlined
-              use-chips
-              :rules="[(val) => !!val || `${'กรุณาเลือกไฟล์เอกสารหลักฐาน'}`]"
-              multiple
-              @update:modelValue="clickEditRow"
-              class="q-py-sm"
-            >
-              <template v-slot:prepend>
-                <q-icon name="attach_file" color="primary" />
-              </template>
-            </q-file>
-          </div>
-        </q-card-section>
-        <q-separator />
-        <DialogFooter
-          v-model:editvisible="edit"
-          v-model:modalEdit="modalEdit"
-          :validate="validateData"
-          :save="modalEdit ? savePostpone : saveDisclaim"
-        />
-      </q-form>
-    </q-card>
+  <q-card style="width: 800px">
+
+    <q-form ref="myForm">
+      <DialogHeader
+        :title="`${modalEdit ? 'ขอผ่อนผัน' : 'สละสิทธิ์'} ชื่อ${Name}`"
+        :close="clickClose"
+      />
+      <q-separator />
+      <q-card-section class="q-p-sm">
+        <div class="col-xs-12 col-sm-12 col-md-12">
+          <q-input
+            :class="getClass(edit)"
+            hide-bottom-space
+            :outlined="edit"
+            dense
+            lazy-rules
+            :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
+            :readonly="!edit"
+            :borderless="!edit"
+            v-model="positionMasterUserNote"
+            :label="`${'กรอกเหตุผล'}`"
+            @update:model-value="clickEditRow"
+            
+            type="textarea"
+          />
+          <q-file
+            v-if="getNumFile === 1"
+            v-model="files"
+            dense
+            :label="`${'เลือกไฟล์เอกสารหลักฐาน'}`"
+            outlined
+            use-chips
+            :rules="[(val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']"
+            multiple
+            @update:model-value="clickEditRow"
+            class="q-py-sm"
+          >
+            <template v-slot:prepend>
+              <q-icon name="attach_file" color="primary" />
+            </template>
+          </q-file>
+        </div>
+      </q-card-section>
+      <q-separator />
+      <DialogFooter
+        v-model:editvisible="edit"
+        v-model:modalEdit="modalEdit"
+        :validate="validateData"
+        :save="modalEdit ? savePostpone : saveDisclaim"
+      />
+    </q-form>
+  </q-card>
   </q-dialog>
 
   <!-- dialog ขอผ่อนผัน / สละสิทธิ์ -->
diff --git a/src/modules/05_placement/components/pass/TableDetail.vue b/src/modules/05_placement/components/pass/TableDetail.vue
index ef8e26281..b031d2121 100644
--- a/src/modules/05_placement/components/pass/TableDetail.vue
+++ b/src/modules/05_placement/components/pass/TableDetail.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
-import { ref, computed } from "vue";
+import { ref } from "vue";
 import DialogHeader from "@/modules/05_placement/components/pass/DialogHeader.vue";
 import { useQuasar } from "quasar";
 import DialogFooter from "@/modules/05_placement/components/pass/DialogFooter.vue";
+import type { QTableProps } from "quasar";
 import type { CheckboxItem } from "@/modules/05_placement/interface/index/Main";
 import { useCounterMixin } from "@/stores/mixin";
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
@@ -24,9 +25,61 @@ const props = defineProps({
     default: () => console.log("not function"),
   },
 });
+const rows = ref<any[]>([
+  {
+    university: props.getdetail.university || "-",
+    degree: props.getdetail.degree || "-",
+    major: props.getdetail.major || "-",
+    graduation: "2022-01-01",
+  },
+
+]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "university",
+    align: "center",
+    label: "สถานศึกษา",
+    sortable: true,
+    field: "university",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "degree",
+    align: "center",
+    label: "วุฒิการศึกษา",
+    sortable: true,
+    field: "degree",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "major",
+    align: "center",
+    label: "สาขาวิชาเอก",
+    sortable: true,
+    field: "major",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "graduation",
+    align: "center",
+    label: "วันที่สำเร็จการศึกษา",
+    sortable: true,
+    field: "graduation",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+]);
 const myForm = ref<any>();
 const checkValidate = ref<boolean>(false);
 const selection = ref<number[]>([]);
+
 const checkboxItems: CheckboxItem[] = [
   { id: 1, label: "ไม่เป็นผู้ดำรงตำแหน่งทางการเมือง" },
   {
@@ -168,32 +221,18 @@ const close = async () => {
           <div class="contanier-box-mini">
             <q-card bordered class="card-panding">
               <div class="row items-center q-pa-xs header-text">การศึกษา</div>
-              <div class="row q-pa-xs">
-                <div class="col-3 header-sub-text">
-                  <div class="q-pb-md">สถานศึกษา</div>
-                  <div>สาขาวิชาเอก</div>
-                </div>
-                <div class="col-4 sub-text">
-                  <div class="q-pb-md">
-                    {{ props.getdetail.university }}
-                  </div>
-                  <div>
-                    {{ props.getdetail.major }}
-                  </div>
-                </div>
-                <div class="col-2 header-sub-text">
-                  <div class="q-pb-md">วุฒิการศึกษา</div>
-                  <div>อื่นๆ</div>
-                </div>
-                <div class="col-3 sub-text">
-                  <div class="q-pb-md">
-                    {{ props.getdetail.degree ? props.getdetail.degree : "-" }}
-                  </div>
-                  <div>
-                    {{ props.getdetail.remark ? props.getdetail.remark : "-" }}
-                  </div>
-                </div>
-              </div>
+              <q-table
+                ref="table"
+                :rows="rows"
+                :columns="columns"
+                flat
+                bordered
+                class="custom-header-table"
+                virtual-scroll
+                :virtual-scroll-sticky-size-start="48"
+                dense
+              >
+              </q-table>
             </q-card>
           </div>
           <div class="contanier-box-mini">

From 21a3e6f20668c32943546d4aa4d0a3aa94e5c6f7 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Fri, 30 Jun 2023 16:03:27 +0700
Subject: [PATCH 4/6] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=20data=20=E0=B9=83=E0=B8=99=20store=20=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=20Ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OrderPlacement/MainOrderPlacement.vue     | 153 ++++++++++--------
 .../components/OrderPlacement/step/step03.vue |   2 +-
 src/modules/05_placement/store.ts             |  61 +++++++
 3 files changed, 144 insertions(+), 72 deletions(-)

diff --git a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
index 984579088..db0d953df 100644
--- a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
+++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
@@ -27,20 +27,20 @@
               <q-tooltip>เพิ่มข้อมูล</q-tooltip>
               <q-menu>
                 <q-list style="min-width: 100px">
+                  <q-item clickable @click="clickAdd">
+                    <q-item-section>ลายเซ็นชื่อ (ออฟไลน์)</q-item-section>
+                  </q-item>
                   <q-item clickable v-close-popup disable>
                     <q-item-section
                       >ลายเซ็นอิเล็กทรอนิกส์ (ออนไลน์)</q-item-section
                     >
                   </q-item>
-                  <q-item clickable @click="clickAdd">
-                    <q-item-section>ลายเซ็นชื่อ (ออฟไลน์)</q-item-section>
-                  </q-item>
                 </q-list>
               </q-menu>
             </q-btn>
           </div>
-          <q-space/>
-        
+          <q-space />
+
           <q-input
             class="col-xs-12 col-sm-3 col-md-2"
             standout
@@ -61,7 +61,7 @@
               />
             </template>
           </q-input>
-        
+
           <q-select
             v-model="visibleColumns"
             multiple
@@ -118,7 +118,7 @@
                 @update:model-value="searchFilterTable"
               />
             </div>
-        </q-card>
+          </q-card>
         </div>
         <div class="col-12">
           <q-table
@@ -187,18 +187,7 @@
                   :props="props"
                   @click="redirectToPage(props.row.Order)"
                 >
-                  <q-icon
-                    v-if="props.row.OrderStatus == 'ยังไม่ได้ออกคำสั่ง'"
-                    name="mdi-timer-sand"
-                    color="orange"
-                    size="20px"
-                  />
-                  <q-icon
-                    v-if="props.row.OrderStatus == 'ออกคำสั่งแล้ว'"
-                    name="mdi-check"
-                    color="positive"
-                    size="20px"
-                  />
+                  {{ props.row.OrderStatus }}
                 </q-td>
 
                 <q-td auto-width>
@@ -241,12 +230,12 @@ import type { QTableProps } from "quasar";
 import type { FormOrderPlacementMainData } from "@/modules/05_placement/interface/request/Main";
 import type { DataOption } from "@/modules/05_placement/interface/index/Main";
 import { useCounterMixin } from "@/stores/mixin";
-import { usePlacementDataStore } from "@/modules/05_placement/store";
+import { useOrderPlacementDataStore } from "@/modules/05_placement/store";
 import router from "@/router";
 import { useQuasar } from "quasar";
 
 const $q = useQuasar(); //ใช้ noti quasar
-const DataStore = usePlacementDataStore();
+const DataStore = useOrderPlacementDataStore();
 const pagination = ref({
   sortBy: "desc",
   descending: false,
@@ -359,7 +348,7 @@ const rows = ref<FormOrderPlacementMainData[]>([
     OrderDate: "30 พ.ค. 2565",
     OrderBy: "สำนักงาน กทม.",
     Signer: "นาม สมคิด ยอดใจ ",
-    OrderStatus: "ยังไม่ได้ออกคำสั่ง",
+    OrderStatus: "จัดทำร่างคำสั่ง",
     OrderType: "คำสั่งย้าย",
   },
 
@@ -370,7 +359,7 @@ const rows = ref<FormOrderPlacementMainData[]>([
     OrderDate: "30 พ.ค. 2565",
     OrderBy: "สำนักงาน กทม.",
     Signer: "นาม สมคิด ยอดใจ ",
-    OrderStatus: "ยังไม่ได้ออกคำสั่ง",
+    OrderStatus: "จัดทำร่างคำสั่ง",
     OrderType: "คำสั่งบรรจุและแต่งตั้ง",
   },
   {
@@ -380,7 +369,7 @@ const rows = ref<FormOrderPlacementMainData[]>([
     OrderDate: "30 พ.ค. 2565",
     OrderBy: "สำนักงาน กทม.",
     Signer: "นาม สมคิด ยอดใจ ",
-    OrderStatus: "ยังไม่ได้ออกคำสั่ง",
+    OrderStatus: "บัญชีแนบท้าย",
     OrderType: "คำสั่งบรรจุและแต่งตั้ง",
   },
   {
@@ -390,7 +379,7 @@ const rows = ref<FormOrderPlacementMainData[]>([
     OrderDate: "30 พ.ค. 2565",
     OrderBy: "สำนักงาน กทม.",
     Signer: "นาม สมคิด ยอดใจ ",
-    OrderStatus: "ยังไม่ได้ออกคำสั่ง",
+    OrderStatus: "บัญชีแนบท้าย",
     OrderType: "คำสั่งบรรจุและแต่งตั้ง",
   },
   {
@@ -400,7 +389,27 @@ const rows = ref<FormOrderPlacementMainData[]>([
     OrderDate: "30 พ.ค. 2565",
     OrderBy: "สำนักงาน กทม.",
     Signer: "นาม สมคิด ยอดใจ ",
-    OrderStatus: "ยังไม่ได้ออกคำสั่ง",
+    OrderStatus: "ส่งสำเนาคำสั่ง",
+    OrderType: "คำสั่งบรรจุและแต่งตั้ง",
+  },
+  {
+    Order: "คำสั่งแต่งตั้งผู้สอบแข่งขันได้",
+    OrderNum: "1/2565",
+    fiscalYear: 2565,
+    OrderDate: "30 พ.ค. 2565",
+    OrderBy: "สำนักงาน กทม.",
+    Signer: "นาม สมคิด ยอดใจ ",
+    OrderStatus: "ส่งสำเนาคำสั่ง",
+    OrderType: "คำสั่งบรรจุและแต่งตั้ง",
+  },
+  {
+    Order: "คำสั่งแต่งตั้งผู้สอบแข่งขันได้",
+    OrderNum: "1/2565",
+    fiscalYear: 2565,
+    OrderDate: "30 พ.ค. 2565",
+    OrderBy: "สำนักงาน กทม.",
+    Signer: "นาม สมคิด ยอดใจ ",
+    OrderStatus: "รอลงนาม",
     OrderType: "คำสั่งบรรจุและแต่งตั้ง",
   },
   {
@@ -430,27 +439,7 @@ const rows = ref<FormOrderPlacementMainData[]>([
     OrderDate: "30 พ.ค. 2565",
     OrderBy: "สำนักงาน กทม.",
     Signer: "นาม สมคิด ยอดใจ ",
-    OrderStatus: "ยังไม่ได้ออกคำสั่ง",
-    OrderType: "คำสั่งบรรจุและแต่งตั้ง",
-  },
-  {
-    Order: "คำสั่งแต่งตั้งผู้สอบแข่งขันได้",
-    OrderNum: "1/2565",
-    fiscalYear: 2565,
-    OrderDate: "30 พ.ค. 2565",
-    OrderBy: "สำนักงาน กทม.",
-    Signer: "นาม สมคิด ยอดใจ ",
-    OrderStatus: "ยังไม่ได้ออกคำสั่ง",
-    OrderType: "คำสั่งบรรจุและแต่งตั้ง",
-  },
-  {
-    Order: "คำสั่งแต่งตั้งผู้สอบแข่งขันได้",
-    OrderNum: "1/2565",
-    fiscalYear: 2565,
-    OrderDate: "30 พ.ค. 2565",
-    OrderBy: "สำนักงาน กทม.",
-    Signer: "นาม สมคิด ยอดใจ ",
-    OrderStatus: "ยังไม่ได้ออกคำสั่ง",
+    OrderStatus: "ออกคำสั่งแล้ว",
     OrderType: "คำสั่งบรรจุและแต่งตั้ง",
   },
   {
@@ -482,7 +471,7 @@ const rows = ref<FormOrderPlacementMainData[]>([
     OrderDate: "30 พ.ค. 2566",
     OrderBy: "สำนักงาน กทม.",
     Signer: "นาม สมคิด ยอดใจ ",
-    OrderStatus: "ยังไม่ได้ออกคำสั่ง",
+    OrderStatus: "ออกคำสั่งแล้ว",
     OrderType: "คำสั่งแต่งตั้ง",
   },
 ]);
@@ -515,8 +504,8 @@ const OriginalDataFetch = async () => {
   //   })
   //   .finally(async () => {
   //   });
-  await DataStore.DataMain(rows.value);
-  OriginalData.value = await DataStore.DataMainOrig;
+  await DataStore.DataMainOrder(rows.value);
+  OriginalData.value = await DataStore.DataMainOrigOrder;
   UpdataData.value = OriginalData.value;
 };
 
@@ -582,6 +571,7 @@ const fiscalYearFilter = async () => {
   //   });
   for (let data of OriginalData.value) {
     const year = data.fiscalYear;
+    console.log(year);
 
     if (fiscalyear.value === null || year > fiscalyear.value) {
       fiscalyear.value = year;
@@ -594,9 +584,9 @@ const fiscalYearFilter = async () => {
   }
 };
 
-const OrderType = ref<number | null>(0);
+const OrderType = ref<string | null>(null);
 const OrderTypeOption = reactive<DataOption[]>([{ id: 0, name: "ทั้งหมด" }]);
-const addedOrderTypeValues: number[] = [];
+const addedOrderTypeValues: string[] = [];
 const OrderTypeFilter = async () => {
   // API
   // await http
@@ -611,22 +601,34 @@ const OrderTypeFilter = async () => {
   //   .finally(async () => {
   //   });
   for (let data of OriginalData.value) {
-    const OrderType = data.OrderType;
+    const OrderTypeValue = data.OrderType;
+    console.log(OrderTypeValue);
 
-    if (OrderType.value === null || OrderType > OrderType.value) {
-      OrderType.value = OrderType;
-    }
-
-    if (!addedOrderTypeValues.includes(OrderType)) {
-      OrderTypeOption.push({ id: OrderType, name: OrderType.toString() });
-      addedOrderTypeValues.push(OrderType);
+    // if (OrderTypeValue === null || OrderType > OrderTypeValue) {
+    //   OrderTypeValue = OrderType;
+    // }
+    if (!addedOrderTypeValues.includes(OrderTypeValue)) {
+      OrderTypeOption.push({
+        id: OrderTypeValue,
+        name: OrderTypeValue,
+      });
+      addedOrderTypeValues.push(OrderTypeValue);
     }
+    // if (!addedOrderTypeValues.includes(OrderTypeValue)) {
+    //   OrderTypeOption.push({
+    //     id: OrderTypeValue,
+    //     name: OrderTypeValue.toString(),
+    //   });
+    //   addedOrderTypeValues.push(OrderTypeValue);
+    // }
   }
 };
-
-const OrderStatus = ref<number | null>(0);
+const OrderStatus = ref<string | null>(null);
+const OrderStatusText = ref<FormOrderPlacementMainData[]>(
+  DataStore.DataMainOrigOrder
+);
 const OrderStatusOption = reactive<DataOption[]>([{ id: 0, name: "ทั้งหมด" }]);
-const addedOrderStatusValues: number[] = [];
+const addedOrderStatusValues: string[] = [];
 const OrderStatusFilter = async () => {
   // API
   // await http
@@ -641,15 +643,22 @@ const OrderStatusFilter = async () => {
   //   .finally(async () => {
   //   });
   for (let data of OriginalData.value) {
-    const OrderStatus = data.OrderStatus;
+    const OrderStatusValue = data.OrderStatus;
+    console.log(OrderStatusValue);
 
-    if (OrderStatus.value === null || OrderStatus > OrderStatus.value) {
-      OrderStatus.value = OrderStatus;
-    }
+    // if (
+    //   OrderStatusValue === null ||
+    //   parseInt(OrderStatusValue) > parseInt(OrderStatusValue)
+    // ) {
+    //   OrderStatusText.value = OrderStatusValue;
+    // }
 
-    if (!addedOrderStatusValues.includes(OrderStatus)) {
-      OrderStatusOption.push({ id: OrderStatus, name: OrderStatus.toString() });
-      addedOrderStatusValues.push(OrderStatus);
+    if (!addedOrderStatusValues.includes(OrderStatusValue)) {
+      OrderStatusOption.push({
+        id: OrderStatusValue,
+        name: OrderStatusValue,
+      });
+      addedOrderStatusValues.push(OrderStatusValue);
     }
   }
 };
@@ -688,7 +697,9 @@ const visibleColumns = ref<string[]>([
 ]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 
 const searchFilterTable = async () => {
-  await DataStore.DataUpdateMain(OrderStatus.value, OrderType.value);
+  // console.log('Input value changed:', examTime.value, examType.value, expiredAccount.value);
+  await DataStore.DataUpdateMainOrder(OrderType.value, OrderStatus.value);
+  UpdataData.value = DataStore.DataMainUpdateOrder;
 };
 //   UpdataData.value = DataStore.DataMainUpdate;
 // console.log("Input value changed:", OrderStatus.value, OrderType.value);
diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
index 707ac202f..351061668 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
@@ -470,7 +470,7 @@ const pagination = ref({
 
 const optionSelect = ref<any>([
   { id: 1, name: "อีเมล" },
-  { id: 2, name: "แจ้งเตือน" },
+  { id: 2, name: "กล่องข้อความ" },
 ]);
 
 const visibleColumns = ref<String[]>([
diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index bc7b251b8..ec5548899 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -190,3 +190,64 @@ export const usePlacementDataStore = defineStore("placement", () => {
     DataUpdateMain,
   };
 });
+
+export const useOrderPlacementDataStore = defineStore("placement", () => {
+  interface placement {
+    mappingPosition: { columns: String[] };
+  }
+  const placementData = ref<placement>({
+    mappingPosition: { columns: [] },
+  });
+  const changePlacementColumns = (system: String, val: String[]) => {
+    if (system == "mappingPosition")
+      placementData.value.mappingPosition.columns = val;
+    localStorage.setItem("placement", JSON.stringify(placementData.value));
+  };
+
+  if (localStorage.getItem("placement") !== null) {
+    placementData.value = JSON.parse(localStorage.getItem("placement") || "{}");
+  }
+
+  const DataMainYearOrder = ref<object[]>([]); // ข้อมูลจำนวนปี
+  const DataMainOrigOrder = ref<FormOrderPlacementMainData[]>([]); // ข้อมูลหลักดั้งเดิม
+  const DataMainUpdateOrder = ref<FormOrderPlacementMainData[]>([]); // ข้อมูลเปลี่ยนแปลง
+  const DataMainYearSetOrder = (val: FormOrderPlacementMainData[]) =>
+    (DataMainYearOrder.value = val);
+
+  const DataMainOrder = (val: FormOrderPlacementMainData[]) =>
+    (DataMainOrigOrder.value = val);
+
+  const DataUpdateMainOrder = (
+    filter_1: string | null,
+    filter_2: string | null
+  ) => {
+    DataMainUpdateOrder.value = [];
+
+    if (filter_1 === null && filter_2 === "0") {
+      DataMainUpdateOrder.value = DataMainOrigOrder.value;
+    } else if (filter_1 !== null && filter_2 === "0") {
+      DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
+        (item) => item.Order === filter_1
+      );
+    } else if (filter_1 !== null && filter_2 !== "0") {
+      DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
+        (item) => item.Order === filter_1 && item.OrderType === filter_2
+      );
+    } else if (filter_1 === null && filter_2 !== "0") {
+      DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
+        (item) => item.OrderStatus === filter_2
+      );
+    }
+  };
+
+  return {
+    placementData,
+    changePlacementColumns,
+    DataMainYearOrder,
+    DataMainOrigOrder,
+    DataMainUpdateOrder,
+    DataUpdateMainOrder,
+    DataMainYearSetOrder,
+    DataMainOrder,
+  };
+});

From bd7db2ad8eca57206b3429938d2000a2b1e42d79 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Fri, 30 Jun 2023 16:29:33 +0700
Subject: [PATCH 5/6] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A2=E0=B8=99=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B9=81=E0=B8=9B=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OrderPlacement/MainOrderPlacement.vue          | 14 +++++++-------
 src/modules/05_placement/store.ts                  |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
index db0d953df..b5482e3ba 100644
--- a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
+++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
@@ -646,12 +646,12 @@ const OrderStatusFilter = async () => {
     const OrderStatusValue = data.OrderStatus;
     console.log(OrderStatusValue);
 
-    // if (
-    //   OrderStatusValue === null ||
-    //   parseInt(OrderStatusValue) > parseInt(OrderStatusValue)
-    // ) {
-    //   OrderStatusText.value = OrderStatusValue;
-    // }
+    if (
+      OrderStatusValue === null ||
+      parseInt(OrderStatusValue) > parseInt(OrderStatusValue)
+    ) {
+      OrderStatus.value = OrderStatusValue;
+    }
 
     if (!addedOrderStatusValues.includes(OrderStatusValue)) {
       OrderStatusOption.push({
@@ -698,7 +698,7 @@ const visibleColumns = ref<string[]>([
 
 const searchFilterTable = async () => {
   // console.log('Input value changed:', examTime.value, examType.value, expiredAccount.value);
-  await DataStore.DataUpdateMainOrder(OrderType.value, OrderStatus.value);
+  await DataStore.DataUpdateOrder(OrderType.value, OrderStatus.value);
   UpdataData.value = DataStore.DataMainUpdateOrder;
 };
 //   UpdataData.value = DataStore.DataMainUpdate;
diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index ec5548899..4ff47f8e8 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -217,7 +217,7 @@ export const useOrderPlacementDataStore = defineStore("placement", () => {
   const DataMainOrder = (val: FormOrderPlacementMainData[]) =>
     (DataMainOrigOrder.value = val);
 
-  const DataUpdateMainOrder = (
+  const DataUpdateOrder = (
     filter_1: string | null,
     filter_2: string | null
   ) => {
@@ -246,7 +246,7 @@ export const useOrderPlacementDataStore = defineStore("placement", () => {
     DataMainYearOrder,
     DataMainOrigOrder,
     DataMainUpdateOrder,
-    DataUpdateMainOrder,
+    DataUpdateOrder,
     DataMainYearSetOrder,
     DataMainOrder,
   };

From a0437a8a66d8f7269d9760d92c041cc24e22fea1 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Fri, 30 Jun 2023 17:26:51 +0700
Subject: [PATCH 6/6] filter OrderType,OrderStatus

---
 .../OrderPlacement/MainOrderPlacement.vue     |  8 ++--
 .../components/OrderPlacement/step/step03.vue |  3 +-
 src/modules/05_placement/store.ts             | 38 ++++++++++---------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
index b5482e3ba..83047e607 100644
--- a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
+++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
@@ -584,8 +584,8 @@ const fiscalYearFilter = async () => {
   }
 };
 
-const OrderType = ref<string | null>(null);
-const OrderTypeOption = reactive<DataOption[]>([{ id: 0, name: "ทั้งหมด" }]);
+const OrderType = ref<string>("");
+const OrderTypeOption = reactive<DataOption[]>([{ id: "", name: "ทั้งหมด" }]);
 const addedOrderTypeValues: string[] = [];
 const OrderTypeFilter = async () => {
   // API
@@ -623,11 +623,11 @@ const OrderTypeFilter = async () => {
     // }
   }
 };
-const OrderStatus = ref<string | null>(null);
+const OrderStatus = ref<string>("");
 const OrderStatusText = ref<FormOrderPlacementMainData[]>(
   DataStore.DataMainOrigOrder
 );
-const OrderStatusOption = reactive<DataOption[]>([{ id: 0, name: "ทั้งหมด" }]);
+const OrderStatusOption = reactive<DataOption[]>([{ id: "", name: "ทั้งหมด" }]);
 const addedOrderStatusValues: string[] = [];
 const OrderStatusFilter = async () => {
   // API
diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
index 351061668..66da2ed48 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
@@ -364,7 +364,7 @@ const search = ref<string>("");
 const expanded = ref<string[]>([]);
 const selected = ref<string>("");
 const nodesTree = ref<treeTab[]>([]);
-
+const send = ref<String[]>([]);
 const selectedModal = ref([]);
 const filterModal = ref<string>("");
 const visibleColumnsModal = ref<String[]>(["no", "idcard", "name"]);
@@ -467,7 +467,6 @@ const pagination = ref({
   page: 1,
   rowsPerPage: 10,
 });
-
 const optionSelect = ref<any>([
   { id: 1, name: "อีเมล" },
   { id: 2, name: "กล่องข้อความ" },
diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index 4ff47f8e8..296a38b78 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -191,21 +191,26 @@ export const usePlacementDataStore = defineStore("placement", () => {
   };
 });
 
-export const useOrderPlacementDataStore = defineStore("placement", () => {
-  interface placement {
+export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
+  interface placementOrder {
     mappingPosition: { columns: String[] };
   }
-  const placementData = ref<placement>({
+  const placementOrderData = ref<placementOrder>({
     mappingPosition: { columns: [] },
   });
   const changePlacementColumns = (system: String, val: String[]) => {
     if (system == "mappingPosition")
-      placementData.value.mappingPosition.columns = val;
-    localStorage.setItem("placement", JSON.stringify(placementData.value));
+      placementOrderData.value.mappingPosition.columns = val;
+    localStorage.setItem(
+      "placementOrder",
+      JSON.stringify(placementOrderData.value)
+    );
   };
 
-  if (localStorage.getItem("placement") !== null) {
-    placementData.value = JSON.parse(localStorage.getItem("placement") || "{}");
+  if (localStorage.getItem("placementOrder") !== null) {
+    placementOrderData.value = JSON.parse(
+      localStorage.getItem("placementOrder") || "{}"
+    );
   }
 
   const DataMainYearOrder = ref<object[]>([]); // ข้อมูลจำนวนปี
@@ -217,23 +222,20 @@ export const useOrderPlacementDataStore = defineStore("placement", () => {
   const DataMainOrder = (val: FormOrderPlacementMainData[]) =>
     (DataMainOrigOrder.value = val);
 
-  const DataUpdateOrder = (
-    filter_1: string | null,
-    filter_2: string | null
-  ) => {
+  const DataUpdateOrder = (filter_1: string, filter_2: string) => {
     DataMainUpdateOrder.value = [];
 
-    if (filter_1 === null && filter_2 === "0") {
+    if (filter_1 === "" && filter_2 === "") {
       DataMainUpdateOrder.value = DataMainOrigOrder.value;
-    } else if (filter_1 !== null && filter_2 === "0") {
+    } else if (filter_1 !== "" && filter_2 === "") {
       DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
-        (item) => item.Order === filter_1
+        (item) => item.OrderType === filter_1
       );
-    } else if (filter_1 !== null && filter_2 !== "0") {
+    } else if (filter_1 !== "" && filter_2 !== "") {
       DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
-        (item) => item.Order === filter_1 && item.OrderType === filter_2
+        (item) => item.OrderType === filter_1 && item.OrderStatus === filter_2
       );
-    } else if (filter_1 === null && filter_2 !== "0") {
+    } else if (filter_1 === "" && filter_2 !== "") {
       DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
         (item) => item.OrderStatus === filter_2
       );
@@ -241,7 +243,7 @@ export const useOrderPlacementDataStore = defineStore("placement", () => {
   };
 
   return {
-    placementData,
+    placementOrderData,
     changePlacementColumns,
     DataMainYearOrder,
     DataMainOrigOrder,