Merge branch 'develop' into dev-tee

src/modules/04_registry/components/Profile.vue

@@ -153,6 +153,49 @@
           </div>
         </div>
         <q-space />
+
+        <q-btn
+          round
+          flat
+          :color="reasonStatus ? 'primary' : 'pink'"
+          :icon="
+            reasonStatus ? 'mdi-home-import-outline' : 'mdi-home-export-outline'
+          "
+        >
+          <q-tooltip>{{
+            reasonStatus ? "การกลับเข้ารับราชการ" : "การออกจากราชการ"
+          }}</q-tooltip>
+
+          <q-menu transition-show="jump-down" transition-hide="jump-up">
+            <q-list dense style="min-width: 160px">
+              <q-item clickable v-close-popup @click="clickPassaway">
+                <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                </q-item-section>
+                <q-item-section>ถึงแก่กรรม</q-item-section>
+              </q-item>
+              <q-separator />
+              <q-item clickable v-close-popup @click="clickaddOrder">
+                <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                </q-item-section>
+                <q-item-section>ให้ออกจากราชการ</q-item-section>
+              </q-item>
+              <q-separator />
+              <q-item clickable v-close-popup @click="clickaddOrder">
+                <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                </q-item-section>
+                <q-item-section>ปลดออกจากราชการ</q-item-section>
+              </q-item>
+              <q-separator />
+              <q-item clickable v-close-popup @click="clickaddOrder">
+                <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                </q-item-section>
+                <q-item-section>ไล่ออกจากราชการ</q-item-section>
+              </q-item>
+              <q-separator />
+            </q-list>
+          </q-menu>
+        </q-btn>
+
         <q-btn
           round
           flat
@@ -349,6 +392,41 @@
       </q-card-actions>
     </q-card>
   </q-dialog>
+  <!-- Dialog แนบใบมรณบัตร -->
+  <q-dialog v-model="dialogPassaway" persistent>
+    <q-card style="width: 100vw; max-width: 60vw">
+      <q-card-section class="q-py-sm row">
+        <div class="text-h6">แนบใบมรณบัตร</div>
+        <q-space />
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          @click="closePassaway"
+          style="color: #ff8080; background-color: #ffdede"
+        >
+          <q-tooltip>ปิดหน้านี้</q-tooltip>
+        </q-btn>
+      </q-card-section>
+      <q-separator />
+      <q-card-actions align="right">
+        <q-file
+          class="col-xs-12 col-sm-12"
+          outlined
+          dense
+          v-model="filePassaway"
+          label="แนบใบมรณบัตร"
+          hide-bottom-space
+          lazy-rules
+        >
+          <template v-slot:prepend>
+            <q-icon name="attach_file" />
+          </template>
+        </q-file>
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
   <!-- Dialog เลือก เกษียณ -->
   <q-dialog v-model="dialogLeave" persistent>
     <q-card style="width: 600px">
@@ -559,9 +637,11 @@ const dialog = ref<boolean>(false);
 const dialogShort = ref<boolean>(false);
 const dialogLeave = ref<boolean>(false);
 const dialogImage = ref<boolean>(false);
+const dialogPassaway = ref<boolean>(false);
 const loader = ref<boolean>(false); //รอโหลด
 const statusEdit = ref<boolean>(false);
 const activeImage = ref<any | null>(null);
+const filePassaway = ref(null);
 const images = ref<any>([]);
 const profileId = ref<string>(route.params.id.toString());
 const profileType = ref<string>("");
@@ -806,6 +886,10 @@ const closeImage = () => {
   dialogImage.value = false;
 };
 
+const closePassaway = () => {
+  dialogPassaway.value = false;
+};
+
 const closeLeave = () => {
   dialogLeave.value = false;
 };
@@ -818,6 +902,10 @@ const closeKp7Short = () => {
   dialogShort.value = false;
 };
 
+const clickaddOrder = () => {
+  router.push({ name: "addOrder" });
+};
+
 const downloadKP7 = () => {};
 
 const downloadKP7Short = () => {};
@@ -896,6 +984,10 @@ const clickRetire = async () => {
   }
 };
 
+const clickPassaway = async () => {
+  dialogPassaway.value = true;
+};
+
 const Retire = async () => {
   if (reasonStatus.value == true) {
     loaderPage(true);

src/modules/04_registry/router.ts

@@ -4,6 +4,10 @@
 
 const Main = () => import("@/modules/04_registry/views/Main.vue");
 const Detail = () => import("@/modules/04_registry/components/Profile.vue");
+const addOrder = () =>
+  import(
+    "@/modules/05_placement/components/OrderPlacement/addOrderPlacement.vue"
+  );
 
 export default [
   {
@@ -26,4 +30,14 @@ export default [
       Role: "registry",
     },
   },
+  {
+    path: "/dismiss-order/add",
+    name: "addOrder",
+    component: addOrder,
+    meta: {
+      Auth: true,
+      Key: [7],
+      Role: "registry",
+    },
+  },
 ];