Merge branch 'develop' into dev-tee

src/api/05_placement/api.probation.ts

@@ -30,7 +30,7 @@ export default {
   probationGetAssignList: (personalId: string) =>
     `${finish}/probation-assign-list?personal_id=${personalId}`,
   probationsGetAssign: (assignId: string) => `${finish}/probation-assign?assign_id=${assignId}`,
-  changestatusProbations: (personalId: string) => `${evaluate}/probation/change-status?personal_id=${personalId}`,
+  changestatusProbations: (personalId: string) => `${evaluate}/report/change-status?personal_id=${personalId}`,
 
   // probationGetAssignList: (personalId: string) =>
   //   `${finish}/probation-assign-list?personal_id=${personalId}`,

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

@@ -27,7 +27,7 @@ const name = ref<string>("");
 const position_line = ref<string>("");
 const position_level = ref<string>("");
 const organization = ref<string>("");
-const probation_status = ref<string>("");
+const probation_status = ref<number>();
 const probation_statusold = ref<string>("");
 const avatarprofile = ref<string>("");
 
@@ -95,10 +95,12 @@ const probation_statusOP = ref<any>([
   {
     id: 2,
     label: "พ้นการทดลองปฏิบัติหน้าที่ราชการ",
+    disable: true
   },
   {
     id: 3,
     label: "ไม่พ้นการทดลองปฏิบัติหน้าที่ราชการ",
+    disable: true
   },
   {
     id: 4,
@@ -115,10 +117,12 @@ const probation_statusOP = ref<any>([
   {
     id: 7,
     label: "ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการ",
+    disable: true
   },
   {
     id: 8,
     label: "ดึงรายชื่อไปออกคำสั่งแล้ว",
+    disable: true
   },
 ]);
 
@@ -279,6 +283,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
             <div class="col-12 text-top">สถานะการทดลองปฏิบัติหน้าที่ราชการ</div>
             <div class="col-12 text-detail">
               <q-select
+                :disable="probation_status==2 || probation_status==3 || probation_status==7 || probation_status==8"
                 dense
                 borderless
                 v-model="probation_status"

src/modules/08_registryEmployee/views/Main.vue

@@ -403,10 +403,10 @@
           :visible-columns="visibleColumnsOrder"
           :filter="filter"
           row-key="id"
-          selection="single"
+          selection="multiple"
           v-model:selected="selectedToOrder"
         >
-          <template v-slot:body-selection="scope">
+          <template v-slot:header-selection="scope">
             <q-checkbox
               keep-color
               color="primary"
@@ -1408,7 +1408,9 @@ const saveData = async () => {
   }
 };
 const checkSaveOrder = () => {
-  dialogConfirm($q, () => SaveOrder());
+  if (selectedToOrder.value.length == 0) {
+    dialogMessageNotify($q, "กรุณาเลือกคนออกคำสั่ง");
+  } else dialogConfirm($q, () => SaveOrder());
 };
 const SaveOrder = async () => {
   // ส่งไปออกคำสั่ง
@@ -1419,7 +1421,6 @@ const SaveOrder = async () => {
   let data = {
     id: pId,
   };
-  console.log(data);
   showLoader();
   await http
     .post(config.API.organizationEmployeeSendOrder, data)