no message

src/modules/05_placement/components/probation/FormAssign.vue

@@ -70,7 +70,7 @@ const dataEdit = async (id: string) => {
     if (result) {
       showLoader();
       const data = putDataEdit(id);
-       http
+      http
         .put(config.API.saveEditAssign(id), data)
         .then(() => {})
         .catch(() => {})
@@ -79,7 +79,7 @@ const dataEdit = async (id: string) => {
           getAssign();
           hideLoader();
         });
-    }else {
+    } else {
       dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
     }
   });
@@ -242,6 +242,8 @@ interface CheckboxItem {
 }
 
 const checkRule = ref<CheckboxItem[]>([]);
+const checkListItem = checkRule.value.filter(item => item.checked === 1).length;
+
 const getUser = async () => {
   await http.get(config.API.userPlacement(personalId)).then((res: any) => {
     const data = res.data.result;
@@ -398,7 +400,10 @@ const putDataEdit = (id: string) => {
 
   const assign_director = [
     {
-      personal_id: caretaker1.value.id != null ? caretaker1.value.id:caretaker1.value.personal_id,
+      personal_id:
+        caretaker1.value.id != null
+          ? caretaker1.value.id
+          : caretaker1.value.personal_id,
       role: "mentor",
       dated:
         date2.value instanceof Date
@@ -406,7 +411,10 @@ const putDataEdit = (id: string) => {
           : dateToISO(new Date(date2.value)),
     },
     {
-      personal_id: commander.value.id != null ? commander.value.id:commander.value.personal_id,
+      personal_id:
+        commander.value.id != null
+          ? commander.value.id
+          : commander.value.personal_id,
       role: "commander",
       dated:
         date4.value instanceof Date
@@ -414,13 +422,19 @@ const putDataEdit = (id: string) => {
           : dateToISO(new Date(date4.value)),
     },
     {
-      personal_id: chairman.value.id != null ? chairman.value.id:chairman.value.personal_id,
+      personal_id:
+        chairman.value.id != null
+          ? chairman.value.id
+          : chairman.value.personal_id,
       role: "chairman",
     },
   ];
   if (caretaker2.value) {
     assign_director.push({
-      personal_id: caretaker2.value.id != null ? caretaker2.value.id:caretaker2.value.personal_id,
+      personal_id:
+        caretaker2.value.id != null
+          ? caretaker2.value.id
+          : caretaker2.value.personal_id,
       role: "mentor",
       dated:
         date3.value instanceof Date
@@ -593,30 +607,31 @@ const putData = (id: string) => {
   return data;
 };
 
-const saveData = (id: string) => {
+const saveData = async (id: string) => {
-  dialogConfirm($q, async () => await DataSave(id));
-};
-const DataSave = async (id: string) => {
   await myForm.value.validate().then((result: boolean) => {
     if (result) {
-      const data = putData(id);
+      dialogConfirm($q, async () => await DataSave(id));
-      http
-        .post(config.API.saveFinish(id), data)
-        .then(() => {
-          router.push(`/probation/detail/${id}`);
-          success($q, "บันทึกข้อมูลสำเร็จ");
-        })
-        .catch((e) => {
-          messageError($q, e);
-        })
-        .finally(() => {
-          hideLoader();
-        });
     } else {
       dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
     }
   });
 };
+
+const DataSave = async (id: string) => {
+  const data = putData(id);
+  await http
+    .post(config.API.saveFinish(id), data)
+    .then(() => {
+      router.push(`/probation/detail/${id}`);
+      success($q, "บันทึกข้อมูลสำเร็จ");
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+};
 const OtherLaw = ref<string>("");
 const skill = ref<any>();
 const skill2 = ref<any>();
@@ -670,7 +685,6 @@ const getAssign = async () => {
       caretaker1.value = data.mentors[0];
       date3.value = data.mentors[1].dated;
       caretaker2.value = data.mentors[1];
-
     } else {
       date2.value = data.mentors[0].dated;
       caretaker1.value = data.mentors[0];
@@ -1221,10 +1235,15 @@ watch(knowledge.value, () => {
                       </div>
                     </div>
                   </div>
-
+                  {{ checkRule.length }}
+                  <br/>
+                  {{ checkListItem }}
                   <div class="col-12 row">
                     <div class="col-12 text-top2 row items-center">
                       ความรู้เรื่องกฎหมายและกฎระเบียบ (ไม่เกิน 20 หัวข้อ)
+                      <div v-if="checkListItem > 1">
+test
+                      </div>
                     </div>
                     <q-card
                       flat
@@ -2282,7 +2301,9 @@ watch(knowledge.value, () => {
                         borderless
                         :outlined="status == true"
                         class="full-width datepicker"
-                        :model-value="caretaker2 != null ? date2Thai(date3) : null"
+                        :model-value="
+                          caretaker2 != null ? date2Thai(date3) : null
+                        "
                         label="ลงวันที่"
                       >
                         <template v-slot:prepend>
@@ -2314,6 +2335,7 @@ watch(knowledge.value, () => {
                   :readonly="status != true"
                   dense
                   borderless
+                  :rules="[(val) => !!val || 'กรุณาเลือกผู้บังคับบัญชา']"
                   :outlined="status == true"
                   v-model="commander"
                   label="ผู้บังคับบัญชา"
@@ -2326,6 +2348,7 @@ watch(knowledge.value, () => {
                   class="col-xs-12 col-sm-8"
                   :readonly="!status"
                   dense
+                  :rules="[(val) => !!val || 'กรุณาเลือกผู้บังคับบัญชา']"
                   borderless
                   :outlined="status"
                   v-model="commander"