แก้ วินัย เพิ่ม api

src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue

@@ -59,6 +59,7 @@ const data = reactive<FormData>({
   organizationId: "",
   persons: [],
   investigationExtendHistory: [],
+  isDisciplinary:false
 });
 
 /** ข้อมูล v-model ของฟอร์มเรื่องร้องเรียน */
@@ -162,6 +163,7 @@ function getData() {
       data.investigationStatusResult = dataList.investigationStatusResult;
       data.investigationExtendStatus = dataList.investigationExtendStatus;
       data.investigationDaysExtend = dataList.investigationDaysExtend;
+      data.isDisciplinary = dataList.isDisciplinary;
       data.investigationExtendHistory =
         dataList.investigationExtendHistory ?? [];
     })

src/modules/11_discipline/components/2_InvestigateFacts/Form.vue

@@ -128,6 +128,7 @@ const formData = reactive<FormData>({
   organizationId: "",
   persons: [],
   investigationExtendHistory: [],
+  isDisciplinary:false
 });
 
 /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
@@ -292,7 +293,7 @@ watch(props.data, async () => {
 
     mainStore.rowsAdd = props.data.persons;
     mainStore.rowsCheck = mainStore.rowsAdd.filter(
-      (item: any) => item.isSend === "NEW"
+      (item: any) => item.isDisciplinary === false && item.isSend === 'NEW'
     );
 
     const dataMap = props.data.directors.map((item: any) => ({
@@ -679,7 +680,7 @@ onMounted(async () => {
                 </div>
                 <div
                   class="col-xs-12 col-sm-4"
-                  v-if="route.name === 'disciplineInvestigatefactsEdit'"
+                  v-if="route.name === 'disciplineInvestigatefactsEdit' && mainStore.rowsCheck.length >0"
                 >
                   <q-btn
                     class="q-pa-sm"
@@ -1200,7 +1201,7 @@ onMounted(async () => {
               <div class="row col-12">
                 <q-card
                   bordered
-                  class="row col-12"
+                  class="col-12"
                   style="border: 1px solid #d6dee1"
                 >
                   <div
@@ -1211,8 +1212,8 @@ onMounted(async () => {
 
                   <div class="col-12"><q-separator /></div>
 
-                  <div class="col-xs-12 q-pa-sm row">
-                    <div class="row col-12 q-col-gutter-md">
+                  
+                    <div class="row col-12 q-col-gutter-sm q-pa-sm">
                       <div class="col-3">
                         <q-select
                           :class="inputEdit(isReadonly)"
@@ -1274,24 +1275,24 @@ onMounted(async () => {
                           </template>
                         </q-select>
                       </div>
+                      <div class="col-12">
+                        <q-input
+                          :class="inputEdit(isReadonly)"
+                          outlined
+                          ref="resultRef"
+                          :readonly="isReadonly"
+                          dense
+                          borderless
+                          v-model="formData.result"
+                          hide-bottom-space
+                          :label="`${'เหตุผล'}`"
+                          type="textarea"
+                          @update:model-value="changeFormData()"
+                        />
+                      </div>
                     </div>
 
-                    <div class="row col-12">
-                      <q-input
-                        :class="inputEdit(isReadonly)"
-                        outlined
-                        ref="resultRef"
-                        :readonly="isReadonly"
-                        dense
-                        borderless
-                        v-model="formData.result"
-                        hide-bottom-space
-                        :label="`${'เหตุผล'}`"
-                        type="textarea"
-                        @update:model-value="changeFormData()"
-                      />
-                    </div>
-                  </div>
+             
                 </q-card>
               </div>
 

src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue

@@ -64,7 +64,8 @@ async function getList() {
       config.API.investigateMain(
         currentPage.value,
         rowsPerPage.value,
-        filterKeyword.value
+        filterKeyword.value,
+        statusFilter.value
       )
     )
     .then((res) => {
@@ -123,7 +124,7 @@ onMounted(async () => {
           option-label="name"
           option-value="id"
           :options="dataInvestigate.statusOptions"
-          @update:model-value="dataUpdate"
+          @update:model-value="getList()"
         />
       </div>
       <q-space />