From 40300cf4ce4924217e2a4ee21447222a221c4792 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 18 Aug 2023 11:50:53 +0700
Subject: [PATCH] no message

---
 .../components/probation/FormAssign.vue       | 43 +++++++++++++++++--
 .../components/1_Proposals/addProposals.vue   | 10 +++--
 .../components/1_Proposals/addProposals.vue   |  9 ++--
 3 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index 9959cbd28..047c35bb0 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -1305,7 +1305,7 @@
               </div>
               <div class="col-12 row q-col-gutter-md">
                 <q-select
-                  :options="OPcaretaker"
+                :options="filtermantor(OPcaretaker, [caretaker2])"
                   option-value="personal_id"
                   option-label="name"
                   class="col-xs-12 col-sm-8"
@@ -1358,7 +1358,7 @@
                   </datepicker>
                 </div>
                 <q-select
-                  :options="OPcaretaker"
+                :options="filtermantor(OPcaretaker, [caretaker1])"
                   option-value="personal_id"
                   option-label="name"
                   class="col-xs-12 col-sm-8"
@@ -1474,6 +1474,27 @@
                 </div>
               </div>
             </div>
+            <div class="col-12 row">
+              <div class="col-12 text-top2 row items-center">
+                <q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
+                ประธานกรรมการ
+              </div>
+              <div class="col-12 row q-col-gutter-md">
+                <q-select
+                  :options="OPchairman"
+                  option-value="personal_id"
+                  option-label="name"
+                  class="col-xs-12 col-sm-8"
+                  :readonly="routeName != 'probationWorkAdd'"
+                  dense
+                  borderless
+                  :outlined="routeName == 'probationWorkAdd'"
+                  v-model="chairman"
+                  label="ประธานกรรมการ"
+                />
+
+              </div>
+            </div>
           </div>
         </div>
         <q-separator v-show="routeName == 'probationWorkAdd'" />
@@ -1572,6 +1593,7 @@ const main5 = ref<any>();
 const assignId = ref<string>(route.params.form as string);
 const Other = ref<string>("");
 const commander = ref<string>("");
+const chairman = ref<string>("");
 
 const date1 = ref<Date>();
 const date2 = ref<Date>();
@@ -1633,6 +1655,16 @@ const OPcommander = ref<
     OrganizationOrganization: string;
   }[]
 >([]);
+const OPchairman = ref<
+  {
+    personal_id: string;
+    name: string;
+    PositionId: string;
+    PositionLevelId: string;
+    PositionLineId: string;
+    OrganizationOrganization: string;
+  }[]
+>([]);
 interface MonthOption {
   value: number;
   label: string;
@@ -1731,6 +1763,7 @@ const getAssignNew = async (id: string) => {
     monthSelect.value = `${data.assign_month} เดือน`;
     OPcaretaker.value = data.mentors;
     OPcommander.value = [data.commander];
+    OPchairman.value = [data.chairman];
     fullname.value = data.person.name;
     position.value = data.person.OrganizationOrganization;
   });
@@ -1863,6 +1896,10 @@ const putData = (id: string) => {
       role: "commander",
       dated: date4.value instanceof Date ? dateToISO(date4.value) : null,
     },
+    {
+      personal_id: chairman.value.personal_id,
+      role: "chairman"
+    },
   ];
 
   const data = {
@@ -1996,7 +2033,7 @@ const getAssign = async () => {
     activityCount.value = data.jobs.length
     caretaker1.value = data.mentors[0];
     caretaker2.value = data.mentors[1];
-    
+    chairman.value = data.chairman.name;
     commander.value = data.commander.name
     knowledge.value = data.knowledges.map((id:any)=> id.id)
     knowledgeCount.value = data.knowledges.length
diff --git a/src/modules/07_insignia/components/1_Proposals/addProposals.vue b/src/modules/07_insignia/components/1_Proposals/addProposals.vue
index 725b8ced2..801f25fd8 100644
--- a/src/modules/07_insignia/components/1_Proposals/addProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/addProposals.vue
@@ -10,6 +10,7 @@
         color="primary"
         class="q-mr-sm"
         @click="clickBack"
+        
       />
       {{
         edit
@@ -34,6 +35,7 @@
                   option-label="label"
                   label="รอบการเสนอขอพระราชทานเครื่องราชฯ"
                   @update:model-value="updateDateRange"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกรอบที่'}`]"
                 />
                 <datepicker
                   menu-class-name="modalfix"
@@ -201,7 +203,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
+const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
   mixin;
 const router = useRouter();
 const route = useRoute();
@@ -293,8 +295,10 @@ const editData = async (id: string) => {
     });
   console.log(formData);
 };
-
-const checkSave = async () => {
+const checkSave =  () => {
+  dialogConfirm($q,()=> SaveData())
+}
+const SaveData = async () => {
   if (myForm.value !== null) {
     myForm.value.validate().then(async (success) => {
       if (success) {
diff --git a/src/modules/09_coin/components/1_Proposals/addProposals.vue b/src/modules/09_coin/components/1_Proposals/addProposals.vue
index 37613850f..05765e1d4 100644
--- a/src/modules/09_coin/components/1_Proposals/addProposals.vue
+++ b/src/modules/09_coin/components/1_Proposals/addProposals.vue
@@ -34,6 +34,7 @@
                   option-value="value"
                   option-label="label"
                   @update:model-value="updateDateRange"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกรอบที่'}`]"
                 />
                 <datepicker
                   menu-class-name="modalfix"
@@ -201,7 +202,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
+const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
   mixin;
 const router = useRouter();
 const route = useRoute();
@@ -317,8 +318,10 @@ const editData = async (id: string) => {
     });
   console.log(formData);
 };
-
-const checkSave = async () => {
+const checkSave =  () => {
+  dialogConfirm($q,()=>SaveData())
+}
+const SaveData = async () => {
   if (myForm.value !== null) {
     myForm.value.validate().then(async (success) => {
       if (success) {