Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

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

@@ -84,7 +84,7 @@ const fullname = ref<string>();
 const knowledge_skill_map_no = ref<string[]>([]);
 const round_no = ref<number>();
 const date_start = ref<Date>();
-const date_finish = ref<Date>();
+const date_finish = ref<any>();
 const behavior_desc = ref<string>();
 const other_desc = ref<object>({});
 const other4_desc = ref<string>();
@@ -104,13 +104,13 @@ const main4 = ref<any>();
 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 commander = ref<any>("");
+const chairman = ref<any>("");
 
-const date1 = ref<Date>();
-const date2 = ref<Date>();
-const date3 = ref<Date>();
-const date4 = ref<Date>();
+const date1 = ref<any>();
+const date2 = ref<any>();
+const date3 = ref<any>();
+const date4 = ref<any>();
 
 const OPmain = ref<
   Array<{
@@ -142,10 +142,10 @@ const routeName = router.currentRoute.value.name;
 const name = ref<string>("");
 const position = ref<string>("");
 
-const monthSelect = ref<number | string>();
+const monthSelect = ref<any>();
 
-const caretaker1 = ref<string>("");
-const caretaker2 = ref<string>("");
+const caretaker1 = ref<any>("");
+const caretaker2 = ref<any>("");
 const OPcaretaker = ref<
   Array<{
     id: string;
@@ -595,8 +595,7 @@ const putData = (id: string) => {
       date_finish.value instanceof Date
         ? dateToISO(date_finish.value)
         : dateToISO(new Date(date_finish.value)),
-    // caretaker_1: caretaker1.value,
-    // caretaker_2: caretaker2.value,
+
     assign_knowledges: know_ledge,
     assign_jobs: assign_job.filter((item) => item !== null),
     other_desc: OtherLaw.value,
@@ -606,15 +605,11 @@ const putData = (id: string) => {
     other4_desc: Other.value,
     other5_no1_desc: Other5.value,
     assign_outputs: Productivity_assign.filter((item) => item !== null),
-    // commander: commander.value,
+
     assign_director: assign_director,
     experimenter_dated:
       date1.value instanceof Date ? dateToISO(date1.value) : new Date(),
-    // date_2: date2.value instanceof Date ? dateToISO(date2.value) : new Date(),
-    // date_3: date3.value instanceof Date ? dateToISO(date3.value) : new Date(),
-    // date_4: date4.value instanceof Date ? dateToISO(date4.value) : new Date(),
-    // caretaker_foot: caretakerFoot.value,
-    // caretaker_foot2: caretakerFoot2.value,
+
     assign_law: checkRule.value
       .filter((item) => item.checked === 1)
       .map((item) => ({
@@ -741,10 +736,6 @@ const getAssign = async () => {
       description: law.description,
       status_select: law.status_select,
     }));
-    // console.log(
-    //   "🚀 ~ file: FormAssign.vue:2009 ~ awaithttp.get ~ checkRule:",
-    //   checkRule.value
-    // );
   });
 };
 const downloadFile = (response: any, filename: string) => {
@@ -764,7 +755,10 @@ const clickdownloadFile = async (type: string) => {
       responseType: "blob",
     })
     .then((res) => {
-      downloadFile(res,`แบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ-${fullname.value}.${type}`);
+      downloadFile(
+        res,
+        `แบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ-${fullname.value}.${type}`
+      );
     })
     .catch((e) => {
       messageError($q, e);
@@ -774,7 +768,6 @@ const clickdownloadFile = async (type: string) => {
     });
 };
 onMounted(async () => {
-  getAssign();
   await getUser();
   await getLaw(personalId);
   await getcompetency(personalId);
@@ -782,6 +775,7 @@ onMounted(async () => {
   await getSkill(personalId);
   await getKnowledge(personalId);
   await getAssignNew(personalId);
+  await getAssign();
 });
 watch(
   () => [monthSelect.value, date_start.value],
@@ -818,8 +812,6 @@ watch(knowledge.value, () => {
         </div>
         <div v-else class="col-12 row q-gutter-md">
           <div>แบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ</div>
-
-          <!-- <q-space /> -->
           <q-btn
             v-if="!status"
             size="12px"
@@ -837,8 +829,8 @@ watch(knowledge.value, () => {
                   @click="clickdownloadFile('pdf')"
                 >
                   <q-item-section avatar
-                    ><q-icon color="red" name="mdi-file-pdf"
-                  /></q-item-section>
+                    ><q-icon color="red" name="mdi-file-pdf" />
+                  </q-item-section>
                   <q-item-section>ไฟล์ .PDF</q-item-section>
                 </q-item>
                 <q-item
@@ -1072,11 +1064,11 @@ watch(knowledge.value, () => {
                   option-value="id"
                   :options="filtermantor(OPcaretaker, [caretaker2])"
                   class="col-xs-12 col-sm-6"
-                  :readonly="status != true"
+                  :readonly="!status"
                   dense
                   hide-bottom-space
                   borderless
-                  :outlined="status == true"
+                  :outlined="status"
                   v-model="caretaker1"
                   :label="`ผู้ดูแลคนที่ 1`"
                   option-label="name"
@@ -1088,10 +1080,10 @@ watch(knowledge.value, () => {
                   option-label="name"
                   hide-bottom-space
                   class="col-xs-12 col-sm-6"
-                  :readonly="status != true"
+                  :readonly="!status"
                   dense
                   borderless
-                  :outlined="status == true"
+                  :outlined="status"
                   v-model="caretaker2"
                   :label="`ผู้ดูแลคนที่ 2`"
                 />
@@ -1250,15 +1242,6 @@ watch(knowledge.value, () => {
                   <div class="col-12 row">
                     <div class="col-12 text-top2 row items-center">
                       ความรู้เรื่องกฎหมายและกฎระเบียบ (ไม่เกิน 20 หัวข้อ)
-                      <!-- <q-btn
-                      v-if="status == true"
-                      round
-                      color="primary"
-                      dense
-                      icon="mdi-plus"
-                      flat
-                      class="q-ml-sm"
-                    /> -->
                     </div>
                     <q-card
                       flat
@@ -1411,26 +1394,6 @@ watch(knowledge.value, () => {
                             </div>
                           </div>
                         </div>
-                        <!-- <div class="row q-mt-xs bg-grey-3 q-py-xs">
-                        <div class="col-1 text-center"></div>
-                        <div class="col-11">
-                          3. กฎหมายอื่นๆ ที่เกี่ยวข้องกับการปฏิบัติงาน
-                        </div>
-                      </div>
-                      <div class="row border_y borderCheck">
-                        <div class="col-1 text-center"></div>
-                        <div class="q-py-sm col-10" style="min-width: 300px">
-                          <q-input
-                            hide-bottom-space
-                            dense
-                            outlined
-                            lazy-rules
-                            v-model="ruleNote"
-                            :label="`${'กรอกกฎหมายอื่นๆ'}`"
-                            type="textarea"
-                          />
-                        </div>
-                      </div> -->
                       </div>
                     </q-card>
                   </div>
@@ -2229,10 +2192,10 @@ watch(knowledge.value, () => {
                   option-value="id"
                   option-label="name"
                   class="col-xs-12 col-sm-8"
-                  :readonly="status != true"
+                  :readonly="!status"
                   dense
                   borderless
-                  :outlined="status == true"
+                  :outlined="status"
                   v-model="caretaker1"
                   label="ผู้ดูแลคนที่ 1"
                 />
@@ -2298,10 +2261,10 @@ watch(knowledge.value, () => {
                   option-value="id"
                   option-label="name"
                   class="col-xs-12 col-sm-8"
-                  :readonly="status != true"
+                  :readonly="!status"
                   dense
                   borderless
-                  :outlined="status == true"
+                  :outlined="status"
                   v-model="caretaker2"
                   label="ผู้ดูแลคนที่ 2"
                 />
@@ -2314,7 +2277,7 @@ watch(knowledge.value, () => {
                     borderless
                     :enableTimePicker="false"
                     week-start="0"
-                    :readonly="(status != true) | !caretaker2"
+                    :readonly="status != true || !caretaker2"
                   >
                     <template #year="{ year }">
                       {{ year + 543 }}
@@ -2374,10 +2337,10 @@ watch(knowledge.value, () => {
                   option-value="id"
                   option-label="name"
                   class="col-xs-12 col-sm-8"
-                  :readonly="status != true"
+                  :readonly="!status"
                   dense
                   borderless
-                  :outlined="status == true"
+                  :outlined="status"
                   v-model="commander"
                   label="ผู้บังคับบัญชา"
                 />
@@ -2449,10 +2412,10 @@ watch(knowledge.value, () => {
                   option-value="id"
                   option-label="name"
                   class="col-xs-12 col-sm-8"
-                  :readonly="status != true"
+                  :readonly="!status"
                   dense
                   borderless
-                  :outlined="status == true"
+                  :outlined="status"
                   v-model="chairman"
                   label="ประธานกรรมการ"
                 />

src/modules/05_placement/components/probation/FormEvaluation/Template1.vue

@@ -31,7 +31,7 @@ const evaluate = ref<any>([]);
 const tabs = ref<any>([]);
 const tab = ref<string>("save1");
 const dataArrayNumber = ref<number>();
-const dataRole = ref<string>("metor");
+const dataRole = ref<string>("mentor");
 onMounted(async () => {
   await fecthAssign(assignId.value);
 });